From 9f661e567c4528e7f7f662209e4b677f12b99875 Mon Sep 17 00:00:00 2001 From: MooglyGuy Date: Wed, 31 May 2023 17:43:46 +0200 Subject: emu/device.h: Removed device (READ|WRITE)_LINE_MEMBER in favor of explicit function signatures. (#11283) [Ryan Holtz] --- src/devices/bus/a1bus/a1bus.cpp | 4 +- src/devices/bus/a1bus/a1bus.h | 4 +- src/devices/bus/a2bus/a2arcadebd.cpp | 4 +- src/devices/bus/a2bus/a2bus.cpp | 4 +- src/devices/bus/a2bus/a2bus.h | 4 +- src/devices/bus/a2bus/a2eauxslot.cpp | 4 +- src/devices/bus/a2bus/a2eauxslot.h | 4 +- src/devices/bus/a2bus/a2echoii.cpp | 8 +- src/devices/bus/a2bus/a2hsscsi.cpp | 2 +- src/devices/bus/a2bus/a2hsscsi.h | 2 +- src/devices/bus/a2bus/a2mcms.cpp | 2 +- src/devices/bus/a2bus/a2mcms.h | 2 +- src/devices/bus/a2bus/a2midi.cpp | 12 +- src/devices/bus/a2bus/a2mockingboard.cpp | 12 +- src/devices/bus/a2bus/a2parprn.cpp | 4 +- src/devices/bus/a2bus/a2pic.cpp | 16 +-- src/devices/bus/a2bus/a2scsi.cpp | 2 +- src/devices/bus/a2bus/a2scsi.h | 2 +- src/devices/bus/a2bus/a2sd.h | 2 +- src/devices/bus/a2bus/a2ssc.cpp | 4 +- src/devices/bus/a2bus/a2thunderclock.cpp | 4 +- src/devices/bus/a2bus/a2ultraterm.cpp | 4 +- src/devices/bus/a2bus/agat7ports.cpp | 2 +- src/devices/bus/a2bus/agat7ports.h | 2 +- src/devices/bus/a2bus/agat840k_hle.cpp | 4 +- src/devices/bus/a2bus/agat840k_hle.h | 4 +- src/devices/bus/a2bus/ccs7710.cpp | 4 +- src/devices/bus/a2bus/ccs7710.h | 4 +- src/devices/bus/a2bus/cmsscsi.h | 2 +- src/devices/bus/a2bus/corvfdc01.cpp | 4 +- src/devices/bus/a2bus/corvfdc01.h | 4 +- src/devices/bus/a2bus/corvfdc02.cpp | 4 +- src/devices/bus/a2bus/corvfdc02.h | 4 +- src/devices/bus/a2bus/ezcgi.cpp | 12 +- src/devices/bus/a2bus/grappler.cpp | 24 ++-- src/devices/bus/a2bus/lancegs.cpp | 4 +- src/devices/bus/a2bus/mouse.cpp | 8 +- src/devices/bus/a2bus/nippelclock.cpp | 2 +- src/devices/bus/a2bus/nippelclock.h | 2 +- src/devices/bus/a2bus/pc_xporter.cpp | 48 +++---- src/devices/bus/a2bus/ssprite.cpp | 4 +- src/devices/bus/a2bus/timemasterho.cpp | 8 +- src/devices/bus/a2bus/uniprint.cpp | 4 +- src/devices/bus/a2gameio/computereyes.cpp | 24 ++-- src/devices/bus/a2gameio/gameio.cpp | 20 +-- src/devices/bus/a2gameio/gameio.h | 40 +++--- src/devices/bus/a2gameio/gizmo.cpp | 16 +-- src/devices/bus/a2gameio/joyport.cpp | 20 +-- src/devices/bus/a2gameio/joystick.cpp | 16 +-- src/devices/bus/a2gameio/paddles.cpp | 16 +-- src/devices/bus/a800/a8sio.cpp | 26 ++-- src/devices/bus/a800/a8sio.h | 28 ++-- src/devices/bus/a800/atari1050.cpp | 6 +- src/devices/bus/a800/atari1050.h | 6 +- src/devices/bus/a800/atari810.cpp | 6 +- src/devices/bus/a800/atari810.h | 6 +- src/devices/bus/a800/cassette.cpp | 2 +- src/devices/bus/a800/cassette.h | 2 +- src/devices/bus/abcbus/abcbus.h | 48 +++---- src/devices/bus/abcbus/lux10828.cpp | 4 +- src/devices/bus/abcbus/lux10828.h | 4 +- src/devices/bus/abcbus/lux21046.cpp | 4 +- src/devices/bus/abcbus/lux21046.h | 4 +- src/devices/bus/abcbus/lux21056.cpp | 10 +- src/devices/bus/abcbus/lux21056.h | 10 +- src/devices/bus/abcbus/lux4105.cpp | 10 +- src/devices/bus/abcbus/lux4105.h | 10 +- src/devices/bus/abckb/abc77.h | 4 +- src/devices/bus/abckb/abc800kb.cpp | 2 +- src/devices/bus/abckb/abc800kb.h | 2 +- src/devices/bus/abckb/abc99.h | 4 +- src/devices/bus/abckb/abckb.cpp | 8 +- src/devices/bus/abckb/abckb.h | 8 +- src/devices/bus/acorn/atom/discpack.cpp | 6 +- src/devices/bus/acorn/atom/discpack.h | 6 +- src/devices/bus/acorn/atom/econet.cpp | 2 +- src/devices/bus/acorn/atom/econet.h | 2 +- src/devices/bus/acorn/bus.cpp | 4 +- src/devices/bus/acorn/bus.h | 4 +- src/devices/bus/acorn/cms/4080term.cpp | 2 +- src/devices/bus/acorn/cms/4080term.h | 2 +- src/devices/bus/acorn/cms/ieee.cpp | 2 +- src/devices/bus/acorn/cms/ieee.h | 2 +- src/devices/bus/acorn/system/cass.cpp | 2 +- src/devices/bus/acorn/system/cass.h | 2 +- src/devices/bus/acorn/system/econet.cpp | 2 +- src/devices/bus/acorn/system/econet.h | 2 +- src/devices/bus/acorn/system/fdc.cpp | 6 +- src/devices/bus/acorn/system/fdc.h | 6 +- src/devices/bus/acorn/system/vdu40.cpp | 2 +- src/devices/bus/acorn/system/vdu40.h | 2 +- src/devices/bus/acorn/system/vib.cpp | 4 +- src/devices/bus/acorn/system/vib.h | 4 +- src/devices/bus/adam/exp.h | 2 +- src/devices/bus/adamnet/adamnet.cpp | 8 +- src/devices/bus/adamnet/adamnet.h | 8 +- src/devices/bus/adb/a9m0330.cpp | 4 +- src/devices/bus/adb/a9m0330.h | 4 +- src/devices/bus/amiga/keyboard/a1200.cpp | 4 +- src/devices/bus/amiga/keyboard/a1200.h | 4 +- src/devices/bus/amiga/keyboard/a2000.cpp | 2 +- src/devices/bus/amiga/keyboard/keyboard.cpp | 2 +- src/devices/bus/amiga/keyboard/keyboard.h | 10 +- src/devices/bus/amiga/keyboard/mitsumi.cpp | 10 +- src/devices/bus/amiga/zorro/a2052.cpp | 2 +- src/devices/bus/amiga/zorro/a2052.h | 2 +- src/devices/bus/amiga/zorro/a2058.cpp | 2 +- src/devices/bus/amiga/zorro/a2058.h | 2 +- src/devices/bus/amiga/zorro/a2065.cpp | 4 +- src/devices/bus/amiga/zorro/a2065.h | 4 +- src/devices/bus/amiga/zorro/a2232.cpp | 32 ++--- src/devices/bus/amiga/zorro/a2232.h | 32 ++--- src/devices/bus/amiga/zorro/a590.cpp | 10 +- src/devices/bus/amiga/zorro/a590.h | 12 +- src/devices/bus/amiga/zorro/buddha.cpp | 6 +- src/devices/bus/amiga/zorro/buddha.h | 6 +- src/devices/bus/amiga/zorro/zorro.cpp | 18 +-- src/devices/bus/amiga/zorro/zorro.h | 20 +-- src/devices/bus/apricot/expansion/expansion.cpp | 12 +- src/devices/bus/apricot/expansion/expansion.h | 12 +- src/devices/bus/apricot/expansion/winchester.cpp | 12 +- src/devices/bus/apricot/expansion/winchester.h | 12 +- src/devices/bus/apricot/keyboard/keyboard.cpp | 2 +- src/devices/bus/apricot/keyboard/keyboard.h | 4 +- src/devices/bus/apricot/video/video.h | 2 +- src/devices/bus/aquarius/slot.h | 4 +- src/devices/bus/archimedes/econet/slot.h | 2 +- src/devices/bus/astrocde/accessory.h | 2 +- src/devices/bus/astrocde/ctrl.cpp | 2 +- src/devices/bus/astrocde/ctrl.h | 2 +- src/devices/bus/ata/atadev.h | 8 +- src/devices/bus/ata/atahle.cpp | 8 +- src/devices/bus/ata/atahle.h | 8 +- src/devices/bus/ata/ataintf.cpp | 18 +-- src/devices/bus/ata/ataintf.h | 20 +-- src/devices/bus/ata/cp2024.cpp | 8 +- src/devices/bus/ata/cp2024.h | 8 +- src/devices/bus/ata/gdrom.cpp | 2 +- src/devices/bus/ata/gdrom.h | 2 +- src/devices/bus/ata/px320a.cpp | 8 +- src/devices/bus/ata/px320a.h | 8 +- src/devices/bus/bbc/1mhzbus/1mhzbus.h | 4 +- src/devices/bus/bbc/1mhzbus/2ndserial.cpp | 2 +- src/devices/bus/bbc/1mhzbus/2ndserial.h | 2 +- src/devices/bus/bbc/1mhzbus/datacentre.cpp | 2 +- src/devices/bus/bbc/1mhzbus/datacentre.h | 2 +- src/devices/bus/bbc/1mhzbus/emrmidi.cpp | 2 +- src/devices/bus/bbc/1mhzbus/emrmidi.h | 2 +- src/devices/bus/bbc/1mhzbus/ide.cpp | 2 +- src/devices/bus/bbc/1mhzbus/ide.h | 2 +- src/devices/bus/bbc/1mhzbus/m2000.cpp | 2 +- src/devices/bus/bbc/1mhzbus/m2000.h | 2 +- src/devices/bus/bbc/1mhzbus/sasi.cpp | 4 +- src/devices/bus/bbc/1mhzbus/sasi.h | 4 +- src/devices/bus/bbc/1mhzbus/scsi.cpp | 4 +- src/devices/bus/bbc/1mhzbus/scsi.h | 4 +- src/devices/bus/bbc/analogue/analogue.h | 2 +- src/devices/bus/bbc/exp/exp.h | 8 +- src/devices/bus/bbc/fdc/acorn.cpp | 8 +- src/devices/bus/bbc/fdc/acorn.h | 8 +- src/devices/bus/bbc/fdc/ams.cpp | 4 +- src/devices/bus/bbc/fdc/ams.h | 6 +- src/devices/bus/bbc/fdc/cumana.cpp | 6 +- src/devices/bus/bbc/fdc/cumana.h | 6 +- src/devices/bus/bbc/fdc/cv1797.cpp | 4 +- src/devices/bus/bbc/fdc/cv1797.h | 4 +- src/devices/bus/bbc/fdc/fdc.h | 4 +- src/devices/bus/bbc/fdc/kenda.cpp | 2 +- src/devices/bus/bbc/fdc/kenda.h | 2 +- src/devices/bus/bbc/fdc/opus.cpp | 2 +- src/devices/bus/bbc/fdc/opus.h | 2 +- src/devices/bus/bbc/fdc/solidisk.cpp | 4 +- src/devices/bus/bbc/fdc/solidisk.h | 4 +- src/devices/bus/bbc/fdc/udm.cpp | 6 +- src/devices/bus/bbc/fdc/udm.h | 6 +- src/devices/bus/bbc/internal/cumana68k.cpp | 6 +- src/devices/bus/bbc/internal/cumana68k.h | 6 +- src/devices/bus/bbc/internal/internal.cpp | 2 +- src/devices/bus/bbc/internal/internal.h | 8 +- src/devices/bus/bbc/joyport/joyport.h | 4 +- src/devices/bus/bbc/modem/modem.h | 2 +- src/devices/bus/bbc/modem/scsiaiv.cpp | 4 +- src/devices/bus/bbc/modem/scsiaiv.h | 4 +- src/devices/bus/bbc/tube/tube.h | 2 +- src/devices/bus/bbc/tube/tube_32016.cpp | 2 +- src/devices/bus/bbc/tube/tube_32016.h | 2 +- src/devices/bus/bbc/tube/tube_6502.cpp | 2 +- src/devices/bus/bbc/tube/tube_6502.h | 2 +- src/devices/bus/bbc/tube/tube_80186.cpp | 2 +- src/devices/bus/bbc/tube/tube_80186.h | 2 +- src/devices/bus/bbc/tube/tube_80286.cpp | 2 +- src/devices/bus/bbc/tube/tube_80286.h | 2 +- src/devices/bus/bbc/tube/tube_a500.cpp | 2 +- src/devices/bus/bbc/tube/tube_a500.h | 2 +- src/devices/bus/bbc/tube/tube_arm.cpp | 2 +- src/devices/bus/bbc/tube/tube_arm.h | 2 +- src/devices/bus/bbc/tube/tube_arm7.cpp | 6 +- src/devices/bus/bbc/tube/tube_arm7.h | 6 +- src/devices/bus/bbc/tube/tube_rc6502.cpp | 2 +- src/devices/bus/bbc/tube/tube_rc6502.h | 2 +- src/devices/bus/bbc/tube/tube_z80.cpp | 2 +- src/devices/bus/bbc/tube/tube_z80.h | 2 +- src/devices/bus/bbc/userport/beebspch.cpp | 4 +- src/devices/bus/bbc/userport/beebspch.h | 4 +- src/devices/bus/bbc/userport/userport.h | 4 +- src/devices/bus/bbc/userport/usersplit.cpp | 8 +- src/devices/bus/bbc/userport/usersplit.h | 8 +- src/devices/bus/bml3/bml3bus.cpp | 6 +- src/devices/bus/bml3/bml3bus.h | 6 +- src/devices/bus/bml3/bml3mp1802.cpp | 2 +- src/devices/bus/bml3/bml3mp1802.h | 2 +- src/devices/bus/c64/4dxh.h | 4 +- src/devices/bus/c64/4ksa.h | 4 +- src/devices/bus/c64/4tba.h | 4 +- src/devices/bus/c64/bn1541.cpp | 2 +- src/devices/bus/c64/bn1541.h | 18 +-- src/devices/bus/c64/buscard.cpp | 2 +- src/devices/bus/c64/buscard.h | 2 +- src/devices/bus/c64/buscard2.h | 2 +- src/devices/bus/c64/c128_partner.cpp | 2 +- src/devices/bus/c64/c128_partner.h | 2 +- src/devices/bus/c64/exp.h | 8 +- src/devices/bus/c64/fcc.h | 2 +- src/devices/bus/c64/geocable.h | 18 +-- src/devices/bus/c64/magic_formel.cpp | 2 +- src/devices/bus/c64/magic_formel.h | 2 +- src/devices/bus/c64/magic_voice.cpp | 12 +- src/devices/bus/c64/magic_voice.h | 12 +- src/devices/bus/c64/midi_maplin.cpp | 4 +- src/devices/bus/c64/midi_maplin.h | 4 +- src/devices/bus/c64/midi_namesoft.cpp | 4 +- src/devices/bus/c64/midi_namesoft.h | 4 +- src/devices/bus/c64/midi_passport.cpp | 6 +- src/devices/bus/c64/midi_passport.h | 6 +- src/devices/bus/c64/midi_sci.cpp | 4 +- src/devices/bus/c64/midi_sci.h | 4 +- src/devices/bus/c64/midi_siel.cpp | 4 +- src/devices/bus/c64/midi_siel.h | 4 +- src/devices/bus/c64/partner.cpp | 2 +- src/devices/bus/c64/partner.h | 2 +- src/devices/bus/c64/sfx_sound_expander.cpp | 2 +- src/devices/bus/c64/sfx_sound_expander.h | 2 +- src/devices/bus/c64/swiftlink.cpp | 2 +- src/devices/bus/c64/swiftlink.h | 2 +- src/devices/bus/c64/turbo232.cpp | 2 +- src/devices/bus/c64/turbo232.h | 2 +- src/devices/bus/cbm2/user.h | 22 +-- src/devices/bus/cbmiec/c1541.cpp | 10 +- src/devices/bus/cbmiec/c1541.h | 10 +- src/devices/bus/cbmiec/c1571.cpp | 14 +- src/devices/bus/cbmiec/c1571.h | 14 +- src/devices/bus/cbmiec/c1581.cpp | 4 +- src/devices/bus/cbmiec/c1581.h | 4 +- src/devices/bus/cbmiec/cbmiec.h | 20 +-- src/devices/bus/cbmiec/mps1200.cpp | 6 +- src/devices/bus/cbmiec/mps1200.h | 6 +- src/devices/bus/cbus/mpu_pc98.cpp | 2 +- src/devices/bus/cbus/mpu_pc98.h | 2 +- src/devices/bus/cbus/pc9801_118.cpp | 2 +- src/devices/bus/cbus/pc9801_118.h | 2 +- src/devices/bus/cbus/pc9801_26.cpp | 2 +- src/devices/bus/cbus/pc9801_26.h | 2 +- src/devices/bus/cbus/pc9801_55.cpp | 2 +- src/devices/bus/cbus/pc9801_55.h | 2 +- src/devices/bus/cbus/pc9801_86.cpp | 2 +- src/devices/bus/cbus/pc9801_86.h | 2 +- src/devices/bus/centronics/chessmec.h | 6 +- src/devices/bus/centronics/comxpl80.h | 16 +-- src/devices/bus/centronics/covox.h | 36 ++--- src/devices/bus/centronics/ctronics.cpp | 34 ++--- src/devices/bus/centronics/ctronics.h | 102 +++++++------- src/devices/bus/centronics/digiblst.h | 16 +-- src/devices/bus/centronics/dsjoy.h | 12 +- src/devices/bus/centronics/epson_lx800.cpp | 16 +-- src/devices/bus/centronics/epson_lx800.h | 16 +-- src/devices/bus/centronics/epson_lx810l.cpp | 4 +- src/devices/bus/centronics/epson_lx810l.h | 38 ++--- src/devices/bus/centronics/nlq401.cpp | 20 +-- src/devices/bus/centronics/nlq401.h | 20 +-- src/devices/bus/centronics/printer.cpp | 6 +- src/devices/bus/centronics/printer.h | 22 +-- src/devices/bus/centronics/samdac.cpp | 2 +- src/devices/bus/centronics/samdac.h | 18 +-- src/devices/bus/centronics/smartboard.h | 4 +- src/devices/bus/centronics/spjoy.h | 16 +-- src/devices/bus/cgenie/expansion/expansion.h | 6 +- src/devices/bus/cgenie/expansion/floppy.cpp | 2 +- src/devices/bus/cgenie/expansion/floppy.h | 2 +- src/devices/bus/cgenie/parallel/printer.cpp | 8 +- src/devices/bus/cgenie/parallel/printer.h | 8 +- src/devices/bus/coco/coco_dcmodem.cpp | 2 +- src/devices/bus/coco/coco_fdc.h | 4 +- src/devices/bus/coco/coco_midi.cpp | 4 +- src/devices/bus/coco/coco_rs232.cpp | 2 +- src/devices/bus/coco/coco_t4426.cpp | 18 +-- src/devices/bus/coco/dragon_claw.cpp | 2 +- src/devices/bus/coco/dragon_claw.h | 2 +- src/devices/bus/coco/dragon_jcbspch.cpp | 4 +- src/devices/bus/coco/dragon_jcbspch.h | 4 +- src/devices/bus/coco/dragon_serial.cpp | 2 +- src/devices/bus/coco/dragon_serial.h | 2 +- src/devices/bus/coco/dragon_sprites.cpp | 2 +- src/devices/bus/coco/dragon_sprites.h | 2 +- src/devices/bus/coco/meb_intrf.cpp | 2 +- src/devices/bus/coco/meb_intrf.h | 4 +- src/devices/bus/coco/meb_rtime.cpp | 4 +- src/devices/bus/coleco/controller/ctrl.h | 4 +- src/devices/bus/compis/graphics.h | 2 +- src/devices/bus/compucolor/floppy.h | 4 +- src/devices/bus/comx35/exp.cpp | 8 +- src/devices/bus/comx35/exp.h | 10 +- src/devices/bus/comx35/expbox.h | 8 +- src/devices/bus/cpc/cpc_rs232.cpp | 6 +- src/devices/bus/cpc/cpc_rs232.h | 6 +- src/devices/bus/cpc/cpc_ssa1.cpp | 8 +- src/devices/bus/cpc/cpc_ssa1.h | 8 +- src/devices/bus/cpc/cpcexp.cpp | 8 +- src/devices/bus/cpc/cpcexp.h | 16 +-- src/devices/bus/cpc/ddi1.h | 2 +- src/devices/bus/cpc/hd20.cpp | 2 +- src/devices/bus/cpc/hd20.h | 2 +- src/devices/bus/cpc/magicsound.cpp | 18 +-- src/devices/bus/cpc/magicsound.h | 18 +-- src/devices/bus/cpc/musicmachine.cpp | 2 +- src/devices/bus/cpc/musicmachine.h | 2 +- src/devices/bus/cpc/playcity.h | 6 +- src/devices/bus/cpc/transtape.h | 2 +- src/devices/bus/dmv/k012.h | 2 +- src/devices/bus/dmv/k210.cpp | 16 +-- src/devices/bus/dmv/k210.h | 14 +- src/devices/bus/dmv/k220.cpp | 6 +- src/devices/bus/dmv/k220.h | 6 +- src/devices/bus/dmv/k801.cpp | 2 +- src/devices/bus/dmv/k801.h | 2 +- src/devices/bus/dmv/k803.cpp | 2 +- src/devices/bus/dmv/k803.h | 2 +- src/devices/bus/dmv/k806.cpp | 2 +- src/devices/bus/dmv/k806.h | 2 +- src/devices/bus/ecbbus/ecbbus.h | 4 +- src/devices/bus/ecbbus/grip.cpp | 6 +- src/devices/bus/ecbbus/grip.h | 6 +- src/devices/bus/econet/e01.cpp | 18 +-- src/devices/bus/econet/e01.h | 18 +-- src/devices/bus/econet/econet.cpp | 4 +- src/devices/bus/econet/econet.h | 4 +- src/devices/bus/einstein/pipe/pipe.cpp | 2 +- src/devices/bus/einstein/pipe/pipe.h | 8 +- src/devices/bus/einstein/pipe/speculator.cpp | 4 +- src/devices/bus/einstein/pipe/speculator.h | 4 +- src/devices/bus/einstein/pipe/tk02.cpp | 2 +- src/devices/bus/einstein/pipe/tk02.h | 2 +- src/devices/bus/einstein/userport/userport.cpp | 2 +- src/devices/bus/einstein/userport/userport.h | 4 +- src/devices/bus/ekara/rom.cpp | 6 +- src/devices/bus/ekara/rom.h | 6 +- src/devices/bus/ekara/slot.cpp | 6 +- src/devices/bus/ekara/slot.h | 16 +-- src/devices/bus/electron/cart/peg400.cpp | 2 +- src/devices/bus/electron/cart/peg400.h | 2 +- src/devices/bus/electron/cart/slot.h | 4 +- src/devices/bus/electron/exp.h | 4 +- src/devices/bus/electron/mode7.cpp | 2 +- src/devices/bus/electron/mode7.h | 2 +- src/devices/bus/electron/voxbox.cpp | 2 +- src/devices/bus/electron/voxbox.h | 2 +- src/devices/bus/ep64/exp.h | 6 +- src/devices/bus/epson_qx/keyboard/keyboard.cpp | 10 +- src/devices/bus/epson_qx/keyboard/keyboard.h | 10 +- src/devices/bus/epson_qx/option.cpp | 18 +-- src/devices/bus/epson_qx/option.h | 18 +-- src/devices/bus/epson_qx/sound_card.cpp | 2 +- src/devices/bus/epson_qx/sound_card.h | 2 +- src/devices/bus/epson_sio/epson_sio.cpp | 4 +- src/devices/bus/epson_sio/epson_sio.h | 8 +- src/devices/bus/epson_sio/pf10.cpp | 6 +- src/devices/bus/epson_sio/pf10.h | 6 +- src/devices/bus/epson_sio/tf20.cpp | 8 +- src/devices/bus/epson_sio/tf20.h | 8 +- src/devices/bus/gamate/gamate_protection.cpp | 4 +- src/devices/bus/gamate/gamate_protection.h | 4 +- src/devices/bus/gio64/gio64.h | 2 +- src/devices/bus/gio64/newport.cpp | 6 +- src/devices/bus/gio64/newport.h | 6 +- src/devices/bus/hexbus/hx5102.cpp | 36 ++--- src/devices/bus/hexbus/hx5102.h | 36 ++--- src/devices/bus/hp80_io/82900.cpp | 2 +- src/devices/bus/hp80_io/82900.h | 2 +- src/devices/bus/hp80_io/82937.cpp | 6 +- src/devices/bus/hp80_io/82937.h | 6 +- src/devices/bus/hp80_io/hp80_io.cpp | 8 +- src/devices/bus/hp80_io/hp80_io.h | 8 +- src/devices/bus/hp9845_io/98032.cpp | 30 ++-- src/devices/bus/hp9845_io/98032.h | 36 ++--- src/devices/bus/hp9845_io/98034.cpp | 2 +- src/devices/bus/hp9845_io/98034.h | 2 +- src/devices/bus/hp9845_io/98036.cpp | 20 +-- src/devices/bus/hp9845_io/98036.h | 20 +-- src/devices/bus/hp9845_io/98046.cpp | 20 +-- src/devices/bus/hp9845_io/98046.h | 20 +-- src/devices/bus/hp9845_io/hp9845_io.cpp | 28 ++-- src/devices/bus/hp9845_io/hp9845_io.h | 28 ++-- src/devices/bus/hp9845_io/hp9871.cpp | 8 +- src/devices/bus/hp9845_io/hp9871.h | 8 +- src/devices/bus/hp9845_io/hp9885.cpp | 6 +- src/devices/bus/hp9845_io/hp9885.h | 6 +- src/devices/bus/hp_dio/hp98265a.cpp | 4 +- src/devices/bus/hp_dio/hp98265a.h | 4 +- src/devices/bus/hp_dio/hp98543.cpp | 10 +- src/devices/bus/hp_dio/hp98543.h | 10 +- src/devices/bus/hp_dio/hp98544.cpp | 4 +- src/devices/bus/hp_dio/hp98544.h | 4 +- src/devices/bus/hp_dio/hp98550.cpp | 2 +- src/devices/bus/hp_dio/hp98550.h | 2 +- src/devices/bus/hp_dio/hp98620.cpp | 4 +- src/devices/bus/hp_dio/hp98620.h | 6 +- src/devices/bus/hp_dio/hp98643.cpp | 2 +- src/devices/bus/hp_dio/hp98643.h | 2 +- src/devices/bus/hp_dio/hp_dio.cpp | 2 +- src/devices/bus/hp_dio/hp_dio.h | 78 +++++------ src/devices/bus/hp_dio/human_interface.cpp | 14 +- src/devices/bus/hp_dio/human_interface.h | 14 +- src/devices/bus/hp_hil/hp_hil.cpp | 2 +- src/devices/bus/hp_hil/hp_hil.h | 2 +- src/devices/bus/hp_ipc_io/82919.cpp | 22 +-- src/devices/bus/hp_ipc_io/82919.h | 22 +-- src/devices/bus/ieee488/c2031.cpp | 6 +- src/devices/bus/ieee488/c2031.h | 6 +- src/devices/bus/ieee488/c2040fdc.cpp | 14 +- src/devices/bus/ieee488/c2040fdc.h | 20 +-- src/devices/bus/ieee488/c8050fdc.cpp | 18 +-- src/devices/bus/ieee488/c8050fdc.h | 22 +-- src/devices/bus/ieee488/d9060.cpp | 4 +- src/devices/bus/ieee488/d9060.h | 4 +- src/devices/bus/ieee488/hp9122c.cpp | 24 ++-- src/devices/bus/ieee488/hp9122c.h | 24 ++-- src/devices/bus/ieee488/hp9895.cpp | 18 +-- src/devices/bus/ieee488/hp9895.h | 18 +-- src/devices/bus/ieee488/ieee488.h | 32 ++--- src/devices/bus/imi7000/imi5000h.cpp | 6 +- src/devices/bus/imi7000/imi5000h.h | 6 +- src/devices/bus/intellec4/insdatastor.cpp | 4 +- src/devices/bus/intellec4/intellec4.cpp | 6 +- src/devices/bus/intellec4/intellec4.h | 44 +++--- src/devices/bus/intellec4/tapereader.cpp | 4 +- src/devices/bus/interpro/keyboard/hle.cpp | 2 +- src/devices/bus/interpro/keyboard/hle.h | 2 +- src/devices/bus/interpro/keyboard/keyboard.cpp | 2 +- src/devices/bus/interpro/keyboard/keyboard.h | 6 +- src/devices/bus/interpro/keyboard/lle.cpp | 4 +- src/devices/bus/interpro/keyboard/lle.h | 6 +- src/devices/bus/interpro/sr/edge.cpp | 10 +- src/devices/bus/interpro/sr/edge.h | 10 +- src/devices/bus/interpro/sr/gt.cpp | 2 +- src/devices/bus/interpro/sr/gt.h | 2 +- src/devices/bus/interpro/sr/sr.h | 24 ++-- src/devices/bus/isa/3c503.cpp | 2 +- src/devices/bus/isa/aga.cpp | 4 +- src/devices/bus/isa/aga.h | 4 +- src/devices/bus/isa/aha1542b.cpp | 4 +- src/devices/bus/isa/aha1542b.h | 4 +- src/devices/bus/isa/asc88.cpp | 4 +- src/devices/bus/isa/asc88.h | 4 +- src/devices/bus/isa/bblue2.cpp | 2 +- src/devices/bus/isa/bblue2.h | 6 +- src/devices/bus/isa/cga.cpp | 4 +- src/devices/bus/isa/cga.h | 4 +- src/devices/bus/isa/com.h | 4 +- src/devices/bus/isa/dectalk.cpp | 4 +- src/devices/bus/isa/dectalk.h | 4 +- src/devices/bus/isa/ega.cpp | 8 +- src/devices/bus/isa/ega.h | 8 +- src/devices/bus/isa/eis_hgb107x.cpp | 4 +- src/devices/bus/isa/eis_hgb107x.h | 4 +- src/devices/bus/isa/ex1280.cpp | 2 +- src/devices/bus/isa/ex1280.h | 2 +- src/devices/bus/isa/fdc.cpp | 10 +- src/devices/bus/isa/fdc.h | 10 +- src/devices/bus/isa/gus.cpp | 24 ++-- src/devices/bus/isa/gus.h | 24 ++-- src/devices/bus/isa/hdc.cpp | 4 +- src/devices/bus/isa/hdc.h | 4 +- src/devices/bus/isa/hpblp.cpp | 4 +- src/devices/bus/isa/hpblp.h | 4 +- src/devices/bus/isa/ibm_mfc.cpp | 8 +- src/devices/bus/isa/ibm_mfc.h | 8 +- src/devices/bus/isa/ibm_speech.cpp | 10 +- src/devices/bus/isa/ibm_speech.h | 10 +- src/devices/bus/isa/ide.cpp | 2 +- src/devices/bus/isa/ide.h | 2 +- src/devices/bus/isa/isa.cpp | 36 ++--- src/devices/bus/isa/isa.h | 36 ++--- src/devices/bus/isa/lpt.cpp | 2 +- src/devices/bus/isa/lpt.h | 2 +- src/devices/bus/isa/mc1502_fdc.cpp | 2 +- src/devices/bus/isa/mc1502_fdc.h | 2 +- src/devices/bus/isa/mda.cpp | 6 +- src/devices/bus/isa/mda.h | 6 +- src/devices/bus/isa/mpu401.cpp | 2 +- src/devices/bus/isa/mpu401.h | 2 +- src/devices/bus/isa/mufdc.cpp | 4 +- src/devices/bus/isa/mufdc.h | 4 +- src/devices/bus/isa/myb3k_com.cpp | 16 +-- src/devices/bus/isa/myb3k_com.h | 16 +-- src/devices/bus/isa/myb3k_fdc.cpp | 4 +- src/devices/bus/isa/myb3k_fdc.h | 4 +- src/devices/bus/isa/ne1000.cpp | 2 +- src/devices/bus/isa/ne2000.cpp | 2 +- src/devices/bus/isa/np600.cpp | 2 +- src/devices/bus/isa/np600.h | 2 +- src/devices/bus/isa/omti8621.cpp | 4 +- src/devices/bus/isa/omti8621.h | 4 +- src/devices/bus/isa/p1_fdc.cpp | 2 +- src/devices/bus/isa/p1_fdc.h | 2 +- src/devices/bus/isa/p1_sound.cpp | 2 +- src/devices/bus/isa/p1_sound.h | 2 +- src/devices/bus/isa/pgc.cpp | 2 +- src/devices/bus/isa/pgc.h | 2 +- src/devices/bus/isa/sblaster.h | 2 +- src/devices/bus/isa/side116.cpp | 2 +- src/devices/bus/isa/side116.h | 2 +- src/devices/bus/isa/svga_s3.cpp | 6 +- src/devices/bus/isa/svga_s3.h | 6 +- src/devices/bus/isa/wdxt_gen.cpp | 8 +- src/devices/bus/isa/wdxt_gen.h | 8 +- src/devices/bus/isa/xtide.cpp | 2 +- src/devices/bus/isa/xtide.h | 2 +- src/devices/bus/isbx/compis_fdc.cpp | 4 +- src/devices/bus/isbx/compis_fdc.h | 4 +- src/devices/bus/isbx/isbc_218a.cpp | 4 +- src/devices/bus/isbx/isbc_218a.h | 4 +- src/devices/bus/isbx/isbx.h | 22 +-- src/devices/bus/kc/d002.cpp | 8 +- src/devices/bus/kc/d002.h | 8 +- src/devices/bus/kc/d004.cpp | 2 +- src/devices/bus/kc/d004.h | 2 +- src/devices/bus/kc/kc.cpp | 4 +- src/devices/bus/kc/kc.h | 6 +- src/devices/bus/kc/ram.cpp | 2 +- src/devices/bus/kc/ram.h | 2 +- src/devices/bus/kc/rom.cpp | 2 +- src/devices/bus/kc/rom.h | 2 +- src/devices/bus/lpci/i82439tx.cpp | 2 +- src/devices/bus/lpci/i82439tx.h | 2 +- src/devices/bus/lpci/southbridge.cpp | 28 ++-- src/devices/bus/lpci/southbridge.h | 28 ++-- src/devices/bus/mackbd/keyboard.cpp | 14 +- src/devices/bus/mackbd/mackbd.cpp | 2 +- src/devices/bus/mackbd/mackbd.h | 8 +- src/devices/bus/mackbd/pluskbd.cpp | 2 +- src/devices/bus/megadrive/jcart.cpp | 2 +- src/devices/bus/megadrive/jcart.h | 2 +- src/devices/bus/midi/midi.cpp | 2 +- src/devices/bus/midi/midi.h | 8 +- src/devices/bus/midi/midiinport.h | 2 +- src/devices/bus/midi/midioutport.h | 2 +- src/devices/bus/mononcol/rom.h | 2 +- src/devices/bus/mononcol/slot.h | 4 +- src/devices/bus/msx/cart/bm_012.cpp | 2 +- src/devices/bus/msx/cart/bm_012.h | 2 +- src/devices/bus/msx/cart/moonsound.cpp | 2 +- src/devices/bus/msx/cart/moonsound.h | 2 +- src/devices/bus/msx/cart/msx_audio.cpp | 4 +- src/devices/bus/msx/cart/msx_audio.h | 4 +- src/devices/bus/msx/module/sfg.cpp | 4 +- src/devices/bus/msx/module/sfg.h | 4 +- src/devices/bus/msx/slot/cartridge.cpp | 4 +- src/devices/bus/msx/slot/cartridge.h | 4 +- src/devices/bus/msx/slot/msx_rs232.cpp | 12 +- src/devices/bus/msx/slot/msx_rs232.h | 12 +- src/devices/bus/mtx/exp.h | 6 +- src/devices/bus/mtx/sdx.cpp | 2 +- src/devices/bus/mtx/sdx.h | 2 +- src/devices/bus/multibus/isbc202.cpp | 2 +- src/devices/bus/multibus/isbc202.h | 2 +- src/devices/bus/nabupc/adapter.cpp | 2 +- src/devices/bus/nabupc/adapter.h | 2 +- src/devices/bus/nabupc/option.cpp | 2 +- src/devices/bus/nabupc/option.h | 2 +- src/devices/bus/nabupc/rs232.cpp | 4 +- src/devices/bus/nasbus/nasbus.cpp | 2 +- src/devices/bus/nasbus/nasbus.h | 4 +- src/devices/bus/nes/nes_slot.cpp | 2 +- src/devices/bus/nes/nes_slot.h | 2 +- src/devices/bus/newbrain/eim.cpp | 6 +- src/devices/bus/newbrain/eim.h | 6 +- src/devices/bus/newbrain/fdc.cpp | 2 +- src/devices/bus/newbrain/fdc.h | 2 +- src/devices/bus/nubus/nubus.cpp | 12 +- src/devices/bus/nubus/nubus.h | 12 +- src/devices/bus/nubus/nubus_asntmc3b.cpp | 2 +- src/devices/bus/odyssey2/homecomp.h | 2 +- src/devices/bus/odyssey2/slot.cpp | 2 +- src/devices/bus/odyssey2/slot.h | 4 +- src/devices/bus/odyssey2/voice.cpp | 2 +- src/devices/bus/odyssey2/voice.h | 2 +- src/devices/bus/oricext/jasmin.cpp | 8 +- src/devices/bus/oricext/jasmin.h | 8 +- src/devices/bus/oricext/microdisc.cpp | 6 +- src/devices/bus/oricext/microdisc.h | 6 +- src/devices/bus/oricext/oricext.cpp | 4 +- src/devices/bus/oricext/oricext.h | 4 +- src/devices/bus/pc8801/pc8801_23.cpp | 2 +- src/devices/bus/pc8801/pc8801_23.h | 2 +- src/devices/bus/pc8801/pc8801_exp.cpp | 6 +- src/devices/bus/pc8801/pc8801_exp.h | 6 +- src/devices/bus/pc_kbd/cherry_mx1500.cpp | 2 +- src/devices/bus/pc_kbd/cherry_mx1500.h | 2 +- src/devices/bus/pc_kbd/ec1841.cpp | 6 +- src/devices/bus/pc_kbd/ec1841.h | 6 +- src/devices/bus/pc_kbd/iskr1030.cpp | 6 +- src/devices/bus/pc_kbd/iskr1030.h | 6 +- src/devices/bus/pc_kbd/keytro.cpp | 4 +- src/devices/bus/pc_kbd/keytro.h | 4 +- src/devices/bus/pc_kbd/msnat.cpp | 4 +- src/devices/bus/pc_kbd/msnat.h | 4 +- src/devices/bus/pc_kbd/pc83.cpp | 2 +- src/devices/bus/pc_kbd/pc83.h | 6 +- src/devices/bus/pc_kbd/pc_kbdc.cpp | 12 +- src/devices/bus/pc_kbd/pc_kbdc.h | 12 +- src/devices/bus/pc_kbd/pcat84.cpp | 4 +- src/devices/bus/pc_kbd/pcat84.h | 8 +- src/devices/bus/pc_kbd/pcxt83.cpp | 8 +- src/devices/bus/pc_kbd/pcxt83.h | 8 +- src/devices/bus/pet/2joysnd.cpp | 2 +- src/devices/bus/pet/2joysnd.h | 14 +- src/devices/bus/pet/cass.cpp | 10 +- src/devices/bus/pet/cass.h | 10 +- src/devices/bus/pet/cb2snd.cpp | 2 +- src/devices/bus/pet/cb2snd.h | 2 +- src/devices/bus/pet/diag.h | 26 ++-- src/devices/bus/pet/exp.cpp | 4 +- src/devices/bus/pet/exp.h | 4 +- src/devices/bus/pet/petuja.h | 12 +- src/devices/bus/pet/superpet.cpp | 2 +- src/devices/bus/pet/superpet.h | 2 +- src/devices/bus/pet/user.cpp | 38 ++--- src/devices/bus/pet/user.h | 114 +++++++-------- src/devices/bus/plus4/diag264_lb_user.h | 34 ++--- src/devices/bus/plus4/exp.h | 4 +- src/devices/bus/pofo/exp.cpp | 6 +- src/devices/bus/pofo/exp.h | 16 +-- src/devices/bus/pofo/hpc104.h | 2 +- src/devices/bus/psi_kbd/psi_kbd.cpp | 2 +- src/devices/bus/psi_kbd/psi_kbd.h | 6 +- src/devices/bus/psion/honda/slot.h | 2 +- src/devices/bus/psion/module/slot.h | 2 +- src/devices/bus/psion/sibo/slot.h | 2 +- src/devices/bus/psx/ctlrport.cpp | 6 +- src/devices/bus/psx/ctlrport.h | 18 +-- src/devices/bus/qbus/qbus.h | 14 +- src/devices/bus/ql/cst_q_plus4.h | 8 +- src/devices/bus/ql/exp.h | 10 +- src/devices/bus/ql/rom.h | 2 +- src/devices/bus/ql/sandy_superdisk.cpp | 2 +- src/devices/bus/ql/sandy_superdisk.h | 2 +- src/devices/bus/ql/sandy_superqboard.cpp | 2 +- src/devices/bus/ql/sandy_superqboard.h | 2 +- src/devices/bus/rc2014/cf.cpp | 2 +- src/devices/bus/rc2014/clock.cpp | 14 +- src/devices/bus/rc2014/micro.cpp | 6 +- src/devices/bus/rc2014/ram.cpp | 2 +- src/devices/bus/rc2014/rc2014.h | 34 ++--- src/devices/bus/rc2014/serial.cpp | 26 ++-- src/devices/bus/rc2014/z180cpu.cpp | 6 +- src/devices/bus/rs232/exorterm.cpp | 6 +- src/devices/bus/rs232/exorterm.h | 6 +- src/devices/bus/rs232/hlemouse.cpp | 4 +- src/devices/bus/rs232/hlemouse.h | 4 +- src/devices/bus/rs232/ie15.cpp | 2 +- src/devices/bus/rs232/keyboard.cpp | 4 +- src/devices/bus/rs232/keyboard.h | 4 +- src/devices/bus/rs232/loopback.cpp | 14 +- src/devices/bus/rs232/loopback.h | 14 +- src/devices/bus/rs232/mboardd.cpp | 4 +- src/devices/bus/rs232/null_modem.cpp | 2 +- src/devices/bus/rs232/null_modem.h | 8 +- src/devices/bus/rs232/patchbox.cpp | 12 +- src/devices/bus/rs232/printer.cpp | 4 +- src/devices/bus/rs232/printer.h | 6 +- src/devices/bus/rs232/pty.cpp | 2 +- src/devices/bus/rs232/pty.h | 4 +- src/devices/bus/rs232/rs232.cpp | 10 +- src/devices/bus/rs232/rs232.h | 58 ++++---- src/devices/bus/rs232/rs232_sync_io.cpp | 6 +- src/devices/bus/rs232/rs232_sync_io.h | 6 +- src/devices/bus/rs232/sun_kbd.cpp | 2 +- src/devices/bus/rs232/swtpc8212.cpp | 6 +- src/devices/bus/rs232/swtpc8212.h | 6 +- src/devices/bus/rs232/terminal.cpp | 6 +- src/devices/bus/rs232/xvd701.h | 2 +- src/devices/bus/s100/ascsasi.cpp | 8 +- src/devices/bus/s100/dj2db.cpp | 4 +- src/devices/bus/s100/dj2db.h | 4 +- src/devices/bus/s100/polyvti.cpp | 4 +- src/devices/bus/s100/s100.h | 34 ++--- src/devices/bus/s100/wunderbus.cpp | 4 +- src/devices/bus/s100/wunderbus.h | 4 +- src/devices/bus/samcoupe/drive/drive.h | 2 +- src/devices/bus/samcoupe/expansion/expansion.cpp | 4 +- src/devices/bus/samcoupe/expansion/expansion.h | 6 +- src/devices/bus/samcoupe/expansion/spi.cpp | 2 +- src/devices/bus/samcoupe/expansion/spi.h | 2 +- src/devices/bus/samcoupe/mouse/mouseport.h | 2 +- src/devices/bus/sbus/cgsix.cpp | 2 +- src/devices/bus/sbus/cgsix.h | 2 +- src/devices/bus/scsi/scsi.cpp | 34 ++--- src/devices/bus/scsi/scsi.h | 104 +++++++------- src/devices/bus/scsi/scsihle.cpp | 6 +- src/devices/bus/scsi/scsihle.h | 22 +-- src/devices/bus/sg1000_exp/kblink.h | 10 +- src/devices/bus/sg1000_exp/sk1100prn.cpp | 10 +- src/devices/bus/sg1000_exp/sk1100prn.h | 20 +-- src/devices/bus/sms_ctrl/rfu.cpp | 4 +- src/devices/bus/sms_ctrl/smsctrl.h | 2 +- src/devices/bus/sms_ctrl/teamplayer.cpp | 4 +- src/devices/bus/snes/sfx.cpp | 2 +- src/devices/bus/snes/sfx.h | 2 +- src/devices/bus/snes/snes_slot.cpp | 2 +- src/devices/bus/snes/snes_slot.h | 4 +- src/devices/bus/spc1000/vdp.cpp | 2 +- src/devices/bus/spc1000/vdp.h | 2 +- src/devices/bus/spectrum/beta.cpp | 2 +- src/devices/bus/spectrum/beta.h | 4 +- src/devices/bus/spectrum/beta128.cpp | 2 +- src/devices/bus/spectrum/beta128.h | 2 +- src/devices/bus/spectrum/d40.cpp | 2 +- src/devices/bus/spectrum/d40.h | 2 +- src/devices/bus/spectrum/exp.cpp | 2 +- src/devices/bus/spectrum/exp.h | 8 +- src/devices/bus/spectrum/floppyone.cpp | 2 +- src/devices/bus/spectrum/floppyone.h | 4 +- src/devices/bus/spectrum/fuller.h | 2 +- src/devices/bus/spectrum/intf1.cpp | 2 +- src/devices/bus/spectrum/intf1.h | 2 +- src/devices/bus/spectrum/intf2.cpp | 2 +- src/devices/bus/spectrum/intf2.h | 2 +- src/devices/bus/spectrum/kempdisc.cpp | 2 +- src/devices/bus/spectrum/kempdisc.h | 2 +- src/devices/bus/spectrum/logitek.cpp | 2 +- src/devices/bus/spectrum/logitek.h | 2 +- src/devices/bus/spectrum/lprint.cpp | 6 +- src/devices/bus/spectrum/lprint.h | 14 +- src/devices/bus/spectrum/melodik.h | 2 +- src/devices/bus/spectrum/mface.cpp | 2 +- src/devices/bus/spectrum/mface.h | 4 +- src/devices/bus/spectrum/mgt.cpp | 6 +- src/devices/bus/spectrum/mgt.h | 6 +- src/devices/bus/spectrum/mikroplus.cpp | 2 +- src/devices/bus/spectrum/mikroplus.h | 2 +- src/devices/bus/spectrum/mpoker.cpp | 2 +- src/devices/bus/spectrum/mpoker.h | 2 +- src/devices/bus/spectrum/opus.cpp | 4 +- src/devices/bus/spectrum/opus.h | 4 +- src/devices/bus/spectrum/plus2test.cpp | 2 +- src/devices/bus/spectrum/plus2test.h | 2 +- src/devices/bus/spectrum/sdi.cpp | 2 +- src/devices/bus/spectrum/sdi.h | 2 +- src/devices/bus/spectrum/sixword.cpp | 2 +- src/devices/bus/spectrum/sixword.h | 4 +- src/devices/bus/spectrum/speccydos.cpp | 2 +- src/devices/bus/spectrum/speccydos.h | 2 +- src/devices/bus/spectrum/specmate.cpp | 2 +- src/devices/bus/spectrum/specmate.h | 2 +- src/devices/bus/spectrum/uslot.cpp | 2 +- src/devices/bus/spectrum/uslot.h | 2 +- src/devices/bus/spectrum/usource.cpp | 2 +- src/devices/bus/spectrum/usource.h | 2 +- src/devices/bus/spectrum/uspeech.cpp | 2 +- src/devices/bus/spectrum/uspeech.h | 2 +- src/devices/bus/spectrum/wafa.cpp | 2 +- src/devices/bus/spectrum/wafa.h | 2 +- src/devices/bus/ss50/dc5.cpp | 12 +- src/devices/bus/ss50/interface.cpp | 10 +- src/devices/bus/ss50/interface.h | 24 ++-- src/devices/bus/ss50/mpc.cpp | 24 ++-- src/devices/bus/ss50/mps.cpp | 28 ++-- src/devices/bus/ss50/mps2.cpp | 20 +-- src/devices/bus/ss50/mpt.cpp | 10 +- src/devices/bus/sunkbd/hlekbd.cpp | 2 +- src/devices/bus/sunkbd/hlekbd.h | 2 +- src/devices/bus/sunkbd/sunkbd.cpp | 2 +- src/devices/bus/sunkbd/sunkbd.h | 8 +- src/devices/bus/sunmouse/sunmouse.cpp | 2 +- src/devices/bus/sunmouse/sunmouse.h | 8 +- src/devices/bus/svi3x8/expander/expander.cpp | 24 ++-- src/devices/bus/svi3x8/expander/expander.h | 18 +-- src/devices/bus/svi3x8/expander/sv601.cpp | 6 +- src/devices/bus/svi3x8/expander/sv601.h | 6 +- src/devices/bus/svi3x8/expander/sv602.cpp | 6 +- src/devices/bus/svi3x8/expander/sv602.h | 6 +- src/devices/bus/svi3x8/expander/sv603.cpp | 2 +- src/devices/bus/svi3x8/expander/sv603.h | 2 +- src/devices/bus/svi3x8/slot/slot.cpp | 8 +- src/devices/bus/svi3x8/slot/slot.h | 22 +-- src/devices/bus/svi3x8/slot/sv801.cpp | 4 +- src/devices/bus/svi3x8/slot/sv801.h | 4 +- src/devices/bus/svi3x8/slot/sv802.cpp | 2 +- src/devices/bus/svi3x8/slot/sv802.h | 2 +- src/devices/bus/svi3x8/slot/sv805.cpp | 2 +- src/devices/bus/svi3x8/slot/sv805.h | 2 +- src/devices/bus/tanbus/keyboard/keyboard.h | 4 +- src/devices/bus/tanbus/mpvdu.cpp | 2 +- src/devices/bus/tanbus/mpvdu.h | 2 +- src/devices/bus/tanbus/radisc.cpp | 6 +- src/devices/bus/tanbus/radisc.h | 6 +- src/devices/bus/tanbus/ravdu.cpp | 2 +- src/devices/bus/tanbus/ravdu.h | 2 +- src/devices/bus/tanbus/tanbus.h | 6 +- src/devices/bus/tanbus/tandos.cpp | 6 +- src/devices/bus/tanbus/tandos.h | 6 +- src/devices/bus/tanbus/tanex.cpp | 12 +- src/devices/bus/tanbus/tanex.h | 12 +- src/devices/bus/tanbus/tug8082.cpp | 4 +- src/devices/bus/tanbus/tug8082.h | 4 +- src/devices/bus/thomson/cc90_232.cpp | 8 +- src/devices/bus/thomson/cc90_232.h | 8 +- src/devices/bus/thomson/extension.cpp | 4 +- src/devices/bus/thomson/extension.h | 4 +- src/devices/bus/thomson/md90_120.cpp | 6 +- src/devices/bus/thomson/md90_120.h | 6 +- src/devices/bus/ti8x/bitsocket.cpp | 8 +- src/devices/bus/ti8x/teeconn.cpp | 24 ++-- src/devices/bus/ti8x/ti8x.cpp | 8 +- src/devices/bus/ti8x/ti8x.h | 20 +-- src/devices/bus/ti8x/tispeaker.cpp | 8 +- src/devices/bus/ti99/gromport/cartridges.cpp | 10 +- src/devices/bus/ti99/gromport/cartridges.h | 10 +- src/devices/bus/ti99/gromport/gkracker.cpp | 4 +- src/devices/bus/ti99/gromport/gkracker.h | 4 +- src/devices/bus/ti99/gromport/gromport.cpp | 8 +- src/devices/bus/ti99/gromport/gromport.h | 12 +- src/devices/bus/ti99/gromport/multiconn.cpp | 4 +- src/devices/bus/ti99/gromport/multiconn.h | 4 +- src/devices/bus/ti99/gromport/singleconn.cpp | 4 +- src/devices/bus/ti99/gromport/singleconn.h | 4 +- src/devices/bus/ti99/internal/992board.cpp | 2 +- src/devices/bus/ti99/internal/992board.h | 2 +- src/devices/bus/ti99/internal/998board.cpp | 108 +++++++-------- src/devices/bus/ti99/internal/998board.h | 112 +++++++-------- src/devices/bus/ti99/internal/datamux.cpp | 6 +- src/devices/bus/ti99/internal/datamux.h | 8 +- src/devices/bus/ti99/internal/evpcconn.cpp | 2 +- src/devices/bus/ti99/internal/evpcconn.h | 2 +- src/devices/bus/ti99/internal/genboard.cpp | 56 ++++---- src/devices/bus/ti99/internal/genboard.h | 58 ++++---- src/devices/bus/ti99/internal/genkbd.cpp | 6 +- src/devices/bus/ti99/internal/genkbd.h | 6 +- src/devices/bus/ti99/internal/ioport.cpp | 12 +- src/devices/bus/ti99/internal/ioport.h | 20 +-- src/devices/bus/ti99/joyport/joyport.cpp | 2 +- src/devices/bus/ti99/peb/bwg.cpp | 26 ++-- src/devices/bus/ti99/peb/bwg.h | 28 ++-- src/devices/bus/ti99/peb/cc_fdc.cpp | 42 +++--- src/devices/bus/ti99/peb/cc_fdc.h | 44 +++--- src/devices/bus/ti99/peb/evpc.cpp | 4 +- src/devices/bus/ti99/peb/evpc.h | 4 +- src/devices/bus/ti99/peb/forti.cpp | 2 +- src/devices/bus/ti99/peb/forti.h | 2 +- src/devices/bus/ti99/peb/hfdc.cpp | 6 +- src/devices/bus/ti99/peb/hfdc.h | 6 +- src/devices/bus/ti99/peb/myarcfdc.cpp | 16 +-- src/devices/bus/ti99/peb/myarcfdc.h | 18 +-- src/devices/bus/ti99/peb/pcode.cpp | 8 +- src/devices/bus/ti99/peb/pcode.h | 8 +- src/devices/bus/ti99/peb/peribox.cpp | 28 ++-- src/devices/bus/ti99/peb/peribox.h | 32 ++--- src/devices/bus/ti99/peb/samsmem.cpp | 4 +- src/devices/bus/ti99/peb/samsmem.h | 4 +- src/devices/bus/ti99/peb/scsicard.cpp | 4 +- src/devices/bus/ti99/peb/scsicard.h | 4 +- src/devices/bus/ti99/peb/spchsyn.cpp | 2 +- src/devices/bus/ti99/peb/spchsyn.h | 2 +- src/devices/bus/ti99/peb/ti_fdc.cpp | 24 ++-- src/devices/bus/ti99/peb/ti_fdc.h | 28 ++-- src/devices/bus/ti99/peb/ti_rs232.cpp | 24 ++-- src/devices/bus/ti99/peb/ti_rs232.h | 24 ++-- src/devices/bus/ti99/peb/tn_ide.cpp | 6 +- src/devices/bus/ti99/peb/tn_ide.h | 6 +- src/devices/bus/tiki100/exp.cpp | 2 +- src/devices/bus/tiki100/exp.h | 8 +- src/devices/bus/uts_kbd/400kbd.cpp | 6 +- src/devices/bus/uts_kbd/400kbd.h | 6 +- src/devices/bus/uts_kbd/extw.cpp | 6 +- src/devices/bus/uts_kbd/extw.h | 6 +- src/devices/bus/uts_kbd/uts_kbd.h | 10 +- src/devices/bus/vic10/exp.cpp | 4 +- src/devices/bus/vic10/exp.h | 12 +- src/devices/bus/vic20/4cga.cpp | 2 +- src/devices/bus/vic20/4cga.h | 18 +-- src/devices/bus/vic20/exp.h | 6 +- src/devices/bus/vic20/vic1011.cpp | 2 +- src/devices/bus/vic20/vic1011.h | 10 +- src/devices/bus/vic20/vic1112.cpp | 4 +- src/devices/bus/vic20/vic1112.h | 4 +- src/devices/bus/vidbrain/exp.h | 2 +- src/devices/bus/vip/byteio.cpp | 6 +- src/devices/bus/vip/byteio.h | 8 +- src/devices/bus/vip/exp.cpp | 12 +- src/devices/bus/vip/exp.h | 18 +-- src/devices/bus/vip/vp575.h | 34 ++--- src/devices/bus/vip/vp590.cpp | 6 +- src/devices/bus/vip/vp590.h | 6 +- src/devices/bus/vme/vme_cp31.cpp | 2 +- src/devices/bus/vme/vme_cp31.h | 2 +- src/devices/bus/vme/vme_fccpu20.cpp | 2 +- src/devices/bus/vme/vme_fccpu20.h | 2 +- src/devices/bus/vme/vme_fcscsi.cpp | 4 +- src/devices/bus/vme/vme_fcscsi.h | 4 +- src/devices/bus/vme/vme_hcpu30.cpp | 10 +- src/devices/bus/vme/vme_hcpu30.h | 10 +- src/devices/bus/vme/vme_mvme120.cpp | 4 +- src/devices/bus/vme/vme_mvme120.h | 4 +- src/devices/bus/vtech/ioexp/printer.cpp | 2 +- src/devices/bus/vtech/ioexp/printer.h | 2 +- src/devices/bus/vtech/memexp/memexp.h | 6 +- src/devices/bus/wangpc/lvc.cpp | 2 +- src/devices/bus/wangpc/lvc.h | 2 +- src/devices/bus/wangpc/mvc.cpp | 2 +- src/devices/bus/wangpc/mvc.h | 2 +- src/devices/bus/wangpc/wangpc.cpp | 2 +- src/devices/bus/wangpc/wangpc.h | 22 +-- src/devices/bus/wysekbd/wysekbd.h | 8 +- src/devices/bus/x68k/x68k_neptunex.cpp | 2 +- src/devices/bus/x68k/x68kexp.cpp | 8 +- src/devices/bus/x68k/x68kexp.h | 8 +- src/devices/bus/z29_kbd/he191_3425.cpp | 4 +- src/devices/bus/z29_kbd/he191_3425.h | 4 +- src/devices/bus/z29_kbd/keyboard.h | 4 +- src/devices/bus/z29_kbd/md_kbd.cpp | 2 +- src/devices/bus/z29_kbd/md_kbd.h | 2 +- src/devices/cpu/cosmac/cosmac.h | 18 +-- src/devices/cpu/dsp16/dsp16.cpp | 2 +- src/devices/cpu/dsp16/dsp16.h | 22 +-- src/devices/cpu/f2mc16/mb9061x.cpp | 4 +- src/devices/cpu/f2mc16/mb9061x.h | 4 +- src/devices/cpu/h8/h8_adc.cpp | 2 +- src/devices/cpu/h8/h8_adc.h | 2 +- src/devices/cpu/h8/h8_sci.cpp | 4 +- src/devices/cpu/h8/h8_sci.h | 4 +- src/devices/cpu/hphybrid/hphybrid.cpp | 8 +- src/devices/cpu/hphybrid/hphybrid.h | 8 +- src/devices/cpu/i8089/i8089.cpp | 10 +- src/devices/cpu/i8089/i8089.h | 16 +-- src/devices/cpu/i8089/i8089_channel.cpp | 4 +- src/devices/cpu/i8089/i8089_channel.h | 4 +- src/devices/cpu/i86/i186.h | 16 +-- src/devices/cpu/jaguar/jaguar.cpp | 2 +- src/devices/cpu/jaguar/jaguar.h | 2 +- src/devices/cpu/m6502/m6500_1.cpp | 2 +- src/devices/cpu/m6502/m6500_1.h | 2 +- src/devices/cpu/m6502/rp2a03.cpp | 2 +- src/devices/cpu/m6502/rp2a03.h | 2 +- src/devices/cpu/m68000/tmp68301.h | 6 +- src/devices/cpu/m6805/m68705.h | 2 +- src/devices/cpu/mb86233/mb86233.cpp | 8 +- src/devices/cpu/mb86233/mb86233.h | 8 +- src/devices/cpu/mb88xx/mb88xx.cpp | 2 +- src/devices/cpu/mb88xx/mb88xx.h | 2 +- src/devices/cpu/mcs40/mcs40.h | 4 +- src/devices/cpu/mips/mips3.cpp | 3 + src/devices/cpu/nec/v5x.cpp | 8 +- src/devices/cpu/nec/v5x.h | 16 +-- src/devices/cpu/psx/irq.cpp | 22 +-- src/devices/cpu/psx/irq.h | 22 +-- src/devices/cpu/psx/sio.cpp | 4 +- src/devices/cpu/psx/sio.h | 4 +- src/devices/cpu/rx01/rx01.h | 2 +- src/devices/cpu/sharc/sharc.cpp | 2 +- src/devices/cpu/sharc/sharc.h | 2 +- src/devices/cpu/st62xx/st62xx.cpp | 48 +++---- src/devices/cpu/st62xx/st62xx.h | 50 +++---- src/devices/cpu/tms57002/tms57002.cpp | 12 +- src/devices/cpu/tms57002/tms57002.h | 12 +- src/devices/cpu/tms9900/tms9995.cpp | 6 +- src/devices/cpu/tms9900/tms9995.h | 6 +- src/devices/cpu/upd7810/upd7810.cpp | 2 +- src/devices/cpu/upd7810/upd7810.h | 2 +- src/devices/cpu/z180/z180.h | 16 +-- src/devices/cpu/z180/z180asci.cpp | 8 +- src/devices/cpu/z180/z180asci.h | 8 +- src/devices/cpu/z180/z180csio.cpp | 4 +- src/devices/cpu/z180/z180csio.h | 4 +- src/devices/cpu/z80/kp63.h | 2 +- src/devices/cpu/z80/kp64.cpp | 4 +- src/devices/cpu/z80/kp64.h | 4 +- src/devices/cpu/z80/kp69.h | 2 +- src/devices/cpu/z80/tmpz84c011.h | 14 +- src/devices/cpu/z80/tmpz84c015.h | 106 +++++++------- src/devices/cpu/z8000/z8000.h | 2 +- src/devices/imagedev/flopdrv.cpp | 24 ++-- src/devices/imagedev/flopdrv.h | 24 ++-- src/devices/imagedev/microdrv.cpp | 16 +-- src/devices/imagedev/microdrv.h | 16 +-- src/devices/machine/1ma6.cpp | 12 +- src/devices/machine/1ma6.h | 12 +- src/devices/machine/1mb5.cpp | 8 +- src/devices/machine/1mb5.h | 8 +- src/devices/machine/2812fifo.cpp | 8 +- src/devices/machine/2812fifo.h | 14 +- src/devices/machine/28fxxx.h | 2 +- src/devices/machine/40105.cpp | 8 +- src/devices/machine/40105.h | 8 +- src/devices/machine/64h156.cpp | 16 +-- src/devices/machine/64h156.h | 24 ++-- src/devices/machine/6522via.cpp | 8 +- src/devices/machine/6525tpi.cpp | 10 +- src/devices/machine/6525tpi.h | 26 ++-- src/devices/machine/6532riot.cpp | 32 ++--- src/devices/machine/6532riot.h | 32 ++--- src/devices/machine/68153bim.cpp | 2 +- src/devices/machine/68153bim.h | 12 +- src/devices/machine/6821pia.cpp | 8 +- src/devices/machine/6821pia.h | 44 +++--- src/devices/machine/68230pit.cpp | 8 +- src/devices/machine/68230pit.h | 62 ++++----- src/devices/machine/68307.cpp | 10 +- src/devices/machine/68307.h | 14 +- src/devices/machine/68340.cpp | 4 +- src/devices/machine/68340.h | 14 +- src/devices/machine/68340ser.cpp | 2 +- src/devices/machine/68340ser.h | 2 +- src/devices/machine/68340sim.cpp | 2 +- src/devices/machine/68340tmu.cpp | 4 +- src/devices/machine/68340tmu.h | 4 +- src/devices/machine/6840ptm.h | 12 +- src/devices/machine/6850acia.cpp | 10 +- src/devices/machine/6850acia.h | 10 +- src/devices/machine/68561mpcc.cpp | 8 +- src/devices/machine/68561mpcc.h | 12 +- src/devices/machine/7200fifo.h | 6 +- src/devices/machine/7400.cpp | 28 ++-- src/devices/machine/7400.h | 26 ++-- src/devices/machine/7404.cpp | 26 ++-- src/devices/machine/7404.h | 26 ++-- src/devices/machine/74123.cpp | 8 +- src/devices/machine/74123.h | 10 +- src/devices/machine/74153.cpp | 24 ++-- src/devices/machine/74153.h | 24 ++-- src/devices/machine/74157.cpp | 20 +-- src/devices/machine/74157.h | 20 +-- src/devices/machine/74161.cpp | 22 +-- src/devices/machine/74161.h | 22 +-- src/devices/machine/74165.cpp | 6 +- src/devices/machine/74165.h | 6 +- src/devices/machine/74166.cpp | 6 +- src/devices/machine/74166.h | 6 +- src/devices/machine/74175.cpp | 16 +-- src/devices/machine/74175.h | 16 +-- src/devices/machine/74181.cpp | 4 +- src/devices/machine/74181.h | 12 +- src/devices/machine/74259.cpp | 4 +- src/devices/machine/74259.h | 20 +-- src/devices/machine/74543.cpp | 12 +- src/devices/machine/74543.h | 12 +- src/devices/machine/7474.cpp | 12 +- src/devices/machine/7474.h | 12 +- src/devices/machine/8042kbdc.cpp | 4 +- src/devices/machine/8042kbdc.h | 4 +- src/devices/machine/82s129.cpp | 28 ++-- src/devices/machine/82s129.h | 28 ++-- src/devices/machine/acorn_bmu.cpp | 6 +- src/devices/machine/acorn_bmu.h | 6 +- src/devices/machine/acorn_ioc.cpp | 4 +- src/devices/machine/acorn_ioc.h | 30 ++-- src/devices/machine/acorn_memc.cpp | 6 +- src/devices/machine/acorn_memc.h | 6 +- src/devices/machine/acorn_vidc.cpp | 2 +- src/devices/machine/acorn_vidc.h | 2 +- src/devices/machine/adc0804.cpp | 4 +- src/devices/machine/adc0804.h | 6 +- src/devices/machine/adc0808.cpp | 4 +- src/devices/machine/adc0808.h | 4 +- src/devices/machine/adc083x.cpp | 12 +- src/devices/machine/adc083x.h | 12 +- src/devices/machine/adc1038.cpp | 8 +- src/devices/machine/adc1038.h | 8 +- src/devices/machine/aic580.cpp | 2 +- src/devices/machine/aic580.h | 2 +- src/devices/machine/aic6250.cpp | 2 +- src/devices/machine/aic6250.h | 2 +- src/devices/machine/alpha_8921.cpp | 12 +- src/devices/machine/alpha_8921.h | 12 +- src/devices/machine/am2847.cpp | 18 +-- src/devices/machine/am2847.h | 18 +-- src/devices/machine/am2901b.cpp | 12 +- src/devices/machine/am2901b.h | 12 +- src/devices/machine/am2910.cpp | 10 +- src/devices/machine/am2910.h | 10 +- src/devices/machine/am9513.h | 30 ++-- src/devices/machine/am9516.cpp | 4 +- src/devices/machine/am9516.h | 4 +- src/devices/machine/am9517a.cpp | 14 +- src/devices/machine/am9517a.h | 18 +-- src/devices/machine/am9519.h | 16 +-- src/devices/machine/applepic.cpp | 6 +- src/devices/machine/applepic.h | 6 +- src/devices/machine/archimedes_keyb.cpp | 2 +- src/devices/machine/archimedes_keyb.h | 2 +- src/devices/machine/arm_iomd.cpp | 8 +- src/devices/machine/arm_iomd.h | 8 +- src/devices/machine/at.cpp | 34 ++--- src/devices/machine/at.h | 32 ++--- src/devices/machine/at28c16.cpp | 4 +- src/devices/machine/at28c16.h | 4 +- src/devices/machine/at28c64b.cpp | 4 +- src/devices/machine/at28c64b.h | 4 +- src/devices/machine/at45dbxx.cpp | 8 +- src/devices/machine/at45dbxx.h | 8 +- src/devices/machine/at_keybc.cpp | 8 +- src/devices/machine/at_keybc.h | 8 +- src/devices/machine/ay31015.h | 38 ++--- src/devices/machine/bacta_datalogger.h | 4 +- src/devices/machine/bl_handhelds_menucontrol.cpp | 10 +- src/devices/machine/bl_handhelds_menucontrol.h | 10 +- src/devices/machine/bq4847.cpp | 2 +- src/devices/machine/bq4847.h | 2 +- src/devices/machine/bq48x2.cpp | 2 +- src/devices/machine/bq48x2.h | 2 +- src/devices/machine/buffer.h | 16 +-- src/devices/machine/cdp1852.cpp | 2 +- src/devices/machine/cdp1852.h | 2 +- src/devices/machine/cdp1871.h | 10 +- src/devices/machine/clock.h | 2 +- src/devices/machine/cop452.cpp | 8 +- src/devices/machine/cop452.h | 8 +- src/devices/machine/cr511b.cpp | 4 +- src/devices/machine/cr511b.h | 4 +- src/devices/machine/cs4031.cpp | 14 +- src/devices/machine/cs4031.h | 74 +++++----- src/devices/machine/dl11.cpp | 4 +- src/devices/machine/dl11.h | 6 +- src/devices/machine/dmac.cpp | 10 +- src/devices/machine/dmac.h | 10 +- src/devices/machine/dp8390.cpp | 2 +- src/devices/machine/dp8390.h | 2 +- src/devices/machine/ds1204.cpp | 8 +- src/devices/machine/ds1204.h | 8 +- src/devices/machine/ds1205.cpp | 8 +- src/devices/machine/ds1205.h | 8 +- src/devices/machine/ds1207.cpp | 8 +- src/devices/machine/ds1207.h | 8 +- src/devices/machine/ds1302.cpp | 8 +- src/devices/machine/ds1302.h | 8 +- src/devices/machine/ds1386.h | 6 +- src/devices/machine/ds1994.cpp | 4 +- src/devices/machine/ds1994.h | 4 +- src/devices/machine/ds2401.cpp | 4 +- src/devices/machine/ds2401.h | 4 +- src/devices/machine/ds2430a.cpp | 4 +- src/devices/machine/ds2430a.h | 4 +- src/devices/machine/ds6417.cpp | 2 +- src/devices/machine/ds6417.h | 8 +- src/devices/machine/ds75160a.cpp | 4 +- src/devices/machine/ds75160a.h | 4 +- src/devices/machine/ds75161a.cpp | 36 ++--- src/devices/machine/ds75161a.h | 40 +++--- src/devices/machine/ds8874.cpp | 4 +- src/devices/machine/ds8874.h | 4 +- src/devices/machine/e0516.cpp | 10 +- src/devices/machine/e0516.h | 10 +- src/devices/machine/e05a03.cpp | 12 +- src/devices/machine/e05a03.h | 12 +- src/devices/machine/e05a30.cpp | 4 +- src/devices/machine/e05a30.h | 20 +-- src/devices/machine/eeprompar.cpp | 2 +- src/devices/machine/eeprompar.h | 2 +- src/devices/machine/eepromser.cpp | 26 ++-- src/devices/machine/eepromser.h | 26 ++-- src/devices/machine/er1400.cpp | 12 +- src/devices/machine/er1400.h | 12 +- src/devices/machine/er2055.cpp | 2 +- src/devices/machine/er2055.h | 2 +- src/devices/machine/exorterm.cpp | 36 ++--- src/devices/machine/exorterm.h | 36 ++--- src/devices/machine/f3853.cpp | 4 +- src/devices/machine/f3853.h | 4 +- src/devices/machine/f4702.cpp | 2 +- src/devices/machine/f4702.h | 2 +- src/devices/machine/fdc37c665gt.cpp | 40 +++--- src/devices/machine/fdc37c665gt.h | 40 +++--- src/devices/machine/fdc37c93x.cpp | 52 +++---- src/devices/machine/fdc37c93x.h | 52 +++---- src/devices/machine/fga002.cpp | 16 +-- src/devices/machine/fga002.h | 16 +-- src/devices/machine/gayle.cpp | 10 +- src/devices/machine/gayle.h | 10 +- src/devices/machine/gen_latch.cpp | 10 +- src/devices/machine/gen_latch.h | 10 +- src/devices/machine/generalplus_gpl16250soc.cpp | 4 +- src/devices/machine/generalplus_gpl16250soc.h | 6 +- .../machine/generalplus_gpl16250soc_video.cpp | 2 +- .../machine/generalplus_gpl16250soc_video.h | 2 +- src/devices/machine/generic_spi_flash.h | 2 +- src/devices/machine/genpc.cpp | 32 ++--- src/devices/machine/genpc.h | 32 ++--- src/devices/machine/gt64xxx.cpp | 2 +- src/devices/machine/gt64xxx.h | 2 +- src/devices/machine/hd63450.cpp | 8 +- src/devices/machine/hd63450.h | 8 +- src/devices/machine/hdc92x4.cpp | 4 +- src/devices/machine/hdc92x4.h | 4 +- src/devices/machine/hp_taco.cpp | 16 +-- src/devices/machine/hp_taco.h | 18 +-- src/devices/machine/i2cmem.cpp | 14 +- src/devices/machine/i2cmem.h | 14 +- src/devices/machine/i3001.cpp | 2 +- src/devices/machine/i3001.h | 10 +- src/devices/machine/i3002.cpp | 2 +- src/devices/machine/i3002.h | 10 +- src/devices/machine/i80130.h | 24 ++-- src/devices/machine/i8212.cpp | 2 +- src/devices/machine/i8212.h | 2 +- src/devices/machine/i82357.cpp | 4 +- src/devices/machine/i82357.h | 4 +- src/devices/machine/i82371sb.cpp | 74 +++++----- src/devices/machine/i82371sb.h | 76 +++++----- src/devices/machine/i8243.cpp | 4 +- src/devices/machine/i8243.h | 4 +- src/devices/machine/i82439hx.cpp | 2 +- src/devices/machine/i82439hx.h | 2 +- src/devices/machine/i8251.cpp | 14 +- src/devices/machine/i8251.h | 16 +-- src/devices/machine/i8255.cpp | 6 +- src/devices/machine/i8255.h | 6 +- src/devices/machine/i82586.cpp | 4 +- src/devices/machine/i82586.h | 4 +- src/devices/machine/ie15.cpp | 6 +- src/devices/machine/ie15.h | 14 +- src/devices/machine/input_merger.h | 2 +- src/devices/machine/ins8250.cpp | 12 +- src/devices/machine/ins8250.h | 12 +- src/devices/machine/k033906.cpp | 2 +- src/devices/machine/k033906.h | 2 +- src/devices/machine/keytronic_l2207.cpp | 2 +- src/devices/machine/keytronic_l2207.h | 2 +- src/devices/machine/latch8.h | 32 ++--- src/devices/machine/m3002.h | 4 +- src/devices/machine/m68sfdc.cpp | 4 +- src/devices/machine/m68sfdc.h | 4 +- src/devices/machine/m6m80011ap.cpp | 10 +- src/devices/machine/m6m80011ap.h | 10 +- src/devices/machine/mb3773.cpp | 2 +- src/devices/machine/mb3773.h | 2 +- src/devices/machine/mb8421.h | 2 +- src/devices/machine/mc68328.cpp | 2 +- src/devices/machine/mc68328.h | 2 +- src/devices/machine/mc6844.h | 4 +- src/devices/machine/mc6852.h | 16 +-- src/devices/machine/mc6854.cpp | 10 +- src/devices/machine/mc6854.h | 10 +- src/devices/machine/mc68681.cpp | 14 +- src/devices/machine/mc68681.h | 22 +-- src/devices/machine/mc68901.cpp | 26 ++-- src/devices/machine/mc68901.h | 30 ++-- src/devices/machine/mc88200.h | 2 +- src/devices/machine/mccs1850.cpp | 14 +- src/devices/machine/mccs1850.h | 14 +- src/devices/machine/mdcr.cpp | 18 +-- src/devices/machine/mdcr.h | 18 +-- src/devices/machine/micomxe1a.cpp | 6 +- src/devices/machine/micomxe1a.h | 6 +- src/devices/machine/microtch.h | 2 +- src/devices/machine/mm74c922.h | 2 +- src/devices/machine/mos6526.cpp | 8 +- src/devices/machine/mos6526.h | 14 +- src/devices/machine/mos6530n.h | 34 ++--- src/devices/machine/mos6551.cpp | 18 +-- src/devices/machine/mos6551.h | 18 +-- src/devices/machine/mos8722.cpp | 2 +- src/devices/machine/mos8722.h | 2 +- src/devices/machine/mos8726.cpp | 2 +- src/devices/machine/mos8726.h | 2 +- src/devices/machine/msm5832.cpp | 12 +- src/devices/machine/msm5832.h | 12 +- src/devices/machine/msm58321.cpp | 22 +-- src/devices/machine/msm58321.h | 22 +-- src/devices/machine/mv_sonora.h | 4 +- src/devices/machine/netlist.h | 6 +- src/devices/machine/nmc9306.cpp | 8 +- src/devices/machine/nmc9306.h | 8 +- src/devices/machine/pccard.h | 8 +- src/devices/machine/pcf8573.cpp | 10 +- src/devices/machine/pcf8573.h | 10 +- src/devices/machine/pcf8583.cpp | 8 +- src/devices/machine/pcf8583.h | 8 +- src/devices/machine/pcf8593.cpp | 6 +- src/devices/machine/pcf8593.h | 6 +- src/devices/machine/pci-ide.cpp | 2 +- src/devices/machine/pci-ide.h | 2 +- src/devices/machine/phi.cpp | 16 +-- src/devices/machine/phi.h | 16 +-- src/devices/machine/pic8259.h | 16 +-- src/devices/machine/pit8253.h | 12 +- src/devices/machine/psion_asic1.cpp | 8 +- src/devices/machine/psion_asic1.h | 8 +- src/devices/machine/psion_asic2.cpp | 8 +- src/devices/machine/psion_asic2.h | 8 +- src/devices/machine/psion_asic9.cpp | 8 +- src/devices/machine/psion_asic9.h | 8 +- src/devices/machine/ripple_counter.cpp | 4 +- src/devices/machine/ripple_counter.h | 4 +- src/devices/machine/roc10937.cpp | 6 +- src/devices/machine/roc10937.h | 6 +- src/devices/machine/rp5h01.cpp | 14 +- src/devices/machine/rp5h01.h | 14 +- src/devices/machine/rstbuf.h | 12 +- src/devices/machine/rtc4543.cpp | 10 +- src/devices/machine/rtc4543.h | 10 +- src/devices/machine/rtc65271.cpp | 2 +- src/devices/machine/rtc65271.h | 2 +- src/devices/machine/rtc9701.cpp | 8 +- src/devices/machine/rtc9701.h | 8 +- src/devices/machine/s3520cf.cpp | 10 +- src/devices/machine/s3520cf.h | 10 +- src/devices/machine/s3c2410.cpp | 2 +- src/devices/machine/s3c2410.h | 4 +- src/devices/machine/s3c2440.cpp | 2 +- src/devices/machine/s3c2440.h | 4 +- src/devices/machine/s3c24xx.hxx | 2 +- src/devices/machine/sa1110.cpp | 4 +- src/devices/machine/sa1110.h | 4 +- src/devices/machine/sa1111.cpp | 2 +- src/devices/machine/sa1111.h | 2 +- src/devices/machine/saa7191.cpp | 4 +- src/devices/machine/saa7191.h | 4 +- src/devices/machine/scc68070.cpp | 16 +-- src/devices/machine/scc68070.h | 16 +-- src/devices/machine/scn_pci.cpp | 12 +- src/devices/machine/scn_pci.h | 20 +-- src/devices/machine/sda2006.cpp | 8 +- src/devices/machine/sda2006.h | 8 +- src/devices/machine/sdlc.cpp | 2 +- src/devices/machine/sdlc.h | 8 +- src/devices/machine/sega_scu.cpp | 14 +- src/devices/machine/sega_scu.h | 14 +- src/devices/machine/sis85c496.cpp | 32 ++--- src/devices/machine/sis85c496.h | 32 ++--- src/devices/machine/sis950_lpc.cpp | 14 +- src/devices/machine/sis950_lpc.h | 12 +- src/devices/machine/spg110.cpp | 8 +- src/devices/machine/spg110.h | 10 +- src/devices/machine/spg110_video.cpp | 2 +- src/devices/machine/spg110_video.h | 2 +- src/devices/machine/spg2xx.cpp | 16 +-- src/devices/machine/spg2xx.h | 20 +-- src/devices/machine/spg2xx_video.cpp | 2 +- src/devices/machine/spg2xx_video.h | 2 +- src/devices/machine/tdc1008.cpp | 22 +-- src/devices/machine/tdc1008.h | 22 +-- src/devices/machine/ticket.cpp | 4 +- src/devices/machine/ticket.h | 4 +- src/devices/machine/tmc0430.cpp | 8 +- src/devices/machine/tmc0430.h | 8 +- src/devices/machine/tms9914.cpp | 18 +-- src/devices/machine/tms9914.h | 18 +-- src/devices/machine/tsb12lv01a.cpp | 2 +- src/devices/machine/tsb12lv01a.h | 2 +- src/devices/machine/upc82c710.cpp | 14 +- src/devices/machine/upc82c710.h | 14 +- src/devices/machine/upc82c711.cpp | 24 ++-- src/devices/machine/upc82c711.h | 24 ++-- src/devices/machine/upd1990a.cpp | 20 +-- src/devices/machine/upd1990a.h | 20 +-- src/devices/machine/upd4701.cpp | 20 +-- src/devices/machine/upd4701.h | 20 +-- src/devices/machine/upd7001.cpp | 6 +- src/devices/machine/upd7001.h | 14 +- src/devices/machine/upd7002.cpp | 2 +- src/devices/machine/upd7002.h | 2 +- src/devices/machine/upd71071.cpp | 4 +- src/devices/machine/upd765.cpp | 2 +- src/devices/machine/upd765.h | 4 +- src/devices/machine/v3021.cpp | 6 +- src/devices/machine/v3021.h | 6 +- src/devices/machine/vic_pl192.h | 2 +- src/devices/machine/vrc5074.cpp | 12 +- src/devices/machine/vrc5074.h | 12 +- src/devices/machine/vrender0.cpp | 4 +- src/devices/machine/vrender0.h | 6 +- src/devices/machine/wd33c9x.cpp | 2 +- src/devices/machine/wd33c9x.h | 2 +- src/devices/machine/wd7600.cpp | 14 +- src/devices/machine/wd7600.h | 74 +++++----- src/devices/machine/wd_fdc.cpp | 14 +- src/devices/machine/wd_fdc.h | 18 +-- src/devices/machine/x2201.cpp | 6 +- src/devices/machine/x2201.h | 6 +- src/devices/machine/x76f041.cpp | 10 +- src/devices/machine/x76f041.h | 10 +- src/devices/machine/x76f100.cpp | 10 +- src/devices/machine/x76f100.h | 10 +- src/devices/machine/ym2148.cpp | 2 +- src/devices/machine/ym2148.h | 2 +- src/devices/machine/z8038.cpp | 6 +- src/devices/machine/z8038.h | 6 +- src/devices/machine/z80ctc.cpp | 8 +- src/devices/machine/z80ctc.h | 8 +- src/devices/machine/z80daisy_generic.cpp | 4 +- src/devices/machine/z80daisy_generic.h | 4 +- src/devices/machine/z80dma.cpp | 6 +- src/devices/machine/z80dma.h | 8 +- src/devices/machine/z80pio.h | 40 +++--- src/devices/machine/z80sio.cpp | 10 +- src/devices/machine/z80sio.h | 42 +++--- src/devices/machine/z80sti.cpp | 20 +-- src/devices/machine/z80sti.h | 22 +-- src/devices/machine/z8536.h | 44 +++--- src/devices/sound/beep.cpp | 2 +- src/devices/sound/beep.h | 14 +- src/devices/sound/bsmt2000.cpp | 2 +- src/devices/sound/bsmt2000.h | 2 +- src/devices/sound/dac.h | 4 +- src/devices/sound/dac76.h | 16 +-- src/devices/sound/dave.cpp | 4 +- src/devices/sound/dave.h | 4 +- src/devices/sound/discrete.h | 2 +- src/devices/sound/hc55516.cpp | 14 +- src/devices/sound/hc55516.h | 18 +-- src/devices/sound/l7a1045_l6028_dsp_a.cpp | 2 +- src/devices/sound/l7a1045_l6028_dsp_a.h | 2 +- src/devices/sound/lc7535.cpp | 6 +- src/devices/sound/lc7535.h | 6 +- src/devices/sound/lc82310.cpp | 10 +- src/devices/sound/lc82310.h | 10 +- src/devices/sound/lmc1992.cpp | 6 +- src/devices/sound/lmc1992.h | 6 +- src/devices/sound/namco_163.cpp | 2 +- src/devices/sound/namco_163.h | 2 +- src/devices/sound/okim6376.cpp | 10 +- src/devices/sound/okim6376.h | 10 +- src/devices/sound/pokey.cpp | 2 +- src/devices/sound/pokey.h | 2 +- src/devices/sound/qsound.cpp | 2 +- src/devices/sound/qsound.h | 2 +- src/devices/sound/sn76477.cpp | 16 +-- src/devices/sound/sn76477.h | 16 +-- src/devices/sound/sn76496.h | 2 +- src/devices/sound/sp0256.cpp | 4 +- src/devices/sound/sp0256.h | 4 +- src/devices/sound/t6721a.cpp | 4 +- src/devices/sound/t6721a.h | 4 +- src/devices/sound/tms5220.cpp | 8 +- src/devices/sound/tms5220.h | 8 +- src/devices/sound/upd7759.cpp | 8 +- src/devices/sound/upd7759.h | 8 +- src/devices/sound/vlm5030.cpp | 8 +- src/devices/sound/vlm5030.h | 8 +- src/devices/sound/votrax.h | 2 +- src/devices/sound/ymopm.cpp | 2 +- src/devices/sound/ymopm.h | 2 +- src/devices/video/avgdvg.cpp | 2 +- src/devices/video/avgdvg.h | 2 +- src/devices/video/catseye.cpp | 2 +- src/devices/video/catseye.h | 2 +- src/devices/video/dl1416.cpp | 8 +- src/devices/video/dl1416.h | 8 +- src/devices/video/dm9368.h | 4 +- src/devices/video/dp8350.cpp | 14 +- src/devices/video/dp8350.h | 14 +- src/devices/video/dp8510.h | 12 +- src/devices/video/hd44780.cpp | 6 +- src/devices/video/hd44780.h | 6 +- src/devices/video/hlcd0488.cpp | 4 +- src/devices/video/hlcd0488.h | 4 +- src/devices/video/hlcd0515.cpp | 4 +- src/devices/video/hlcd0515.h | 8 +- src/devices/video/hlcd0538.cpp | 4 +- src/devices/video/hlcd0538.h | 6 +- src/devices/video/huc6202.cpp | 4 +- src/devices/video/huc6202.h | 4 +- src/devices/video/huc6270.cpp | 4 +- src/devices/video/huc6270.h | 4 +- src/devices/video/i82730.cpp | 4 +- src/devices/video/i82730.h | 4 +- src/devices/video/i8275.cpp | 2 +- src/devices/video/i8275.h | 2 +- src/devices/video/imagetek_i4100.cpp | 2 +- src/devices/video/imagetek_i4100.h | 2 +- src/devices/video/lc7582.cpp | 4 +- src/devices/video/lc7582.h | 8 +- src/devices/video/m50458.cpp | 6 +- src/devices/video/m50458.h | 6 +- src/devices/video/mc68328lcd.cpp | 6 +- src/devices/video/mc68328lcd.h | 6 +- src/devices/video/mc6845.cpp | 8 +- src/devices/video/mc6845.h | 8 +- src/devices/video/mc6847.h | 16 +-- src/devices/video/md4330b.cpp | 2 +- src/devices/video/md4330b.h | 10 +- src/devices/video/mm5445.cpp | 2 +- src/devices/video/mm5445.h | 6 +- src/devices/video/mos6566.cpp | 2 +- src/devices/video/mos6566.h | 8 +- src/devices/video/pcd8544.cpp | 6 +- src/devices/video/pcd8544.h | 6 +- src/devices/video/pcf2100.cpp | 2 +- src/devices/video/pcf2100.h | 6 +- src/devices/video/saa5050.cpp | 12 +- src/devices/video/saa5050.h | 12 +- src/devices/video/saa5240.cpp | 10 +- src/devices/video/saa5240.h | 10 +- src/devices/video/sda5708.cpp | 8 +- src/devices/video/sda5708.h | 8 +- src/devices/video/topcat.cpp | 2 +- src/devices/video/topcat.h | 2 +- src/devices/video/upd7220.cpp | 4 +- src/devices/video/upd7220.h | 4 +- src/devices/video/upd7227.cpp | 10 +- src/devices/video/upd7227.h | 10 +- src/emu/device.h | 13 -- src/emu/diserial.cpp | 8 +- src/emu/diserial.h | 8 +- src/emu/screen.h | 4 +- src/mame/acorn/aristmk5.cpp | 4 +- src/mame/acorn/atom.cpp | 6 +- src/mame/acorn/atom.h | 6 +- src/mame/acorn/bbc.cpp | 2 +- src/mame/acorn/bbc.h | 36 ++--- src/mame/acorn/bbc_m.cpp | 28 ++-- src/mame/acorn/bbc_v.cpp | 6 +- src/mame/acorn/cms.cpp | 4 +- src/mame/acorn/riscpc.cpp | 16 +-- src/mame/acorn/ssfindo.cpp | 16 +-- src/mame/acorn/upd65031.cpp | 8 +- src/mame/acorn/upd65031.h | 10 +- src/mame/acorn/z88_impexp.cpp | 2 +- src/mame/acorn/z88_impexp.h | 6 +- src/mame/act/apricot.cpp | 18 +-- src/mame/act/apricotf.cpp | 8 +- src/mame/act/apricotp.cpp | 16 +-- src/mame/act/apxen.cpp | 4 +- src/mame/act/victor9k.cpp | 56 ++++---- src/mame/act/victor9k_fdc.cpp | 16 +-- src/mame/act/victor9k_fdc.h | 16 +-- src/mame/act/victor9k_kb.cpp | 4 +- src/mame/act/victor9k_kb.h | 4 +- src/mame/adc/super6.cpp | 4 +- src/mame/adc/super6.h | 4 +- src/mame/agat/agat.cpp | 16 +-- src/mame/alpha/ad_sound.cpp | 4 +- src/mame/alpha/ad_sound.h | 4 +- src/mame/alpha/alpha68k.h | 4 +- src/mame/alpha/alpha68k_v.cpp | 4 +- src/mame/alpha/alpha8201.cpp | 4 +- src/mame/alpha/alpha8201.h | 4 +- src/mame/alpha/champbas.cpp | 6 +- src/mame/alpha/champbas.h | 12 +- src/mame/alpha/champbas_v.cpp | 6 +- src/mame/alpha/equites.cpp | 4 +- src/mame/alpha/shougi.cpp | 4 +- src/mame/alpha/splendor.cpp | 4 +- src/mame/altos/acs8600_ics.cpp | 2 +- src/mame/altos/acs8600_ics.h | 2 +- src/mame/altos/altos2_kbd.cpp | 4 +- src/mame/altos/altos2_kbd.h | 4 +- src/mame/altos/altos5.cpp | 8 +- src/mame/altos/altos8600.cpp | 12 +- src/mame/amiga/alg.cpp | 8 +- src/mame/amiga/amiga.cpp | 54 ++++---- src/mame/amiga/amiga.h | 30 ++-- src/mame/amiga/amiga_m.cpp | 30 ++-- src/mame/amiga/cubo.cpp | 8 +- src/mame/ampro/lbpc.cpp | 28 ++-- src/mame/amstrad/amstrad.h | 18 +-- src/mame/amstrad/amstrad_m.cpp | 18 +-- src/mame/amstrad/nc.cpp | 42 +++--- src/mame/amstrad/pc1512.cpp | 34 ++--- src/mame/amstrad/pc1512.h | 34 ++--- src/mame/amstrad/pc1512kb.cpp | 12 +- src/mame/amstrad/pc1512kb.h | 12 +- src/mame/amstrad/pcw.cpp | 10 +- src/mame/amstrad/pcw.h | 10 +- src/mame/amstrad/pcw16.cpp | 8 +- src/mame/amstrad/pcw16.h | 8 +- src/mame/amstrad/pda600.cpp | 2 +- src/mame/amstrad/pda600_copro.cpp | 2 +- src/mame/amstrad/pda600_copro.h | 6 +- src/mame/apf/apf.cpp | 4 +- src/mame/apollo/apollo.cpp | 4 +- src/mame/apollo/apollo.h | 40 +++--- src/mame/apollo/apollo_m.cpp | 36 ++--- src/mame/apple/apple1.cpp | 4 +- src/mame/apple/apple2.cpp | 28 ++-- src/mame/apple/apple2e.cpp | 32 ++--- src/mame/apple/apple2gs.cpp | 20 +-- src/mame/apple/apple2video.cpp | 12 +- src/mame/apple/apple2video.h | 12 +- src/mame/apple/apple3.h | 16 +-- src/mame/apple/apple3_m.cpp | 16 +-- src/mame/apple/heathrow.cpp | 8 +- src/mame/apple/heathrow.h | 10 +- src/mame/apple/imacg3.cpp | 4 +- src/mame/apple/lisa.h | 20 +-- src/mame/apple/lisa_m.cpp | 20 +-- src/mame/apple/lwriter.cpp | 20 +-- src/mame/apple/mac128.cpp | 22 +-- src/mame/apple/macadb.cpp | 4 +- src/mame/apple/macadb.h | 4 +- src/mame/apple/macii.cpp | 42 +++--- src/mame/apple/maciici.cpp | 22 +-- src/mame/apple/maciifx.cpp | 4 +- src/mame/apple/maciivx.cpp | 6 +- src/mame/apple/maclc.cpp | 10 +- src/mame/apple/maclc3.cpp | 2 +- src/mame/apple/macpdm.cpp | 112 +++++++-------- src/mame/apple/macprtb.cpp | 6 +- src/mame/apple/macpwrbk030.cpp | 10 +- src/mame/apple/macquadra700.cpp | 50 +++---- src/mame/apple/macrtc.cpp | 8 +- src/mame/apple/macrtc.h | 8 +- src/mame/apple/macscsi.cpp | 2 +- src/mame/apple/macscsi.h | 2 +- src/mame/apple/pippin.cpp | 4 +- src/mame/apple/powermacg3.cpp | 4 +- src/mame/apple/rbv.cpp | 10 +- src/mame/apple/rbv.h | 10 +- src/mame/apple/sonora.cpp | 16 +-- src/mame/apple/sonora.h | 16 +-- src/mame/apple/tk2000.cpp | 24 ++-- src/mame/apple/v8.cpp | 16 +-- src/mame/apple/v8.h | 16 +-- src/mame/apple/vasp.cpp | 22 +-- src/mame/apple/vasp.h | 22 +-- src/mame/arcadia/arcadia.h | 2 +- src/mame/arcadia/arcadia_v.cpp | 2 +- src/mame/aristocrat/aristmk4.cpp | 16 +-- src/mame/atari/a2600.cpp | 4 +- src/mame/atari/asic65.cpp | 2 +- src/mame/atari/asic65.h | 2 +- src/mame/atari/asteroid.cpp | 8 +- src/mame/atari/asteroid.h | 10 +- src/mame/atari/asteroid_m.cpp | 2 +- src/mame/atari/atarifdc.cpp | 2 +- src/mame/atari/atarifdc.h | 2 +- src/mame/atari/atarigt.cpp | 2 +- src/mame/atari/atarigt.h | 2 +- src/mame/atari/atarijsa.cpp | 6 +- src/mame/atari/atarijsa.h | 10 +- src/mame/atari/atariscom.h | 4 +- src/mame/atari/atarist.cpp | 12 +- src/mame/atari/atarisy1.cpp | 4 +- src/mame/atari/atarisy1.h | 4 +- src/mame/atari/atarisy2.cpp | 2 +- src/mame/atari/atarisy2.h | 2 +- src/mame/atari/atarisy4.cpp | 8 +- src/mame/atari/avalnche.cpp | 2 +- src/mame/atari/avalnche.h | 14 +- src/mame/atari/avalnche_a.cpp | 6 +- src/mame/atari/bsktball.h | 6 +- src/mame/atari/bsktball_m.cpp | 6 +- src/mame/atari/bwidow.cpp | 2 +- src/mame/atari/bwidow.h | 2 +- src/mame/atari/bzone.cpp | 2 +- src/mame/atari/bzone.h | 2 +- src/mame/atari/ccastles.cpp | 4 +- src/mame/atari/ccastles.h | 4 +- src/mame/atari/centiped.cpp | 12 +- src/mame/atari/centiped.h | 14 +- src/mame/atari/centiped_v.cpp | 2 +- src/mame/atari/cloak.cpp | 4 +- src/mame/atari/cloud9.cpp | 4 +- src/mame/atari/cops.cpp | 14 +- src/mame/atari/copsnrob.cpp | 4 +- src/mame/atari/cyberbal.cpp | 8 +- src/mame/atari/firefox.cpp | 32 ++--- src/mame/atari/firetrk.cpp | 20 +-- src/mame/atari/flyball.cpp | 4 +- src/mame/atari/foodf.cpp | 4 +- src/mame/atari/gauntlet.cpp | 14 +- src/mame/atari/harddriv.cpp | 8 +- src/mame/atari/harddriv.h | 26 ++-- src/mame/atari/harddriv_a.cpp | 12 +- src/mame/atari/harddriv_m.cpp | 10 +- src/mame/atari/jaguar.h | 6 +- src/mame/atari/jaguar_a.cpp | 2 +- src/mame/atari/jaguar_v.cpp | 4 +- src/mame/atari/jedi.cpp | 16 +-- src/mame/atari/liberatr.cpp | 12 +- src/mame/atari/maxaflex.cpp | 2 +- src/mame/atari/mhavoc.cpp | 20 +-- src/mame/atari/missile.cpp | 4 +- src/mame/atari/orbit.cpp | 4 +- src/mame/atari/pofo.cpp | 12 +- src/mame/atari/quizshow.cpp | 8 +- src/mame/atari/runaway.cpp | 4 +- src/mame/atari/sbrkout.cpp | 20 +-- src/mame/atari/skydiver.cpp | 12 +- src/mame/atari/sprint2.cpp | 4 +- src/mame/atari/sprint4.cpp | 16 +-- src/mame/atari/sprint8.cpp | 12 +- src/mame/atari/starshp1.cpp | 36 ++--- src/mame/atari/starwars.h | 10 +- src/mame/atari/starwars_m.cpp | 10 +- src/mame/atari/stmmu.h | 4 +- src/mame/atari/subs.cpp | 4 +- src/mame/atari/tank8.cpp | 4 +- src/mame/atari/tempest.cpp | 4 +- src/mame/atari/thunderj.cpp | 4 +- src/mame/atari/tomcat.cpp | 28 ++-- src/mame/atari/triplhnt.cpp | 8 +- src/mame/atari/ultratnk.cpp | 16 +-- src/mame/atari/wolfpack.cpp | 8 +- src/mame/att/att4425.cpp | 8 +- src/mame/att/unixpc.cpp | 28 ++-- src/mame/ausnz/amust.cpp | 16 +-- src/mame/ausnz/applix.cpp | 4 +- src/mame/ausnz/aussiebyte.cpp | 14 +- src/mame/ausnz/aussiebyte.h | 14 +- src/mame/ausnz/binbug.cpp | 12 +- src/mame/ausnz/d6800.cpp | 4 +- src/mame/ausnz/dg680.cpp | 4 +- src/mame/ausnz/dmax8000.cpp | 4 +- src/mame/ausnz/eacc.cpp | 12 +- src/mame/ausnz/eti660.cpp | 20 +-- src/mame/ausnz/excali64.cpp | 20 +-- src/mame/ausnz/magnum.cpp | 4 +- src/mame/ausnz/mbee.h | 10 +- src/mame/ausnz/mbee_m.cpp | 8 +- src/mame/ausnz/mbee_v.cpp | 2 +- src/mame/ausnz/pegasus.cpp | 12 +- src/mame/ausnz/pipbug.cpp | 4 +- src/mame/ausnz/poly.h | 12 +- src/mame/ausnz/poly_m.cpp | 12 +- src/mame/ausnz/proteus.cpp | 12 +- src/mame/ausnz/super80.cpp | 2 +- src/mame/ausnz/super80.h | 2 +- src/mame/ausnz/tec1.cpp | 4 +- src/mame/barcrest/mpu1.cpp | 2 +- src/mame/barcrest/mpu3.cpp | 34 ++--- src/mame/barcrest/mpu4.cpp | 34 ++--- src/mame/barcrest/mpu4.h | 34 ++--- src/mame/barcrest/mpu4_oki_sampled_sound.cpp | 4 +- src/mame/barcrest/mpu4_oki_sampled_sound.h | 4 +- src/mame/barcrest/mpu4vid.cpp | 32 ++--- src/mame/be/bebox.cpp | 2 +- src/mame/be/bebox.h | 24 ++-- src/mame/be/bebox_m.cpp | 23 +-- src/mame/beehive/microb.cpp | 4 +- src/mame/bfm/bfcobra.cpp | 30 ++-- src/mame/bfm/bfm_adr2.cpp | 2 +- src/mame/bfm/bfm_adr2.h | 2 +- src/mame/bfm/bfm_bd1.cpp | 6 +- src/mame/bfm/bfm_bd1.h | 6 +- src/mame/bfm/bfm_sc1.cpp | 2 +- src/mame/bfm/bfm_sc2.cpp | 6 +- src/mame/bfm/bfm_sc4.cpp | 8 +- src/mame/bfm/bfm_sc4.h | 10 +- src/mame/bfm/bfm_sc5.cpp | 4 +- src/mame/bfm/bfm_sc5.h | 4 +- src/mame/bfm/bfmsys85.cpp | 10 +- src/mame/bfm/rastersp.cpp | 20 +-- src/mame/bmc/bmcbowl.cpp | 4 +- src/mame/bmc/bmcpokr.cpp | 4 +- src/mame/bondwell/bw12.cpp | 26 ++-- src/mame/bondwell/bw12.h | 26 ++-- src/mame/bondwell/bw2.cpp | 6 +- src/mame/bondwell/bw2.h | 6 +- src/mame/brother/lw30.cpp | 4 +- src/mame/brother/lw350.cpp | 4 +- src/mame/brother/lw840.cpp | 4 +- src/mame/canon/cat.cpp | 16 +-- src/mame/capcom/commando.cpp | 4 +- src/mame/capcom/cps1.h | 2 +- src/mame/capcom/cps1_v.cpp | 2 +- src/mame/capcom/cps1bl_5205.cpp | 4 +- src/mame/capcom/cps3.cpp | 2 +- src/mame/capcom/cps3.h | 2 +- src/mame/capcom/fcrash.cpp | 4 +- src/mame/capcom/fcrash.h | 4 +- src/mame/capcom/gng.cpp | 8 +- src/mame/capcom/instantm.cpp | 4 +- src/mame/capcom/kenseim.cpp | 12 +- src/mame/capcom/lwings.cpp | 4 +- src/mame/capcom/lwings.h | 4 +- src/mame/capcom/mitchell.cpp | 4 +- src/mame/capcom/sonson.cpp | 8 +- src/mame/casio/ctk2000.cpp | 6 +- src/mame/casio/ctk551.cpp | 20 +-- src/mame/casio/fp1100.cpp | 4 +- src/mame/casio/fp200.cpp | 8 +- src/mame/casio/pv2000.cpp | 4 +- src/mame/cce/mc1000.cpp | 12 +- src/mame/ces/galgames.cpp | 12 +- src/mame/chromatics/cgc7900.h | 2 +- src/mame/cinematronics/cchasm.cpp | 8 +- src/mame/cinematronics/cinemat.cpp | 6 +- src/mame/cinematronics/cinemat.h | 20 +-- src/mame/cinematronics/cinemat_a.cpp | 2 +- src/mame/cinematronics/cinemat_a.h | 2 +- src/mame/cinematronics/cinemat_v.cpp | 10 +- src/mame/cinematronics/dlair.cpp | 12 +- src/mame/cinematronics/leland_a.cpp | 12 +- src/mame/cinematronics/leland_a.h | 12 +- src/mame/citoh/cit101.cpp | 4 +- src/mame/citoh/cit101_kbd.cpp | 2 +- src/mame/citoh/cit101_kbd.h | 2 +- src/mame/citoh/cit220.cpp | 8 +- src/mame/citoh/cit220_kbd.cpp | 2 +- src/mame/citoh/cit220_kbd.h | 2 +- src/mame/coleco/adam.cpp | 8 +- src/mame/coleco/adam.h | 8 +- src/mame/coleco/coleco.cpp | 2 +- src/mame/coleco/coleco.h | 2 +- src/mame/comad/zerozone.cpp | 4 +- src/mame/commodore/c128.cpp | 68 ++++----- src/mame/commodore/c64.cpp | 34 ++--- src/mame/commodore/c65.cpp | 4 +- src/mame/commodore/cbm2.cpp | 18 +-- src/mame/commodore/clcd.cpp | 8 +- src/mame/commodore/pet.cpp | 16 +-- src/mame/commodore/plus4.cpp | 16 +-- src/mame/commodore/vic10.cpp | 4 +- src/mame/commodore/vic20.cpp | 36 ++--- src/mame/comx/comx35.cpp | 10 +- src/mame/comx/comx35.h | 14 +- src/mame/comx/comx35_v.cpp | 2 +- src/mame/concept/concept.h | 6 +- src/mame/concept/concept_m.cpp | 6 +- src/mame/conitec/prof180x.cpp | 16 +-- src/mame/conitec/prof180x.h | 16 +-- src/mame/conitec/prof80.cpp | 12 +- src/mame/conitec/prof80.h | 12 +- src/mame/conitec/prof80mmu.cpp | 2 +- src/mame/conitec/prof80mmu.h | 2 +- src/mame/cvs/cvs.cpp | 10 +- src/mame/cvs/cvs_base.cpp | 2 +- src/mame/cvs/cvs_base.h | 2 +- src/mame/cvs/galaxia.cpp | 4 +- src/mame/cvs/quasar.cpp | 4 +- src/mame/dai/dai_snd.cpp | 6 +- src/mame/dai/dai_snd.h | 6 +- src/mame/dataeast/backfire.cpp | 4 +- src/mame/dataeast/battlera.cpp | 4 +- src/mame/dataeast/brkthru.cpp | 4 +- src/mame/dataeast/cntsteer.cpp | 8 +- src/mame/dataeast/dblewing.cpp | 4 +- src/mame/dataeast/dec0.cpp | 4 +- src/mame/dataeast/dec0.h | 4 +- src/mame/dataeast/dec8.cpp | 8 +- src/mame/dataeast/dec8.h | 8 +- src/mame/dataeast/deco156.cpp | 6 +- src/mame/dataeast/deco32.cpp | 2 +- src/mame/dataeast/deco32.h | 2 +- src/mame/dataeast/deco_irq.cpp | 6 +- src/mame/dataeast/deco_irq.h | 6 +- src/mame/dataeast/deco_ld.cpp | 4 +- src/mame/dataeast/deco_mlc.h | 2 +- src/mame/dataeast/deco_mlc_v.cpp | 2 +- src/mame/dataeast/firetrap.cpp | 4 +- src/mame/dataeast/kchamp.cpp | 8 +- src/mame/dataeast/kchamp.h | 14 +- src/mame/dataeast/kchamp_v.cpp | 2 +- src/mame/dataeast/lemmings.h | 2 +- src/mame/dataeast/lemmings_v.cpp | 2 +- src/mame/dataeast/liberate.cpp | 4 +- src/mame/dataeast/liberate.h | 10 +- src/mame/dataeast/pcktgal.cpp | 4 +- src/mame/dataeast/pktgaldx.cpp | 4 +- src/mame/dataeast/simpl156.cpp | 2 +- src/mame/dataeast/simpl156.h | 2 +- src/mame/dataeast/supbtime.cpp | 2 +- src/mame/dataeast/supbtime.h | 2 +- src/mame/ddr/bcs3.cpp | 8 +- src/mame/ddr/c80.cpp | 4 +- src/mame/ddr/huebler.cpp | 6 +- src/mame/ddr/huebler.h | 6 +- src/mame/ddr/jtc.cpp | 4 +- src/mame/ddr/kc.h | 14 +- src/mame/ddr/kc_m.cpp | 14 +- src/mame/ddr/lc80.cpp | 14 +- src/mame/ddr/nanos.cpp | 16 +-- src/mame/ddr/pcm.cpp | 8 +- src/mame/ddr/poly880.cpp | 8 +- src/mame/ddr/polyplay.cpp | 2 +- src/mame/ddr/polyplay.h | 6 +- src/mame/ddr/polyplay_a.cpp | 4 +- src/mame/dec/decioga.cpp | 8 +- src/mame/dec/decioga.h | 8 +- src/mame/dec/decmate2.cpp | 46 +++--- src/mame/dec/dectalk.cpp | 12 +- src/mame/dec/dtc03.cpp | 12 +- src/mame/dec/pdp1.cpp | 2 +- src/mame/dec/pdp1.h | 4 +- src/mame/dec/pdp1_v.cpp | 2 +- src/mame/dec/rainbow.cpp | 76 +++++----- src/mame/dec/vk100.cpp | 16 +-- src/mame/dec/vt240.cpp | 36 ++--- src/mame/dec/vt52.cpp | 20 +-- src/mame/dec/vtvideo.cpp | 2 +- src/mame/dec/vtvideo.h | 2 +- src/mame/dgrm/pokechmp.cpp | 4 +- src/mame/dms/dms86.cpp | 4 +- src/mame/dynax/ddenlovr.cpp | 72 +++++----- src/mame/dynax/dynax.cpp | 40 +++--- src/mame/dynax/dynax.h | 58 ++++---- src/mame/dynax/dynax_v.cpp | 18 +-- src/mame/dynax/hnayayoi.cpp | 16 +-- src/mame/dynax/realbrk.h | 2 +- src/mame/eaca/cgenie.cpp | 8 +- src/mame/edevices/fantland.cpp | 6 +- src/mame/edevices/fantland.h | 6 +- src/mame/edevices/pzletime.cpp | 4 +- src/mame/efo/cidelsa.cpp | 6 +- src/mame/efo/cidelsa.h | 8 +- src/mame/efo/cidelsa_v.cpp | 2 +- src/mame/efo/nightmare.cpp | 16 +-- src/mame/elektor/elekscmp.cpp | 4 +- src/mame/ensoniq/esq5505.cpp | 20 +-- src/mame/ensoniq/esqasr.cpp | 4 +- src/mame/ensoniq/esqkt.cpp | 16 +-- src/mame/ensoniq/esqmr.cpp | 12 +- src/mame/enterprise/ep64.cpp | 4 +- src/mame/entex/advision.cpp | 8 +- src/mame/eolith/eolith_speedup.cpp | 4 +- src/mame/eolith/eolith_speedup.h | 4 +- src/mame/eolith/ghosteo.cpp | 12 +- src/mame/epoch/scv.cpp | 4 +- src/mame/epson/hx20.cpp | 2 +- src/mame/epson/hx20.h | 6 +- src/mame/epson/px4.cpp | 32 ++--- src/mame/epson/qx10.cpp | 28 ++-- src/mame/ericsson/eispc.cpp | 26 ++-- src/mame/ericsson/eispc_kb.cpp | 6 +- src/mame/ericsson/eispc_kb.h | 6 +- src/mame/excellent/lastbank.cpp | 4 +- src/mame/exidy/carpolo.h | 22 +-- src/mame/exidy/carpolo_m.cpp | 20 +-- src/mame/exidy/carpolo_v.cpp | 2 +- src/mame/exidy/exidy440.cpp | 4 +- src/mame/exidy/exidy440.h | 6 +- src/mame/exidy/exidy440_a.cpp | 4 +- src/mame/exidy/exidy440_a.h | 4 +- src/mame/exidy/exidy440_v.cpp | 2 +- src/mame/exidy/starfire.cpp | 6 +- src/mame/exidy/starfire.h | 6 +- src/mame/exidy/vertigo.h | 6 +- src/mame/exidy/vertigo_m.cpp | 6 +- src/mame/facit/facit4440.cpp | 4 +- src/mame/fairlight/cmi.cpp | 84 +++++------ src/mame/fairlight/cmi_ankbd.cpp | 8 +- src/mame/fairlight/cmi_ankbd.h | 8 +- src/mame/fairlight/cmi_mkbd.cpp | 26 ++-- src/mame/fairlight/cmi_mkbd.h | 26 ++-- src/mame/fidelity/card.cpp | 8 +- src/mame/fidelity/csc.cpp | 12 +- src/mame/fidelity/eldorado.cpp | 4 +- src/mame/fidelity/sc6.cpp | 8 +- src/mame/force/fccpu30.cpp | 4 +- src/mame/force/force68k.cpp | 43 +++--- src/mame/fujitsu/fm7.cpp | 14 +- src/mame/fujitsu/fm7.h | 14 +- src/mame/fujitsu/fmtowns.cpp | 36 ++--- src/mame/fujitsu/fmtowns.h | 36 ++--- src/mame/funworld/funworld.cpp | 2 +- src/mame/funworld/funworld.h | 2 +- src/mame/fuuki/fuukifg3.h | 2 +- src/mame/fuuki/fuukifg3_v.cpp | 2 +- src/mame/gaelco/bigkarnk_ms.cpp | 4 +- src/mame/gaelco/gaelco.cpp | 8 +- src/mame/gaelco/gaelco.h | 8 +- src/mame/gaelco/gaelco2.cpp | 6 +- src/mame/gaelco/gaelco2.h | 14 +- src/mame/gaelco/gaelco2_m.cpp | 8 +- src/mame/gaelco/gaelco3d.cpp | 24 ++-- src/mame/gaelco/gaelco3d.h | 24 ++-- src/mame/gaelco/gaelco3d_m.cpp | 8 +- src/mame/gaelco/gaelco3d_m.h | 8 +- src/mame/gaelco/glass.cpp | 8 +- src/mame/gaelco/mastboy.cpp | 12 +- src/mame/gaelco/splash.cpp | 16 +-- src/mame/gaelco/splash.h | 16 +-- src/mame/gaelco/splash_ms.cpp | 4 +- src/mame/gaelco/targeth.cpp | 4 +- src/mame/gaelco/thoop2.cpp | 8 +- src/mame/gaelco/wrally.cpp | 24 ++-- src/mame/galaxian/fastfred.cpp | 6 +- src/mame/galaxian/fastfred.h | 20 +-- src/mame/galaxian/fastfred_v.cpp | 14 +- src/mame/galaxian/galaxian.cpp | 12 +- src/mame/galaxian/galaxian.h | 12 +- src/mame/galaxian/galaxold.cpp | 4 +- src/mame/galaxian/galaxold.h | 8 +- src/mame/galaxian/galaxold_m.cpp | 4 +- src/mame/galaxian/scobra.cpp | 4 +- src/mame/galaxian/scramble.h | 2 +- src/mame/galaxian/scramble_a.cpp | 2 +- src/mame/gameplan/gameplan.cpp | 8 +- src/mame/gameplan/gameplan.h | 14 +- src/mame/gameplan/gameplan_v.cpp | 2 +- src/mame/gameplan/toratora.cpp | 16 +-- src/mame/gameplan/trvquest.cpp | 4 +- src/mame/grundy/newbrain.cpp | 6 +- src/mame/grundy/newbrain.h | 6 +- src/mame/handheld/monty.cpp | 6 +- src/mame/handheld/rzone.cpp | 20 +-- src/mame/heathkit/et3400.cpp | 8 +- src/mame/heathkit/h8.cpp | 4 +- src/mame/heathkit/tlb.cpp | 8 +- src/mame/heathkit/tlb.h | 8 +- src/mame/hec2hrp/hec2hrp.h | 4 +- src/mame/hec2hrp/hec2hrp_m.cpp | 4 +- src/mame/hegenerglaser/brikett.cpp | 8 +- src/mame/hegenerglaser/mm1.cpp | 8 +- src/mame/hitachi/bml3.cpp | 8 +- src/mame/homebrew/phunsy.cpp | 8 +- src/mame/homebrew/ravens.cpp | 8 +- src/mame/homebrew/sitcom.cpp | 8 +- src/mame/homelab/homelab.cpp | 4 +- src/mame/hp/hp16500.cpp | 8 +- src/mame/hp/hp2620.cpp | 8 +- src/mame/hp/hp2640.cpp | 12 +- src/mame/hp/hp48.h | 4 +- src/mame/hp/hp48_m.cpp | 4 +- src/mame/hp/hp64k.cpp | 68 ++++----- src/mame/hp/hp80.cpp | 12 +- src/mame/hp/hp95lx.cpp | 8 +- src/mame/hp/hp9825_tape.cpp | 16 +-- src/mame/hp/hp9825_tape.h | 18 +-- src/mame/hp/hp9845.cpp | 10 +- src/mame/hp/hp9845.h | 2 +- src/mame/hp/hp9k_3xx.cpp | 14 +- src/mame/hp/hp_ipc.cpp | 28 ++-- src/mame/husky/hunter2.cpp | 16 +-- src/mame/husky/husky.cpp | 16 +-- src/mame/ibm/ibm6580.cpp | 24 ++-- src/mame/ibm/ibm6580_fdc.cpp | 8 +- src/mame/ibm/ibm6580_fdc.h | 8 +- src/mame/ibm/ibm6580_kbd.cpp | 4 +- src/mame/ibm/ibm6580_kbd.h | 4 +- src/mame/ice/chexx.cpp | 16 +-- src/mame/ice/vp101.cpp | 4 +- src/mame/igs/goldstar.cpp | 4 +- src/mame/igs/goldstar.h | 4 +- src/mame/igs/igs009.cpp | 8 +- src/mame/igs/igs011.cpp | 12 +- src/mame/igs/igs_fear.cpp | 4 +- src/mame/igs/igs_m027.cpp | 4 +- src/mame/igs/igspoker.cpp | 4 +- src/mame/igs/jackie.cpp | 4 +- src/mame/igs/pgm.h | 2 +- src/mame/igs/pgm2.cpp | 2 +- src/mame/igs/pgm2.h | 4 +- src/mame/igs/pgm2_v.cpp | 2 +- src/mame/igs/pgm3.cpp | 4 +- src/mame/igs/pgm_v.cpp | 2 +- src/mame/igs/spoker.cpp | 4 +- src/mame/igt/drw80pkr.cpp | 12 +- src/mame/igt/gkigt.cpp | 4 +- src/mame/igt/peplus.cpp | 4 +- src/mame/igt/videopkr.cpp | 8 +- src/mame/intel/imds2.cpp | 8 +- src/mame/intel/imds2ioc.cpp | 12 +- src/mame/intel/imds2ioc.h | 12 +- src/mame/intel/imm6_76.cpp | 12 +- src/mame/intel/imm6_76.h | 12 +- src/mame/intel/intellec4.cpp | 24 ++-- src/mame/intel/isbc.cpp | 28 ++-- src/mame/intel/isbc8010.cpp | 4 +- src/mame/intel/isbc_208.cpp | 6 +- src/mame/intel/isbc_208.h | 6 +- src/mame/intel/rex6000.cpp | 8 +- src/mame/intel/sdk51.cpp | 8 +- src/mame/intel/sdk80.cpp | 4 +- src/mame/intel/sdk85.cpp | 12 +- src/mame/intergraph/interpro_ioga.h | 38 ++--- src/mame/interton/vc4000.h | 2 +- src/mame/interton/vc4000_v.cpp | 2 +- src/mame/irem/m63.cpp | 28 ++-- src/mame/irem/m90.cpp | 4 +- src/mame/irem/m90.h | 4 +- src/mame/irem/m92.cpp | 2 +- src/mame/irem/m92.h | 2 +- src/mame/irem/redalert_a.cpp | 2 +- src/mame/irem/redalert_a.h | 2 +- src/mame/isc/compucolor.cpp | 4 +- src/mame/itech/iteagle_fpga.cpp | 4 +- src/mame/itech/iteagle_fpga.h | 4 +- src/mame/itech/itech32.cpp | 6 +- src/mame/itech/itech32.h | 6 +- src/mame/itech/itech8.cpp | 8 +- src/mame/itech/itech8.h | 8 +- src/mame/jaleco/aeroboto.cpp | 4 +- src/mame/jaleco/armchamp.cpp | 4 +- src/mame/jaleco/bnstars.cpp | 4 +- src/mame/jaleco/cischeat.cpp | 4 +- src/mame/jaleco/cischeat.h | 4 +- src/mame/jaleco/ddayjlc.cpp | 4 +- src/mame/jaleco/homerun.cpp | 8 +- src/mame/jaleco/megasys1.cpp | 2 +- src/mame/jaleco/megasys1.h | 4 +- src/mame/jaleco/megasys1_v.cpp | 2 +- src/mame/jaleco/ms32.cpp | 10 +- src/mame/jaleco/ms32.h | 14 +- src/mame/jaleco/ms32_v.cpp | 4 +- src/mame/jaleco/pturn.cpp | 24 ++-- src/mame/jaleco/tetrisp2.cpp | 18 +-- src/mame/jaleco/tetrisp2.h | 22 +-- src/mame/jaleco/tetrisp2_v.cpp | 4 +- src/mame/jpm/jpmimpct.cpp | 14 +- src/mame/jpm/jpmimpct.h | 22 +-- src/mame/jpm/jpms80.cpp | 16 +-- src/mame/jpm/jpmsru.cpp | 4 +- src/mame/jpm/jpmsys5.cpp | 18 +-- src/mame/jpm/jpmsys5.h | 20 +-- src/mame/kaneko/airbustr.cpp | 4 +- src/mame/kaneko/djboy.cpp | 4 +- src/mame/kaneko/galpanic.cpp | 4 +- src/mame/kaneko/galpanic_ms.cpp | 4 +- src/mame/kaneko/hvyunit.cpp | 4 +- src/mame/kaneko/sandscrp.cpp | 4 +- src/mame/kaneko/snowbros.cpp | 2 +- src/mame/kaneko/snowbros.h | 2 +- src/mame/kaneko/suprnova.h | 2 +- src/mame/kaneko/suprnova_v.cpp | 2 +- src/mame/kaypro/kay_kbd.cpp | 2 +- src/mame/kaypro/kay_kbd.h | 4 +- src/mame/kaypro/kaypro.h | 6 +- src/mame/kaypro/kaypro_m.cpp | 6 +- src/mame/konami/3dom2.h | 12 +- src/mame/konami/battlnts.cpp | 4 +- src/mame/konami/circusc.cpp | 16 +-- src/mame/konami/cobra.cpp | 4 +- src/mame/konami/dbz.cpp | 4 +- src/mame/konami/ddribble.cpp | 4 +- src/mame/konami/djmain.cpp | 4 +- src/mame/konami/finalizr.cpp | 4 +- src/mame/konami/firebeat.cpp | 36 ++--- src/mame/konami/gyruss.cpp | 16 +-- src/mame/konami/hexion.cpp | 8 +- src/mame/konami/hyperspt.cpp | 16 +-- src/mame/konami/jackal.cpp | 4 +- src/mame/konami/jailbrek.cpp | 4 +- src/mame/konami/junofrst.cpp | 4 +- src/mame/konami/k053250_ps.cpp | 4 +- src/mame/konami/k053250_ps.h | 4 +- src/mame/konami/k573cass.cpp | 104 +++++++------- src/mame/konami/k573cass.h | 116 ++++++++-------- src/mame/konami/k573fpga.cpp | 4 +- src/mame/konami/k573fpga.h | 4 +- src/mame/konami/k573mcr.cpp | 2 +- src/mame/konami/k573mcr.h | 2 +- src/mame/konami/konamigq.cpp | 4 +- src/mame/konami/konamigs.cpp | 4 +- src/mame/konami/konamigx.cpp | 6 +- src/mame/konami/konamigx.h | 6 +- src/mame/konami/konamim2.cpp | 12 +- src/mame/konami/konblands.cpp | 4 +- src/mame/konami/konendev.cpp | 4 +- src/mame/konami/konmedal.cpp | 4 +- src/mame/konami/konppc_jvshost.cpp | 2 +- src/mame/konami/konppc_jvshost.h | 2 +- src/mame/konami/kpontoon.cpp | 8 +- src/mame/konami/kpython2.cpp | 4 +- src/mame/konami/ksys573.cpp | 154 ++++++++++----------- src/mame/konami/labyrunr.cpp | 4 +- src/mame/konami/mainevt.cpp | 4 +- src/mame/konami/megazone.cpp | 20 +-- src/mame/konami/mikie.cpp | 20 +-- src/mame/konami/mystwarr.cpp | 2 +- src/mame/konami/mystwarr.h | 2 +- src/mame/konami/nemesis.cpp | 22 +-- src/mame/konami/nemesis.h | 26 ++-- src/mame/konami/nemesis_v.cpp | 4 +- src/mame/konami/pandoras.cpp | 16 +-- src/mame/konami/piratesh.cpp | 4 +- src/mame/konami/plygonet.cpp | 4 +- src/mame/konami/pooyan.cpp | 12 +- src/mame/konami/qdrmfgp.cpp | 12 +- src/mame/konami/quickpick5.cpp | 8 +- src/mame/konami/rockrage.cpp | 4 +- src/mame/konami/rocnrope.cpp | 12 +- src/mame/konami/rollerg.cpp | 4 +- src/mame/konami/rungun.cpp | 4 +- src/mame/konami/sbasketb.cpp | 20 +-- src/mame/konami/scotrsht.cpp | 4 +- src/mame/konami/tasman.cpp | 8 +- src/mame/konami/timeplt.cpp | 20 +-- src/mame/konami/tmnt.h | 6 +- src/mame/konami/tmnt_v.cpp | 2 +- src/mame/konami/tp84.cpp | 20 +-- src/mame/konami/trackfld.cpp | 12 +- src/mame/konami/trackfld.h | 14 +- src/mame/konami/trackfld_a.cpp | 2 +- src/mame/konami/trackfld_a.h | 2 +- src/mame/konami/trackfld_v.cpp | 2 +- src/mame/konami/tutankhm.cpp | 8 +- src/mame/konami/tutankhm.h | 12 +- src/mame/konami/tutankhm_v.cpp | 4 +- src/mame/konami/twin16.h | 4 +- src/mame/konami/twin16_v.cpp | 2 +- src/mame/konami/twinkle.cpp | 12 +- src/mame/konami/viper.cpp | 12 +- src/mame/konami/wecleman.cpp | 2 +- src/mame/konami/wecleman.h | 2 +- src/mame/konami/xmen.cpp | 8 +- src/mame/konami/yiear.cpp | 4 +- src/mame/konami/zr107.cpp | 8 +- src/mame/konami/zs01.cpp | 10 +- src/mame/konami/zs01.h | 10 +- src/mame/kontron/kdt6.cpp | 20 +-- src/mame/korg/korgdss1.cpp | 8 +- src/mame/kyocera/kyocera.cpp | 20 +-- src/mame/kyocera/kyocera.h | 20 +-- src/mame/leapfrog/iquest.cpp | 4 +- src/mame/lsi/octopus.cpp | 46 +++--- src/mame/luxor/abc1600.cpp | 14 +- src/mame/luxor/abc1600.h | 18 +-- src/mame/luxor/abc80.cpp | 2 +- src/mame/luxor/abc80.h | 4 +- src/mame/luxor/abc80x.cpp | 34 ++--- src/mame/luxor/abc80x.h | 34 ++--- src/mame/matsushita/duet16.cpp | 24 ++-- src/mame/matsushita/jr100.cpp | 4 +- src/mame/matsushita/myb3k.cpp | 48 +++---- src/mame/maygay/maygay1b.cpp | 16 +-- src/mame/maygay/maygay1b.h | 18 +-- src/mame/maygay/maygayv1.cpp | 12 +- src/mame/meadows/meadows.cpp | 4 +- src/mame/meadows/meadows.h | 4 +- src/mame/memotech/mtx.cpp | 4 +- src/mame/memotech/mtx.h | 12 +- src/mame/memotech/mtx_m.cpp | 8 +- src/mame/mera/konin.cpp | 4 +- src/mame/mera/m79152pc.cpp | 12 +- src/mame/merit/merit.cpp | 8 +- src/mame/merit/meritm.cpp | 12 +- src/mame/metro/metro.cpp | 14 +- src/mame/metro/metro.h | 14 +- src/mame/microkey/primo.h | 2 +- src/mame/microkey/primo_m.cpp | 2 +- src/mame/microsoft/mct_adr.h | 4 +- src/mame/microterm/microterm_f8.cpp | 4 +- src/mame/microterm/mt420.cpp | 4 +- src/mame/midcoin/wink.cpp | 20 +-- src/mame/midw8080/8080bw.cpp | 8 +- src/mame/midw8080/8080bw.h | 8 +- src/mame/midw8080/mw8080bw.cpp | 2 +- src/mame/midw8080/mw8080bw.h | 4 +- src/mame/midw8080/mw8080bw_v.cpp | 2 +- src/mame/midway/astrocde.cpp | 10 +- src/mame/midway/astrocde.h | 12 +- src/mame/midway/astrocde_v.cpp | 2 +- src/mame/midway/atlantis.cpp | 28 ++-- src/mame/midway/balsente.h | 16 +-- src/mame/midway/balsente_m.cpp | 16 +-- src/mame/midway/csd.cpp | 6 +- src/mame/midway/csd.h | 6 +- src/mame/midway/gridlee.cpp | 2 +- src/mame/midway/gridlee.h | 4 +- src/mame/midway/gridlee_v.cpp | 2 +- src/mame/midway/mcr.h | 4 +- src/mame/midway/mcr_m.cpp | 4 +- src/mame/midway/midway.cpp | 10 +- src/mame/midway/midway.h | 10 +- src/mame/midway/midwayic.cpp | 10 +- src/mame/midway/midwayic.h | 10 +- src/mame/midway/midxunit.h | 4 +- src/mame/midway/midxunit_m.cpp | 4 +- src/mame/midway/midyunit.cpp | 4 +- src/mame/midway/midyunit.h | 4 +- src/mame/midway/midzeus.cpp | 8 +- src/mame/midway/seattle.cpp | 14 +- src/mame/midway/sente6vb.cpp | 8 +- src/mame/midway/sente6vb.h | 8 +- src/mame/midway/sspeedr.h | 2 +- src/mame/midway/sspeedr_v.cpp | 2 +- src/mame/midway/starrider.cpp | 20 +-- src/mame/midway/tmaster.cpp | 20 +-- src/mame/midway/vegas.cpp | 24 ++-- src/mame/midway/williams.h | 4 +- src/mame/midway/williams_m.cpp | 4 +- src/mame/midway/wmg.cpp | 4 +- src/mame/midway/zwackery.cpp | 4 +- src/mame/miltonbradley/microvsn.cpp | 4 +- src/mame/miltonbradley/vectrex.h | 6 +- src/mame/miltonbradley/vectrex_m.cpp | 2 +- src/mame/miltonbradley/vectrex_v.cpp | 4 +- src/mame/mips/mips.cpp | 4 +- src/mame/mips/mips_rambo.cpp | 6 +- src/mame/mips/mips_rambo.h | 2 +- src/mame/misc/acefruit.cpp | 6 +- src/mame/misc/amaticmg.cpp | 4 +- src/mame/misc/amusco.cpp | 4 +- src/mame/misc/arachnid.cpp | 24 ++-- src/mame/misc/artmagic.cpp | 4 +- src/mame/misc/artmagic.h | 4 +- src/mame/misc/astrcorp.cpp | 12 +- src/mame/misc/avt.cpp | 8 +- src/mame/misc/aztarac.cpp | 4 +- src/mame/misc/beezer.cpp | 24 ++-- src/mame/misc/blitz68k.cpp | 12 +- src/mame/misc/calomega.cpp | 16 +-- src/mame/misc/calomega.h | 16 +-- src/mame/misc/cardline.cpp | 8 +- src/mame/misc/cave.cpp | 10 +- src/mame/misc/cave.h | 10 +- src/mame/misc/clpoker.cpp | 4 +- src/mame/misc/coolpool.cpp | 2 +- src/mame/misc/coolpool.h | 2 +- src/mame/misc/cubeqst.cpp | 4 +- src/mame/misc/dcheese.cpp | 2 +- src/mame/misc/dcheese.h | 2 +- src/mame/misc/dfruit.cpp | 4 +- src/mame/misc/discoboy.cpp | 4 +- src/mame/misc/dreamwld.cpp | 4 +- src/mame/misc/dwarfd.cpp | 8 +- src/mame/misc/ecoinf2.cpp | 2 +- src/mame/misc/ecoinf3.cpp | 2 +- src/mame/misc/ecoinfr.cpp | 14 +- src/mame/misc/efdt.cpp | 4 +- src/mame/misc/efdt.h | 4 +- src/mame/misc/esh.cpp | 4 +- src/mame/misc/esripsys.cpp | 2 +- src/mame/misc/esripsys.h | 2 +- src/mame/misc/fastinvaders.cpp | 16 +-- src/mame/misc/flipjack.cpp | 4 +- src/mame/misc/freekick.cpp | 16 +-- src/mame/misc/freekick.h | 22 +-- src/mame/misc/freeway.cpp | 4 +- src/mame/misc/galaxi.cpp | 8 +- src/mame/misc/homedata.h | 4 +- src/mame/misc/homedata_v.cpp | 2 +- src/mame/misc/imolagp.cpp | 4 +- src/mame/misc/istellar.cpp | 4 +- src/mame/misc/jackpool.cpp | 4 +- src/mame/misc/jankenmn.cpp | 4 +- src/mame/misc/kurukuru.cpp | 4 +- src/mame/misc/laserbas.cpp | 4 +- src/mame/misc/limenko.cpp | 4 +- src/mame/misc/magicard.cpp | 24 ++-- src/mame/misc/mcatadv.cpp | 2 +- src/mame/misc/meyc8088.cpp | 4 +- src/mame/misc/micro3d.h | 8 +- src/mame/misc/micro3d_m.cpp | 6 +- src/mame/misc/micro3d_v.cpp | 2 +- src/mame/misc/miniboy7.cpp | 4 +- src/mame/misc/mirax.cpp | 24 ++-- src/mame/misc/monon_color.cpp | 2 +- src/mame/misc/mpu12wbk.cpp | 4 +- src/mame/misc/mtu130.cpp | 4 +- src/mame/misc/nabupc.cpp | 13 +- src/mame/misc/nexus3d.cpp | 4 +- src/mame/misc/norautp.cpp | 2 +- src/mame/misc/norautp.h | 2 +- src/mame/misc/pachifev.cpp | 6 +- src/mame/misc/photon2.cpp | 4 +- src/mame/misc/pkscram.cpp | 4 +- src/mame/misc/policetr.cpp | 4 +- src/mame/misc/policetr.h | 4 +- src/mame/misc/proconn.cpp | 35 ++--- src/mame/misc/rgum.cpp | 4 +- src/mame/misc/savquest.cpp | 4 +- src/mame/misc/shangkid.cpp | 18 +-- src/mame/misc/shangkid.h | 18 +-- src/mame/misc/skeetsht.cpp | 4 +- src/mame/misc/skimaxx.cpp | 4 +- src/mame/misc/skyarmy.cpp | 16 +-- src/mame/misc/skylncr.cpp | 4 +- src/mame/misc/sothello.cpp | 4 +- src/mame/misc/ssingles.cpp | 4 +- src/mame/misc/statriv2.cpp | 4 +- src/mame/misc/stuntair.cpp | 16 +-- src/mame/misc/supertnk.cpp | 28 ++-- src/mame/misc/tapatune.cpp | 4 +- src/mame/misc/thayers.cpp | 16 +-- src/mame/misc/truco.cpp | 12 +- src/mame/misc/vcombat.cpp | 4 +- src/mame/misc/video21.cpp | 4 +- src/mame/misc/vpoker.cpp | 4 +- src/mame/misc/xtom3d.cpp | 2 +- src/mame/misc/xyonix.cpp | 4 +- src/mame/misc/z80ne.cpp | 12 +- src/mame/mit/tx0.cpp | 18 +-- src/mame/mit/tx0.h | 20 +-- src/mame/mit/tx0_v.cpp | 2 +- src/mame/mitsubishi/multi8.cpp | 4 +- src/mame/morrow/mpz80.cpp | 4 +- src/mame/morrow/mpz80.h | 4 +- src/mame/motorola/exorciser.cpp | 52 +++---- src/mame/motorola/mekd1.cpp | 40 +++--- src/mame/motorola/mekd2.cpp | 8 +- src/mame/motorola/mekd3.cpp | 56 ++++---- src/mame/motorola/mekd4.cpp | 50 +++---- src/mame/motorola/mekd5.cpp | 40 +++--- src/mame/motorola/uchroma68.cpp | 4 +- src/mame/mr/subhuntr.cpp | 12 +- src/mame/msx/msx.cpp | 2 +- src/mame/msx/msx.h | 2 +- src/mame/msx/sfkick.cpp | 4 +- src/mame/mupid/mdisk.cpp | 16 +-- src/mame/namco/20pacgal.cpp | 2 +- src/mame/namco/20pacgal.h | 2 +- src/mame/namco/baraduke.cpp | 4 +- src/mame/namco/bosco.cpp | 2 +- src/mame/namco/bosco.h | 2 +- src/mame/namco/cgang.cpp | 12 +- src/mame/namco/digdug.cpp | 4 +- src/mame/namco/digdug.h | 4 +- src/mame/namco/galaga.cpp | 12 +- src/mame/namco/galaga.h | 16 +-- src/mame/namco/galaga_v.cpp | 4 +- src/mame/namco/gaplus.cpp | 4 +- src/mame/namco/gaplus.h | 6 +- src/mame/namco/gaplus_v.cpp | 2 +- src/mame/namco/kungfur.cpp | 4 +- src/mame/namco/mappy.cpp | 10 +- src/mame/namco/mappy.h | 10 +- src/mame/namco/namco50.cpp | 6 +- src/mame/namco/namco50.h | 6 +- src/mame/namco/namco51.cpp | 8 +- src/mame/namco/namco51.h | 8 +- src/mame/namco/namco52.cpp | 6 +- src/mame/namco/namco52.h | 6 +- src/mame/namco/namco53.cpp | 4 +- src/mame/namco/namco53.h | 4 +- src/mame/namco/namco54.cpp | 4 +- src/mame/namco/namco54.h | 4 +- src/mame/namco/namco_settings.cpp | 6 +- src/mame/namco/namco_settings.h | 6 +- src/mame/namco/namcoio.cpp | 4 +- src/mame/namco/namcoio.h | 4 +- src/mame/namco/namcoio_gearbox.cpp | 2 +- src/mame/namco/namcoio_gearbox.h | 2 +- src/mame/namco/namconb1.h | 2 +- src/mame/namco/namconb1_v.cpp | 2 +- src/mame/namco/namcos1.h | 4 +- src/mame/namco/namcos10.cpp | 8 +- src/mame/namco/namcos12.cpp | 4 +- src/mame/namco/namcos1_m.cpp | 2 +- src/mame/namco/namcos1_v.cpp | 2 +- src/mame/namco/namcos21_c67.cpp | 4 +- src/mame/namco/namcos22.cpp | 2 +- src/mame/namco/namcos22.h | 4 +- src/mame/namco/namcos22_v.cpp | 2 +- src/mame/namco/namcos23.cpp | 4 +- src/mame/namco/namcos86.h | 2 +- src/mame/namco/namcos86_v.cpp | 2 +- src/mame/namco/pacland.cpp | 4 +- src/mame/namco/polepos.cpp | 8 +- src/mame/namco/polepos.h | 10 +- src/mame/namco/polepos_a.cpp | 2 +- src/mame/namco/polepos_a.h | 2 +- src/mame/namco/polepos_v.cpp | 2 +- src/mame/namco/skykid.cpp | 4 +- src/mame/namco/tankbatt.cpp | 4 +- src/mame/namco/tceptor.h | 2 +- src/mame/namco/tceptor_v.cpp | 2 +- src/mame/namco/toypop.cpp | 4 +- src/mame/namco/turrett.cpp | 4 +- src/mame/namco/turrett.h | 4 +- src/mame/namco/wacky_gator.cpp | 6 +- src/mame/namco/warpwarp.cpp | 12 +- src/mame/namco/warpwarp.h | 12 +- src/mame/namco/xevious.h | 2 +- src/mame/namco/xevious_m.cpp | 2 +- src/mame/nasco/crgolf.cpp | 18 +-- src/mame/nasco/suprgolf.cpp | 4 +- src/mame/nascom/nascom1.cpp | 24 ++-- src/mame/ncd/ncdmips.cpp | 4 +- src/mame/nec/apc.cpp | 24 ++-- src/mame/nec/pc100.cpp | 16 +-- src/mame/nec/pc8001.cpp | 8 +- src/mame/nec/pc8001.h | 8 +- src/mame/nec/pc8801.cpp | 12 +- src/mame/nec/pc8801.h | 10 +- src/mame/nec/pc88va.cpp | 6 +- src/mame/nec/pc88va.h | 6 +- src/mame/nec/pc9801.cpp | 24 ++-- src/mame/nec/pc9801.h | 24 ++-- src/mame/nec/pce_cd.cpp | 4 +- src/mame/nec/pce_cd.h | 4 +- src/mame/nec/pcfx.cpp | 32 ++--- src/mame/neogeo/midas.cpp | 4 +- src/mame/neogeo/neogeo.cpp | 6 +- src/mame/neogeo/neogeo.h | 10 +- src/mame/neogeo/neogeo_v.cpp | 4 +- src/mame/neogeo/ng_memcard.cpp | 6 +- src/mame/neogeo/ng_memcard.h | 6 +- src/mame/netronics/elf.cpp | 10 +- src/mame/netronics/elf.h | 10 +- src/mame/netronics/exp85.cpp | 8 +- src/mame/next/next.cpp | 30 ++-- src/mame/next/next.h | 30 ++-- src/mame/nichibutsu/clshroad.cpp | 8 +- src/mame/nichibutsu/cop01.cpp | 4 +- src/mame/nichibutsu/dacholer.cpp | 8 +- src/mame/nichibutsu/hrdvd.cpp | 8 +- src/mame/nichibutsu/jangou.cpp | 4 +- src/mame/nichibutsu/nb1413m3.cpp | 4 +- src/mame/nichibutsu/nb1413m3.h | 4 +- src/mame/nichibutsu/nbmj8891.cpp | 2 +- src/mame/nichibutsu/nbmj8891.h | 2 +- src/mame/nichibutsu/niyanpai.cpp | 2 +- src/mame/nichibutsu/niyanpai.h | 4 +- src/mame/nichibutsu/tubep.cpp | 6 +- src/mame/nichibutsu/tubep.h | 12 +- src/mame/nichibutsu/tubep_v.cpp | 6 +- src/mame/nichibutsu/wiping.cpp | 12 +- src/mame/nintendo/dkong.cpp | 10 +- src/mame/nintendo/dkong.h | 10 +- src/mame/nintendo/famibox.cpp | 4 +- src/mame/nintendo/gba.cpp | 10 +- src/mame/nintendo/gba.h | 10 +- src/mame/nintendo/mario.cpp | 8 +- src/mame/nintendo/mario.h | 18 +-- src/mame/nintendo/mario_a.cpp | 4 +- src/mame/nintendo/mario_v.cpp | 6 +- src/mame/nintendo/multigam.cpp | 4 +- src/mame/nintendo/n64.h | 2 +- src/mame/nintendo/n64_v.cpp | 2 +- src/mame/nintendo/n8080.cpp | 2 +- src/mame/nintendo/n8080.h | 12 +- src/mame/nintendo/n8080_a.cpp | 10 +- src/mame/nintendo/n8080_v.cpp | 2 +- src/mame/nintendo/nes_sh6578.cpp | 4 +- src/mame/nintendo/nes_vt_soc.cpp | 2 +- src/mame/nintendo/nes_vt_soc.h | 2 +- src/mame/nintendo/nss.cpp | 8 +- src/mame/nintendo/playch10.cpp | 44 +++--- src/mame/nintendo/popeye.cpp | 8 +- src/mame/nintendo/popeye.h | 8 +- src/mame/nintendo/punchout.cpp | 4 +- src/mame/nintendo/punchout.h | 4 +- src/mame/nintendo/snes.h | 2 +- src/mame/nintendo/snes_m.cpp | 2 +- src/mame/nintendo/vt1682.cpp | 12 +- src/mame/nix/pirates.cpp | 4 +- src/mame/nmk/macrossp.cpp | 8 +- src/mame/nmk/nmk004.h | 2 +- src/mame/nmk/powerins.h | 4 +- src/mame/nmk/powerins_v.cpp | 4 +- src/mame/nokia/mikromik.cpp | 34 ++--- src/mame/nokia/mikromik.h | 34 ++--- src/mame/nokia/mm1kb.h | 2 +- src/mame/olivetti/m20.cpp | 16 +-- src/mame/olivetti/m20_8086.cpp | 4 +- src/mame/olivetti/m20_8086.h | 4 +- src/mame/olivetti/m24.cpp | 40 +++--- src/mame/olivetti/m24_kbd.cpp | 8 +- src/mame/olivetti/m24_kbd.h | 8 +- src/mame/olivetti/m24_z8000.cpp | 4 +- src/mame/olivetti/m24_z8000.h | 8 +- src/mame/olympia/vega.cpp | 4 +- src/mame/olympiaint/olyboss.cpp | 12 +- src/mame/olympiaint/peoplepc.cpp | 8 +- src/mame/omron/luna_kbd.h | 2 +- src/mame/openuni/hektor.cpp | 8 +- src/mame/orca/akazukin.cpp | 4 +- src/mame/orca/funkybee.cpp | 8 +- src/mame/orca/marineb.cpp | 24 ++-- src/mame/orca/sub.cpp | 8 +- src/mame/orca/vastar.cpp | 4 +- src/mame/orca/vastar_viddev.cpp | 2 +- src/mame/orca/vastar_viddev.h | 2 +- src/mame/orca/zodiack.cpp | 4 +- src/mame/osborne/osbexec.cpp | 28 ++-- src/mame/osborne/osborne1.cpp | 20 +-- src/mame/osborne/vixen.cpp | 24 ++-- src/mame/osi/osi.cpp | 2 +- src/mame/osi/osi.h | 2 +- src/mame/pacific/thief.cpp | 4 +- src/mame/pacman/pacman.cpp | 14 +- src/mame/pacman/pacman.h | 30 ++-- src/mame/pacman/pacman_v.cpp | 16 +-- src/mame/pacman/pengo.cpp | 4 +- src/mame/pacman/schick.cpp | 28 ++-- src/mame/pc/at.cpp | 6 +- src/mame/pc/ct486.cpp | 6 +- src/mame/pc/europc.cpp | 4 +- src/mame/pc/europc_kbd.cpp | 4 +- src/mame/pc/europc_kbd.h | 4 +- src/mame/pc/ibmpcjr.cpp | 12 +- src/mame/pc/mc1502.cpp | 16 +-- src/mame/pc/nforcepc.cpp | 54 ++++---- src/mame/pc/nforcepc.h | 50 +++---- src/mame/pc/pc_t1t.cpp | 10 +- src/mame/pc/pc_t1t.h | 10 +- src/mame/pc/poisk1.cpp | 12 +- src/mame/pce/paranoia.cpp | 4 +- src/mame/pce/tourvis.cpp | 4 +- src/mame/philips/odyssey2.cpp | 4 +- src/mame/phoenix/phoenix.h | 4 +- src/mame/phoenix/phoenix_v.cpp | 4 +- src/mame/pinball/by17.cpp | 28 ++-- src/mame/pinball/by35.cpp | 28 ++-- src/mame/pinball/by6803.cpp | 16 +-- src/mame/pinball/byvid.cpp | 24 ++-- src/mame/pinball/de_2.cpp | 8 +- src/mame/pinball/de_3.cpp | 8 +- src/mame/pinball/decodmd1.cpp | 10 +- src/mame/pinball/decodmd1.h | 10 +- src/mame/pinball/decopincpu.cpp | 2 +- src/mame/pinball/decopincpu.h | 16 +-- src/mame/pinball/flicker.cpp | 8 +- src/mame/pinball/gts3.cpp | 4 +- src/mame/pinball/gts3a.cpp | 8 +- src/mame/pinball/hankin.cpp | 28 ++-- src/mame/pinball/idsa.cpp | 4 +- src/mame/pinball/inder.cpp | 12 +- src/mame/pinball/inderp.cpp | 4 +- src/mame/pinball/jeutel.cpp | 4 +- src/mame/pinball/joctronic.cpp | 4 +- src/mame/pinball/jp.cpp | 20 +-- src/mame/pinball/ltd.cpp | 4 +- src/mame/pinball/macp.cpp | 8 +- src/mame/pinball/micropin.cpp | 12 +- src/mame/pinball/mrgame.cpp | 24 ++-- src/mame/pinball/pinsnd88.cpp | 4 +- src/mame/pinball/pinsnd88.h | 4 +- src/mame/pinball/play_1.cpp | 24 ++-- src/mame/pinball/play_2.cpp | 16 +-- src/mame/pinball/play_3.cpp | 22 +-- src/mame/pinball/s11.cpp | 12 +- src/mame/pinball/s11.h | 32 ++--- src/mame/pinball/s3.cpp | 16 +-- src/mame/pinball/s4.cpp | 20 +-- src/mame/pinball/s6.cpp | 20 +-- src/mame/pinball/s7.cpp | 24 ++-- src/mame/pinball/s8.cpp | 16 +-- src/mame/pinball/s9.cpp | 12 +- src/mame/pinball/spinb.cpp | 8 +- src/mame/pinball/st_mp100.cpp | 16 +-- src/mame/pinball/st_mp200.cpp | 16 +-- src/mame/pinball/stargame.cpp | 2 +- src/mame/pinball/supstarf.cpp | 12 +- src/mame/pinball/taito.cpp | 8 +- src/mame/pinball/wms_shuffle.cpp | 22 +-- src/mame/pinball/wpc_95.cpp | 4 +- src/mame/pinball/wpc_an.cpp | 12 +- src/mame/pinball/wpc_dcs.cpp | 4 +- src/mame/pinball/wpc_dot.cpp | 6 +- src/mame/pinball/wpc_dot.h | 6 +- src/mame/pinball/wpc_s.cpp | 4 +- src/mame/pinball/wpcsnd.cpp | 2 +- src/mame/pinball/wpcsnd.h | 2 +- src/mame/pinball/zac_1.cpp | 20 +-- src/mame/pinball/zac_2.cpp | 8 +- src/mame/pinball/zac_proto.cpp | 8 +- src/mame/pinball/zpinball.cpp | 8 +- src/mame/poly88/poly88.h | 8 +- src/mame/poly88/poly88_m.cpp | 8 +- src/mame/promat/gstream.cpp | 8 +- src/mame/psikyo/psikyo.cpp | 4 +- src/mame/psikyo/psikyo.h | 8 +- src/mame/psikyo/psikyo_v.cpp | 4 +- src/mame/psikyo/psikyosh.h | 2 +- src/mame/psikyo/psikyosh_v.cpp | 2 +- src/mame/psion/etna.cpp | 6 +- src/mame/psion/etna.h | 6 +- src/mame/quantel/dpb7000.cpp | 16 +-- src/mame/qume/qvt102.cpp | 32 ++--- src/mame/rare/btoads.cpp | 4 +- src/mame/rare/btoads.h | 4 +- src/mame/rare/xtheball.cpp | 4 +- src/mame/rca/microkit.cpp | 4 +- src/mame/rca/studio2.cpp | 28 ++-- src/mame/rca/vip.cpp | 26 ++-- src/mame/rca/vip.h | 32 ++--- src/mame/regnecentralen/rc702.cpp | 28 ++-- src/mame/regnecentralen/rc759.cpp | 28 ++-- src/mame/rm/rmnimbus.h | 22 +-- src/mame/rm/rmnimbus_m.cpp | 22 +-- src/mame/robotron/rt1715.cpp | 12 +- src/mame/robotron/z9001.cpp | 4 +- src/mame/roland/bu3905.cpp | 2 +- src/mame/roland/bu3905.h | 2 +- src/mame/roland/mb87013.cpp | 6 +- src/mame/roland/mb87013.h | 6 +- src/mame/sage/sage2.cpp | 16 +-- src/mame/sage/sage2.h | 16 +-- src/mame/samsung/spc1000.cpp | 6 +- src/mame/samsung/spc1500.cpp | 2 +- src/mame/sanritsu/appoooh.cpp | 4 +- src/mame/sanritsu/chinsan.cpp | 4 +- src/mame/sanritsu/drmicro.cpp | 4 +- src/mame/sanritsu/jantotsu.cpp | 4 +- src/mame/sanritsu/mermaid.cpp | 14 +- src/mame/sanritsu/mermaid.h | 28 ++-- src/mame/sanritsu/mermaid_v.cpp | 14 +- src/mame/sanritsu/mjkjidai.cpp | 8 +- src/mame/sanritsu/ron.cpp | 8 +- src/mame/sanyo/mbc55x.cpp | 6 +- src/mame/sanyo/mbc55x.h | 10 +- src/mame/sanyo/mbc55x_v.cpp | 4 +- src/mame/sanyo/phc25.cpp | 4 +- src/mame/sanyo/phc25.h | 4 +- src/mame/sega/blockade.cpp | 4 +- src/mame/sega/calcune.cpp | 12 +- src/mame/sega/coolridr.cpp | 8 +- src/mame/sega/dc.cpp | 6 +- src/mame/sega/dc.h | 6 +- src/mame/sega/dccons.h | 6 +- src/mame/sega/dccons_m.cpp | 2 +- src/mame/sega/dsbz80.cpp | 4 +- src/mame/sega/dsbz80.h | 4 +- src/mame/sega/eshockey.cpp | 12 +- src/mame/sega/fd1094.cpp | 2 +- src/mame/sega/fd1094.h | 2 +- src/mame/sega/jvs13551.cpp | 4 +- src/mame/sega/jvs13551.h | 4 +- src/mame/sega/m1comm.cpp | 4 +- src/mame/sega/m1comm.h | 4 +- src/mame/sega/mdconsole.cpp | 2 +- src/mame/sega/mdconsole.h | 2 +- src/mame/sega/mdioport.cpp | 4 +- src/mame/sega/mdioport.h | 4 +- src/mame/sega/megadriv.cpp | 8 +- src/mame/sega/megadriv.h | 8 +- src/mame/sega/megadriv_sunplus_hybrid.cpp | 4 +- src/mame/sega/megadriv_vt_hybrid.cpp | 4 +- src/mame/sega/megaplay.cpp | 8 +- src/mame/sega/megatech.cpp | 4 +- src/mame/sega/model1.h | 2 +- src/mame/sega/model1_v.cpp | 2 +- src/mame/sega/model2.cpp | 2 +- src/mame/sega/model2.h | 4 +- src/mame/sega/naomi.cpp | 2 +- src/mame/sega/naomi.h | 2 +- src/mame/sega/naomigd.cpp | 2 +- src/mame/sega/naomigd.h | 2 +- src/mame/sega/saturn.h | 18 +-- src/mame/sega/saturn_m.cpp | 16 +-- src/mame/sega/segac2.cpp | 16 +-- src/mame/sega/segag80v.cpp | 8 +- src/mame/sega/segag80v.h | 10 +- src/mame/sega/segaic16_m.cpp | 2 +- src/mame/sega/segaic16_m.h | 2 +- src/mame/sega/segajw.cpp | 4 +- src/mame/sega/segaorun.cpp | 2 +- src/mame/sega/segaorun.h | 2 +- src/mame/sega/segapico.cpp | 4 +- src/mame/sega/segas16a.cpp | 2 +- src/mame/sega/segas16a.h | 2 +- src/mame/sega/segas16b.cpp | 2 +- src/mame/sega/segas16b.h | 2 +- src/mame/sega/segas18.cpp | 6 +- src/mame/sega/segas18.h | 10 +- src/mame/sega/segas18_v.cpp | 4 +- src/mame/sega/segas24.cpp | 4 +- src/mame/sega/segas24.h | 4 +- src/mame/sega/segas32.cpp | 8 +- src/mame/sega/segas32.h | 8 +- src/mame/sega/segaspeech.cpp | 6 +- src/mame/sega/segaspeech.h | 6 +- src/mame/sega/segaufo.cpp | 12 +- src/mame/sega/segausb.cpp | 2 +- src/mame/sega/segausb.h | 2 +- src/mame/sega/segaxbd.cpp | 4 +- src/mame/sega/segaxbd.h | 4 +- src/mame/sega/segaybd.cpp | 4 +- src/mame/sega/segaybd.h | 4 +- src/mame/sega/sg1000.cpp | 4 +- src/mame/sega/shtzone.cpp | 4 +- src/mame/sega/sms.h | 16 +-- src/mame/sega/sms_m.cpp | 16 +-- src/mame/sega/stactics.cpp | 38 ++--- src/mame/sega/system16.cpp | 8 +- src/mame/sega/system16.h | 8 +- src/mame/sega/turbo.cpp | 6 +- src/mame/sega/turbo.h | 6 +- src/mame/sega/vicdual.cpp | 16 +-- src/mame/sega/vicdual.h | 16 +-- src/mame/sega/zaxxon.cpp | 12 +- src/mame/sega/zaxxon.h | 24 ++-- src/mame/sega/zaxxon_v.cpp | 12 +- src/mame/seibu/bloodbro.cpp | 2 +- src/mame/seibu/bloodbro.h | 2 +- src/mame/seibu/dynduke.cpp | 2 +- src/mame/seibu/dynduke.h | 2 +- src/mame/seibu/feversoc.cpp | 4 +- src/mame/seibu/goal92.cpp | 8 +- src/mame/seibu/goodejan.cpp | 4 +- src/mame/seibu/raiden.cpp | 2 +- src/mame/seibu/raiden.h | 2 +- src/mame/seibu/raiden_ms.cpp | 8 +- src/mame/seibu/seibuspi.cpp | 2 +- src/mame/seibu/seibuspi.h | 2 +- src/mame/seibu/sengokmj.cpp | 4 +- src/mame/seibu/stfight.h | 2 +- src/mame/seibu/stfight_m.cpp | 2 +- src/mame/seibu/t5182.cpp | 2 +- src/mame/seibu/t5182.h | 2 +- src/mame/seibu/toki.cpp | 2 +- src/mame/seibu/toki.h | 2 +- src/mame/seibu/toki_ms.cpp | 4 +- src/mame/sequential/prophet600.cpp | 16 +-- src/mame/seta/kiwame.cpp | 2 +- src/mame/seta/seta.cpp | 4 +- src/mame/seta/seta.h | 6 +- src/mame/seta/seta2.h | 2 +- src/mame/seta/seta2_v.cpp | 2 +- src/mame/seta/seta_v.cpp | 2 +- src/mame/seta/srmp2.cpp | 2 +- src/mame/seta/srmp2.h | 2 +- src/mame/seta/ssv.cpp | 2 +- src/mame/seta/ssv.h | 2 +- src/mame/seta/thedealr.cpp | 4 +- src/mame/sfrj/lola8a.cpp | 12 +- src/mame/sfrj/pecom.cpp | 16 +-- src/mame/sfrj/tim100.cpp | 4 +- src/mame/sgi/hpc1.cpp | 16 +-- src/mame/sgi/hpc1.h | 16 +-- src/mame/sgi/hpc3.cpp | 4 +- src/mame/sgi/hpc3.h | 4 +- src/mame/sgi/ioc2.cpp | 28 ++-- src/mame/sgi/ioc2.h | 36 ++--- src/mame/sgi/iris3130.cpp | 8 +- src/mame/sgi/kbd.cpp | 2 +- src/mame/sgi/kbd.h | 8 +- src/mame/shared/ballysound.cpp | 16 +-- src/mame/shared/ballysound.h | 16 +-- src/mame/shared/dcs.cpp | 2 +- src/mame/shared/dcs.h | 2 +- src/mame/shared/decobsmt.cpp | 2 +- src/mame/shared/decobsmt.h | 2 +- src/mame/shared/efo_zsu.cpp | 14 +- src/mame/shared/efo_zsu.h | 14 +- src/mame/shared/exidysound.cpp | 12 +- src/mame/shared/exidysound.h | 12 +- src/mame/shared/isbc_215g.cpp | 8 +- src/mame/shared/isbc_215g.h | 8 +- src/mame/shared/ms7004.cpp | 4 +- src/mame/shared/ms7004.h | 4 +- src/mame/shared/namco_c355spr.cpp | 2 +- src/mame/shared/namco_c355spr.h | 2 +- src/mame/shared/pcshare.cpp | 12 +- src/mame/shared/pcshare.h | 12 +- src/mame/shared/s11c_bg.cpp | 8 +- src/mame/shared/s11c_bg.h | 8 +- src/mame/shared/sec.cpp | 6 +- src/mame/shared/sec.h | 6 +- src/mame/shared/segam1audio.cpp | 4 +- src/mame/shared/segam1audio.h | 4 +- src/mame/shared/seibusound.cpp | 2 +- src/mame/shared/seibusound.h | 2 +- src/mame/shared/taito68705.cpp | 2 +- src/mame/shared/taito68705.h | 6 +- src/mame/shared/timeplt_a.cpp | 4 +- src/mame/shared/timeplt_a.h | 4 +- src/mame/shared/vt100_kbd.cpp | 6 +- src/mame/shared/vt100_kbd.h | 8 +- src/mame/shared/williamssound.cpp | 12 +- src/mame/shared/williamssound.h | 12 +- src/mame/shared/xbox.cpp | 4 +- src/mame/shared/xbox.h | 4 +- src/mame/shared/xbox_nv2a.cpp | 2 +- src/mame/shared/xbox_nv2a.h | 2 +- src/mame/shared/xbox_pci.cpp | 24 ++-- src/mame/shared/xbox_pci.h | 44 +++--- src/mame/sharp/mz2500.cpp | 4 +- src/mame/sharp/mz2500.h | 4 +- src/mame/sharp/mz700.h | 8 +- src/mame/sharp/mz700_m.cpp | 8 +- src/mame/sharp/mz80.h | 4 +- src/mame/sharp/mz80_m.cpp | 4 +- src/mame/sharp/pc1251.h | 2 +- src/mame/sharp/pc1251_m.cpp | 2 +- src/mame/sharp/pc1401.h | 2 +- src/mame/sharp/pc1401_m.cpp | 2 +- src/mame/sharp/pc1403.h | 2 +- src/mame/sharp/pc1403_m.cpp | 2 +- src/mame/sharp/pocketc.h | 2 +- src/mame/sharp/pocketc_m.cpp | 2 +- src/mame/sharp/x1.cpp | 4 +- src/mame/sharp/x1.h | 4 +- src/mame/sharp/x68k.cpp | 16 +-- src/mame/sharp/x68k.h | 16 +-- src/mame/siemens/pcd.cpp | 24 ++-- src/mame/siemens/pcd_kbd.cpp | 4 +- src/mame/siemens/pcd_kbd.h | 4 +- src/mame/siemens/pg685.cpp | 4 +- src/mame/sigma/nyny.cpp | 20 +-- src/mame/sigma/r2dtank.cpp | 16 +-- src/mame/sigma/sigmab52.cpp | 4 +- src/mame/sigma/sigmab98.cpp | 8 +- src/mame/sigma/spiders.cpp | 4 +- src/mame/sigma/spiders.h | 4 +- src/mame/sinclair/elwro800.cpp | 4 +- src/mame/sinclair/ql.cpp | 48 +++---- src/mame/sinclair/zx8302.cpp | 14 +- src/mame/sinclair/zx8302.h | 16 +-- src/mame/skeleton/alfaskop_s41_kb.cpp | 6 +- src/mame/skeleton/alfaskop_s41_kb.h | 6 +- src/mame/skeleton/ampex.cpp | 12 +- src/mame/skeleton/ampex210_kbd.cpp | 2 +- src/mame/skeleton/ampex210_kbd.h | 2 +- src/mame/skeleton/attache.cpp | 20 +-- src/mame/skeleton/bitgraph.cpp | 28 ++-- src/mame/skeleton/blit.cpp | 4 +- src/mame/skeleton/candela.cpp | 17 +-- src/mame/skeleton/cd2650.cpp | 8 +- src/mame/skeleton/cdc721.cpp | 8 +- src/mame/skeleton/ckz80.cpp | 12 +- src/mame/skeleton/cortex.cpp | 12 +- src/mame/skeleton/cosmicos.cpp | 18 +-- src/mame/skeleton/cosmicos.h | 18 +-- src/mame/skeleton/didact.cpp | 12 +- src/mame/skeleton/digel804.cpp | 12 +- src/mame/skeleton/dim68k.cpp | 4 +- src/mame/skeleton/dim68k_kbd.cpp | 2 +- src/mame/skeleton/dim68k_kbd.h | 2 +- src/mame/skeleton/dmv.cpp | 60 ++++---- src/mame/skeleton/dmv_keyb.cpp | 4 +- src/mame/skeleton/dmv_keyb.h | 4 +- src/mame/skeleton/dps1.cpp | 4 +- src/mame/skeleton/e100.cpp | 8 +- src/mame/skeleton/eurocom2.cpp | 10 +- src/mame/skeleton/fanucspmg.cpp | 12 +- src/mame/skeleton/fk1.cpp | 18 +-- src/mame/skeleton/fs3216.cpp | 20 +-- src/mame/skeleton/gimix.cpp | 8 +- src/mame/skeleton/goupil.cpp | 4 +- src/mame/skeleton/hazeltin.cpp | 12 +- src/mame/skeleton/hazl1420.cpp | 8 +- src/mame/skeleton/ht68k.cpp | 4 +- src/mame/skeleton/icebox.cpp | 8 +- src/mame/skeleton/ikt5a.cpp | 8 +- src/mame/skeleton/itt1700_kbd.cpp | 8 +- src/mame/skeleton/itt1700_kbd.h | 8 +- src/mame/skeleton/itt3030.cpp | 16 +-- src/mame/skeleton/kron.cpp | 4 +- src/mame/skeleton/mfabfz.cpp | 8 +- src/mame/skeleton/micro20.cpp | 10 +- src/mame/skeleton/micromon.cpp | 4 +- src/mame/skeleton/micronic.cpp | 2 +- src/mame/skeleton/micronic.h | 2 +- src/mame/skeleton/miniframe.cpp | 4 +- src/mame/skeleton/mmd1.cpp | 12 +- src/mame/skeleton/mstation.cpp | 4 +- src/mame/skeleton/ngen.cpp | 54 ++++---- src/mame/skeleton/p8k.cpp | 16 +-- src/mame/skeleton/pencil2.cpp | 16 +-- src/mame/skeleton/proteus3.cpp | 38 ++--- src/mame/skeleton/pt68k4.cpp | 20 +-- src/mame/skeleton/qtsbc.cpp | 8 +- src/mame/skeleton/rd100.cpp | 8 +- src/mame/skeleton/sb8085.cpp | 20 +-- src/mame/skeleton/sbrain.cpp | 24 ++-- src/mame/skeleton/scopus.cpp | 4 +- src/mame/skeleton/si5500.cpp | 16 +-- src/mame/skeleton/squale.cpp | 12 +- src/mame/skeleton/swyft.cpp | 32 ++--- src/mame/skeleton/systel1.cpp | 12 +- src/mame/skeleton/teleray10.cpp | 20 +-- src/mame/skeleton/textelcomp.cpp | 8 +- src/mame/skeleton/tsispch.cpp | 8 +- src/mame/skeleton/v6809.cpp | 8 +- src/mame/skeleton/vp415.cpp | 8 +- src/mame/skeleton/vp415.h | 4 +- src/mame/skeleton/wicat.cpp | 20 +-- src/mame/skeleton/xor100.cpp | 10 +- src/mame/skeleton/xor100.h | 10 +- src/mame/skeleton/zorba.cpp | 12 +- src/mame/skeleton/zorba.h | 12 +- src/mame/skeleton/zorbakbd.cpp | 2 +- src/mame/skeleton/zorbakbd.h | 2 +- src/mame/slicer/slicer.cpp | 8 +- src/mame/snk/hng64.cpp | 2 +- src/mame/snk/hng64.h | 12 +- src/mame/snk/hng64_a.cpp | 8 +- src/mame/snk/hng64_v.cpp | 2 +- src/mame/snk/munchmo.cpp | 20 +-- src/mame/snk/ngp.cpp | 8 +- src/mame/snk/snk.cpp | 6 +- src/mame/snk/snk.h | 6 +- src/mame/snk/snk6502_a.cpp | 2 +- src/mame/snk/snk6502_a.h | 2 +- src/mame/sony/cat702.cpp | 6 +- src/mame/sony/cat702.h | 6 +- src/mame/sony/ps2sony.cpp | 4 +- src/mame/sony/pve500.cpp | 20 +-- src/mame/sony/smc777.cpp | 12 +- src/mame/sony/zn.cpp | 4 +- src/mame/sony/zn.h | 8 +- src/mame/sony/znmcu.cpp | 4 +- src/mame/sony/znmcu.h | 4 +- src/mame/sord/m5.cpp | 4 +- src/mame/stern/mazerbla.cpp | 4 +- src/mame/stm/pp.cpp | 20 +-- src/mame/sun/sun2.cpp | 4 +- src/mame/sun/sun4.cpp | 20 +-- src/mame/svi/svi318.cpp | 20 +-- src/mame/svision/svision.cpp | 8 +- src/mame/swtpc/swtpc09.h | 22 +-- src/mame/swtpc/swtpc09_m.cpp | 24 ++-- src/mame/synertek/ktm3.cpp | 12 +- src/mame/synertek/sym1.cpp | 36 ++--- src/mame/ta/alphatpx.cpp | 32 ++--- src/mame/ta/alphatro.cpp | 12 +- src/mame/taito/ashnojoe.cpp | 4 +- src/mame/taito/asuka.cpp | 8 +- src/mame/taito/bking.h | 2 +- src/mame/taito/bking_v.cpp | 2 +- src/mame/taito/champbwl.cpp | 8 +- src/mame/taito/changela.cpp | 10 +- src/mame/taito/changela.h | 10 +- src/mame/taito/crbaloon.cpp | 2 +- src/mame/taito/crbaloon.h | 2 +- src/mame/taito/cyclemb.cpp | 2 +- src/mame/taito/darius.cpp | 2 +- src/mame/taito/darius.h | 2 +- src/mame/taito/fgoal.cpp | 4 +- src/mame/taito/galastrm.cpp | 4 +- src/mame/taito/gladiatr.cpp | 12 +- src/mame/taito/gladiatr.h | 16 +-- src/mame/taito/gladiatr_v.cpp | 4 +- src/mame/taito/groundfx.cpp | 4 +- src/mame/taito/heromem.cpp | 4 +- src/mame/taito/jollyjgr.cpp | 4 +- src/mame/taito/lgp.cpp | 4 +- src/mame/taito/missb2.cpp | 4 +- src/mame/taito/mlanding.cpp | 8 +- src/mame/taito/opwolf.cpp | 4 +- src/mame/taito/othunder.cpp | 4 +- src/mame/taito/othunder.h | 4 +- src/mame/taito/pitnrun.cpp | 28 ++-- src/mame/taito/qix.cpp | 4 +- src/mame/taito/qix.h | 14 +- src/mame/taito/qix_a.cpp | 4 +- src/mame/taito/qix_m.cpp | 2 +- src/mame/taito/qix_v.cpp | 4 +- src/mame/taito/rastan.cpp | 4 +- src/mame/taito/retofinv.cpp | 12 +- src/mame/taito/rollrace.cpp | 28 ++-- src/mame/taito/sbmjb.cpp | 4 +- src/mame/taito/scyclone.cpp | 4 +- src/mame/taito/slapshot.h | 2 +- src/mame/taito/slapshot_v.cpp | 2 +- src/mame/taito/ssrj.cpp | 2 +- src/mame/taito/superqix.cpp | 6 +- src/mame/taito/superqix.h | 6 +- src/mame/taito/taito_f2.h | 10 +- src/mame/taito/taito_f2_v.cpp | 10 +- src/mame/taito/taito_f3.h | 2 +- src/mame/taito/taito_f3_v.cpp | 2 +- src/mame/taito/taito_l.cpp | 2 +- src/mame/taito/taito_l.h | 4 +- src/mame/taito/taito_l_v.cpp | 2 +- src/mame/taito/taito_z.h | 2 +- src/mame/taito/taito_z_v.cpp | 2 +- src/mame/taito/taitoio_yoke.cpp | 12 +- src/mame/taito/taitoio_yoke.h | 12 +- src/mame/taito/taitosj.h | 4 +- src/mame/taito/taitosj_m.cpp | 4 +- src/mame/taito/taitosjsec.cpp | 4 +- src/mame/taito/taitosjsec.h | 4 +- src/mame/taito/taitotz.cpp | 4 +- src/mame/taito/tc0080vco.cpp | 2 +- src/mame/taito/tc0080vco.h | 2 +- src/mame/taito/tnzs.cpp | 4 +- src/mame/taito/tnzs_video.cpp | 2 +- src/mame/taito/tnzs_video.h | 2 +- src/mame/taito/topspeed.cpp | 4 +- src/mame/taito/topspeed.h | 4 +- src/mame/taito/tsamurai.cpp | 10 +- src/mame/taito/tsamurai.h | 14 +- src/mame/taito/tsamurai_v.cpp | 4 +- src/mame/taito/undrfire.cpp | 2 +- src/mame/taito/undrfire.h | 2 +- src/mame/tangerine/hhtiger.cpp | 28 ++-- src/mame/tangerine/microtan.cpp | 4 +- src/mame/tangerine/microtan.h | 4 +- src/mame/tangerine/oric.cpp | 48 +++---- src/mame/tatsumi/lockon.cpp | 2 +- src/mame/tatsumi/lockon.h | 4 +- src/mame/tatsumi/lockon_v.cpp | 2 +- src/mame/tatsumi/tatsumi.cpp | 2 +- src/mame/tatsumi/tatsumi.h | 2 +- src/mame/tatsumi/tx1.h | 4 +- src/mame/tatsumi/tx1_v.cpp | 4 +- src/mame/tatung/einstein.cpp | 38 ++--- src/mame/tch/wheelfir.cpp | 12 +- src/mame/tecfri/ambush.cpp | 20 +-- src/mame/tecfri/holeland.cpp | 12 +- src/mame/tecfri/sauro.cpp | 24 ++-- src/mame/technos/blockout.cpp | 4 +- src/mame/technos/chinagat.cpp | 8 +- src/mame/technos/ddragon.cpp | 6 +- src/mame/technos/ddragon.h | 6 +- src/mame/technos/renegade.cpp | 4 +- src/mame/technos/spdodgeb.cpp | 8 +- src/mame/technos/wwfsstar.cpp | 4 +- src/mame/technos/xain.cpp | 2 +- src/mame/technos/xain.h | 2 +- src/mame/tecmo/bombjack.cpp | 4 +- src/mame/tecmo/gaiden.cpp | 2 +- src/mame/tecmo/gaiden.h | 4 +- src/mame/tecmo/gaiden_v.cpp | 2 +- src/mame/tecmo/pbaction.cpp | 16 +-- src/mame/tecmo/senjyo.cpp | 2 +- src/mame/tecmo/senjyo.h | 2 +- src/mame/tecmo/tbowl.cpp | 4 +- src/mame/tecmo/tecmo.cpp | 2 +- src/mame/tecmo/tecmo.h | 2 +- src/mame/tecmo/tecmo16.cpp | 4 +- src/mame/tecmo/tehkanwc.cpp | 4 +- src/mame/tecmo/wc90b.cpp | 4 +- src/mame/tektronix/tek405x.cpp | 38 ++--- src/mame/tektronix/tek405x.h | 38 ++--- src/mame/tektronix/tek410x.cpp | 12 +- src/mame/tektronix/tek410x_kbd.cpp | 6 +- src/mame/tektronix/tek410x_kbd.h | 6 +- src/mame/tektronix/tek440x.cpp | 12 +- src/mame/telenova/compis.cpp | 24 ++-- src/mame/telenova/compiskb.cpp | 2 +- src/mame/telenova/compiskb.h | 2 +- src/mame/telercas/tmc1800.cpp | 32 ++--- src/mame/telercas/tmc1800.h | 38 ++--- src/mame/telercas/tmc1800_v.cpp | 6 +- src/mame/telercas/tmc2000e.cpp | 14 +- src/mame/telercas/tmc2000e.h | 14 +- src/mame/telercas/tmc600.cpp | 6 +- src/mame/telercas/tmc600.h | 10 +- src/mame/telercas/tmc600_v.cpp | 2 +- src/mame/televideo/tv910.cpp | 20 +-- src/mame/televideo/tv950.cpp | 8 +- src/mame/televideo/tv950kb.cpp | 4 +- src/mame/televideo/tv950kb.h | 4 +- src/mame/televideo/tv955.cpp | 4 +- src/mame/televideo/tv955kb.cpp | 8 +- src/mame/televideo/tv955kb.h | 8 +- src/mame/televideo/tv990.cpp | 16 +-- src/mame/tesla/ondra.cpp | 2 +- src/mame/tesla/ondra.h | 2 +- src/mame/tesla/sapi1.cpp | 12 +- src/mame/thepit/thepit.cpp | 8 +- src/mame/thepit/thepit.h | 14 +- src/mame/thepit/thepit_v.cpp | 6 +- src/mame/thepit/timelimt.cpp | 8 +- src/mame/thomson/thomson.h | 26 ++-- src/mame/thomson/thomson_m.cpp | 22 +-- src/mame/thomson/thomson_v.cpp | 2 +- src/mame/ti/avigo.cpp | 4 +- src/mame/ti/avigo.h | 4 +- src/mame/ti/geneve.cpp | 68 ++++----- src/mame/ti/ti990_10.cpp | 20 +-- src/mame/ti/ti990_4.cpp | 16 +-- src/mame/ti/ti99_2.cpp | 18 +-- src/mame/ti/ti99_4p.cpp | 50 +++---- src/mame/ti/ti99_4x.cpp | 93 +++++++------ src/mame/ti/ti99_8.cpp | 56 ++++---- src/mame/ti/tm990189.cpp | 30 ++-- src/mame/tiki/tiki100.cpp | 12 +- src/mame/tiki/tiki100.h | 12 +- src/mame/toaplan/gp9001.cpp | 6 +- src/mame/toaplan/gp9001.h | 6 +- src/mame/toaplan/mjsister.cpp | 32 ++--- src/mame/toaplan/slapfght.cpp | 6 +- src/mame/toaplan/slapfght.h | 10 +- src/mame/toaplan/slapfght_ms.cpp | 12 +- src/mame/toaplan/slapfght_v.cpp | 4 +- src/mame/toaplan/toaplan1.h | 18 +-- src/mame/toaplan/toaplan1_m.cpp | 12 +- src/mame/toaplan/toaplan1_v.cpp | 6 +- src/mame/toaplan/toaplan2.cpp | 4 +- src/mame/toaplan/toaplan2.h | 6 +- src/mame/toaplan/toaplan2_v.cpp | 2 +- src/mame/toaplan/twincobr.h | 24 ++-- src/mame/toaplan/twincobr_m.cpp | 16 +-- src/mame/toaplan/twincobr_v.cpp | 8 +- src/mame/toaplan/wardner.cpp | 8 +- src/mame/tomy/tutor.cpp | 4 +- src/mame/toshiba/pasopia.cpp | 4 +- src/mame/toshiba/pasopia7.cpp | 4 +- src/mame/trainer/babbage.cpp | 12 +- src/mame/trainer/bob85.cpp | 8 +- src/mame/trainer/dolphunk.cpp | 4 +- src/mame/trainer/instruct.cpp | 8 +- src/mame/trainer/mk14.cpp | 8 +- src/mame/trs/6883sam.cpp | 2 +- src/mame/trs/6883sam.h | 2 +- src/mame/trs/coco.cpp | 8 +- src/mame/trs/coco.h | 10 +- src/mame/trs/coco12.h | 4 +- src/mame/trs/coco12_m.cpp | 4 +- src/mame/trs/dgn_beta.h | 20 +-- src/mame/trs/dgn_beta_m.cpp | 18 +-- src/mame/trs/dgn_beta_v.cpp | 2 +- src/mame/trs/dgnalpha.cpp | 8 +- src/mame/trs/max80.cpp | 8 +- src/mame/trs/tandy2k.cpp | 40 +++--- src/mame/trs/tandy2k.h | 40 +++--- src/mame/trs/tandy2kb.cpp | 8 +- src/mame/trs/tandy2kb.h | 8 +- src/mame/trs/trs80.h | 2 +- src/mame/trs/trs80_m.cpp | 2 +- src/mame/trs/trs80m2.cpp | 14 +- src/mame/trs/trs80m2.h | 14 +- src/mame/trs/trs80m2kb.cpp | 6 +- src/mame/trs/trs80m2kb.h | 6 +- src/mame/trs/trs80m3.h | 4 +- src/mame/trs/trs80m3_m.cpp | 4 +- src/mame/tvgames/elan_ep3a19a.cpp | 12 +- src/mame/tvgames/elan_eu3a05.cpp | 12 +- src/mame/tvgames/elan_eu3a14.cpp | 12 +- src/mame/tvgames/generalplus_gpl162xx_lcdtype.cpp | 4 +- src/mame/tvgames/spg2xx_jakks_gkr.cpp | 4 +- src/mame/tvgames/spg2xx_jakks_tvtouch.cpp | 4 +- src/mame/tvgames/spg2xx_playvision.cpp | 4 +- src/mame/tvgames/xavix.cpp | 2 +- src/mame/tvgames/xavix.h | 20 +-- src/mame/tvgames/xavix_2002.cpp | 4 +- src/mame/tvgames/xavix_2002.h | 2 +- src/mame/tvgames/xavix_m.cpp | 16 +-- src/mame/unisys/univac.cpp | 60 ++++---- src/mame/universal/cheekyms.cpp | 2 +- src/mame/universal/cheekyms.h | 2 +- src/mame/universal/cheekyms_a.cpp | 18 +-- src/mame/universal/cheekyms_a.h | 18 +-- src/mame/universal/cosmic.cpp | 2 +- src/mame/universal/cosmic.h | 2 +- src/mame/universal/docastle.cpp | 4 +- src/mame/universal/docastle.h | 4 +- src/mame/universal/getaway.cpp | 4 +- src/mame/universal/zerohour.cpp | 24 ++-- src/mame/upl/mouser.cpp | 16 +-- src/mame/upl/ninjakd2.h | 2 +- src/mame/upl/ninjakd2_v.cpp | 2 +- src/mame/upl/xxmissio.cpp | 8 +- src/mame/ussr/apogee.cpp | 12 +- src/mame/ussr/argo.cpp | 8 +- src/mame/ussr/b2m.h | 4 +- src/mame/ussr/b2m_m.cpp | 4 +- src/mame/ussr/debut.cpp | 4 +- src/mame/ussr/dvk_ksm.cpp | 14 +- src/mame/ussr/irisha.cpp | 4 +- src/mame/ussr/istrebiteli.cpp | 4 +- src/mame/ussr/km035.cpp | 2 +- src/mame/ussr/km035.h | 2 +- src/mame/ussr/mikrosha.cpp | 4 +- src/mame/ussr/mk98.cpp | 8 +- src/mame/ussr/ms0515.cpp | 36 ++--- src/mame/ussr/ms6102.cpp | 10 +- src/mame/ussr/pk8020.h | 2 +- src/mame/ussr/pk8020_m.cpp | 2 +- src/mame/ussr/sm7238.cpp | 8 +- src/mame/ussr/special.h | 2 +- src/mame/ussr/special_m.cpp | 2 +- src/mame/ussr/specialsound.cpp | 6 +- src/mame/ussr/specialsound.h | 6 +- src/mame/ussr/tiamc1.cpp | 2 +- src/mame/ussr/tiamc1.h | 2 +- src/mame/ussr/unior.cpp | 8 +- src/mame/ussr/vector06.h | 2 +- src/mame/ussr/vector06_m.cpp | 2 +- src/mame/ussr/vta2000.cpp | 4 +- src/mame/valadon/bagman.cpp | 12 +- src/mame/valadon/bagman.h | 18 +-- src/mame/valadon/bagman_v.cpp | 6 +- src/mame/vectorgraphic/v4_kbd.cpp | 2 +- src/mame/vectorgraphic/v4_kbd.h | 2 +- src/mame/vectorgraphic/vector4.cpp | 2 +- src/mame/venture/looping.cpp | 52 +++---- src/mame/venture/spcforce.cpp | 16 +-- src/mame/verifone/tranz330.h | 6 +- src/mame/vidbrain/uv201.cpp | 4 +- src/mame/vidbrain/uv201.h | 4 +- src/mame/vidbrain/vidbrain.cpp | 4 +- src/mame/vidbrain/vidbrain.h | 4 +- src/mame/videoton/tvc.cpp | 8 +- src/mame/virtual/vgmplay.cpp | 4 +- src/mame/visual/v100.cpp | 4 +- src/mame/visual/v102.cpp | 4 +- src/mame/visual/v102_kbd.cpp | 4 +- src/mame/visual/v102_kbd.h | 4 +- src/mame/visual/v1050.cpp | 22 +-- src/mame/visual/v1050.h | 34 ++--- src/mame/visual/v1050_v.cpp | 2 +- src/mame/visual/v1050kb.cpp | 2 +- src/mame/visual/v1050kb.h | 2 +- src/mame/votrax/votrhv.cpp | 12 +- src/mame/votrax/votrpss.cpp | 2 +- src/mame/vsystem/fromanc2.cpp | 6 +- src/mame/vsystem/fromanc2.h | 6 +- src/mame/vsystem/fromance.cpp | 2 +- src/mame/vsystem/fromance.h | 2 +- src/mame/vsystem/gstriker.cpp | 4 +- src/mame/vsystem/inufuku.cpp | 4 +- src/mame/vsystem/ojankohs.cpp | 2 +- src/mame/vsystem/ojankohs.h | 2 +- src/mame/vsystem/taotaido.cpp | 4 +- src/mame/vtech/crvision.cpp | 12 +- src/mame/vtech/crvision.h | 12 +- src/mame/vtech/inteladv.cpp | 8 +- src/mame/vtech/laser3k.cpp | 12 +- src/mame/vtech/vsmile.cpp | 2 +- src/mame/vtech/vsmile.h | 2 +- src/mame/vtech/vtech_eu3a12.cpp | 8 +- src/mame/wang/wangpc.cpp | 74 +++++----- src/mame/wang/wangpckb.cpp | 2 +- src/mame/wang/wangpckb.h | 2 +- src/mame/wavemate/bullet.cpp | 20 +-- src/mame/wavemate/bullet.h | 20 +-- src/mame/wing/lucky74.cpp | 2 +- src/mame/wing/lucky74.h | 2 +- src/mame/wing/slotcarn.cpp | 4 +- src/mame/wing/superwng.cpp | 4 +- src/mame/wyse/wy100.cpp | 8 +- src/mame/wyse/wy50.cpp | 4 +- src/mame/wyse/wy50kb.cpp | 2 +- src/mame/wyse/wy50kb.h | 2 +- src/mame/wyse/wy60.cpp | 8 +- src/mame/xerox/bigbord2.cpp | 44 +++--- src/mame/xerox/x820kb.cpp | 4 +- src/mame/xerox/x820kb.h | 4 +- src/mame/xerox/xerox820.cpp | 6 +- src/mame/xerox/xerox820.h | 6 +- src/mame/yamaha/fb01.cpp | 12 +- src/mame/yamaha/mulcd.cpp | 2 +- src/mame/yamaha/mulcd.h | 2 +- src/mame/yamaha/ymdx100.cpp | 6 +- src/mame/yamaha/ymdx9.cpp | 4 +- src/mame/yamaha/ymmu5.cpp | 4 +- src/mame/yamaha/ympsr150.cpp | 22 +-- src/mame/yamaha/ympsr340.cpp | 4 +- src/mame/yamaha/ympsr60.cpp | 8 +- src/mame/yamaha/ymtx81z.cpp | 4 +- src/mame/yunsung/yunsung8.cpp | 4 +- src/mame/zaccaria/zaccaria.cpp | 6 +- src/mame/zaccaria/zaccaria.h | 10 +- src/mame/zaccaria/zaccaria_a.cpp | 6 +- src/mame/zaccaria/zaccaria_a.h | 6 +- src/mame/zaccaria/zaccaria_v.cpp | 4 +- src/mame/zenith/mdt60.cpp | 4 +- src/mame/zenith/z100.cpp | 32 ++--- src/mame/zenith/z22.cpp | 4 +- src/mame/zenith/z29.cpp | 4 +- src/mame/zvt/pp01.h | 2 +- src/mame/zvt/pp01_m.cpp | 2 +- 3329 files changed, 15366 insertions(+), 15370 deletions(-) diff --git a/src/devices/bus/a1bus/a1bus.cpp b/src/devices/bus/a1bus/a1bus.cpp index 21549f5a171..b1bd0587c24 100644 --- a/src/devices/bus/a1bus/a1bus.cpp +++ b/src/devices/bus/a1bus/a1bus.cpp @@ -140,8 +140,8 @@ void a1bus_device::install_bank(offs_t start, offs_t end, uint8_t *data) } // interrupt request from a1bus card -WRITE_LINE_MEMBER( a1bus_device::irq_w ) { m_out_irq_cb(state); } -WRITE_LINE_MEMBER( a1bus_device::nmi_w ) { m_out_nmi_cb(state); } +void a1bus_device::irq_w(int state) { m_out_irq_cb(state); } +void a1bus_device::nmi_w(int state) { m_out_nmi_cb(state); } //************************************************************************** // DEVICE CONFIG A1BUS CARD INTERFACE diff --git a/src/devices/bus/a1bus/a1bus.h b/src/devices/bus/a1bus/a1bus.h index d1d4860113d..34b5ada79e3 100644 --- a/src/devices/bus/a1bus/a1bus.h +++ b/src/devices/bus/a1bus/a1bus.h @@ -71,8 +71,8 @@ public: void install_device(offs_t start, offs_t end, read8sm_delegate rhandler, write8sm_delegate whandler); void install_bank(offs_t start, offs_t end, uint8_t *data); - DECLARE_WRITE_LINE_MEMBER( irq_w ); - DECLARE_WRITE_LINE_MEMBER( nmi_w ); + void irq_w(int state); + void nmi_w(int state); protected: a1bus_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); diff --git a/src/devices/bus/a2bus/a2arcadebd.cpp b/src/devices/bus/a2bus/a2arcadebd.cpp index 85c0cfc02d2..9dbdfe44e8f 100644 --- a/src/devices/bus/a2bus/a2arcadebd.cpp +++ b/src/devices/bus/a2bus/a2arcadebd.cpp @@ -56,7 +56,7 @@ protected: virtual void write_c0nx(uint8_t offset, uint8_t data) override; private: - DECLARE_WRITE_LINE_MEMBER( tms_irq_w ); + void tms_irq_w(int state); required_device m_tms; required_device m_ay; @@ -157,7 +157,7 @@ void a2bus_arcboard_device::write_c0nx(uint8_t offset, uint8_t data) } } -WRITE_LINE_MEMBER( a2bus_arcboard_device::tms_irq_w ) +void a2bus_arcboard_device::tms_irq_w(int state) { if (state) { diff --git a/src/devices/bus/a2bus/a2bus.cpp b/src/devices/bus/a2bus/a2bus.cpp index deb322f67a8..026e0060445 100644 --- a/src/devices/bus/a2bus/a2bus.cpp +++ b/src/devices/bus/a2bus/a2bus.cpp @@ -257,8 +257,8 @@ void a2bus_device::recalc_inh(int slot) } // interrupt request from a2bus card -WRITE_LINE_MEMBER( a2bus_device::irq_w ) { m_out_irq_cb(state); } -WRITE_LINE_MEMBER( a2bus_device::nmi_w ) { m_out_nmi_cb(state); } +void a2bus_device::irq_w(int state) { m_out_irq_cb(state); } +void a2bus_device::nmi_w(int state) { m_out_nmi_cb(state); } //************************************************************************** // DEVICE CONFIG A2BUS CARD INTERFACE diff --git a/src/devices/bus/a2bus/a2bus.h b/src/devices/bus/a2bus/a2bus.h index 5a10f06de39..2d4b523fa2a 100644 --- a/src/devices/bus/a2bus/a2bus.h +++ b/src/devices/bus/a2bus/a2bus.h @@ -99,8 +99,8 @@ public: uint8_t dma_r(uint16_t offset); void dma_w(uint16_t offset, uint8_t data); - DECLARE_WRITE_LINE_MEMBER( irq_w ); - DECLARE_WRITE_LINE_MEMBER( nmi_w ); + void irq_w(int state); + void nmi_w(int state); protected: a2bus_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); diff --git a/src/devices/bus/a2bus/a2eauxslot.cpp b/src/devices/bus/a2bus/a2eauxslot.cpp index 36b99cbe6aa..004fdc760e0 100644 --- a/src/devices/bus/a2bus/a2eauxslot.cpp +++ b/src/devices/bus/a2bus/a2eauxslot.cpp @@ -113,8 +113,8 @@ void a2eauxslot_device::set_nmi_line(int state) } // interrupt request from a2eauxslot card -WRITE_LINE_MEMBER( a2eauxslot_device::irq_w ) { m_out_irq_cb(state); } -WRITE_LINE_MEMBER( a2eauxslot_device::nmi_w ) { m_out_nmi_cb(state); } +void a2eauxslot_device::irq_w(int state) { m_out_irq_cb(state); } +void a2eauxslot_device::nmi_w(int state) { m_out_nmi_cb(state); } //************************************************************************** // DEVICE CONFIG A2EAUXSLOT CARD INTERFACE diff --git a/src/devices/bus/a2bus/a2eauxslot.h b/src/devices/bus/a2bus/a2eauxslot.h index 0eefe28db1d..a527b616d6c 100644 --- a/src/devices/bus/a2bus/a2eauxslot.h +++ b/src/devices/bus/a2bus/a2eauxslot.h @@ -75,8 +75,8 @@ public: void set_irq_line(int state); void set_nmi_line(int state); - DECLARE_WRITE_LINE_MEMBER( irq_w ); - DECLARE_WRITE_LINE_MEMBER( nmi_w ); + void irq_w(int state); + void nmi_w(int state); protected: a2eauxslot_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); diff --git a/src/devices/bus/a2bus/a2echoii.cpp b/src/devices/bus/a2bus/a2echoii.cpp index 5b28c77a511..f87d48ac74b 100644 --- a/src/devices/bus/a2bus/a2echoii.cpp +++ b/src/devices/bus/a2bus/a2echoii.cpp @@ -70,8 +70,8 @@ protected: virtual bool take_c800() override; private: - //DECLARE_WRITE_LINE_MEMBER(tms_irq_callback); - DECLARE_WRITE_LINE_MEMBER(tms_readyq_callback); + //void tms_irq_callback(int state); + void tms_readyq_callback(int state); uint8_t m_writelatch_data; // 74ls373 latch bool m_readlatch_flag; // 74c74 1st half bool m_writelatch_flag; // 74c74 2nd half @@ -140,13 +140,13 @@ void a2bus_echoii_device::device_reset() } /* -WRITE_LINE_MEMBER(a2bus_echoii_device::tms_irq_callback) +void a2bus_echoii_device::tms_irq_callback(int state) { update_irq_to_maincpu(); } */ -WRITE_LINE_MEMBER(a2bus_echoii_device::tms_readyq_callback) +void a2bus_echoii_device::tms_readyq_callback(int state) { if (state == ASSERT_LINE) { diff --git a/src/devices/bus/a2bus/a2hsscsi.cpp b/src/devices/bus/a2bus/a2hsscsi.cpp index b2043c20f30..2d015cf5d36 100644 --- a/src/devices/bus/a2bus/a2hsscsi.cpp +++ b/src/devices/bus/a2bus/a2hsscsi.cpp @@ -329,7 +329,7 @@ void a2bus_hsscsi_device::write_c800(uint16_t offset, uint8_t data) } } -WRITE_LINE_MEMBER( a2bus_hsscsi_device::drq_w ) +void a2bus_hsscsi_device::drq_w(int state) { m_drq = (state ? 0x80 : 0x00); // printf("DRQ to %d\n", state); diff --git a/src/devices/bus/a2bus/a2hsscsi.h b/src/devices/bus/a2bus/a2hsscsi.h index be200ccde0d..3878ffac370 100644 --- a/src/devices/bus/a2bus/a2hsscsi.h +++ b/src/devices/bus/a2bus/a2hsscsi.h @@ -30,7 +30,7 @@ public: static constexpr feature_type unemulated_features() { return feature::DISK; } - DECLARE_WRITE_LINE_MEMBER( drq_w ); + void drq_w(int state); protected: a2bus_hsscsi_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); diff --git a/src/devices/bus/a2bus/a2mcms.cpp b/src/devices/bus/a2bus/a2mcms.cpp index f23a647f4a8..d4e699361de 100644 --- a/src/devices/bus/a2bus/a2mcms.cpp +++ b/src/devices/bus/a2bus/a2mcms.cpp @@ -123,7 +123,7 @@ mcms_device *a2bus_mcms1_device::get_engine(void) return m_mcms; } -WRITE_LINE_MEMBER(a2bus_mcms1_device::irq_w) +void a2bus_mcms1_device::irq_w(int state) { if (state == ASSERT_LINE) { diff --git a/src/devices/bus/a2bus/a2mcms.h b/src/devices/bus/a2bus/a2mcms.h index 371c74c54fa..a696455ffad 100644 --- a/src/devices/bus/a2bus/a2mcms.h +++ b/src/devices/bus/a2bus/a2mcms.h @@ -88,7 +88,7 @@ protected: virtual bool take_c800() override { return false; } private: - DECLARE_WRITE_LINE_MEMBER(irq_w); + void irq_w(int state); }; // card 2 diff --git a/src/devices/bus/a2bus/a2midi.cpp b/src/devices/bus/a2bus/a2midi.cpp index f1cc7ecb2a6..941800180ed 100644 --- a/src/devices/bus/a2bus/a2midi.cpp +++ b/src/devices/bus/a2bus/a2midi.cpp @@ -53,9 +53,9 @@ protected: required_device m_acia; private: - DECLARE_WRITE_LINE_MEMBER( acia_irq_w ); - DECLARE_WRITE_LINE_MEMBER( ptm_irq_w ); - DECLARE_WRITE_LINE_MEMBER( write_acia_clock ); + void acia_irq_w(int state); + void ptm_irq_w(int state); + void write_acia_clock(int state); bool m_acia_irq, m_ptm_irq; }; @@ -149,7 +149,7 @@ void a2bus_midi_device::write_c0nx(uint8_t offset, uint8_t data) } } -WRITE_LINE_MEMBER( a2bus_midi_device::acia_irq_w ) +void a2bus_midi_device::acia_irq_w(int state) { m_acia_irq = state ? true : false; @@ -163,7 +163,7 @@ WRITE_LINE_MEMBER( a2bus_midi_device::acia_irq_w ) } } -WRITE_LINE_MEMBER( a2bus_midi_device::ptm_irq_w ) +void a2bus_midi_device::ptm_irq_w(int state) { m_acia_irq = state ? true : false; @@ -177,7 +177,7 @@ WRITE_LINE_MEMBER( a2bus_midi_device::ptm_irq_w ) } } -WRITE_LINE_MEMBER( a2bus_midi_device::write_acia_clock ) +void a2bus_midi_device::write_acia_clock(int state) { m_acia->write_txc(state); m_acia->write_rxc(state); diff --git a/src/devices/bus/a2bus/a2mockingboard.cpp b/src/devices/bus/a2bus/a2mockingboard.cpp index 3db86d9a40b..79a7c407a4f 100644 --- a/src/devices/bus/a2bus/a2mockingboard.cpp +++ b/src/devices/bus/a2bus/a2mockingboard.cpp @@ -43,8 +43,8 @@ class a2bus_ayboard_device: public device_a2bus_card_interface { public: - DECLARE_WRITE_LINE_MEMBER( via1_irq_w ); - DECLARE_WRITE_LINE_MEMBER( via2_irq_w ); + void via1_irq_w(int state); + void via2_irq_w(int state); u8 via1_in_a() { return m_porta1; } u8 via2_in_a() { return m_porta2; } void via1_out_a(u8 data); @@ -90,7 +90,7 @@ protected: required_device m_sc01; private: - DECLARE_WRITE_LINE_MEMBER(write_via1_cb2); + void write_via1_cb2(int state); u8 m_portb1; int m_last_cb2_state; @@ -373,7 +373,7 @@ void a2bus_phasor_device::write_cnxx(u8 offset, u8 data) } } -WRITE_LINE_MEMBER( a2bus_ayboard_device::via1_irq_w ) +void a2bus_ayboard_device::via1_irq_w(int state) { if (state) { @@ -385,7 +385,7 @@ WRITE_LINE_MEMBER( a2bus_ayboard_device::via1_irq_w ) } } -WRITE_LINE_MEMBER( a2bus_ayboard_device::via2_irq_w ) +void a2bus_ayboard_device::via2_irq_w(int state) { if (state) { @@ -675,7 +675,7 @@ void a2bus_mockingboard_device::device_reset() m_last_cb2_state = ASSERT_LINE; } -WRITE_LINE_MEMBER( a2bus_mockingboard_device::write_via1_cb2 ) +void a2bus_mockingboard_device::write_via1_cb2(int state) { if ((state == CLEAR_LINE) && (m_last_cb2_state == ASSERT_LINE)) { diff --git a/src/devices/bus/a2bus/a2parprn.cpp b/src/devices/bus/a2bus/a2parprn.cpp index c79f04f6da8..ceb4f166bee 100644 --- a/src/devices/bus/a2bus/a2parprn.cpp +++ b/src/devices/bus/a2bus/a2parprn.cpp @@ -31,7 +31,7 @@ protected: private: // printer status inputs - DECLARE_WRITE_LINE_MEMBER(ack_w); + void ack_w(int state); // timer handlers TIMER_CALLBACK_MEMBER(update_strobe); @@ -232,7 +232,7 @@ void a2bus_parprn_device::device_reset() // printer status inputs //---------------------------------------------- -WRITE_LINE_MEMBER(a2bus_parprn_device::ack_w) +void a2bus_parprn_device::ack_w(int state) { if (bool(state) != bool(m_ack_in)) { diff --git a/src/devices/bus/a2bus/a2pic.cpp b/src/devices/bus/a2bus/a2pic.cpp index 321155f2cf8..32ec527b254 100644 --- a/src/devices/bus/a2bus/a2pic.cpp +++ b/src/devices/bus/a2bus/a2pic.cpp @@ -40,10 +40,10 @@ protected: private: // printer status inputs - DECLARE_WRITE_LINE_MEMBER(ack_w); - DECLARE_WRITE_LINE_MEMBER(perror_w); - DECLARE_WRITE_LINE_MEMBER(select_w); - DECLARE_WRITE_LINE_MEMBER(fault_w); + void ack_w(int state); + void perror_w(int state); + void select_w(int state); + void fault_w(int state); // timer handlers TIMER_CALLBACK_MEMBER(release_strobe); @@ -384,25 +384,25 @@ void a2bus_pic_device::device_reset() // printer status inputs //---------------------------------------------- -WRITE_LINE_MEMBER(a2bus_pic_device::ack_w) +void a2bus_pic_device::ack_w(int state) { machine().scheduler().synchronize(timer_expired_delegate(FUNC(a2bus_pic_device::set_ack_in), this), state ? 1 : 0); } -WRITE_LINE_MEMBER(a2bus_pic_device::perror_w) +void a2bus_pic_device::perror_w(int state) { machine().scheduler().synchronize(timer_expired_delegate(FUNC(a2bus_pic_device::set_perror_in), this), state ? 1 : 0); } -WRITE_LINE_MEMBER(a2bus_pic_device::select_w) +void a2bus_pic_device::select_w(int state) { machine().scheduler().synchronize(timer_expired_delegate(FUNC(a2bus_pic_device::set_select_in), this), state ? 1 : 0); } -WRITE_LINE_MEMBER(a2bus_pic_device::fault_w) +void a2bus_pic_device::fault_w(int state) { machine().scheduler().synchronize(timer_expired_delegate(FUNC(a2bus_pic_device::set_fault_in), this), state ? 1 : 0); } diff --git a/src/devices/bus/a2bus/a2scsi.cpp b/src/devices/bus/a2bus/a2scsi.cpp index fb3e7e8e222..af6af4ad3fb 100644 --- a/src/devices/bus/a2bus/a2scsi.cpp +++ b/src/devices/bus/a2bus/a2scsi.cpp @@ -290,7 +290,7 @@ void a2bus_scsi_device::write_c800(uint16_t offset, uint8_t data) } } -WRITE_LINE_MEMBER( a2bus_scsi_device::drq_w ) +void a2bus_scsi_device::drq_w(int state) { m_drq = (state ? 0x80 : 0x00); } diff --git a/src/devices/bus/a2bus/a2scsi.h b/src/devices/bus/a2bus/a2scsi.h index 098e7848563..e45d0171975 100644 --- a/src/devices/bus/a2bus/a2scsi.h +++ b/src/devices/bus/a2bus/a2scsi.h @@ -28,7 +28,7 @@ public: // construction/destruction a2bus_scsi_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - DECLARE_WRITE_LINE_MEMBER( drq_w ); + void drq_w(int state); protected: a2bus_scsi_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); diff --git a/src/devices/bus/a2bus/a2sd.h b/src/devices/bus/a2bus/a2sd.h index 88414ec39d3..481761c42ab 100644 --- a/src/devices/bus/a2bus/a2sd.h +++ b/src/devices/bus/a2bus/a2sd.h @@ -46,7 +46,7 @@ protected: virtual void write_c800(uint16_t offset, u8 data) override; // SPI 4-wire interface - WRITE_LINE_MEMBER(spi_miso_w) { m_in_bit = state; } + void spi_miso_w(int state) { m_in_bit = state; } TIMER_CALLBACK_MEMBER(shift_tick); private: diff --git a/src/devices/bus/a2bus/a2ssc.cpp b/src/devices/bus/a2bus/a2ssc.cpp index 61ab1efc30b..1d6d286fd6e 100644 --- a/src/devices/bus/a2bus/a2ssc.cpp +++ b/src/devices/bus/a2bus/a2ssc.cpp @@ -56,7 +56,7 @@ protected: required_region_ptr m_rom; private: - DECLARE_WRITE_LINE_MEMBER( acia_irq_w ); + void acia_irq_w(int state); }; class apricorn_ssi_device : public a2bus_ssc_device @@ -419,7 +419,7 @@ void apricorn_ssi_device::write_c0nx(uint8_t offset, uint8_t data) m_alt_bank = true; } -WRITE_LINE_MEMBER( a2bus_ssc_device::acia_irq_w ) +void a2bus_ssc_device::acia_irq_w(int state) { if (machine().ioport().safe_to_read()) { diff --git a/src/devices/bus/a2bus/a2thunderclock.cpp b/src/devices/bus/a2bus/a2thunderclock.cpp index c109be5c276..5f264ee261e 100644 --- a/src/devices/bus/a2bus/a2thunderclock.cpp +++ b/src/devices/bus/a2bus/a2thunderclock.cpp @@ -75,7 +75,7 @@ protected: required_region_ptr m_rom; private: - DECLARE_WRITE_LINE_MEMBER( upd_dataout_w ); + void upd_dataout_w(int state); int m_dataout; }; @@ -192,7 +192,7 @@ uint8_t a2bus_thunderclock_device::read_c800(uint16_t offset) return m_rom[offset]; } -WRITE_LINE_MEMBER( a2bus_thunderclock_device::upd_dataout_w ) +void a2bus_thunderclock_device::upd_dataout_w(int state) { if (state) { diff --git a/src/devices/bus/a2bus/a2ultraterm.cpp b/src/devices/bus/a2bus/a2ultraterm.cpp index 468c7402c46..1f2c09c3b73 100644 --- a/src/devices/bus/a2bus/a2ultraterm.cpp +++ b/src/devices/bus/a2bus/a2ultraterm.cpp @@ -126,7 +126,7 @@ protected: required_region_ptr m_rom, m_chrrom; private: - DECLARE_WRITE_LINE_MEMBER(vsync_changed); + void vsync_changed(int state); MC6845_UPDATE_ROW(crtc_update_row); int m_rambank; @@ -436,7 +436,7 @@ MC6845_UPDATE_ROW( a2bus_videx160_device::crtc_update_row ) } } -WRITE_LINE_MEMBER( a2bus_videx160_device::vsync_changed ) +void a2bus_videx160_device::vsync_changed(int state) { if ( state ) { diff --git a/src/devices/bus/a2bus/agat7ports.cpp b/src/devices/bus/a2bus/agat7ports.cpp index afd196d6549..417840b0164 100644 --- a/src/devices/bus/a2bus/agat7ports.cpp +++ b/src/devices/bus/a2bus/agat7ports.cpp @@ -178,7 +178,7 @@ uint8_t a2bus_agat7_ports_device::read_portc() return (m_centronics_busy << 7) | m_printer_cfg->read(); } -WRITE_LINE_MEMBER(a2bus_agat7_ports_device::write_centronics_busy) +void a2bus_agat7_ports_device::write_centronics_busy(int state) { m_centronics_busy = state; } diff --git a/src/devices/bus/a2bus/agat7ports.h b/src/devices/bus/a2bus/agat7ports.h index 2ee4f38b4dd..1d587c9f747 100644 --- a/src/devices/bus/a2bus/agat7ports.h +++ b/src/devices/bus/a2bus/agat7ports.h @@ -52,7 +52,7 @@ protected: void write_portb(uint8_t data); uint8_t read_portc(); - DECLARE_WRITE_LINE_MEMBER(write_centronics_busy); + void write_centronics_busy(int state); private: bool m_centronics_busy; diff --git a/src/devices/bus/a2bus/agat840k_hle.cpp b/src/devices/bus/a2bus/agat840k_hle.cpp index cd6d01389b4..0a0fd511a95 100644 --- a/src/devices/bus/a2bus/agat840k_hle.cpp +++ b/src/devices/bus/a2bus/agat840k_hle.cpp @@ -100,12 +100,12 @@ a2bus_agat840k_hle_device::a2bus_agat840k_hle_device(const machine_config &mconf { } -WRITE_LINE_MEMBER(a2bus_agat840k_hle_device::index_0_w) +void a2bus_agat840k_hle_device::index_0_w(int state) { index_callback(0, state); } -WRITE_LINE_MEMBER(a2bus_agat840k_hle_device::index_1_w) +void a2bus_agat840k_hle_device::index_1_w(int state) { index_callback(1, state); } diff --git a/src/devices/bus/a2bus/agat840k_hle.h b/src/devices/bus/a2bus/agat840k_hle.h index a497f2bc7aa..61d2f8f267b 100644 --- a/src/devices/bus/a2bus/agat840k_hle.h +++ b/src/devices/bus/a2bus/agat840k_hle.h @@ -44,8 +44,8 @@ public: void d15_o_b(uint8_t data); void d15_o_c(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(index_0_w); - DECLARE_WRITE_LINE_MEMBER(index_1_w); + void index_0_w(int state); + void index_1_w(int state); void index_callback(int unit, int state); diff --git a/src/devices/bus/a2bus/ccs7710.cpp b/src/devices/bus/a2bus/ccs7710.cpp index 17f8cdfe80e..3a6d1449fbb 100644 --- a/src/devices/bus/a2bus/ccs7710.cpp +++ b/src/devices/bus/a2bus/ccs7710.cpp @@ -69,7 +69,7 @@ u8 ccs7710_device::read_cnxx(u8 offset) return m_firmware[offset]; } -WRITE_LINE_MEMBER(ccs7710_device::acia_irq_w) +void ccs7710_device::acia_irq_w(int state) { if (state == ASSERT_LINE) raise_slot_irq(); @@ -77,7 +77,7 @@ WRITE_LINE_MEMBER(ccs7710_device::acia_irq_w) lower_slot_irq(); } -WRITE_LINE_MEMBER(ccs7710_device::external_clock_w) +void ccs7710_device::external_clock_w(int state) { m_external_clock = state; if (!BIT(m_baud_select->read(), 0)) diff --git a/src/devices/bus/a2bus/ccs7710.h b/src/devices/bus/a2bus/ccs7710.h index db2a7616891..0a5a7ea34e2 100644 --- a/src/devices/bus/a2bus/ccs7710.h +++ b/src/devices/bus/a2bus/ccs7710.h @@ -36,8 +36,8 @@ protected: private: // miscellaneous handlers - DECLARE_WRITE_LINE_MEMBER(acia_irq_w); - DECLARE_WRITE_LINE_MEMBER(external_clock_w); + void acia_irq_w(int state); + void external_clock_w(int state); u8 baud_select_r(offs_t offset); // object finders diff --git a/src/devices/bus/a2bus/cmsscsi.h b/src/devices/bus/a2bus/cmsscsi.h index 8e417d76bc0..67f79120f9c 100644 --- a/src/devices/bus/a2bus/cmsscsi.h +++ b/src/devices/bus/a2bus/cmsscsi.h @@ -28,7 +28,7 @@ public: // construction/destruction a2bus_cmsscsi_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - DECLARE_WRITE_LINE_MEMBER( drq_w ); + void drq_w(int state); protected: a2bus_cmsscsi_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); diff --git a/src/devices/bus/a2bus/corvfdc01.cpp b/src/devices/bus/a2bus/corvfdc01.cpp index 212f49ed20b..4511aa29a88 100644 --- a/src/devices/bus/a2bus/corvfdc01.cpp +++ b/src/devices/bus/a2bus/corvfdc01.cpp @@ -249,7 +249,7 @@ uint8_t a2bus_corvfdc01_device::read_cnxx(uint8_t offset) return m_rom[offset & 0x1f]; } -WRITE_LINE_MEMBER(a2bus_corvfdc01_device::intrq_w) +void a2bus_corvfdc01_device::intrq_w(int state) { if (state) m_fdc_local_status |= LS_INT_mask; @@ -257,7 +257,7 @@ WRITE_LINE_MEMBER(a2bus_corvfdc01_device::intrq_w) m_fdc_local_status &= ~LS_INT_mask; } -WRITE_LINE_MEMBER(a2bus_corvfdc01_device::drq_w) +void a2bus_corvfdc01_device::drq_w(int state) { if (state) m_fdc_local_status |= LS_DRQ_mask; diff --git a/src/devices/bus/a2bus/corvfdc01.h b/src/devices/bus/a2bus/corvfdc01.h index 5c92107fcbe..1d731d2460e 100644 --- a/src/devices/bus/a2bus/corvfdc01.h +++ b/src/devices/bus/a2bus/corvfdc01.h @@ -50,8 +50,8 @@ protected: required_device m_con4; private: - DECLARE_WRITE_LINE_MEMBER(intrq_w); - DECLARE_WRITE_LINE_MEMBER(drq_w); + void intrq_w(int state); + void drq_w(int state); uint8_t *m_rom; uint8_t m_fdc_local_status, m_fdc_local_command; diff --git a/src/devices/bus/a2bus/corvfdc02.cpp b/src/devices/bus/a2bus/corvfdc02.cpp index 12c7aed06ac..3a1b4c433b5 100644 --- a/src/devices/bus/a2bus/corvfdc02.cpp +++ b/src/devices/bus/a2bus/corvfdc02.cpp @@ -243,7 +243,7 @@ uint8_t a2bus_corvfdc02_device::read_cnxx(uint8_t offset) return m_rom[offset & 0x1f]; } -WRITE_LINE_MEMBER(a2bus_corvfdc02_device::intrq_w) +void a2bus_corvfdc02_device::intrq_w(int state) { if (state) { @@ -260,7 +260,7 @@ WRITE_LINE_MEMBER(a2bus_corvfdc02_device::intrq_w) } } -WRITE_LINE_MEMBER(a2bus_corvfdc02_device::drq_w) +void a2bus_corvfdc02_device::drq_w(int state) { if (state) { diff --git a/src/devices/bus/a2bus/corvfdc02.h b/src/devices/bus/a2bus/corvfdc02.h index 825d68d564b..af057f13be3 100644 --- a/src/devices/bus/a2bus/corvfdc02.h +++ b/src/devices/bus/a2bus/corvfdc02.h @@ -52,8 +52,8 @@ protected: required_device m_con4; private: - DECLARE_WRITE_LINE_MEMBER(intrq_w); - DECLARE_WRITE_LINE_MEMBER(drq_w); + void intrq_w(int state); + void drq_w(int state); static void corv_floppy_formats(format_registration &fr); diff --git a/src/devices/bus/a2bus/ezcgi.cpp b/src/devices/bus/a2bus/ezcgi.cpp index 3ebccb45518..bbbe2931f56 100644 --- a/src/devices/bus/a2bus/ezcgi.cpp +++ b/src/devices/bus/a2bus/ezcgi.cpp @@ -52,7 +52,7 @@ protected: required_device m_tms; private: - DECLARE_WRITE_LINE_MEMBER( tms_irq_w ); + void tms_irq_w(int state); }; class a2bus_ezcgi_9938_device: @@ -77,7 +77,7 @@ protected: required_device m_tms; private: - DECLARE_WRITE_LINE_MEMBER( tms_irq_w ); + void tms_irq_w(int state); }; class a2bus_ezcgi_9958_device: @@ -102,7 +102,7 @@ protected: required_device m_tms; private: - DECLARE_WRITE_LINE_MEMBER( tms_irq_w ); + void tms_irq_w(int state); }; #define MSX2_XBORDER_PIXELS 16 @@ -328,7 +328,7 @@ void a2bus_ezcgi_9958_device::write_c0nx(uint8_t offset, uint8_t data) } } -WRITE_LINE_MEMBER( a2bus_ezcgi_device::tms_irq_w ) +void a2bus_ezcgi_device::tms_irq_w(int state) { if (state) { @@ -340,7 +340,7 @@ WRITE_LINE_MEMBER( a2bus_ezcgi_device::tms_irq_w ) } } -WRITE_LINE_MEMBER( a2bus_ezcgi_9938_device::tms_irq_w ) +void a2bus_ezcgi_9938_device::tms_irq_w(int state) { if (state) { @@ -352,7 +352,7 @@ WRITE_LINE_MEMBER( a2bus_ezcgi_9938_device::tms_irq_w ) } } -WRITE_LINE_MEMBER( a2bus_ezcgi_9958_device::tms_irq_w ) +void a2bus_ezcgi_9958_device::tms_irq_w(int state) { if (state) { diff --git a/src/devices/bus/a2bus/grappler.cpp b/src/devices/bus/a2bus/grappler.cpp index c09ff95e8fc..057e9718667 100644 --- a/src/devices/bus/a2bus/grappler.cpp +++ b/src/devices/bus/a2bus/grappler.cpp @@ -84,9 +84,9 @@ protected: private: // printer status inputs - DECLARE_WRITE_LINE_MEMBER(busy_w); - DECLARE_WRITE_LINE_MEMBER(pe_w); - DECLARE_WRITE_LINE_MEMBER(slct_w); + void busy_w(int state); + void pe_w(int state); + void slct_w(int state); // synchronised printer status inputs void set_busy_in(s32 param); @@ -169,19 +169,19 @@ void a2bus_grappler_device_base::set_rom_bank(u16 rom_bank) // printer status inputs //-------------------------------------------------- -WRITE_LINE_MEMBER(a2bus_grappler_device_base::busy_w) +void a2bus_grappler_device_base::busy_w(int state) { machine().scheduler().synchronize(timer_expired_delegate(FUNC(a2bus_grappler_device_base::set_busy_in), this), state ? 1 : 0); } -WRITE_LINE_MEMBER(a2bus_grappler_device_base::pe_w) +void a2bus_grappler_device_base::pe_w(int state) { machine().scheduler().synchronize(timer_expired_delegate(FUNC(a2bus_grappler_device_base::set_pe_in), this), state ? 1 : 0); } -WRITE_LINE_MEMBER(a2bus_grappler_device_base::slct_w) +void a2bus_grappler_device_base::slct_w(int state) { machine().scheduler().synchronize(timer_expired_delegate(FUNC(a2bus_grappler_device_base::set_slct_in), this), state ? 1 : 0); } @@ -247,7 +247,7 @@ protected: private: // printer status inputs - DECLARE_WRITE_LINE_MEMBER(ack_w); + void ack_w(int state); // synchronised signals void set_data(s32 param); @@ -362,7 +362,7 @@ void a2bus_grappler_device::device_reset() // printer status inputs //-------------------------------------------------- -WRITE_LINE_MEMBER(a2bus_grappler_device::ack_w) +void a2bus_grappler_device::ack_w(int state) { machine().scheduler().synchronize(timer_expired_delegate(FUNC(a2bus_grappler_device::set_ack_in), this), state ? 1 : 0); } @@ -451,7 +451,7 @@ protected: virtual void device_reset() override; // ACK latch set input - DECLARE_WRITE_LINE_MEMBER(ack_w); + void ack_w(int state); // signal state u8 ack_latch() const { return m_ack_latch; } @@ -581,7 +581,7 @@ void a2bus_grapplerplus_device_base::write_cnxx(u8 offset, u8 data) // ACK latch set input //-------------------------------------------------- -WRITE_LINE_MEMBER(a2bus_grapplerplus_device_base::ack_w) +void a2bus_grapplerplus_device_base::ack_w(int state) { machine().scheduler().synchronize(timer_expired_delegate(FUNC(a2bus_grapplerplus_device_base::set_ack_in), this), state ? 1 : 0); } @@ -868,7 +868,7 @@ private: virtual void data_latched(u8 data) override; // printer status inputs - DECLARE_WRITE_LINE_MEMBER(buf_ack_w); + void buf_ack_w(int state); // MCU I/O handlers void mcu_io(address_map &map); @@ -1039,7 +1039,7 @@ void a2bus_buf_grapplerplus_device::data_latched(u8 data) // printer status inputs //-------------------------------------------------- -DECLARE_WRITE_LINE_MEMBER(a2bus_buf_grapplerplus_device::buf_ack_w) +void a2bus_buf_grapplerplus_device::buf_ack_w(int state) { machine().scheduler().synchronize(timer_expired_delegate(FUNC(a2bus_buf_grapplerplus_device::set_buf_ack_in), this), state ? 1 : 0); } diff --git a/src/devices/bus/a2bus/lancegs.cpp b/src/devices/bus/a2bus/lancegs.cpp index cca53536c2e..a1559596727 100644 --- a/src/devices/bus/a2bus/lancegs.cpp +++ b/src/devices/bus/a2bus/lancegs.cpp @@ -81,7 +81,7 @@ private: required_device m_i2cmem; bool m_shadow; - DECLARE_WRITE_LINE_MEMBER( netinf_irq_w ); + void netinf_irq_w(int state); }; @@ -185,7 +185,7 @@ void a2bus_lancegs_device::write_c0nx(uint8_t offset, uint8_t data) } } -WRITE_LINE_MEMBER( a2bus_lancegs_device::netinf_irq_w ) +void a2bus_lancegs_device::netinf_irq_w(int state) { if (state) { raise_slot_irq(); diff --git a/src/devices/bus/a2bus/mouse.cpp b/src/devices/bus/a2bus/mouse.cpp index 6a40c244a40..144c6ed23b8 100644 --- a/src/devices/bus/a2bus/mouse.cpp +++ b/src/devices/bus/a2bus/mouse.cpp @@ -115,8 +115,8 @@ protected: void pia_out_a(uint8_t data); void pia_out_b(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(pia_irqa_w); - DECLARE_WRITE_LINE_MEMBER(pia_irqb_w); + void pia_irqa_w(int state); + void pia_irqb_w(int state); uint8_t mcu_port_a_r(); uint8_t mcu_port_b_r(); @@ -287,11 +287,11 @@ void a2bus_mouse_device::pia_out_b(uint8_t data) m_rom_bank = (data & 0xe) << 7; } -WRITE_LINE_MEMBER(a2bus_mouse_device::pia_irqa_w) +void a2bus_mouse_device::pia_irqa_w(int state) { } -WRITE_LINE_MEMBER(a2bus_mouse_device::pia_irqb_w) +void a2bus_mouse_device::pia_irqb_w(int state) { } diff --git a/src/devices/bus/a2bus/nippelclock.cpp b/src/devices/bus/a2bus/nippelclock.cpp index 047e13422e0..97dbec1bf3e 100644 --- a/src/devices/bus/a2bus/nippelclock.cpp +++ b/src/devices/bus/a2bus/nippelclock.cpp @@ -39,7 +39,7 @@ void a2bus_nippelclock_device::device_add_mconfig(machine_config &config) m_rtc->set_binary(true); } -WRITE_LINE_MEMBER(a2bus_nippelclock_device::irq_w) +void a2bus_nippelclock_device::irq_w(int state) { if (state == ASSERT_LINE) { diff --git a/src/devices/bus/a2bus/nippelclock.h b/src/devices/bus/a2bus/nippelclock.h index d2ac6f14c7f..3601ca14df8 100644 --- a/src/devices/bus/a2bus/nippelclock.h +++ b/src/devices/bus/a2bus/nippelclock.h @@ -42,7 +42,7 @@ protected: required_device m_rtc; private: - DECLARE_WRITE_LINE_MEMBER(irq_w); + void irq_w(int state); }; // device type definition diff --git a/src/devices/bus/a2bus/pc_xporter.cpp b/src/devices/bus/a2bus/pc_xporter.cpp index 06a87cc1820..3d0937e0832 100644 --- a/src/devices/bus/a2bus/pc_xporter.cpp +++ b/src/devices/bus/a2bus/pc_xporter.cpp @@ -155,14 +155,14 @@ private: uint8_t m_6845_reg; // interface to the keyboard - DECLARE_WRITE_LINE_MEMBER( keyboard_clock_w ); - DECLARE_WRITE_LINE_MEMBER( keyboard_data_w ); + void keyboard_clock_w(int state); + void keyboard_data_w(int state); - DECLARE_WRITE_LINE_MEMBER( pc_pit8253_out1_changed ); - DECLARE_WRITE_LINE_MEMBER( pc_pit8253_out2_changed ); + void pc_pit8253_out1_changed(int state); + void pc_pit8253_out2_changed(int state); - DECLARE_WRITE_LINE_MEMBER( pc_dma_hrq_changed ); - DECLARE_WRITE_LINE_MEMBER( pc_dma8237_out_eop ); + void pc_dma_hrq_changed(int state); + void pc_dma8237_out_eop(int state); uint8_t pc_dma_read_byte(offs_t offset); void pc_dma_write_byte(offs_t offset, uint8_t data); uint8_t pc_dma8237_1_dack_r(); @@ -172,19 +172,19 @@ private: void pc_dma8237_2_dack_w(uint8_t data); void pc_dma8237_3_dack_w(uint8_t data); void pc_dma8237_0_dack_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER( pc_dack0_w ); - DECLARE_WRITE_LINE_MEMBER( pc_dack1_w ); - DECLARE_WRITE_LINE_MEMBER( pc_dack2_w ); - DECLARE_WRITE_LINE_MEMBER( pc_dack3_w ); + void pc_dack0_w(int state); + void pc_dack1_w(int state); + void pc_dack2_w(int state); + void pc_dack3_w(int state); uint8_t kbd_6502_r(offs_t offset); void kbd_6502_w(offs_t offset, uint8_t data); - [[maybe_unused]] DECLARE_WRITE_LINE_MEMBER( pc_speaker_set_spkrdata ); // TODO: hook up to something? + [[maybe_unused]] void pc_speaker_set_spkrdata(int state); // TODO: hook up to something? void pc_page_w(offs_t offset, uint8_t data); void nmi_enable_w(uint8_t data); - [[maybe_unused]] DECLARE_WRITE_LINE_MEMBER(iochck_w); // TODO: hook up to something? + [[maybe_unused]] void iochck_w(int state); // TODO: hook up to something? void pc_select_dma_channel(int channel, bool state); @@ -580,7 +580,7 @@ void a2bus_pcxporter_device::pc_page_w(offs_t offset, uint8_t data) } -WRITE_LINE_MEMBER( a2bus_pcxporter_device::pc_dma_hrq_changed ) +void a2bus_pcxporter_device::pc_dma_hrq_changed(int state) { m_v30->set_input_line(INPUT_LINE_HALT, state ? ASSERT_LINE : CLEAR_LINE); @@ -651,7 +651,7 @@ void a2bus_pcxporter_device::pc_dma8237_0_dack_w(uint8_t data) } -WRITE_LINE_MEMBER( a2bus_pcxporter_device::pc_dma8237_out_eop ) +void a2bus_pcxporter_device::pc_dma8237_out_eop(int state) { m_cur_eop = state == ASSERT_LINE; if(m_dma_channel != -1 && m_cur_eop) @@ -672,10 +672,10 @@ void a2bus_pcxporter_device::pc_select_dma_channel(int channel, bool state) } } -WRITE_LINE_MEMBER( a2bus_pcxporter_device::pc_dack0_w ) { pc_select_dma_channel(0, state); } -WRITE_LINE_MEMBER( a2bus_pcxporter_device::pc_dack1_w ) { pc_select_dma_channel(1, state); } -WRITE_LINE_MEMBER( a2bus_pcxporter_device::pc_dack2_w ) { pc_select_dma_channel(2, state); } -WRITE_LINE_MEMBER( a2bus_pcxporter_device::pc_dack3_w ) { pc_select_dma_channel(3, state); } +void a2bus_pcxporter_device::pc_dack0_w(int state) { pc_select_dma_channel(0, state); } +void a2bus_pcxporter_device::pc_dack1_w(int state) { pc_select_dma_channel(1, state); } +void a2bus_pcxporter_device::pc_dack2_w(int state) { pc_select_dma_channel(2, state); } +void a2bus_pcxporter_device::pc_dack3_w(int state) { pc_select_dma_channel(3, state); } /************************************************************* * @@ -683,7 +683,7 @@ WRITE_LINE_MEMBER( a2bus_pcxporter_device::pc_dack3_w ) { pc_select_dma_channel( * *************************************************************/ -WRITE_LINE_MEMBER(a2bus_pcxporter_device::pc_speaker_set_spkrdata) +void a2bus_pcxporter_device::pc_speaker_set_spkrdata(int state) { m_pc_spkrdata = state ? 1 : 0; m_speaker->level_w(m_pc_spkrdata & m_pit_out2); @@ -696,7 +696,7 @@ WRITE_LINE_MEMBER(a2bus_pcxporter_device::pc_speaker_set_spkrdata) * *************************************************************/ -WRITE_LINE_MEMBER( a2bus_pcxporter_device::pc_pit8253_out1_changed ) +void a2bus_pcxporter_device::pc_pit8253_out1_changed(int state) { /* Trigger DMA channel #0 */ if ( m_out1 == 0 && state == 1 && m_u73_q2 == 0 ) @@ -708,19 +708,19 @@ WRITE_LINE_MEMBER( a2bus_pcxporter_device::pc_pit8253_out1_changed ) } -WRITE_LINE_MEMBER( a2bus_pcxporter_device::pc_pit8253_out2_changed ) +void a2bus_pcxporter_device::pc_pit8253_out2_changed(int state) { m_pit_out2 = state ? 1 : 0; m_speaker->level_w(m_pc_spkrdata & m_pit_out2); } -WRITE_LINE_MEMBER( a2bus_pcxporter_device::keyboard_clock_w ) +void a2bus_pcxporter_device::keyboard_clock_w(int state) { } -WRITE_LINE_MEMBER( a2bus_pcxporter_device::keyboard_data_w ) +void a2bus_pcxporter_device::keyboard_data_w(int state) { } @@ -737,7 +737,7 @@ void a2bus_pcxporter_device::nmi_enable_w(uint8_t data) m_v30->set_input_line(INPUT_LINE_NMI, CLEAR_LINE); } -WRITE_LINE_MEMBER( a2bus_pcxporter_device::iochck_w ) +void a2bus_pcxporter_device::iochck_w(int state) { if (m_nmi_enabled && !state) m_v30->set_input_line(INPUT_LINE_NMI, ASSERT_LINE); diff --git a/src/devices/bus/a2bus/ssprite.cpp b/src/devices/bus/a2bus/ssprite.cpp index 2fdecb117c9..c34a0a90748 100644 --- a/src/devices/bus/a2bus/ssprite.cpp +++ b/src/devices/bus/a2bus/ssprite.cpp @@ -53,7 +53,7 @@ protected: virtual void write_c0nx(uint8_t offset, uint8_t data) override; private: - DECLARE_WRITE_LINE_MEMBER( tms_irq_w ); + void tms_irq_w(int state); required_device m_tms; required_device m_ay; @@ -165,7 +165,7 @@ void a2bus_ssprite_device::write_c0nx(uint8_t offset, uint8_t data) } } -WRITE_LINE_MEMBER( a2bus_ssprite_device::tms_irq_w ) +void a2bus_ssprite_device::tms_irq_w(int state) { if (state) raise_slot_irq(); diff --git a/src/devices/bus/a2bus/timemasterho.cpp b/src/devices/bus/a2bus/timemasterho.cpp index 8dbef3a5a37..b8f2b511971 100644 --- a/src/devices/bus/a2bus/timemasterho.cpp +++ b/src/devices/bus/a2bus/timemasterho.cpp @@ -112,8 +112,8 @@ private: void update_irqs(); void pia_out_a(uint8_t data); void pia_out_b(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(pia_irqa_w); - DECLARE_WRITE_LINE_MEMBER(pia_irqb_w); + void pia_irqa_w(int state); + void pia_irqb_w(int state); bool m_irqa = false, m_irqb = false; bool m_started = false; @@ -297,13 +297,13 @@ void a2bus_timemasterho_device::update_irqs() } } -WRITE_LINE_MEMBER(a2bus_timemasterho_device::pia_irqa_w) +void a2bus_timemasterho_device::pia_irqa_w(int state) { m_irqa = state; update_irqs(); } -WRITE_LINE_MEMBER(a2bus_timemasterho_device::pia_irqb_w) +void a2bus_timemasterho_device::pia_irqb_w(int state) { m_irqb = state; update_irqs(); diff --git a/src/devices/bus/a2bus/uniprint.cpp b/src/devices/bus/a2bus/uniprint.cpp index d451a45fe89..6af2662a846 100644 --- a/src/devices/bus/a2bus/uniprint.cpp +++ b/src/devices/bus/a2bus/uniprint.cpp @@ -36,7 +36,7 @@ protected: private: // printer status inputs - DECLARE_WRITE_LINE_MEMBER(ack_w); + void ack_w(int state); required_device m_printer_conn; required_device m_printer_out; @@ -209,7 +209,7 @@ void a2bus_uniprint_device::device_reset() // printer status inputs //---------------------------------------------- -WRITE_LINE_MEMBER(a2bus_uniprint_device::ack_w) +void a2bus_uniprint_device::ack_w(int state) { if (bool(state) != bool(m_ack_in)) { diff --git a/src/devices/bus/a2gameio/computereyes.cpp b/src/devices/bus/a2gameio/computereyes.cpp index 38b100586e4..0e7613260d4 100644 --- a/src/devices/bus/a2gameio/computereyes.cpp +++ b/src/devices/bus/a2gameio/computereyes.cpp @@ -31,12 +31,12 @@ protected: virtual void device_reset() override; // device_a2gameio_interface overrides - virtual DECLARE_READ_LINE_MEMBER(sw0_r) override; - virtual DECLARE_READ_LINE_MEMBER(sw1_r) override; - virtual DECLARE_WRITE_LINE_MEMBER(an0_w) override; - virtual DECLARE_WRITE_LINE_MEMBER(an1_w) override; - virtual DECLARE_WRITE_LINE_MEMBER(an2_w) override; - virtual DECLARE_WRITE_LINE_MEMBER(an3_w) override; + virtual int sw0_r() override; + virtual int sw1_r() override; + virtual void an0_w(int state) override; + virtual void an1_w(int state) override; + virtual void an2_w(int state) override; + virtual void an3_w(int state) override; private: required_device m_picture; @@ -75,12 +75,12 @@ void apple2_compeyes_device::device_reset() m_x = m_y = m_an1 = m_an2 = m_an3 = m_level = 0; } -READ_LINE_MEMBER(apple2_compeyes_device::sw0_r) +int apple2_compeyes_device::sw0_r() { return 0; } -READ_LINE_MEMBER(apple2_compeyes_device::sw1_r) +int apple2_compeyes_device::sw1_r() { // to avoid triggering the self-test on //e, return only 0 // for the first 2 seconds of emulation. @@ -104,7 +104,7 @@ READ_LINE_MEMBER(apple2_compeyes_device::sw1_r) return res; } -WRITE_LINE_MEMBER(apple2_compeyes_device::an0_w) +void apple2_compeyes_device::an0_w(int state) { m_x = m_y = 0; @@ -131,19 +131,19 @@ WRITE_LINE_MEMBER(apple2_compeyes_device::an0_w) } } -WRITE_LINE_MEMBER(apple2_compeyes_device::an1_w) +void apple2_compeyes_device::an1_w(int state) { m_an1 = state; m_level = (128 * m_an2) + (64 * m_an1) + (32 * m_an3); } -WRITE_LINE_MEMBER(apple2_compeyes_device::an2_w) +void apple2_compeyes_device::an2_w(int state) { m_an2 = state; m_level = (128 * m_an2) + (64 * m_an1) + (32 * m_an3); } -WRITE_LINE_MEMBER(apple2_compeyes_device::an3_w) +void apple2_compeyes_device::an3_w(int state) { m_an3 = state; m_level = (128 * m_an2) + (64 * m_an1) + (32 * m_an3); diff --git a/src/devices/bus/a2gameio/gameio.cpp b/src/devices/bus/a2gameio/gameio.cpp index 9a600776a90..99f60e78f27 100644 --- a/src/devices/bus/a2gameio/gameio.cpp +++ b/src/devices/bus/a2gameio/gameio.cpp @@ -139,7 +139,7 @@ u8 apple2_gameio_device::pdl3_r() return 0; } -READ_LINE_MEMBER(apple2_gameio_device::sw0_r) +int apple2_gameio_device::sw0_r() { if (m_intf != nullptr) return m_intf->sw0_r(); @@ -147,7 +147,7 @@ READ_LINE_MEMBER(apple2_gameio_device::sw0_r) return m_sw_pullups ? 1 : 0; } -READ_LINE_MEMBER(apple2_gameio_device::sw1_r) +int apple2_gameio_device::sw1_r() { if (m_intf != nullptr) return m_intf->sw1_r(); @@ -155,7 +155,7 @@ READ_LINE_MEMBER(apple2_gameio_device::sw1_r) return m_sw_pullups ? 1 : 0; } -READ_LINE_MEMBER(apple2_gameio_device::sw2_r) +int apple2_gameio_device::sw2_r() { if (m_intf != nullptr) return m_intf->sw2_r(); @@ -163,7 +163,7 @@ READ_LINE_MEMBER(apple2_gameio_device::sw2_r) return m_sw_pullups ? 1 : 0; } -READ_LINE_MEMBER(apple2_gameio_device::sw3_r) +int apple2_gameio_device::sw3_r() { if (m_intf != nullptr) return m_intf->sw3_r(); @@ -171,37 +171,37 @@ READ_LINE_MEMBER(apple2_gameio_device::sw3_r) return m_sw_pullups ? 1 : 0; } -WRITE_LINE_MEMBER(apple2_gameio_device::an0_w) +void apple2_gameio_device::an0_w(int state) { if (m_intf != nullptr) m_intf->an0_w(state); } -WRITE_LINE_MEMBER(apple2_gameio_device::an1_w) +void apple2_gameio_device::an1_w(int state) { if (m_intf != nullptr) m_intf->an1_w(state); } -WRITE_LINE_MEMBER(apple2_gameio_device::an2_w) +void apple2_gameio_device::an2_w(int state) { if (m_intf != nullptr) m_intf->an2_w(state); } -WRITE_LINE_MEMBER(apple2_gameio_device::an3_w) +void apple2_gameio_device::an3_w(int state) { if (m_intf != nullptr) m_intf->an3_w(state); } -WRITE_LINE_MEMBER(apple2_gameio_device::an4_w) +void apple2_gameio_device::an4_w(int state) { if (m_intf != nullptr) m_intf->an4_w(state); } -WRITE_LINE_MEMBER(apple2_gameio_device::strobe_w) +void apple2_gameio_device::strobe_w(int state) { if (m_intf != nullptr) m_intf->strobe_w(state); diff --git a/src/devices/bus/a2gameio/gameio.h b/src/devices/bus/a2gameio/gameio.h index 7ff1771b17b..54690bd683a 100644 --- a/src/devices/bus/a2gameio/gameio.h +++ b/src/devices/bus/a2gameio/gameio.h @@ -52,20 +52,20 @@ public: u8 pdl3_r(); // digital switches - DECLARE_READ_LINE_MEMBER(sw0_r); - DECLARE_READ_LINE_MEMBER(sw1_r); - DECLARE_READ_LINE_MEMBER(sw2_r); - DECLARE_READ_LINE_MEMBER(sw3_r); + int sw0_r(); + int sw1_r(); + int sw2_r(); + int sw3_r(); // annunciator outputs - DECLARE_WRITE_LINE_MEMBER(an0_w); - DECLARE_WRITE_LINE_MEMBER(an1_w); - DECLARE_WRITE_LINE_MEMBER(an2_w); - DECLARE_WRITE_LINE_MEMBER(an3_w); - DECLARE_WRITE_LINE_MEMBER(an4_w); + void an0_w(int state); + void an1_w(int state); + void an2_w(int state); + void an3_w(int state); + void an4_w(int state); // utility strobe (active low) - DECLARE_WRITE_LINE_MEMBER(strobe_w); + void strobe_w(int state); // check if a device is connected bool is_device_connected() { return (m_intf != nullptr); } @@ -101,18 +101,18 @@ protected: virtual u8 pdl1_r() { return 0; } virtual u8 pdl2_r() { return 0; } virtual u8 pdl3_r() { return 0; } - virtual DECLARE_READ_LINE_MEMBER(sw0_r) { return m_connector->has_sw_pullups() ? 1 : 0; } - virtual DECLARE_READ_LINE_MEMBER(sw1_r) { return m_connector->has_sw_pullups() ? 1 : 0; } - virtual DECLARE_READ_LINE_MEMBER(sw2_r) { return m_connector->has_sw_pullups() ? 1 : 0; } - virtual DECLARE_READ_LINE_MEMBER(sw3_r) { return m_connector->has_sw_pullups() ? 1 : 0; } + virtual int sw0_r() { return m_connector->has_sw_pullups() ? 1 : 0; } + virtual int sw1_r() { return m_connector->has_sw_pullups() ? 1 : 0; } + virtual int sw2_r() { return m_connector->has_sw_pullups() ? 1 : 0; } + virtual int sw3_r() { return m_connector->has_sw_pullups() ? 1 : 0; } // optional output overrides - virtual DECLARE_WRITE_LINE_MEMBER(an0_w) { } - virtual DECLARE_WRITE_LINE_MEMBER(an1_w) { } - virtual DECLARE_WRITE_LINE_MEMBER(an2_w) { } - virtual DECLARE_WRITE_LINE_MEMBER(an3_w) { } - virtual DECLARE_WRITE_LINE_MEMBER(an4_w) { } - virtual DECLARE_WRITE_LINE_MEMBER(strobe_w) { } + virtual void an0_w(int state) { } + virtual void an1_w(int state) { } + virtual void an2_w(int state) { } + virtual void an3_w(int state) { } + virtual void an4_w(int state) { } + virtual void strobe_w(int state) { } private: apple2_gameio_device *m_connector; diff --git a/src/devices/bus/a2gameio/gizmo.cpp b/src/devices/bus/a2gameio/gizmo.cpp index 999fdf94ded..c7bcbac826b 100644 --- a/src/devices/bus/a2gameio/gizmo.cpp +++ b/src/devices/bus/a2gameio/gizmo.cpp @@ -27,10 +27,10 @@ protected: virtual void device_start() override; // device_a2gameio_interface overrides - virtual DECLARE_READ_LINE_MEMBER(sw0_r) override; - virtual DECLARE_WRITE_LINE_MEMBER(an0_w) override; - virtual DECLARE_WRITE_LINE_MEMBER(an1_w) override; - virtual DECLARE_WRITE_LINE_MEMBER(an2_w) override; + virtual int sw0_r() override; + virtual void an0_w(int state) override; + virtual void an1_w(int state) override; + virtual void an2_w(int state) override; private: // input ports @@ -74,23 +74,23 @@ void apple2_gizmo_device::device_start() save_item(NAME(m_an2)); } -READ_LINE_MEMBER(apple2_gizmo_device::sw0_r) +int apple2_gizmo_device::sw0_r() { static const int gizmo_bits[8] = { 1,3,2,0,4,5,5,5 }; return BIT(m_player1->read(),gizmo_bits[m_an0+(m_an1<<1)+(m_an2<<2)]); } -WRITE_LINE_MEMBER(apple2_gizmo_device::an0_w) +void apple2_gizmo_device::an0_w(int state) { m_an0 = state; } -WRITE_LINE_MEMBER(apple2_gizmo_device::an1_w) +void apple2_gizmo_device::an1_w(int state) { m_an1 = state; } -WRITE_LINE_MEMBER(apple2_gizmo_device::an2_w) +void apple2_gizmo_device::an2_w(int state) { m_an2 = state; } diff --git a/src/devices/bus/a2gameio/joyport.cpp b/src/devices/bus/a2gameio/joyport.cpp index 1c2f1118216..3d00fe504c3 100644 --- a/src/devices/bus/a2gameio/joyport.cpp +++ b/src/devices/bus/a2gameio/joyport.cpp @@ -33,11 +33,11 @@ protected: virtual void device_start() override; // device_a2gameio_interface overrides - virtual DECLARE_READ_LINE_MEMBER(sw0_r) override; - virtual DECLARE_READ_LINE_MEMBER(sw1_r) override; - virtual DECLARE_READ_LINE_MEMBER(sw2_r) override; - virtual DECLARE_WRITE_LINE_MEMBER(an0_w) override; - virtual DECLARE_WRITE_LINE_MEMBER(an1_w) override; + virtual int sw0_r() override; + virtual int sw1_r() override; + virtual int sw2_r() override; + virtual void an0_w(int state) override; + virtual void an1_w(int state) override; private: // input ports @@ -88,33 +88,33 @@ void apple2_joyport_device::device_start() save_item(NAME(m_an1)); } -READ_LINE_MEMBER(apple2_joyport_device::sw0_r) +int apple2_joyport_device::sw0_r() { u8 port_read = m_an0 ? m_player2->read() : m_player1->read(); return BIT(port_read, 4); } -READ_LINE_MEMBER(apple2_joyport_device::sw1_r) +int apple2_joyport_device::sw1_r() { u8 port_read = m_an0 ? m_player2->read() : m_player1->read(); return m_an1 ? BIT(port_read, 0) : BIT(port_read, 3); } -READ_LINE_MEMBER(apple2_joyport_device::sw2_r) +int apple2_joyport_device::sw2_r() { u8 port_read = m_an0 ? m_player2->read() : m_player1->read(); return m_an1 ? BIT(port_read, 2) : BIT(port_read, 1); } -WRITE_LINE_MEMBER(apple2_joyport_device::an0_w) +void apple2_joyport_device::an0_w(int state) { m_an0 = state; } -WRITE_LINE_MEMBER(apple2_joyport_device::an1_w) +void apple2_joyport_device::an1_w(int state) { m_an1 = state; } diff --git a/src/devices/bus/a2gameio/joystick.cpp b/src/devices/bus/a2gameio/joystick.cpp index 498b32757e2..b4a2d397322 100644 --- a/src/devices/bus/a2gameio/joystick.cpp +++ b/src/devices/bus/a2gameio/joystick.cpp @@ -29,10 +29,10 @@ protected: virtual u8 pdl1_r() override; virtual u8 pdl2_r() override; virtual u8 pdl3_r() override; - virtual DECLARE_READ_LINE_MEMBER(sw0_r) override; - virtual DECLARE_READ_LINE_MEMBER(sw1_r) override; - virtual DECLARE_READ_LINE_MEMBER(sw2_r) override; - virtual DECLARE_READ_LINE_MEMBER(sw3_r) override; + virtual int sw0_r() override; + virtual int sw1_r() override; + virtual int sw2_r() override; + virtual int sw3_r() override; private: // input ports @@ -131,22 +131,22 @@ u8 apple2_joystick_device::pdl3_r() return m_joy_y[1]->read(); } -READ_LINE_MEMBER(apple2_joystick_device::sw0_r) +int apple2_joystick_device::sw0_r() { return BIT(m_buttons->read(), 4); } -READ_LINE_MEMBER(apple2_joystick_device::sw1_r) +int apple2_joystick_device::sw1_r() { return BIT(m_buttons->read(), 5); } -READ_LINE_MEMBER(apple2_joystick_device::sw2_r) +int apple2_joystick_device::sw2_r() { return BIT(m_buttons->read(), 6); } -READ_LINE_MEMBER(apple2_joystick_device::sw3_r) +int apple2_joystick_device::sw3_r() { return BIT(m_buttons->read(), 7); } diff --git a/src/devices/bus/a2gameio/paddles.cpp b/src/devices/bus/a2gameio/paddles.cpp index 5f0955fba89..fd5d106f53d 100644 --- a/src/devices/bus/a2gameio/paddles.cpp +++ b/src/devices/bus/a2gameio/paddles.cpp @@ -29,10 +29,10 @@ protected: virtual u8 pdl1_r() override; virtual u8 pdl2_r() override; virtual u8 pdl3_r() override; - virtual DECLARE_READ_LINE_MEMBER(sw0_r) override; - virtual DECLARE_READ_LINE_MEMBER(sw1_r) override; - virtual DECLARE_READ_LINE_MEMBER(sw2_r) override; - virtual DECLARE_READ_LINE_MEMBER(sw3_r) override; + virtual int sw0_r() override; + virtual int sw1_r() override; + virtual int sw2_r() override; + virtual int sw3_r() override; private: // input ports @@ -105,22 +105,22 @@ u8 apple2_paddles_device::pdl3_r() return m_pdl[3]->read(); } -READ_LINE_MEMBER(apple2_paddles_device::sw0_r) +int apple2_paddles_device::sw0_r() { return BIT(m_buttons->read(), 4); } -READ_LINE_MEMBER(apple2_paddles_device::sw1_r) +int apple2_paddles_device::sw1_r() { return BIT(m_buttons->read(), 5); } -READ_LINE_MEMBER(apple2_paddles_device::sw2_r) +int apple2_paddles_device::sw2_r() { return BIT(m_buttons->read(), 6); } -READ_LINE_MEMBER(apple2_paddles_device::sw3_r) +int apple2_paddles_device::sw3_r() { return BIT(m_buttons->read(), 7); } diff --git a/src/devices/bus/a800/a8sio.cpp b/src/devices/bus/a800/a8sio.cpp index 41fb3f863e5..9a4dca9187b 100644 --- a/src/devices/bus/a800/a8sio.cpp +++ b/src/devices/bus/a800/a8sio.cpp @@ -104,41 +104,41 @@ device_a8sio_card_interface *a8sio_device::get_a8sio_card() return m_device; } -WRITE_LINE_MEMBER( a8sio_device::clock_in_w ) +void a8sio_device::clock_in_w(int state) { m_out_clock_in_cb(state); } -WRITE_LINE_MEMBER( a8sio_device::clock_out_w ) +void a8sio_device::clock_out_w(int state) { if (m_device) m_device->clock_out_w(state); } -WRITE_LINE_MEMBER( a8sio_device::data_in_w ) +void a8sio_device::data_in_w(int state) { m_out_data_in_cb(state); } -WRITE_LINE_MEMBER( a8sio_device::data_out_w ) +void a8sio_device::data_out_w(int state) { if (m_device) m_device->data_out_w(state); } -WRITE_LINE_MEMBER( a8sio_device::command_w ) +void a8sio_device::command_w(int state) { if (m_device) m_device->command_w(state); } -WRITE_LINE_MEMBER( a8sio_device::motor_w ) +void a8sio_device::motor_w(int state) { if (m_device) m_device->motor_w(state); } -WRITE_LINE_MEMBER( a8sio_device::proceed_w ) +void a8sio_device::proceed_w(int state) { m_out_proceed_cb(state); } @@ -148,7 +148,7 @@ void a8sio_device::audio_in_w(uint8_t data) m_out_audio_in_cb(data); } -WRITE_LINE_MEMBER( a8sio_device::interrupt_w ) +void a8sio_device::interrupt_w(int state) { m_out_interrupt_cb(state); } @@ -182,24 +182,24 @@ void device_a8sio_card_interface::set_a8sio_device(a8sio_device *sio) m_a8sio = sio; } -WRITE_LINE_MEMBER( device_a8sio_card_interface::clock_out_w ) +void device_a8sio_card_interface::clock_out_w(int state) { } -WRITE_LINE_MEMBER( device_a8sio_card_interface::data_out_w ) +void device_a8sio_card_interface::data_out_w(int state) { } -WRITE_LINE_MEMBER( device_a8sio_card_interface::command_w ) +void device_a8sio_card_interface::command_w(int state) { } -WRITE_LINE_MEMBER( device_a8sio_card_interface::motor_w ) +void device_a8sio_card_interface::motor_w(int state) { //printf("device_a8sio_card_interface::motor_w %d\n", state); } -WRITE_LINE_MEMBER( device_a8sio_card_interface::ready_w ) +void device_a8sio_card_interface::ready_w(int state) { } diff --git a/src/devices/bus/a800/a8sio.h b/src/devices/bus/a800/a8sio.h index 643dffe19a5..dfc04577466 100644 --- a/src/devices/bus/a800/a8sio.h +++ b/src/devices/bus/a800/a8sio.h @@ -62,15 +62,15 @@ public: device_a8sio_card_interface *get_a8sio_card(); - DECLARE_WRITE_LINE_MEMBER( clock_in_w ); // pin 1 - DECLARE_WRITE_LINE_MEMBER( clock_out_w ); // pin 2 - DECLARE_WRITE_LINE_MEMBER( data_in_w ); // pin 3 - DECLARE_WRITE_LINE_MEMBER( data_out_w ); // pin 5 - DECLARE_WRITE_LINE_MEMBER( command_w ); // pin 7 - DECLARE_WRITE_LINE_MEMBER( motor_w ); // pin 8 - DECLARE_WRITE_LINE_MEMBER( proceed_w ); // pin 9 - void audio_in_w(uint8_t data); // pin 11 - DECLARE_WRITE_LINE_MEMBER( interrupt_w ); // pin 13 + void clock_in_w(int state); // pin 1 + void clock_out_w(int state); // pin 2 + void data_in_w(int state); // pin 3 + void data_out_w(int state); // pin 5 + void command_w(int state); // pin 7 + void motor_w(int state); // pin 8 + void proceed_w(int state); // pin 9 + void audio_in_w(uint8_t data); // pin 11 + void interrupt_w(int state); // pin 13 protected: a8sio_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); @@ -102,11 +102,11 @@ public: void set_a8sio_device(a8sio_device *sio); - virtual DECLARE_WRITE_LINE_MEMBER( clock_out_w ); - virtual DECLARE_WRITE_LINE_MEMBER( data_out_w ); - virtual DECLARE_WRITE_LINE_MEMBER( command_w ); - virtual DECLARE_WRITE_LINE_MEMBER( motor_w ); - virtual DECLARE_WRITE_LINE_MEMBER( ready_w ); + virtual void clock_out_w(int state); + virtual void data_out_w(int state); + virtual void command_w(int state); + virtual void motor_w(int state); + virtual void ready_w(int state); public: device_a8sio_card_interface(const machine_config &mconfig, device_t &device); diff --git a/src/devices/bus/a800/atari1050.cpp b/src/devices/bus/a800/atari1050.cpp index 12191d4cc72..532b19723b7 100644 --- a/src/devices/bus/a800/atari1050.cpp +++ b/src/devices/bus/a800/atari1050.cpp @@ -52,17 +52,17 @@ void atari1050_device::mem_map(address_map &map) } -WRITE_LINE_MEMBER(atari1050_device::data_out_w) +void atari1050_device::data_out_w(int state) { m_pia->pb6_w(state); } -WRITE_LINE_MEMBER(atari1050_device::command_w) +void atari1050_device::command_w(int state) { m_pia->pb7_w(state); } -WRITE_LINE_MEMBER(atari1050_device::ready_w) +void atari1050_device::ready_w(int state) { m_pia->pb1_w(state); } diff --git a/src/devices/bus/a800/atari1050.h b/src/devices/bus/a800/atari1050.h index 48e32b86430..413e7bb5560 100644 --- a/src/devices/bus/a800/atari1050.h +++ b/src/devices/bus/a800/atari1050.h @@ -29,9 +29,9 @@ protected: virtual void device_add_mconfig(machine_config &config) override; virtual const tiny_rom_entry *device_rom_region() const override; - virtual DECLARE_WRITE_LINE_MEMBER(data_out_w) override; - virtual DECLARE_WRITE_LINE_MEMBER(command_w) override; - virtual DECLARE_WRITE_LINE_MEMBER(ready_w) override; + virtual void data_out_w(int state) override; + virtual void command_w(int state) override; + virtual void ready_w(int state) override; private: void step_w(u8 data); diff --git a/src/devices/bus/a800/atari810.cpp b/src/devices/bus/a800/atari810.cpp index 69b5bd09d2f..c3111ea1030 100644 --- a/src/devices/bus/a800/atari810.cpp +++ b/src/devices/bus/a800/atari810.cpp @@ -50,17 +50,17 @@ void atari810_device::mem_map(address_map &map) } -WRITE_LINE_MEMBER(atari810_device::data_out_w) +void atari810_device::data_out_w(int state) { m_pia->pb7_w(state); } -WRITE_LINE_MEMBER(atari810_device::command_w) +void atari810_device::command_w(int state) { m_pia->pb6_w(state); } -WRITE_LINE_MEMBER(atari810_device::ready_w) +void atari810_device::ready_w(int state) { m_pia->pb1_w(state); } diff --git a/src/devices/bus/a800/atari810.h b/src/devices/bus/a800/atari810.h index 1bbe8db0f8c..3ff1b402a39 100644 --- a/src/devices/bus/a800/atari810.h +++ b/src/devices/bus/a800/atari810.h @@ -29,9 +29,9 @@ protected: virtual void device_add_mconfig(machine_config &config) override; virtual const tiny_rom_entry *device_rom_region() const override; - virtual DECLARE_WRITE_LINE_MEMBER(data_out_w) override; - virtual DECLARE_WRITE_LINE_MEMBER(command_w) override; - virtual DECLARE_WRITE_LINE_MEMBER(ready_w) override; + virtual void data_out_w(int state) override; + virtual void command_w(int state) override; + virtual void ready_w(int state) override; private: void step_w(u8 data); diff --git a/src/devices/bus/a800/cassette.cpp b/src/devices/bus/a800/cassette.cpp index 32d9fe0b390..ca5486ac7cd 100644 --- a/src/devices/bus/a800/cassette.cpp +++ b/src/devices/bus/a800/cassette.cpp @@ -66,7 +66,7 @@ void a8sio_cassette_device::device_reset() { } -WRITE_LINE_MEMBER( a8sio_cassette_device::motor_w ) +void a8sio_cassette_device::motor_w(int state) { //printf("a8sio_cassette::motor_w %d\n", state); if (!state) diff --git a/src/devices/bus/a800/cassette.h b/src/devices/bus/a800/cassette.h index d1c91c5a2fa..c2436946b66 100644 --- a/src/devices/bus/a800/cassette.h +++ b/src/devices/bus/a800/cassette.h @@ -29,7 +29,7 @@ public: // construction/destruction a8sio_cassette_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - virtual DECLARE_WRITE_LINE_MEMBER( motor_w ) override; + virtual void motor_w(int state) override; protected: a8sio_cassette_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); diff --git a/src/devices/bus/abcbus/abcbus.h b/src/devices/bus/abcbus/abcbus.h index e8ce92a2d9b..638d460efa3 100644 --- a/src/devices/bus/abcbus/abcbus.h +++ b/src/devices/bus/abcbus/abcbus.h @@ -192,16 +192,16 @@ public: void write_c4(uint8_t data) { if (m_card) m_card->abcbus_c4(data); } uint8_t xmemfl_r(offs_t offset) { return m_card ? m_card->abcbus_xmemfl(offset) : 0xff; } void xmemw_w(offs_t offset, uint8_t data) { if (m_card) m_card->abcbus_xmemw(offset, data); } - DECLARE_READ_LINE_MEMBER( csb_r ) { return m_card ? m_card->abcbus_csb() : 1; } + int csb_r() { return m_card ? m_card->abcbus_csb() : 1; } uint8_t ops_r() { return m_card ? m_card->abcbus_ops() : 0xff; } uint8_t exp_r() { return m_card ? m_card->abcbus_exp() : 0xff; } - DECLARE_READ_LINE_MEMBER( xcsb2_r ) { return m_card ? m_card->abcbus_xcsb2() : 1; } - DECLARE_READ_LINE_MEMBER( xcsb3_r ) { return m_card ? m_card->abcbus_xcsb3() : 1; } - DECLARE_READ_LINE_MEMBER( xcsb4_r ) { return m_card ? m_card->abcbus_xcsb4() : 1; } - DECLARE_READ_LINE_MEMBER( xcsb5_r ) { return m_card ? m_card->abcbus_xcsb5() : 1; } + int xcsb2_r() { return m_card ? m_card->abcbus_xcsb2() : 1; } + int xcsb3_r() { return m_card ? m_card->abcbus_xcsb3() : 1; } + int xcsb4_r() { return m_card ? m_card->abcbus_xcsb4() : 1; } + int xcsb5_r() { return m_card ? m_card->abcbus_xcsb5() : 1; } uint8_t read_tren() { return m_card ? m_card->abcbus_tren() : 0xff; } void write_tren(uint8_t data) { if (m_card) m_card->abcbus_tren(data); } - DECLARE_WRITE_LINE_MEMBER( prac_w ) { if (m_card) m_card->abcbus_prac(state); } + void prac_w(int state) { if (m_card) m_card->abcbus_prac(state); } void cs_w(uint8_t data) { write_cs(data); } uint8_t rst_r() { return read_rst(); } @@ -213,26 +213,26 @@ public: void c3_w(uint8_t data) { write_c3(data); } void c4_w(uint8_t data) { write_c4(data); } - DECLARE_READ_LINE_MEMBER( irq_r ) { return m_irq; } - DECLARE_READ_LINE_MEMBER( nmi_r ) { return m_nmi; } - DECLARE_READ_LINE_MEMBER( pren_r ) { return m_pren; } - DECLARE_READ_LINE_MEMBER( trrq_r ) { return m_trrq; } - DECLARE_READ_LINE_MEMBER( xint2_r ) { return m_xint2; } - DECLARE_READ_LINE_MEMBER( xint3_r ) { return m_xint3; } - DECLARE_READ_LINE_MEMBER( xint4_r ) { return m_xint4; } - DECLARE_READ_LINE_MEMBER( xint5_r ) { return m_xint5; } + int irq_r() { return m_irq; } + int nmi_r() { return m_nmi; } + int pren_r() { return m_pren; } + int trrq_r() { return m_trrq; } + int xint2_r() { return m_xint2; } + int xint3_r() { return m_xint3; } + int xint4_r() { return m_xint4; } + int xint5_r() { return m_xint5; } // card interface - DECLARE_WRITE_LINE_MEMBER( irq_w ) { if (m_irq != state) { m_irq = state; m_write_irq(state); } } - DECLARE_WRITE_LINE_MEMBER( nmi_w ) { m_nmi = state; m_write_nmi(state); } - DECLARE_WRITE_LINE_MEMBER( rdy_w ) { m_write_rdy(state); } - DECLARE_WRITE_LINE_MEMBER( resin_w ) { m_write_resin(state); } - DECLARE_WRITE_LINE_MEMBER( pren_w ) { if (m_pren != state) { m_pren = state; m_write_pren(state); } } - DECLARE_WRITE_LINE_MEMBER( trrq_w ) { if (m_trrq != state) { m_trrq = state; m_write_trrq(state); } } - DECLARE_WRITE_LINE_MEMBER( xint2_w ) { m_xint2 = state; m_write_xint2(state); } - DECLARE_WRITE_LINE_MEMBER( xint3_w ) { m_xint3 = state; m_write_xint3(state); } - DECLARE_WRITE_LINE_MEMBER( xint4_w ) { m_xint4 = state; m_write_xint4(state); } - DECLARE_WRITE_LINE_MEMBER( xint5_w ) { m_xint5 = state; m_write_xint5(state); } + void irq_w(int state) { if (m_irq != state) { m_irq = state; m_write_irq(state); } } + void nmi_w(int state) { m_nmi = state; m_write_nmi(state); } + void rdy_w(int state) { m_write_rdy(state); } + void resin_w(int state) { m_write_resin(state); } + void pren_w(int state) { if (m_pren != state) { m_pren = state; m_write_pren(state); } } + void trrq_w(int state) { if (m_trrq != state) { m_trrq = state; m_write_trrq(state); } } + void xint2_w(int state) { m_xint2 = state; m_write_xint2(state); } + void xint3_w(int state) { m_xint3 = state; m_write_xint3(state); } + void xint4_w(int state) { m_xint4 = state; m_write_xint4(state); } + void xint5_w(int state) { m_xint5 = state; m_write_xint5(state); } protected: // device-level overrides diff --git a/src/devices/bus/abcbus/lux10828.cpp b/src/devices/bus/abcbus/lux10828.cpp index 1c1535e9b87..34288b40257 100644 --- a/src/devices/bus/abcbus/lux10828.cpp +++ b/src/devices/bus/abcbus/lux10828.cpp @@ -306,7 +306,7 @@ void luxor_55_10828_device::floppy_formats(format_registration &fr) fr.add(FLOPPY_ABC800_FORMAT); } -WRITE_LINE_MEMBER( luxor_55_10828_device::fdc_intrq_w ) +void luxor_55_10828_device::fdc_intrq_w(int state) { m_fdc_irq = state; m_pio->port_b_write(state << 7); @@ -314,7 +314,7 @@ WRITE_LINE_MEMBER( luxor_55_10828_device::fdc_intrq_w ) //if (state) m_maincpu->wait_w(CLEAR_LINE); } -WRITE_LINE_MEMBER( luxor_55_10828_device::fdc_drq_w ) +void luxor_55_10828_device::fdc_drq_w(int state) { m_fdc_drq = state; diff --git a/src/devices/bus/abcbus/lux10828.h b/src/devices/bus/abcbus/lux10828.h index 0766de4d547..d23820b93af 100644 --- a/src/devices/bus/abcbus/lux10828.h +++ b/src/devices/bus/abcbus/lux10828.h @@ -81,8 +81,8 @@ private: uint8_t pio_pb_r(); void pio_pb_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER( fdc_intrq_w ); - DECLARE_WRITE_LINE_MEMBER( fdc_drq_w ); + void fdc_intrq_w(int state); + void fdc_drq_w(int state); void ctrl_w(uint8_t data); void status_w(uint8_t data); diff --git a/src/devices/bus/abcbus/lux21046.cpp b/src/devices/bus/abcbus/lux21046.cpp index f004990a8fc..6d17cbbf315 100644 --- a/src/devices/bus/abcbus/lux21046.cpp +++ b/src/devices/bus/abcbus/lux21046.cpp @@ -226,7 +226,7 @@ void luxor_55_21046_device::luxor_55_21046_io(address_map &map) */ -WRITE_LINE_MEMBER( luxor_55_21046_device::dma_int_w ) +void luxor_55_21046_device::dma_int_w(int state) { m_dma_irq = state; @@ -271,7 +271,7 @@ static void abc_floppies(device_slot_interface &device) device.option_add("8dsdd", FLOPPY_8_DSDD); } -WRITE_LINE_MEMBER( luxor_55_21046_device::fdc_intrq_w ) +void luxor_55_21046_device::fdc_intrq_w(int state) { m_fdc_irq = state; diff --git a/src/devices/bus/abcbus/lux21046.h b/src/devices/bus/abcbus/lux21046.h index a45eb11d130..89c2adba047 100644 --- a/src/devices/bus/abcbus/lux21046.h +++ b/src/devices/bus/abcbus/lux21046.h @@ -84,14 +84,14 @@ protected: required_device m_floppy1; private: - DECLARE_WRITE_LINE_MEMBER( dma_int_w ); + void dma_int_w(int state); uint8_t memory_read_byte(offs_t offset); void memory_write_byte(offs_t offset, uint8_t data); uint8_t io_read_byte(offs_t offset); void io_write_byte(offs_t offset, uint8_t data); - DECLARE_WRITE_LINE_MEMBER( fdc_intrq_w ); + void fdc_intrq_w(int state); uint8_t out_r(); void inp_w(uint8_t data); diff --git a/src/devices/bus/abcbus/lux21056.cpp b/src/devices/bus/abcbus/lux21056.cpp index f14ea5a0f68..f1f4ca536b0 100644 --- a/src/devices/bus/abcbus/lux21056.cpp +++ b/src/devices/bus/abcbus/lux21056.cpp @@ -198,7 +198,7 @@ void luxor_55_21056_device::io_write_byte(offs_t offset, uint8_t data) } -WRITE_LINE_MEMBER( luxor_55_21056_device::write_sasi_bsy ) +void luxor_55_21056_device::write_sasi_bsy(int state) { m_sasi_bsy = state; @@ -208,7 +208,7 @@ WRITE_LINE_MEMBER( luxor_55_21056_device::write_sasi_bsy ) } } -WRITE_LINE_MEMBER( luxor_55_21056_device::write_sasi_io ) +void luxor_55_21056_device::write_sasi_io(int state) { m_sasi_io = state; @@ -222,7 +222,7 @@ WRITE_LINE_MEMBER( luxor_55_21056_device::write_sasi_io ) } } -WRITE_LINE_MEMBER( luxor_55_21056_device::write_sasi_req ) +void luxor_55_21056_device::write_sasi_req(int state) { m_sasi_req = state; @@ -233,12 +233,12 @@ WRITE_LINE_MEMBER( luxor_55_21056_device::write_sasi_req ) } } -WRITE_LINE_MEMBER( luxor_55_21056_device::write_sasi_cd ) +void luxor_55_21056_device::write_sasi_cd(int state) { m_sasi_cd = state; } -WRITE_LINE_MEMBER( luxor_55_21056_device::write_sasi_msg ) +void luxor_55_21056_device::write_sasi_msg(int state) { m_sasi_msg = state; } diff --git a/src/devices/bus/abcbus/lux21056.h b/src/devices/bus/abcbus/lux21056.h index 812bb8325a3..bf70c79bae1 100644 --- a/src/devices/bus/abcbus/lux21056.h +++ b/src/devices/bus/abcbus/lux21056.h @@ -58,11 +58,11 @@ private: uint8_t io_read_byte(offs_t offset); void io_write_byte(offs_t offset, uint8_t data); - DECLARE_WRITE_LINE_MEMBER( write_sasi_req ); - DECLARE_WRITE_LINE_MEMBER( write_sasi_io ); - DECLARE_WRITE_LINE_MEMBER( write_sasi_cd ); - DECLARE_WRITE_LINE_MEMBER( write_sasi_msg ); - DECLARE_WRITE_LINE_MEMBER( write_sasi_bsy ); + void write_sasi_req(int state); + void write_sasi_io(int state); + void write_sasi_cd(int state); + void write_sasi_msg(int state); + void write_sasi_bsy(int state); uint8_t sasi_status_r(); void stat_w(uint8_t data); diff --git a/src/devices/bus/abcbus/lux4105.cpp b/src/devices/bus/abcbus/lux4105.cpp index 85400f57786..1db5d0d3869 100644 --- a/src/devices/bus/abcbus/lux4105.cpp +++ b/src/devices/bus/abcbus/lux4105.cpp @@ -286,7 +286,7 @@ void luxor_4105_device::write_sasi_data(uint8_t data) } -WRITE_LINE_MEMBER( luxor_4105_device::write_sasi_bsy ) +void luxor_4105_device::write_sasi_bsy(int state) { if (state) { @@ -295,13 +295,13 @@ WRITE_LINE_MEMBER( luxor_4105_device::write_sasi_bsy ) } -WRITE_LINE_MEMBER( luxor_4105_device::write_sasi_cd ) +void luxor_4105_device::write_sasi_cd(int state) { update_dma(); } -WRITE_LINE_MEMBER( luxor_4105_device::write_sasi_req ) +void luxor_4105_device::write_sasi_req(int state) { if (LOG) logerror("%s REQ %u\n", machine().describe_context(), state); @@ -316,13 +316,13 @@ WRITE_LINE_MEMBER( luxor_4105_device::write_sasi_req ) } -WRITE_LINE_MEMBER( luxor_4105_device::write_sasi_msg ) +void luxor_4105_device::write_sasi_msg(int state) { update_ack(); } -WRITE_LINE_MEMBER( luxor_4105_device::write_sasi_io ) +void luxor_4105_device::write_sasi_io(int state) { if (state) { diff --git a/src/devices/bus/abcbus/lux4105.h b/src/devices/bus/abcbus/lux4105.h index dde20ad3075..75003907c65 100644 --- a/src/devices/bus/abcbus/lux4105.h +++ b/src/devices/bus/abcbus/lux4105.h @@ -61,11 +61,11 @@ private: void write_dma_register(uint8_t data); void write_sasi_data(uint8_t data); - DECLARE_WRITE_LINE_MEMBER( write_sasi_bsy ); - DECLARE_WRITE_LINE_MEMBER( write_sasi_cd ); - DECLARE_WRITE_LINE_MEMBER( write_sasi_req ); - DECLARE_WRITE_LINE_MEMBER( write_sasi_msg ); - DECLARE_WRITE_LINE_MEMBER( write_sasi_io ); + void write_sasi_bsy(int state); + void write_sasi_cd(int state); + void write_sasi_req(int state); + void write_sasi_msg(int state); + void write_sasi_io(int state); required_device m_sasi; required_ioport m_1e; diff --git a/src/devices/bus/abckb/abc77.h b/src/devices/bus/abckb/abc77.h index 779e3e1fdb8..304f8c3329f 100644 --- a/src/devices/bus/abckb/abc77.h +++ b/src/devices/bus/abckb/abc77.h @@ -72,8 +72,8 @@ private: uint8_t p1_r(); void p2_w(uint8_t data); - DECLARE_READ_LINE_MEMBER( t1_r ) { return m_clock; } - DECLARE_WRITE_LINE_MEMBER( prog_w ) { m_stb = state; } + int t1_r() { return m_clock; } + void prog_w(int state) { m_stb = state; } void j3_w(uint8_t data) { m_j3 = data; } void abc77_io(address_map &map); diff --git a/src/devices/bus/abckb/abc800kb.cpp b/src/devices/bus/abckb/abc800kb.cpp index 39f00d3347c..aeb56f99ff0 100644 --- a/src/devices/bus/abckb/abc800kb.cpp +++ b/src/devices/bus/abckb/abc800kb.cpp @@ -456,7 +456,7 @@ void abc800_keyboard_device::kb_p2_w(uint8_t data) // kb_t1_r - keyboard T1 timer read //------------------------------------------------- -READ_LINE_MEMBER( abc800_keyboard_device::kb_t1_r ) +int abc800_keyboard_device::kb_t1_r() { return m_clk; } diff --git a/src/devices/bus/abckb/abc800kb.h b/src/devices/bus/abckb/abc800kb.h index 39f54e2f854..1f780444e97 100644 --- a/src/devices/bus/abckb/abc800kb.h +++ b/src/devices/bus/abckb/abc800kb.h @@ -52,7 +52,7 @@ private: uint8_t kb_p1_r(); void kb_p1_w(uint8_t data); void kb_p2_w(uint8_t data); - DECLARE_READ_LINE_MEMBER( kb_t1_r ); + int kb_t1_r(); required_device m_maincpu; required_ioport_array<12> m_x; diff --git a/src/devices/bus/abckb/abc99.h b/src/devices/bus/abckb/abc99.h index aed9483df6a..8f47aa1c6e7 100644 --- a/src/devices/bus/abckb/abc99.h +++ b/src/devices/bus/abckb/abc99.h @@ -75,12 +75,12 @@ private: void key_x_w(offs_t offset, uint8_t data); void z2_p1_w(uint8_t data); uint8_t z2_p2_r(); - DECLARE_READ_LINE_MEMBER( z2_t1_r ) { return m_t1_z2; } + int z2_t1_r() { return m_t1_z2; } void led_w(uint8_t data); uint8_t z5_p1_r(); void z5_p2_w(uint8_t data); - DECLARE_READ_LINE_MEMBER( z5_t1_r ) { return m_t1_z5; } + int z5_t1_r() { return m_t1_z5; } void keyboard_io(address_map &map); void keyboard_mem(address_map &map); diff --git a/src/devices/bus/abckb/abckb.cpp b/src/devices/bus/abckb/abckb.cpp index 6d4decb36a7..aa8ff17117e 100644 --- a/src/devices/bus/abckb/abckb.cpp +++ b/src/devices/bus/abckb/abckb.cpp @@ -87,7 +87,7 @@ void abc_keyboard_port_device::device_reset() // write_rx - //------------------------------------------------- -WRITE_LINE_MEMBER( abc_keyboard_port_device::write_rx ) +void abc_keyboard_port_device::write_rx(int state) { m_out_rx_handler(state); } @@ -97,7 +97,7 @@ WRITE_LINE_MEMBER( abc_keyboard_port_device::write_rx ) // txd_w - //------------------------------------------------- -WRITE_LINE_MEMBER( abc_keyboard_port_device::txd_w ) +void abc_keyboard_port_device::txd_w(int state) { if (m_card) m_card->txd_w(state); @@ -108,7 +108,7 @@ WRITE_LINE_MEMBER( abc_keyboard_port_device::txd_w ) // trxc_w - //------------------------------------------------- -WRITE_LINE_MEMBER( abc_keyboard_port_device::trxc_w ) +void abc_keyboard_port_device::trxc_w(int state) { m_out_trxc_handler(state); } @@ -118,7 +118,7 @@ WRITE_LINE_MEMBER( abc_keyboard_port_device::trxc_w ) // keydown_w - //------------------------------------------------- -WRITE_LINE_MEMBER( abc_keyboard_port_device::keydown_w ) +void abc_keyboard_port_device::keydown_w(int state) { m_out_keydown_handler(state); } diff --git a/src/devices/bus/abckb/abckb.h b/src/devices/bus/abckb/abckb.h index 147edf07257..af1a8ca83ac 100644 --- a/src/devices/bus/abckb/abckb.h +++ b/src/devices/bus/abckb/abckb.h @@ -39,12 +39,12 @@ public: auto out_keydown_handler() { return m_out_keydown_handler.bind(); } // computer interface - DECLARE_WRITE_LINE_MEMBER( txd_w ); + void txd_w(int state); // peripheral interface - DECLARE_WRITE_LINE_MEMBER( write_rx ); - DECLARE_WRITE_LINE_MEMBER( trxc_w ); - DECLARE_WRITE_LINE_MEMBER( keydown_w ); + void write_rx(int state); + void trxc_w(int state); + void keydown_w(int state); protected: // device-level overrides diff --git a/src/devices/bus/acorn/atom/discpack.cpp b/src/devices/bus/acorn/atom/discpack.cpp index 2f2024b86b0..6c8687bbe29 100644 --- a/src/devices/bus/acorn/atom/discpack.cpp +++ b/src/devices/bus/acorn/atom/discpack.cpp @@ -99,20 +99,20 @@ void atom_discpack_device::device_start() // IMPLEMENTATION //************************************************************************** -WRITE_LINE_MEMBER(atom_discpack_device::motor_w) +void atom_discpack_device::motor_w(int state) { if (m_floppy[0]->get_device()) m_floppy[0]->get_device()->mon_w(!state); if (m_floppy[1]->get_device()) m_floppy[1]->get_device()->mon_w(!state); m_fdc->ready_w(!state); } -WRITE_LINE_MEMBER(atom_discpack_device::side_w) +void atom_discpack_device::side_w(int state) { if (m_floppy[0]->get_device()) m_floppy[0]->get_device()->ss_w(state); if (m_floppy[1]->get_device()) m_floppy[1]->get_device()->ss_w(state); } -WRITE_LINE_MEMBER(atom_discpack_device::fdc_intrq_w) +void atom_discpack_device::fdc_intrq_w(int state) { m_bus->nmi_w(state); } diff --git a/src/devices/bus/acorn/atom/discpack.h b/src/devices/bus/acorn/atom/discpack.h index cff8a09005d..8da1194ee78 100644 --- a/src/devices/bus/acorn/atom/discpack.h +++ b/src/devices/bus/acorn/atom/discpack.h @@ -40,9 +40,9 @@ protected: virtual const tiny_rom_entry *device_rom_region() const override; private: - DECLARE_WRITE_LINE_MEMBER(fdc_intrq_w); - DECLARE_WRITE_LINE_MEMBER(motor_w); - DECLARE_WRITE_LINE_MEMBER(side_w); + void fdc_intrq_w(int state); + void motor_w(int state); + void side_w(int state); required_memory_region m_dos_rom; required_device m_fdc; diff --git a/src/devices/bus/acorn/atom/econet.cpp b/src/devices/bus/acorn/atom/econet.cpp index 70c92ff3489..206f3435e7e 100644 --- a/src/devices/bus/acorn/atom/econet.cpp +++ b/src/devices/bus/acorn/atom/econet.cpp @@ -76,7 +76,7 @@ uint8_t atom_econet_device::statid_r() return 0xfe; } -WRITE_LINE_MEMBER(atom_econet_device::bus_irq_w) +void atom_econet_device::bus_irq_w(int state) { m_bus->irq_w(state); } diff --git a/src/devices/bus/acorn/atom/econet.h b/src/devices/bus/acorn/atom/econet.h index 114dc76bbeb..204cbc5b1be 100644 --- a/src/devices/bus/acorn/atom/econet.h +++ b/src/devices/bus/acorn/atom/econet.h @@ -37,7 +37,7 @@ protected: private: uint8_t statid_r(); - DECLARE_WRITE_LINE_MEMBER(bus_irq_w); + void bus_irq_w(int state); required_device m_adlc; required_device m_econet; diff --git a/src/devices/bus/acorn/bus.cpp b/src/devices/bus/acorn/bus.cpp index 55f332e6581..ec4218cead3 100644 --- a/src/devices/bus/acorn/bus.cpp +++ b/src/devices/bus/acorn/bus.cpp @@ -97,8 +97,8 @@ void acorn_bus_device::device_reset() } // interrupt request from acorn_bus card -WRITE_LINE_MEMBER(acorn_bus_device::irq_w) { m_out_irq_cb(state); } -WRITE_LINE_MEMBER(acorn_bus_device::nmi_w) { m_out_nmi_cb(state); } +void acorn_bus_device::irq_w(int state) { m_out_irq_cb(state); } +void acorn_bus_device::nmi_w(int state) { m_out_nmi_cb(state); } diff --git a/src/devices/bus/acorn/bus.h b/src/devices/bus/acorn/bus.h index bfd9a980304..e32b3cae0c6 100644 --- a/src/devices/bus/acorn/bus.h +++ b/src/devices/bus/acorn/bus.h @@ -69,8 +69,8 @@ public: address_space &memspace() const { return *m_space; } - DECLARE_WRITE_LINE_MEMBER(irq_w); - DECLARE_WRITE_LINE_MEMBER(nmi_w); + void irq_w(int state); + void nmi_w(int state); void add_slot(acorn_bus_slot_device &slot); diff --git a/src/devices/bus/acorn/cms/4080term.cpp b/src/devices/bus/acorn/cms/4080term.cpp index 97946af1406..8d9d2eae40f 100644 --- a/src/devices/bus/acorn/cms/4080term.cpp +++ b/src/devices/bus/acorn/cms/4080term.cpp @@ -169,7 +169,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(cms_4080term_device::update_scanline) m_ef9345->update_scanline((uint16_t)param); } -WRITE_LINE_MEMBER(cms_4080term_device::bus_irq_w) +void cms_4080term_device::bus_irq_w(int state) { m_bus->irq_w(state); } diff --git a/src/devices/bus/acorn/cms/4080term.h b/src/devices/bus/acorn/cms/4080term.h index 14d1beacd43..10dbda116bb 100644 --- a/src/devices/bus/acorn/cms/4080term.h +++ b/src/devices/bus/acorn/cms/4080term.h @@ -43,7 +43,7 @@ protected: virtual const tiny_rom_entry *device_rom_region() const override; private: - DECLARE_WRITE_LINE_MEMBER(bus_irq_w); + void bus_irq_w(int state); required_device m_via; required_device m_acia; diff --git a/src/devices/bus/acorn/cms/ieee.cpp b/src/devices/bus/acorn/cms/ieee.cpp index 06d9b47f0dd..001424aeb41 100644 --- a/src/devices/bus/acorn/cms/ieee.cpp +++ b/src/devices/bus/acorn/cms/ieee.cpp @@ -83,7 +83,7 @@ void cms_ieee_device::device_start() // IMPLEMENTATION //************************************************************************** -WRITE_LINE_MEMBER(cms_ieee_device::bus_irq_w) +void cms_ieee_device::bus_irq_w(int state) { m_bus->irq_w(state); } diff --git a/src/devices/bus/acorn/cms/ieee.h b/src/devices/bus/acorn/cms/ieee.h index 48352d4a100..635acba8141 100644 --- a/src/devices/bus/acorn/cms/ieee.h +++ b/src/devices/bus/acorn/cms/ieee.h @@ -34,7 +34,7 @@ protected: virtual void device_add_mconfig(machine_config &config) override; private: - DECLARE_WRITE_LINE_MEMBER(bus_irq_w); + void bus_irq_w(int state); required_device m_ieee; required_device m_tms9914; diff --git a/src/devices/bus/acorn/system/cass.cpp b/src/devices/bus/acorn/system/cass.cpp index 6e5b8faf40c..8905d9d6a22 100644 --- a/src/devices/bus/acorn/system/cass.cpp +++ b/src/devices/bus/acorn/system/cass.cpp @@ -65,7 +65,7 @@ void acorn_cass_device::device_start() // IMPLEMENTATION //************************************************************************** -WRITE_LINE_MEMBER(acorn_cass_device::cass_w) +void acorn_cass_device::cass_w(int state) { m_cass_state = state; } diff --git a/src/devices/bus/acorn/system/cass.h b/src/devices/bus/acorn/system/cass.h index 02a323bb994..11e1d96256f 100644 --- a/src/devices/bus/acorn/system/cass.h +++ b/src/devices/bus/acorn/system/cass.h @@ -38,7 +38,7 @@ protected: virtual void device_add_mconfig(machine_config &config) override; private: - DECLARE_WRITE_LINE_MEMBER(cass_w); + void cass_w(int state); TIMER_DEVICE_CALLBACK_MEMBER(cass_c); TIMER_DEVICE_CALLBACK_MEMBER(cass_p); diff --git a/src/devices/bus/acorn/system/econet.cpp b/src/devices/bus/acorn/system/econet.cpp index f8a0737e456..55ffc5232cf 100644 --- a/src/devices/bus/acorn/system/econet.cpp +++ b/src/devices/bus/acorn/system/econet.cpp @@ -83,7 +83,7 @@ uint8_t acorn_econet_device::statid_r() return 0xfe; } -WRITE_LINE_MEMBER(acorn_econet_device::bus_irq_w) +void acorn_econet_device::bus_irq_w(int state) { m_bus->irq_w(state); } diff --git a/src/devices/bus/acorn/system/econet.h b/src/devices/bus/acorn/system/econet.h index b5e470975c9..9b2981ab947 100644 --- a/src/devices/bus/acorn/system/econet.h +++ b/src/devices/bus/acorn/system/econet.h @@ -40,7 +40,7 @@ protected: private: uint8_t statid_r(); - DECLARE_WRITE_LINE_MEMBER(bus_irq_w); + void bus_irq_w(int state); required_device m_adlc; required_device m_econet; diff --git a/src/devices/bus/acorn/system/fdc.cpp b/src/devices/bus/acorn/system/fdc.cpp index 397fbb9ac50..f4ec3dd48b5 100644 --- a/src/devices/bus/acorn/system/fdc.cpp +++ b/src/devices/bus/acorn/system/fdc.cpp @@ -95,20 +95,20 @@ void acorn_fdc_device::device_reset() // IMPLEMENTATION //************************************************************************** -WRITE_LINE_MEMBER(acorn_fdc_device::motor_w) +void acorn_fdc_device::motor_w(int state) { if (m_floppy[0]->get_device()) m_floppy[0]->get_device()->mon_w(!state); if (m_floppy[1]->get_device()) m_floppy[1]->get_device()->mon_w(!state); m_fdc->ready_w(!state); } -WRITE_LINE_MEMBER(acorn_fdc_device::side_w) +void acorn_fdc_device::side_w(int state) { if (m_floppy[0]->get_device()) m_floppy[0]->get_device()->ss_w(state); if (m_floppy[1]->get_device()) m_floppy[1]->get_device()->ss_w(state); } -WRITE_LINE_MEMBER(acorn_fdc_device::bus_nmi_w) +void acorn_fdc_device::bus_nmi_w(int state) { m_bus->nmi_w(state); } diff --git a/src/devices/bus/acorn/system/fdc.h b/src/devices/bus/acorn/system/fdc.h index f943b1f6767..bd2d4e7f041 100644 --- a/src/devices/bus/acorn/system/fdc.h +++ b/src/devices/bus/acorn/system/fdc.h @@ -42,9 +42,9 @@ protected: virtual void device_add_mconfig(machine_config &config) override; private: - DECLARE_WRITE_LINE_MEMBER(bus_nmi_w); - DECLARE_WRITE_LINE_MEMBER(motor_w); - DECLARE_WRITE_LINE_MEMBER(side_w); + void bus_nmi_w(int state); + void motor_w(int state); + void side_w(int state); required_device m_fdc; required_device_array m_floppy; diff --git a/src/devices/bus/acorn/system/vdu40.cpp b/src/devices/bus/acorn/system/vdu40.cpp index 7bc8629ac35..1916981dc73 100644 --- a/src/devices/bus/acorn/system/vdu40.cpp +++ b/src/devices/bus/acorn/system/vdu40.cpp @@ -121,7 +121,7 @@ MC6845_UPDATE_ROW(acorn_vdu40_device::crtc_update_row) } } -WRITE_LINE_MEMBER(acorn_vdu40_device::vsync_changed) +void acorn_vdu40_device::vsync_changed(int state) { m_trom->dew_w(state); } diff --git a/src/devices/bus/acorn/system/vdu40.h b/src/devices/bus/acorn/system/vdu40.h index ff80a76d1ea..28c87cfb054 100644 --- a/src/devices/bus/acorn/system/vdu40.h +++ b/src/devices/bus/acorn/system/vdu40.h @@ -42,7 +42,7 @@ protected: private: MC6845_UPDATE_ROW(crtc_update_row); - DECLARE_WRITE_LINE_MEMBER(vsync_changed); + void vsync_changed(int state); required_device m_screen; required_device m_crtc; diff --git a/src/devices/bus/acorn/system/vib.cpp b/src/devices/bus/acorn/system/vib.cpp index bf685daac95..cb44e02ce79 100644 --- a/src/devices/bus/acorn/system/vib.cpp +++ b/src/devices/bus/acorn/system/vib.cpp @@ -127,7 +127,7 @@ void acorn_vib_device::device_reset() //************************************************************************** template -WRITE_LINE_MEMBER(acorn_vib_device::write_acia_clock) +void acorn_vib_device::write_acia_clock(int state) { if (T == m_txc->read()) m_acia->write_txc(state); @@ -135,7 +135,7 @@ WRITE_LINE_MEMBER(acorn_vib_device::write_acia_clock) m_acia->write_rxc(state); } -WRITE_LINE_MEMBER(acorn_vib_device::irq_w) +void acorn_vib_device::irq_w(int state) { m_bus->irq_w(state); } diff --git a/src/devices/bus/acorn/system/vib.h b/src/devices/bus/acorn/system/vib.h index bd4d886e281..2a681808ccc 100644 --- a/src/devices/bus/acorn/system/vib.h +++ b/src/devices/bus/acorn/system/vib.h @@ -45,8 +45,8 @@ protected: virtual void device_add_mconfig(machine_config &config) override; private: - template DECLARE_WRITE_LINE_MEMBER(write_acia_clock); - DECLARE_WRITE_LINE_MEMBER(irq_w); + template void write_acia_clock(int state); + void irq_w(int state); required_device m_ppi8255; required_device m_via6522; diff --git a/src/devices/bus/adam/exp.h b/src/devices/bus/adam/exp.h index c3df4b7664b..f8e45daee56 100644 --- a/src/devices/bus/adam/exp.h +++ b/src/devices/bus/adam/exp.h @@ -47,7 +47,7 @@ public: void bd_w(offs_t offset, uint8_t data, int bmreq, int biorq, int aux_rom_cs, int cas1, int cas2); // cartridge interface - DECLARE_WRITE_LINE_MEMBER( irq_w ) { m_write_irq(state); } + void irq_w(int state) { m_write_irq(state); } protected: // device_t implementation diff --git a/src/devices/bus/adamnet/adamnet.cpp b/src/devices/bus/adamnet/adamnet.cpp index 18b91c4fb8c..c2886c61248 100644 --- a/src/devices/bus/adamnet/adamnet.cpp +++ b/src/devices/bus/adamnet/adamnet.cpp @@ -139,7 +139,7 @@ adamnet_device::daisy_entry::daisy_entry(device_t *device) // rxd_r - receive data //------------------------------------------------- -READ_LINE_MEMBER( adamnet_device::rxd_r ) +int adamnet_device::rxd_r() { int state = m_txd;//1; @@ -184,7 +184,7 @@ int adamnet_device::rxd_r(device_t *device) // txd_w - transmit data //------------------------------------------------- -WRITE_LINE_MEMBER( adamnet_device::txd_w ) +void adamnet_device::txd_w(int state) { if (m_txd != state) { @@ -221,7 +221,7 @@ void adamnet_device::txd_w(device_t *device, int state) // reset_r - bus reset //------------------------------------------------- -READ_LINE_MEMBER( adamnet_device::reset_r ) +int adamnet_device::reset_r() { return m_reset; } @@ -231,7 +231,7 @@ READ_LINE_MEMBER( adamnet_device::reset_r ) // reset_w - bus reset //------------------------------------------------- -WRITE_LINE_MEMBER( adamnet_device::reset_w ) +void adamnet_device::reset_w(int state) { m_reset = state; diff --git a/src/devices/bus/adamnet/adamnet.h b/src/devices/bus/adamnet/adamnet.h index a064ce24f2f..6db165e854b 100644 --- a/src/devices/bus/adamnet/adamnet.h +++ b/src/devices/bus/adamnet/adamnet.h @@ -30,13 +30,13 @@ public: void add_device(device_t *target); - DECLARE_READ_LINE_MEMBER( rxd_r ); + int rxd_r(); int rxd_r(device_t *device); - DECLARE_WRITE_LINE_MEMBER( txd_w ); + void txd_w(int state); void txd_w(device_t *device, int state); - DECLARE_READ_LINE_MEMBER( reset_r ); - DECLARE_WRITE_LINE_MEMBER( reset_w ); + int reset_r(); + void reset_w(int state); protected: // device-level overrides diff --git a/src/devices/bus/adb/a9m0330.cpp b/src/devices/bus/adb/a9m0330.cpp index 8d3f9226299..e4e96d45a90 100644 --- a/src/devices/bus/adb/a9m0330.cpp +++ b/src/devices/bus/adb/a9m0330.cpp @@ -256,13 +256,13 @@ void a9m0330_device::p2_w(u8 data) } } -DECLARE_READ_LINE_MEMBER(a9m0330_device::t0_r) +int a9m0330_device::t0_r() { // appears to be a config jumper of some sort return 0; } -DECLARE_READ_LINE_MEMBER(a9m0330_device::t1_r) +int a9m0330_device::t1_r() { return m_adb_state & 1; } diff --git a/src/devices/bus/adb/a9m0330.h b/src/devices/bus/adb/a9m0330.h index 1d44a28bba8..c74a13feb38 100644 --- a/src/devices/bus/adb/a9m0330.h +++ b/src/devices/bus/adb/a9m0330.h @@ -35,8 +35,8 @@ private: u8 bus_r(); void p1_w(u8 data); void p2_w(u8 data); - DECLARE_READ_LINE_MEMBER(t0_r); - DECLARE_READ_LINE_MEMBER(t1_r); + int t0_r(); + int t1_r(); int m_adb_state; int m_kbd_row; diff --git a/src/devices/bus/amiga/keyboard/a1200.cpp b/src/devices/bus/amiga/keyboard/a1200.cpp index 4877903d73a..d375bb07917 100644 --- a/src/devices/bus/amiga/keyboard/a1200.cpp +++ b/src/devices/bus/amiga/keyboard/a1200.cpp @@ -114,7 +114,7 @@ a1200_kbd_device::a1200_kbd_device(machine_config const &mconfig, char const *ta { } -WRITE_LINE_MEMBER(a1200_kbd_device::kdat_w) +void a1200_kbd_device::kdat_w(int state) { if (bool(state) != m_host_kdat) { @@ -167,7 +167,7 @@ void a1200_kbd_device::mpu_portc_w(offs_t offset, u8 data, u8 mem_mask) m_led_kbd_caps = BIT(~data, 7); } -WRITE_LINE_MEMBER(a1200_kbd_device::mpu_tcmp) +void a1200_kbd_device::mpu_tcmp(int state) { m_host->krst_w(state); } diff --git a/src/devices/bus/amiga/keyboard/a1200.h b/src/devices/bus/amiga/keyboard/a1200.h index 4cbba0616db..65b38560e32 100644 --- a/src/devices/bus/amiga/keyboard/a1200.h +++ b/src/devices/bus/amiga/keyboard/a1200.h @@ -27,7 +27,7 @@ public: a1200_kbd_device(machine_config const &mconfig, char const *tag, device_t *owner, uint32_t clock); // from host - virtual DECLARE_WRITE_LINE_MEMBER(kdat_w) override; + virtual void kdat_w(int state) override; DECLARE_INPUT_CHANGED_MEMBER(layout_changed); @@ -37,7 +37,7 @@ protected: void mpu_porta_w(offs_t offset, u8 data, u8 mem_mask = ~0); void mpu_portb_w(offs_t offset, u8 data, u8 mem_mask = ~0); void mpu_portc_w(offs_t offset, u8 data, u8 mem_mask = ~0); - DECLARE_WRITE_LINE_MEMBER(mpu_tcmp); + void mpu_tcmp(int state); virtual tiny_rom_entry const *device_rom_region() const override; virtual void device_add_mconfig(machine_config &config) override; diff --git a/src/devices/bus/amiga/keyboard/a2000.cpp b/src/devices/bus/amiga/keyboard/a2000.cpp index 0b5c5031f83..75c078f128e 100644 --- a/src/devices/bus/amiga/keyboard/a2000.cpp +++ b/src/devices/bus/amiga/keyboard/a2000.cpp @@ -89,7 +89,7 @@ class a2000_kbd_g80_device : public device_t, public device_amiga_keyboard_inter { public: // from host - virtual DECLARE_WRITE_LINE_MEMBER(kdat_w) override + virtual void kdat_w(int state) override { if (bool(state) != m_host_kdat) { diff --git a/src/devices/bus/amiga/keyboard/keyboard.cpp b/src/devices/bus/amiga/keyboard/keyboard.cpp index 141998a15fa..073661028c1 100644 --- a/src/devices/bus/amiga/keyboard/keyboard.cpp +++ b/src/devices/bus/amiga/keyboard/keyboard.cpp @@ -75,7 +75,7 @@ void amiga_keyboard_bus_device::device_reset() // host to module interface //------------------------------------------------- -WRITE_LINE_MEMBER( amiga_keyboard_bus_device::kdat_in_w ) +void amiga_keyboard_bus_device::kdat_in_w(int state) { if (m_kbd) m_kbd->kdat_w(state); diff --git a/src/devices/bus/amiga/keyboard/keyboard.h b/src/devices/bus/amiga/keyboard/keyboard.h index ce11d82ba32..aa57cb3da05 100644 --- a/src/devices/bus/amiga/keyboard/keyboard.h +++ b/src/devices/bus/amiga/keyboard/keyboard.h @@ -49,12 +49,12 @@ public: auto krst_handler() { return m_krst_handler.bind(); } // called from keyboard - DECLARE_WRITE_LINE_MEMBER(kclk_w) { m_kclk_handler(state); } - DECLARE_WRITE_LINE_MEMBER(kdat_w) { m_kdat_handler(state); } - DECLARE_WRITE_LINE_MEMBER(krst_w) { m_krst_handler(state); } + void kclk_w(int state) { m_kclk_handler(state); } + void kdat_w(int state) { m_kdat_handler(state); } + void krst_w(int state) { m_krst_handler(state); } // called from host - DECLARE_WRITE_LINE_MEMBER(kdat_in_w); + void kdat_in_w(int state); protected: // device-level overrides @@ -77,7 +77,7 @@ public: // construction/destruction virtual ~device_amiga_keyboard_interface(); - virtual DECLARE_WRITE_LINE_MEMBER(kdat_w) = 0; + virtual void kdat_w(int state) = 0; protected: device_amiga_keyboard_interface(const machine_config &mconfig, device_t &device); diff --git a/src/devices/bus/amiga/keyboard/mitsumi.cpp b/src/devices/bus/amiga/keyboard/mitsumi.cpp index ccc68d5d1d4..0e6f219192d 100644 --- a/src/devices/bus/amiga/keyboard/mitsumi.cpp +++ b/src/devices/bus/amiga/keyboard/mitsumi.cpp @@ -106,13 +106,13 @@ ROM_END class mitsumi_keyboard_base : public device_t, public device_amiga_keyboard_interface { public: - virtual WRITE_LINE_MEMBER(kdat_w) override + virtual void kdat_w(int state) override { m_kdat_in = state ? 0x01U : 0x00U; m_mcu->pa_w(m_meta->read()); } - READ_LINE_MEMBER(kdat_r) + int kdat_r() { return m_kdat_in ^ 0x01U; } @@ -128,7 +128,7 @@ public: return (result >> 2) ^ 0x3fU; } - READ_LINE_MEMBER(reset_r) + int reset_r() { return m_ctrl_a_a; } @@ -230,7 +230,7 @@ protected: } private: - WRITE_LINE_MEMBER(pd7_w) + void pd7_w(int state) { if (bool(state) != bool(m_pd7)) { @@ -366,7 +366,7 @@ protected: } private: - WRITE_LINE_MEMBER(reset_trigger) + void reset_trigger(int state) { if (bool(state) != bool(m_reset_trigger)) { diff --git a/src/devices/bus/amiga/zorro/a2052.cpp b/src/devices/bus/amiga/zorro/a2052.cpp index 379a75270c5..66eb712f7ff 100644 --- a/src/devices/bus/amiga/zorro/a2052.cpp +++ b/src/devices/bus/amiga/zorro/a2052.cpp @@ -85,7 +85,7 @@ void a2052_device::autoconfig_base_address(offs_t address) m_slot->cfgout_w(0); } -WRITE_LINE_MEMBER( a2052_device::cfgin_w ) +void a2052_device::cfgin_w(int state) { LOG("%s: configin_w (%d)\n", shortname(), state); diff --git a/src/devices/bus/amiga/zorro/a2052.h b/src/devices/bus/amiga/zorro/a2052.h index f64bf06196d..89cb17ee09b 100644 --- a/src/devices/bus/amiga/zorro/a2052.h +++ b/src/devices/bus/amiga/zorro/a2052.h @@ -36,7 +36,7 @@ protected: virtual void device_start() override ATTR_COLD; // device_zorro2_card_interface overrides - virtual DECLARE_WRITE_LINE_MEMBER( cfgin_w ) override; + virtual void cfgin_w(int state) override; // amiga_autoconfig overrides virtual void autoconfig_base_address(offs_t address) override; diff --git a/src/devices/bus/amiga/zorro/a2058.cpp b/src/devices/bus/amiga/zorro/a2058.cpp index 26d5f393222..4077306ad6b 100644 --- a/src/devices/bus/amiga/zorro/a2058.cpp +++ b/src/devices/bus/amiga/zorro/a2058.cpp @@ -92,7 +92,7 @@ void a2058_device::autoconfig_base_address(offs_t address) m_slot->cfgout_w(0); } -WRITE_LINE_MEMBER( a2058_device::cfgin_w ) +void a2058_device::cfgin_w(int state) { LOG("%s: configin_w (%d)\n", shortname(), state); diff --git a/src/devices/bus/amiga/zorro/a2058.h b/src/devices/bus/amiga/zorro/a2058.h index 9b361b403e4..1b9badf9382 100644 --- a/src/devices/bus/amiga/zorro/a2058.h +++ b/src/devices/bus/amiga/zorro/a2058.h @@ -36,7 +36,7 @@ protected: virtual void device_start() override ATTR_COLD; // device_zorro2_card_interface overrides - virtual DECLARE_WRITE_LINE_MEMBER( cfgin_w ) override; + virtual void cfgin_w(int state) override; // amiga_autoconfig overrides virtual void autoconfig_base_address(offs_t address) override; diff --git a/src/devices/bus/amiga/zorro/a2065.cpp b/src/devices/bus/amiga/zorro/a2065.cpp index a76b289bb7f..0c283e19f16 100644 --- a/src/devices/bus/amiga/zorro/a2065.cpp +++ b/src/devices/bus/amiga/zorro/a2065.cpp @@ -105,7 +105,7 @@ void a2065_device::autoconfig_base_address(offs_t address) m_slot->cfgout_w(0); } -WRITE_LINE_MEMBER( a2065_device::cfgin_w ) +void a2065_device::cfgin_w(int state) { LOG("%s: configin_w (%d)\n", shortname(), state); @@ -158,7 +158,7 @@ void a2065_device::lance_ram_w(offs_t offset, uint16_t data, uint16_t mem_mask) COMBINE_DATA(&m_ram[offset]); } -WRITE_LINE_MEMBER( a2065_device::lance_irq_w ) +void a2065_device::lance_irq_w(int state) { // default is irq 2, can be changed via jumper m_slot->int2_w(!state); diff --git a/src/devices/bus/amiga/zorro/a2065.h b/src/devices/bus/amiga/zorro/a2065.h index 43e66c29678..7730370255e 100644 --- a/src/devices/bus/amiga/zorro/a2065.h +++ b/src/devices/bus/amiga/zorro/a2065.h @@ -37,7 +37,7 @@ public: uint16_t lance_ram_r(offs_t offset); void lance_ram_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); - DECLARE_WRITE_LINE_MEMBER( lance_irq_w ); + void lance_irq_w(int state); protected: // device-level overrides @@ -45,7 +45,7 @@ protected: virtual void device_start() override ATTR_COLD; // device_zorro2_card_interface overrides - virtual DECLARE_WRITE_LINE_MEMBER( cfgin_w ) override; + virtual void cfgin_w(int state) override; // amiga_autoconfig overrides virtual void autoconfig_base_address(offs_t address) override; diff --git a/src/devices/bus/amiga/zorro/a2232.cpp b/src/devices/bus/amiga/zorro/a2232.cpp index fbb9f2c9dfc..af33b31a99f 100644 --- a/src/devices/bus/amiga/zorro/a2232.cpp +++ b/src/devices/bus/amiga/zorro/a2232.cpp @@ -207,7 +207,7 @@ void a2232_device::autoconfig_base_address(offs_t address) m_slot->cfgout_w(0); } -WRITE_LINE_MEMBER( a2232_device::cfgin_w ) +void a2232_device::cfgin_w(int state) { LOG("%s: configin_w (%d)\n", shortname(), state); @@ -377,19 +377,19 @@ void a2232_device::cia_port_b_w(uint8_t data) // RS232 //************************************************************************** -WRITE_LINE_MEMBER( a2232_device::rs232_1_rxd_w ) +void a2232_device::rs232_1_rxd_w(int state) { m_acia[0]->write_rxd(state); m_cia->sp_w(state); } -WRITE_LINE_MEMBER( a2232_device::rs232_1_dcd_w ) +void a2232_device::rs232_1_dcd_w(int state) { m_cia_port_a &= ~0x01; m_cia_port_a |= state << 0; } -WRITE_LINE_MEMBER( a2232_device::rs232_1_cts_w ) +void a2232_device::rs232_1_cts_w(int state) { m_cia_port_b &= ~0x01; m_cia_port_b |= state << 0; @@ -397,73 +397,73 @@ WRITE_LINE_MEMBER( a2232_device::rs232_1_cts_w ) m_cia->cnt_w(state); } -WRITE_LINE_MEMBER( a2232_device::rs232_2_dcd_w ) +void a2232_device::rs232_2_dcd_w(int state) { m_cia_port_a &= ~0x02; m_cia_port_a |= state << 1; } -WRITE_LINE_MEMBER( a2232_device::rs232_2_cts_w ) +void a2232_device::rs232_2_cts_w(int state) { m_cia_port_b &= ~0x02; m_cia_port_b |= state << 1; } -WRITE_LINE_MEMBER( a2232_device::rs232_3_dcd_w ) +void a2232_device::rs232_3_dcd_w(int state) { m_cia_port_a &= ~0x04; m_cia_port_a |= state << 2; } -WRITE_LINE_MEMBER( a2232_device::rs232_3_cts_w ) +void a2232_device::rs232_3_cts_w(int state) { m_cia_port_b &= ~0x04; m_cia_port_b |= state << 2; } -WRITE_LINE_MEMBER( a2232_device::rs232_4_dcd_w ) +void a2232_device::rs232_4_dcd_w(int state) { m_cia_port_a &= ~0x08; m_cia_port_a |= state << 3; } -WRITE_LINE_MEMBER( a2232_device::rs232_4_cts_w ) +void a2232_device::rs232_4_cts_w(int state) { m_cia_port_b &= ~0x08; m_cia_port_b |= state << 3; } -WRITE_LINE_MEMBER( a2232_device::rs232_5_dcd_w ) +void a2232_device::rs232_5_dcd_w(int state) { m_cia_port_a &= ~0x10; m_cia_port_a |= state << 4; } -WRITE_LINE_MEMBER( a2232_device::rs232_5_cts_w ) +void a2232_device::rs232_5_cts_w(int state) { m_cia_port_b &= ~0x10; m_cia_port_b |= state << 4; } -WRITE_LINE_MEMBER( a2232_device::rs232_6_dcd_w ) +void a2232_device::rs232_6_dcd_w(int state) { m_cia_port_a &= ~0x20; m_cia_port_a |= state << 5; } -WRITE_LINE_MEMBER( a2232_device::rs232_6_cts_w ) +void a2232_device::rs232_6_cts_w(int state) { m_cia_port_b &= ~0x20; m_cia_port_b |= state << 5; } -WRITE_LINE_MEMBER( a2232_device::rs232_7_dcd_w ) +void a2232_device::rs232_7_dcd_w(int state) { m_cia_port_a &= ~0x40; m_cia_port_a |= state << 6; } -WRITE_LINE_MEMBER( a2232_device::rs232_7_cts_w ) +void a2232_device::rs232_7_cts_w(int state) { m_cia_port_b &= ~0x40; m_cia_port_b |= state << 6; diff --git a/src/devices/bus/amiga/zorro/a2232.h b/src/devices/bus/amiga/zorro/a2232.h index e8a5da3258c..95d545aa203 100644 --- a/src/devices/bus/amiga/zorro/a2232.h +++ b/src/devices/bus/amiga/zorro/a2232.h @@ -58,7 +58,7 @@ protected: virtual void device_reset_after_children() override; // device_zorro2_card_interface overrides - virtual DECLARE_WRITE_LINE_MEMBER( cfgin_w ) override; + virtual void cfgin_w(int state) override; // amiga_autoconfig overrides virtual void autoconfig_base_address(offs_t address) override; @@ -80,21 +80,21 @@ private: void cia_w(offs_t offset, uint8_t data); // rs232 - DECLARE_WRITE_LINE_MEMBER( rs232_1_rxd_w ); - DECLARE_WRITE_LINE_MEMBER( rs232_1_dcd_w ); - DECLARE_WRITE_LINE_MEMBER( rs232_1_cts_w ); - DECLARE_WRITE_LINE_MEMBER( rs232_2_dcd_w ); - DECLARE_WRITE_LINE_MEMBER( rs232_2_cts_w ); - DECLARE_WRITE_LINE_MEMBER( rs232_3_dcd_w ); - DECLARE_WRITE_LINE_MEMBER( rs232_3_cts_w ); - DECLARE_WRITE_LINE_MEMBER( rs232_4_dcd_w ); - DECLARE_WRITE_LINE_MEMBER( rs232_4_cts_w ); - DECLARE_WRITE_LINE_MEMBER( rs232_5_dcd_w ); - DECLARE_WRITE_LINE_MEMBER( rs232_5_cts_w ); - DECLARE_WRITE_LINE_MEMBER( rs232_6_dcd_w ); - DECLARE_WRITE_LINE_MEMBER( rs232_6_cts_w ); - DECLARE_WRITE_LINE_MEMBER( rs232_7_dcd_w ); - DECLARE_WRITE_LINE_MEMBER( rs232_7_cts_w ); + void rs232_1_rxd_w(int state); + void rs232_1_dcd_w(int state); + void rs232_1_cts_w(int state); + void rs232_2_dcd_w(int state); + void rs232_2_cts_w(int state); + void rs232_3_dcd_w(int state); + void rs232_3_cts_w(int state); + void rs232_4_dcd_w(int state); + void rs232_4_cts_w(int state); + void rs232_5_dcd_w(int state); + void rs232_5_cts_w(int state); + void rs232_6_dcd_w(int state); + void rs232_6_cts_w(int state); + void rs232_7_dcd_w(int state); + void rs232_7_cts_w(int state); required_device m_iocpu; required_device m_ioirq; diff --git a/src/devices/bus/amiga/zorro/a590.cpp b/src/devices/bus/amiga/zorro/a590.cpp index 3fe72c69a42..d2d43bf24de 100644 --- a/src/devices/bus/amiga/zorro/a590.cpp +++ b/src/devices/bus/amiga/zorro/a590.cpp @@ -318,7 +318,7 @@ void a2091_device::device_reset() // IMPLEMENTATION //************************************************************************** -WRITE_LINE_MEMBER( a590_device::cfgin_w ) +void a590_device::cfgin_w(int state) { // make sure we configure ourselves first m_int6 = m_jp4->read() & 0x01; @@ -328,7 +328,7 @@ WRITE_LINE_MEMBER( a590_device::cfgin_w ) m_dmac->configin_w(state); } -WRITE_LINE_MEMBER( a2091_device::cfgin_w ) +void a2091_device::cfgin_w(int state) { // make sure we configure ourselves first m_int6 = m_jp3->read() & 0x01; @@ -358,7 +358,7 @@ void dmac_hdc_device_base::dmac_scsi_w(offs_t offset, uint8_t data) } } -WRITE_LINE_MEMBER( dmac_hdc_device_base::dmac_int_w ) +void dmac_hdc_device_base::dmac_int_w(int state) { if (m_int6) int6_w(state); @@ -366,13 +366,13 @@ WRITE_LINE_MEMBER( dmac_hdc_device_base::dmac_int_w ) int2_w(state); } -WRITE_LINE_MEMBER( dmac_hdc_device_base::scsi_irq_w ) +void dmac_hdc_device_base::scsi_irq_w(int state) { // should be or'ed with xt-ide IRQ m_dmac->intx_w(state); } -WRITE_LINE_MEMBER( dmac_hdc_device_base::scsi_drq_w ) +void dmac_hdc_device_base::scsi_drq_w(int state) { m_dmac->xdreq_w(state); } diff --git a/src/devices/bus/amiga/zorro/a590.h b/src/devices/bus/amiga/zorro/a590.h index ab2a71bb0ce..711ac95ece5 100644 --- a/src/devices/bus/amiga/zorro/a590.h +++ b/src/devices/bus/amiga/zorro/a590.h @@ -60,10 +60,10 @@ protected: private: uint8_t dmac_scsi_r(offs_t offset); void dmac_scsi_w(offs_t offset, uint8_t data); - DECLARE_WRITE_LINE_MEMBER( dmac_int_w ); - DECLARE_WRITE_LINE_MEMBER( dmac_cfgout_w ) { cfgout_w(state); } - DECLARE_WRITE_LINE_MEMBER( scsi_irq_w ); - DECLARE_WRITE_LINE_MEMBER( scsi_drq_w ); + void dmac_int_w(int state); + void dmac_cfgout_w(int state) { cfgout_w(state); } + void scsi_irq_w(int state); + void scsi_drq_w(int state); static void scsi_devices(device_slot_interface &device) ATTR_COLD; void wd33c93(device_t *device); @@ -91,7 +91,7 @@ protected: virtual void int6_w(int state) override { m_slot->int6_w(state); } // input from slot - virtual DECLARE_WRITE_LINE_MEMBER( cfgin_w ) override; + virtual void cfgin_w(int state) override; private: required_ioport m_dips; @@ -122,7 +122,7 @@ protected: virtual void int6_w(int state) override { m_slot->int6_w(state); } // input from slot - virtual DECLARE_WRITE_LINE_MEMBER( cfgin_w ) override; + virtual void cfgin_w(int state) override; private: required_ioport m_jp1; diff --git a/src/devices/bus/amiga/zorro/buddha.cpp b/src/devices/bus/amiga/zorro/buddha.cpp index 16a27d07ff2..c515096a28a 100644 --- a/src/devices/bus/amiga/zorro/buddha.cpp +++ b/src/devices/bus/amiga/zorro/buddha.cpp @@ -155,7 +155,7 @@ void buddha_device::autoconfig_base_address(offs_t address) m_slot->cfgout_w(0); } -WRITE_LINE_MEMBER( buddha_device::cfgin_w ) +void buddha_device::cfgin_w(int state) { LOG("configin_w (%d)\n", state); @@ -196,7 +196,7 @@ void buddha_device::speed_w(offs_t offset, uint16_t data, uint16_t mem_mask) LOG("speed_w %04x [mask = %04x]\n", data, mem_mask); } -WRITE_LINE_MEMBER( buddha_device::ide_0_interrupt_w ) +void buddha_device::ide_0_interrupt_w(int state) { LOG("ide_0_interrupt_w (%d)\n", state); @@ -206,7 +206,7 @@ WRITE_LINE_MEMBER( buddha_device::ide_0_interrupt_w ) m_slot->int2_w(state); } -WRITE_LINE_MEMBER( buddha_device::ide_1_interrupt_w ) +void buddha_device::ide_1_interrupt_w(int state) { LOG("ide_1_interrupt_w (%d)\n", state); diff --git a/src/devices/bus/amiga/zorro/buddha.h b/src/devices/bus/amiga/zorro/buddha.h index 80fce2682c5..1ecf8ccd99a 100644 --- a/src/devices/bus/amiga/zorro/buddha.h +++ b/src/devices/bus/amiga/zorro/buddha.h @@ -41,7 +41,7 @@ protected: virtual void device_reset() override; // device_zorro2_card_interface overrides - virtual DECLARE_WRITE_LINE_MEMBER( cfgin_w ) override; + virtual void cfgin_w(int state) override; // amiga_autoconfig overrides virtual void autoconfig_base_address(offs_t address) override; @@ -65,8 +65,8 @@ private: uint16_t ide_0_interrupt_r(offs_t offset, uint16_t mem_mask = ~0); uint16_t ide_1_interrupt_r(offs_t offset, uint16_t mem_mask = ~0); void ide_interrupt_enable_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); - DECLARE_WRITE_LINE_MEMBER( ide_0_interrupt_w ); - DECLARE_WRITE_LINE_MEMBER( ide_1_interrupt_w ); + void ide_0_interrupt_w(int state); + void ide_1_interrupt_w(int state); void mmio_map(address_map &map) ATTR_COLD; diff --git a/src/devices/bus/amiga/zorro/zorro.cpp b/src/devices/bus/amiga/zorro/zorro.cpp index 9f137bbff89..f13a2ded4fa 100644 --- a/src/devices/bus/amiga/zorro/zorro.cpp +++ b/src/devices/bus/amiga/zorro/zorro.cpp @@ -96,9 +96,9 @@ void zorro_bus_device_base::device_start() } // from slot device -WRITE_LINE_MEMBER( zorro_bus_device_base::ovr_w ) { m_ovr_handler(state); } -WRITE_LINE_MEMBER( zorro_bus_device_base::int2_w ) { m_int2_handler(state); } -WRITE_LINE_MEMBER( zorro_bus_device_base::int6_w ) { m_int6_handler(state); } +void zorro_bus_device_base::ovr_w(int state) { m_ovr_handler(state); } +void zorro_bus_device_base::int2_w(int state) { m_int2_handler(state); } +void zorro_bus_device_base::int6_w(int state) { m_int6_handler(state); } //************************************************************************** @@ -272,12 +272,12 @@ void zorro2_bus_device::add_card(device_zorro_card_interface &card) } // from slot device -WRITE_LINE_MEMBER( zorro2_bus_device::eint1_w ) { m_eint1_handler(state); } -WRITE_LINE_MEMBER( zorro2_bus_device::eint4_w ) { m_eint4_handler(state); } -WRITE_LINE_MEMBER( zorro2_bus_device::eint5_w ) { m_eint5_handler(state); } -WRITE_LINE_MEMBER( zorro2_bus_device::eint7_w ) { m_eint7_handler(state); } +void zorro2_bus_device::eint1_w(int state) { m_eint1_handler(state); } +void zorro2_bus_device::eint4_w(int state) { m_eint4_handler(state); } +void zorro2_bus_device::eint5_w(int state) { m_eint5_handler(state); } +void zorro2_bus_device::eint7_w(int state) { m_eint7_handler(state); } -WRITE_LINE_MEMBER( zorro2_bus_device::cfgout_w ) +void zorro2_bus_device::cfgout_w(int state) { // if there is still a device in the chain, tell it to configure itself if (m_dev.size() > ++m_autoconfig_device) @@ -324,7 +324,7 @@ void device_zorro_card_interface::fc_w(int code) { } -WRITE_LINE_MEMBER( device_zorro_card_interface::cfgin_w ) +void device_zorro_card_interface::cfgin_w(int state) { } diff --git a/src/devices/bus/amiga/zorro/zorro.h b/src/devices/bus/amiga/zorro/zorro.h index a75582ce519..24ee21459e8 100644 --- a/src/devices/bus/amiga/zorro/zorro.h +++ b/src/devices/bus/amiga/zorro/zorro.h @@ -207,11 +207,11 @@ public: virtual void add_card(device_zorro_card_interface &card) ATTR_COLD = 0; // interface (from slot device) - virtual DECLARE_WRITE_LINE_MEMBER( cfgout_w ) { } + virtual void cfgout_w(int state) { } - DECLARE_WRITE_LINE_MEMBER( int2_w ); - DECLARE_WRITE_LINE_MEMBER( int6_w ); - DECLARE_WRITE_LINE_MEMBER( ovr_w ); + void int2_w(int state); + void int6_w(int state); + void ovr_w(int state); // interface (from host) virtual void fc_w(int code) = 0; @@ -288,12 +288,12 @@ public: virtual void add_card(device_zorro_card_interface &card) override ATTR_COLD; // interface (from slot device) - virtual DECLARE_WRITE_LINE_MEMBER( cfgout_w ) override; + virtual void cfgout_w(int state) override; - DECLARE_WRITE_LINE_MEMBER( eint1_w ); - DECLARE_WRITE_LINE_MEMBER( eint4_w ); - DECLARE_WRITE_LINE_MEMBER( eint5_w ); - DECLARE_WRITE_LINE_MEMBER( eint7_w ); + void eint1_w(int state); + void eint4_w(int state); + void eint5_w(int state); + void eint7_w(int state); // interface (from host) virtual void fc_w(int code) override; @@ -339,7 +339,7 @@ public: // interface (from host) virtual void fc_w(int code); - virtual DECLARE_WRITE_LINE_MEMBER( cfgin_w ); + virtual void cfgin_w(int state); protected: device_zorro_card_interface(const machine_config &mconfig, device_t &device); diff --git a/src/devices/bus/apricot/expansion/expansion.cpp b/src/devices/bus/apricot/expansion/expansion.cpp index ff7887e5d88..ee86b76412f 100644 --- a/src/devices/bus/apricot/expansion/expansion.cpp +++ b/src/devices/bus/apricot/expansion/expansion.cpp @@ -106,12 +106,12 @@ void apricot_expansion_bus_device::add_card(device_apricot_expansion_card_interf } // callbacks from slot device to the host -WRITE_LINE_MEMBER( apricot_expansion_bus_device::dma1_w ) { m_dma1_handler(state); } -WRITE_LINE_MEMBER( apricot_expansion_bus_device::dma2_w ) { m_dma2_handler(state); } -WRITE_LINE_MEMBER( apricot_expansion_bus_device::ext1_w ) { m_ext1_handler(state); } -WRITE_LINE_MEMBER( apricot_expansion_bus_device::ext2_w ) { m_ext2_handler(state); } -WRITE_LINE_MEMBER( apricot_expansion_bus_device::int2_w ) { m_int2_handler(state); } -WRITE_LINE_MEMBER( apricot_expansion_bus_device::int3_w ) { m_int3_handler(state); } +void apricot_expansion_bus_device::dma1_w(int state) { m_dma1_handler(state); } +void apricot_expansion_bus_device::dma2_w(int state) { m_dma2_handler(state); } +void apricot_expansion_bus_device::ext1_w(int state) { m_ext1_handler(state); } +void apricot_expansion_bus_device::ext2_w(int state) { m_ext2_handler(state); } +void apricot_expansion_bus_device::int2_w(int state) { m_int2_handler(state); } +void apricot_expansion_bus_device::int3_w(int state) { m_int3_handler(state); } //------------------------------------------------- // install_ram - attach ram to cpu/iop diff --git a/src/devices/bus/apricot/expansion/expansion.h b/src/devices/bus/apricot/expansion/expansion.h index 2cf025cde0c..24809d4a37f 100644 --- a/src/devices/bus/apricot/expansion/expansion.h +++ b/src/devices/bus/apricot/expansion/expansion.h @@ -110,12 +110,12 @@ public: void add_card(device_apricot_expansion_card_interface *card); // from cards - DECLARE_WRITE_LINE_MEMBER( dma1_w ); - DECLARE_WRITE_LINE_MEMBER( dma2_w ); - DECLARE_WRITE_LINE_MEMBER( ext1_w ); - DECLARE_WRITE_LINE_MEMBER( ext2_w ); - DECLARE_WRITE_LINE_MEMBER( int2_w ); - DECLARE_WRITE_LINE_MEMBER( int3_w ); + void dma1_w(int state); + void dma2_w(int state); + void ext1_w(int state); + void ext2_w(int state); + void int2_w(int state); + void int3_w(int state); void install_ram(offs_t addrstart, offs_t addrend, void *baseptr); diff --git a/src/devices/bus/apricot/expansion/winchester.cpp b/src/devices/bus/apricot/expansion/winchester.cpp index e400295f3b7..baabcb6f439 100644 --- a/src/devices/bus/apricot/expansion/winchester.cpp +++ b/src/devices/bus/apricot/expansion/winchester.cpp @@ -123,7 +123,7 @@ void apricot_winchester_device::device_reset() // IMPLEMENTATION //************************************************************************** -WRITE_LINE_MEMBER( apricot_winchester_device::hdc_intrq_w ) +void apricot_winchester_device::hdc_intrq_w(int state) { LOGREGS("hdc_intrq_w: %d\n", state); @@ -165,7 +165,7 @@ uint8_t apricot_winchester_device::int_r() } template -WRITE_LINE_MEMBER( apricot_winchester_device::head_w ) +void apricot_winchester_device::head_w(int state) { m_head = (m_head & ~(1 << N)) | (state << N); LOGREGS("Select head: %d\n", m_head); @@ -173,7 +173,7 @@ WRITE_LINE_MEMBER( apricot_winchester_device::head_w ) } template -WRITE_LINE_MEMBER( apricot_winchester_device::drive_w ) +void apricot_winchester_device::drive_w(int state) { m_drive = (m_drive & ~(1 << N)) | (state << N); LOGREGS("Select drive: %d\n", m_drive); @@ -201,14 +201,14 @@ WRITE_LINE_MEMBER( apricot_winchester_device::drive_w ) m_hdc->drdy_w(drive != nullptr && drive->exists()); } -WRITE_LINE_MEMBER( apricot_winchester_device::xferd_w ) +void apricot_winchester_device::xferd_w(int state) { LOGREGS("xferd_w: %02x\n", state); m_hdc->brdy_w(state); } -WRITE_LINE_MEMBER( apricot_winchester_device::hbcr_w ) +void apricot_winchester_device::hbcr_w(int state) { LOGREGS("hbcr_w: %02x\n", state); @@ -219,7 +219,7 @@ WRITE_LINE_MEMBER( apricot_winchester_device::hbcr_w ) m_hbcr = state; } -WRITE_LINE_MEMBER( apricot_winchester_device::clksel_w ) +void apricot_winchester_device::clksel_w(int state) { LOGREGS("clksel_w: %02x\n", state); diff --git a/src/devices/bus/apricot/expansion/winchester.h b/src/devices/bus/apricot/expansion/winchester.h index fc082776d8c..c5ed5ec9a59 100644 --- a/src/devices/bus/apricot/expansion/winchester.h +++ b/src/devices/bus/apricot/expansion/winchester.h @@ -34,15 +34,15 @@ protected: virtual void device_reset() override; private: - DECLARE_WRITE_LINE_MEMBER(hdc_intrq_w); + void hdc_intrq_w(int state); uint8_t hdc_data_r(); void hdc_data_w(uint8_t data); uint8_t int_r(); - template DECLARE_WRITE_LINE_MEMBER(head_w); - template DECLARE_WRITE_LINE_MEMBER(drive_w); - DECLARE_WRITE_LINE_MEMBER(xferd_w); - DECLARE_WRITE_LINE_MEMBER(hbcr_w); - DECLARE_WRITE_LINE_MEMBER(clksel_w); + template void head_w(int state); + template void drive_w(int state); + void xferd_w(int state); + void hbcr_w(int state); + void clksel_w(int state); uint8_t data_r(); void data_w(uint8_t data); diff --git a/src/devices/bus/apricot/keyboard/keyboard.cpp b/src/devices/bus/apricot/keyboard/keyboard.cpp index 4a87d6b0493..b76c8e0835b 100644 --- a/src/devices/bus/apricot/keyboard/keyboard.cpp +++ b/src/devices/bus/apricot/keyboard/keyboard.cpp @@ -59,7 +59,7 @@ void apricot_keyboard_bus_device::device_start() // host to module interface //------------------------------------------------- -WRITE_LINE_MEMBER( apricot_keyboard_bus_device::out_w ) +void apricot_keyboard_bus_device::out_w(int state) { if (m_kbd) m_kbd->out_w(state); diff --git a/src/devices/bus/apricot/keyboard/keyboard.h b/src/devices/bus/apricot/keyboard/keyboard.h index e19605b2459..7a04bbc2e99 100644 --- a/src/devices/bus/apricot/keyboard/keyboard.h +++ b/src/devices/bus/apricot/keyboard/keyboard.h @@ -62,10 +62,10 @@ public: auto in_handler() { return m_in_handler.bind(); } // called from keyboard - DECLARE_WRITE_LINE_MEMBER( in_w ) { m_in_handler(state); } + void in_w(int state) { m_in_handler(state); } // called from host - DECLARE_WRITE_LINE_MEMBER( out_w ); + void out_w(int state); protected: // device-level overrides diff --git a/src/devices/bus/apricot/video/video.h b/src/devices/bus/apricot/video/video.h index 5b1a8b322f8..e1977107bd1 100644 --- a/src/devices/bus/apricot/video/video.h +++ b/src/devices/bus/apricot/video/video.h @@ -43,7 +43,7 @@ public: auto apvid_handler() { return m_apvid_handler.bind(); } // called from cart device - DECLARE_WRITE_LINE_MEMBER( apvid_w ) { m_apvid_handler(state); } + void apvid_w(int state) { m_apvid_handler(state); } // called from host bool mem_r(offs_t offset, uint16_t &data, uint16_t mem_mask); diff --git a/src/devices/bus/aquarius/slot.h b/src/devices/bus/aquarius/slot.h index 8fd5910b42a..59a446edb65 100644 --- a/src/devices/bus/aquarius/slot.h +++ b/src/devices/bus/aquarius/slot.h @@ -62,8 +62,8 @@ public: uint8_t iorq_r(offs_t offset); void iorq_w(offs_t offset, uint8_t data); - DECLARE_WRITE_LINE_MEMBER( irq_w ) { m_irq_handler(state); } - DECLARE_WRITE_LINE_MEMBER( nmi_w ) { m_nmi_handler(state); } + void irq_w(int state) { m_irq_handler(state); } + void nmi_w(int state) { m_nmi_handler(state); } protected: // device_t implementation diff --git a/src/devices/bus/archimedes/econet/slot.h b/src/devices/bus/archimedes/econet/slot.h index 4d963fd608e..5c45fcc58ee 100644 --- a/src/devices/bus/archimedes/econet/slot.h +++ b/src/devices/bus/archimedes/econet/slot.h @@ -65,7 +65,7 @@ public: virtual u8 read(offs_t offset); virtual void write(offs_t offset, u8 data); - DECLARE_WRITE_LINE_MEMBER( efiq_w ) { m_efiq_handler(state); } + void efiq_w(int state) { m_efiq_handler(state); } protected: // device-level overrides diff --git a/src/devices/bus/astrocde/accessory.h b/src/devices/bus/astrocde/accessory.h index 5386cd1362a..dd4e0f4e50a 100644 --- a/src/devices/bus/astrocde/accessory.h +++ b/src/devices/bus/astrocde/accessory.h @@ -63,7 +63,7 @@ class device_astrocade_accessory_interface : public device_interface public: virtual ~device_astrocade_accessory_interface(); - DECLARE_WRITE_LINE_MEMBER( write_ltpen ) { m_port->m_ltpen = state; m_port->m_ltpen_handler(state); } + void write_ltpen(int state) { m_port->m_ltpen = state; m_port->m_ltpen_handler(state); } protected: device_astrocade_accessory_interface(machine_config const &mconfig, device_t &device); diff --git a/src/devices/bus/astrocde/ctrl.cpp b/src/devices/bus/astrocde/ctrl.cpp index b33c8aebb49..94bfd34f7f9 100644 --- a/src/devices/bus/astrocde/ctrl.cpp +++ b/src/devices/bus/astrocde/ctrl.cpp @@ -42,7 +42,7 @@ void device_astrocade_ctrl_interface::interface_pre_start() throw device_missing_dependencies(); } -WRITE_LINE_MEMBER( device_astrocade_ctrl_interface::write_ltpen ) +void device_astrocade_ctrl_interface::write_ltpen(int state) { if (m_port->m_ltpen != state) { diff --git a/src/devices/bus/astrocde/ctrl.h b/src/devices/bus/astrocde/ctrl.h index 0273b4a80fd..1e7a88396ee 100644 --- a/src/devices/bus/astrocde/ctrl.h +++ b/src/devices/bus/astrocde/ctrl.h @@ -34,7 +34,7 @@ protected: virtual void interface_validity_check(validity_checker &valid) const override ATTR_COLD; virtual void interface_pre_start() override; - DECLARE_WRITE_LINE_MEMBER( write_ltpen ); + void write_ltpen(int state); private: astrocade_ctrl_port_device *const m_port; diff --git a/src/devices/bus/ata/atadev.h b/src/devices/bus/ata/atadev.h index 41832a8d22a..6dbc7b2abd3 100644 --- a/src/devices/bus/ata/atadev.h +++ b/src/devices/bus/ata/atadev.h @@ -30,10 +30,10 @@ public: virtual void write_cs0(offs_t offset, uint16_t data, uint16_t mem_mask = 0xffff) = 0; virtual void write_cs1(offs_t offset, uint16_t data, uint16_t mem_mask = 0xffff) = 0; - virtual DECLARE_WRITE_LINE_MEMBER(write_dmack) = 0; - virtual DECLARE_WRITE_LINE_MEMBER(write_csel) = 0; - virtual DECLARE_WRITE_LINE_MEMBER(write_dasp) = 0; - virtual DECLARE_WRITE_LINE_MEMBER(write_pdiag) = 0; + virtual void write_dmack(int state) = 0; + virtual void write_csel(int state) = 0; + virtual void write_dasp(int state) = 0; + virtual void write_pdiag(int state) = 0; protected: device_ata_interface(const machine_config &mconfig, device_t &device); diff --git a/src/devices/bus/ata/atahle.cpp b/src/devices/bus/ata/atahle.cpp index 5d3e413dde2..fecaf717153 100644 --- a/src/devices/bus/ata/atahle.cpp +++ b/src/devices/bus/ata/atahle.cpp @@ -512,17 +512,17 @@ void ata_hle_device::finished_diagnostic() } -WRITE_LINE_MEMBER( ata_hle_device::write_csel ) +void ata_hle_device::write_csel(int state) { m_csel = state; } -WRITE_LINE_MEMBER( ata_hle_device::write_dasp ) +void ata_hle_device::write_dasp(int state) { m_daspin = state; } -WRITE_LINE_MEMBER( ata_hle_device::write_dmack ) +void ata_hle_device::write_dmack(int state) { if (state && !m_dmack && single_word_dma_mode() >= 0) set_dmarq(CLEAR_LINE); @@ -530,7 +530,7 @@ WRITE_LINE_MEMBER( ata_hle_device::write_dmack ) m_dmack = state; } -WRITE_LINE_MEMBER( ata_hle_device::write_pdiag ) +void ata_hle_device::write_pdiag(int state) { m_pdiagin = state; diff --git a/src/devices/bus/ata/atahle.h b/src/devices/bus/ata/atahle.h index 46c1db7887d..fa85cae7213 100644 --- a/src/devices/bus/ata/atahle.h +++ b/src/devices/bus/ata/atahle.h @@ -25,10 +25,10 @@ public: virtual void write_dma(uint16_t data) override; virtual void write_cs0(offs_t offset, uint16_t data, uint16_t mem_mask = 0xffff) override; virtual void write_cs1(offs_t offset, uint16_t data, uint16_t mem_mask = 0xffff) override; - virtual DECLARE_WRITE_LINE_MEMBER(write_csel) override; - virtual DECLARE_WRITE_LINE_MEMBER(write_dasp) override; - virtual DECLARE_WRITE_LINE_MEMBER(write_dmack) override; - virtual DECLARE_WRITE_LINE_MEMBER(write_pdiag) override; + virtual void write_csel(int state) override; + virtual void write_dasp(int state) override; + virtual void write_dmack(int state) override; + virtual void write_pdiag(int state) override; protected: ata_hle_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); diff --git a/src/devices/bus/ata/ataintf.cpp b/src/devices/bus/ata/ataintf.cpp index d2a09e7a689..8bc7a99508d 100644 --- a/src/devices/bus/ata/ataintf.cpp +++ b/src/devices/bus/ata/ataintf.cpp @@ -40,7 +40,7 @@ void abstract_ata_interface_device::set_dasp(int state) m_dasp_handler(state); } -WRITE_LINE_MEMBER( abstract_ata_interface_device::irq0_write_line ) +void abstract_ata_interface_device::irq0_write_line(int state) { if (m_irq[0] != state) { @@ -50,7 +50,7 @@ WRITE_LINE_MEMBER( abstract_ata_interface_device::irq0_write_line ) } } -WRITE_LINE_MEMBER( abstract_ata_interface_device::irq1_write_line ) +void abstract_ata_interface_device::irq1_write_line(int state) { if (m_irq[1] != state) { @@ -60,7 +60,7 @@ WRITE_LINE_MEMBER( abstract_ata_interface_device::irq1_write_line ) } } -WRITE_LINE_MEMBER( abstract_ata_interface_device::dasp0_write_line ) +void abstract_ata_interface_device::dasp0_write_line(int state) { if (m_dasp[0] != state) { @@ -70,7 +70,7 @@ WRITE_LINE_MEMBER( abstract_ata_interface_device::dasp0_write_line ) } } -WRITE_LINE_MEMBER( abstract_ata_interface_device::dasp1_write_line ) +void abstract_ata_interface_device::dasp1_write_line(int state) { if (m_dasp[1] != state) { @@ -84,7 +84,7 @@ WRITE_LINE_MEMBER( abstract_ata_interface_device::dasp1_write_line ) } } -WRITE_LINE_MEMBER( abstract_ata_interface_device::dmarq0_write_line ) +void abstract_ata_interface_device::dmarq0_write_line(int state) { if (m_dmarq[0] != state) { @@ -94,7 +94,7 @@ WRITE_LINE_MEMBER( abstract_ata_interface_device::dmarq0_write_line ) } } -WRITE_LINE_MEMBER( abstract_ata_interface_device::dmarq1_write_line ) +void abstract_ata_interface_device::dmarq1_write_line(int state) { if (m_dmarq[1] != state) { @@ -104,12 +104,12 @@ WRITE_LINE_MEMBER( abstract_ata_interface_device::dmarq1_write_line ) } } -WRITE_LINE_MEMBER( abstract_ata_interface_device::pdiag0_write_line ) +void abstract_ata_interface_device::pdiag0_write_line(int state) { m_pdiag[0] = state; } -WRITE_LINE_MEMBER( abstract_ata_interface_device::pdiag1_write_line ) +void abstract_ata_interface_device::pdiag1_write_line(int state) { if (m_pdiag[1] != state) { @@ -197,7 +197,7 @@ void abstract_ata_interface_device::internal_write_cs1(offs_t offset, uint16_t d elem->dev()->write_cs1(offset, data, mem_mask); } -WRITE_LINE_MEMBER( abstract_ata_interface_device::write_dmack ) +void abstract_ata_interface_device::write_dmack(int state) { // logerror( "%s: write_dmack %04x\n", machine().describe_context(), state ); diff --git a/src/devices/bus/ata/ataintf.h b/src/devices/bus/ata/ataintf.h index 8fef178553d..45819c53436 100644 --- a/src/devices/bus/ata/ataintf.h +++ b/src/devices/bus/ata/ataintf.h @@ -59,7 +59,7 @@ public: uint16_t read_dma(); void write_dma(uint16_t data); - DECLARE_WRITE_LINE_MEMBER(write_dmack); + void write_dmack(int state); protected: abstract_ata_interface_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); @@ -86,15 +86,15 @@ protected: }; private: - DECLARE_WRITE_LINE_MEMBER(irq0_write_line); - DECLARE_WRITE_LINE_MEMBER(dmarq0_write_line); - DECLARE_WRITE_LINE_MEMBER(dasp0_write_line); - DECLARE_WRITE_LINE_MEMBER(pdiag0_write_line); - - DECLARE_WRITE_LINE_MEMBER(irq1_write_line); - DECLARE_WRITE_LINE_MEMBER(dmarq1_write_line); - DECLARE_WRITE_LINE_MEMBER(dasp1_write_line); - DECLARE_WRITE_LINE_MEMBER(pdiag1_write_line); + void irq0_write_line(int state); + void dmarq0_write_line(int state); + void dasp0_write_line(int state); + void pdiag0_write_line(int state); + + void irq1_write_line(int state); + void dmarq1_write_line(int state); + void dasp1_write_line(int state); + void pdiag1_write_line(int state); required_device_array m_slot; int m_irq[SLOT_COUNT]; diff --git a/src/devices/bus/ata/cp2024.cpp b/src/devices/bus/ata/cp2024.cpp index 89e0251ad34..15dc652341f 100644 --- a/src/devices/bus/ata/cp2024.cpp +++ b/src/devices/bus/ata/cp2024.cpp @@ -61,19 +61,19 @@ void cp2024_device::write_cs1(offs_t offset, u16 data, u16 mem_mask) { } -WRITE_LINE_MEMBER(cp2024_device::write_dmack) +void cp2024_device::write_dmack(int state) { } -WRITE_LINE_MEMBER(cp2024_device::write_csel) +void cp2024_device::write_csel(int state) { } -WRITE_LINE_MEMBER(cp2024_device::write_dasp) +void cp2024_device::write_dasp(int state) { } -WRITE_LINE_MEMBER(cp2024_device::write_pdiag) +void cp2024_device::write_pdiag(int state) { } diff --git a/src/devices/bus/ata/cp2024.h b/src/devices/bus/ata/cp2024.h index a7a0f497d57..5b0182a5012 100644 --- a/src/devices/bus/ata/cp2024.h +++ b/src/devices/bus/ata/cp2024.h @@ -26,10 +26,10 @@ protected: virtual void write_dma(u16 data) override; virtual void write_cs0(offs_t offset, u16 data, u16 mem_mask = 0xffff) override; virtual void write_cs1(offs_t offset, u16 data, u16 mem_mask = 0xffff) override; - virtual DECLARE_WRITE_LINE_MEMBER(write_dmack) override; - virtual DECLARE_WRITE_LINE_MEMBER(write_csel) override; - virtual DECLARE_WRITE_LINE_MEMBER(write_dasp) override; - virtual DECLARE_WRITE_LINE_MEMBER(write_pdiag) override; + virtual void write_dmack(int state) override; + virtual void write_csel(int state) override; + virtual void write_dasp(int state) override; + virtual void write_pdiag(int state) override; private: void mcu_map(address_map &map); diff --git a/src/devices/bus/ata/gdrom.cpp b/src/devices/bus/ata/gdrom.cpp index fb927b8d55a..29ca0c02baa 100644 --- a/src/devices/bus/ata/gdrom.cpp +++ b/src/devices/bus/ata/gdrom.cpp @@ -867,7 +867,7 @@ void gdrom_device::signature() // return atapi_cdrom_device::set_features(); //} -WRITE_LINE_MEMBER(gdrom_device::cdda_end_mark_cb) +void gdrom_device::cdda_end_mark_cb(int state) { if (state != ASSERT_LINE) return; diff --git a/src/devices/bus/ata/gdrom.h b/src/devices/bus/ata/gdrom.h index 7e6c714d993..45a4a8b52a0 100644 --- a/src/devices/bus/ata/gdrom.h +++ b/src/devices/bus/ata/gdrom.h @@ -23,7 +23,7 @@ public: virtual void ExecCommand() override; virtual void WriteData( uint8_t *data, int dataLength ) override; virtual void ReadData( uint8_t *data, int dataLength ) override; - DECLARE_WRITE_LINE_MEMBER(cdda_end_mark_cb); + void cdda_end_mark_cb(int state); protected: virtual void process_buffer() override; diff --git a/src/devices/bus/ata/px320a.cpp b/src/devices/bus/ata/px320a.cpp index fabad11e967..b7414df264a 100644 --- a/src/devices/bus/ata/px320a.cpp +++ b/src/devices/bus/ata/px320a.cpp @@ -51,19 +51,19 @@ void px320a_device::write_cs1(offs_t offset, u16 data, u16 mem_mask) { } -WRITE_LINE_MEMBER(px320a_device::write_dmack) +void px320a_device::write_dmack(int state) { } -WRITE_LINE_MEMBER(px320a_device::write_csel) +void px320a_device::write_csel(int state) { } -WRITE_LINE_MEMBER(px320a_device::write_dasp) +void px320a_device::write_dasp(int state) { } -WRITE_LINE_MEMBER(px320a_device::write_pdiag) +void px320a_device::write_pdiag(int state) { } diff --git a/src/devices/bus/ata/px320a.h b/src/devices/bus/ata/px320a.h index 938fc3a580b..553475ddafc 100644 --- a/src/devices/bus/ata/px320a.h +++ b/src/devices/bus/ata/px320a.h @@ -26,10 +26,10 @@ protected: virtual void write_dma(u16 data) override; virtual void write_cs0(offs_t offset, u16 data, u16 mem_mask = 0xffff) override; virtual void write_cs1(offs_t offset, u16 data, u16 mem_mask = 0xffff) override; - virtual DECLARE_WRITE_LINE_MEMBER(write_dmack) override; - virtual DECLARE_WRITE_LINE_MEMBER(write_csel) override; - virtual DECLARE_WRITE_LINE_MEMBER(write_dasp) override; - virtual DECLARE_WRITE_LINE_MEMBER(write_pdiag) override; + virtual void write_dmack(int state) override; + virtual void write_csel(int state) override; + virtual void write_dasp(int state) override; + virtual void write_pdiag(int state) override; private: void frcpu_map(address_map &map); diff --git a/src/devices/bus/bbc/1mhzbus/1mhzbus.h b/src/devices/bus/bbc/1mhzbus/1mhzbus.h index 302348b6822..d743cfc3ea5 100644 --- a/src/devices/bus/bbc/1mhzbus/1mhzbus.h +++ b/src/devices/bus/bbc/1mhzbus/1mhzbus.h @@ -112,8 +112,8 @@ public: virtual uint8_t jim_r(offs_t offset); virtual void jim_w(offs_t offset, uint8_t data); - DECLARE_WRITE_LINE_MEMBER( irq_w ) { m_irq_handler(state); } - DECLARE_WRITE_LINE_MEMBER( nmi_w ) { m_nmi_handler(state); } + void irq_w(int state) { m_irq_handler(state); } + void nmi_w(int state) { m_nmi_handler(state); } protected: // device-level overrides diff --git a/src/devices/bus/bbc/1mhzbus/2ndserial.cpp b/src/devices/bus/bbc/1mhzbus/2ndserial.cpp index 8958149d66e..6d4a53f6a6c 100644 --- a/src/devices/bus/bbc/1mhzbus/2ndserial.cpp +++ b/src/devices/bus/bbc/1mhzbus/2ndserial.cpp @@ -193,7 +193,7 @@ void bbc_2ndserial_device::jim_w(offs_t offset, uint8_t data) } -WRITE_LINE_MEMBER(bbc_2ndserial_device::write_acia_clock) +void bbc_2ndserial_device::write_acia_clock(int state) { m_acia->write_txc(state); m_acia->write_rxc(state); diff --git a/src/devices/bus/bbc/1mhzbus/2ndserial.h b/src/devices/bus/bbc/1mhzbus/2ndserial.h index e195af2523a..c954098aebd 100644 --- a/src/devices/bus/bbc/1mhzbus/2ndserial.h +++ b/src/devices/bus/bbc/1mhzbus/2ndserial.h @@ -40,7 +40,7 @@ protected: virtual void jim_w(offs_t offset, uint8_t data) override; private: - DECLARE_WRITE_LINE_MEMBER(write_acia_clock); + void write_acia_clock(int state); required_device m_1mhzbus; required_device m_acia; diff --git a/src/devices/bus/bbc/1mhzbus/datacentre.cpp b/src/devices/bus/bbc/1mhzbus/datacentre.cpp index 7895e6b6341..e6b7ae944dd 100644 --- a/src/devices/bus/bbc/1mhzbus/datacentre.cpp +++ b/src/devices/bus/bbc/1mhzbus/datacentre.cpp @@ -276,7 +276,7 @@ void bbc_datacentre_device::jim_w(offs_t offset, uint8_t data) m_ram[((m_page_ram & 0x0fff) << 8) | offset] = data; } -WRITE_LINE_MEMBER(bbc_datacentre_device::irq_w) +void bbc_datacentre_device::irq_w(int state) { if (BIT(m_links->read(), 1)) { diff --git a/src/devices/bus/bbc/1mhzbus/datacentre.h b/src/devices/bus/bbc/1mhzbus/datacentre.h index e0c6d70fe7f..df2136137af 100644 --- a/src/devices/bus/bbc/1mhzbus/datacentre.h +++ b/src/devices/bus/bbc/1mhzbus/datacentre.h @@ -47,7 +47,7 @@ protected: virtual void jim_w(offs_t offset, uint8_t data) override; private: - DECLARE_WRITE_LINE_MEMBER(irq_w); + void irq_w(int state); required_ioport m_links; required_device m_ide; diff --git a/src/devices/bus/bbc/1mhzbus/emrmidi.cpp b/src/devices/bus/bbc/1mhzbus/emrmidi.cpp index 6cfbacf23da..9099a2da996 100644 --- a/src/devices/bus/bbc/1mhzbus/emrmidi.cpp +++ b/src/devices/bus/bbc/1mhzbus/emrmidi.cpp @@ -101,7 +101,7 @@ void bbc_emrmidi_device::fred_w(offs_t offset, uint8_t data) } } -WRITE_LINE_MEMBER(bbc_emrmidi_device::write_acia_clock) +void bbc_emrmidi_device::write_acia_clock(int state) { m_acia->write_txc(state); m_acia->write_rxc(state); diff --git a/src/devices/bus/bbc/1mhzbus/emrmidi.h b/src/devices/bus/bbc/1mhzbus/emrmidi.h index 341e487ce24..77d84697928 100644 --- a/src/devices/bus/bbc/1mhzbus/emrmidi.h +++ b/src/devices/bus/bbc/1mhzbus/emrmidi.h @@ -40,7 +40,7 @@ protected: virtual void fred_w(offs_t offset, uint8_t data) override; private: - DECLARE_WRITE_LINE_MEMBER(write_acia_clock); + void write_acia_clock(int state); required_device m_acia; required_device m_acia_clock; diff --git a/src/devices/bus/bbc/1mhzbus/ide.cpp b/src/devices/bus/bbc/1mhzbus/ide.cpp index d5fdafb000d..1c6613f1282 100644 --- a/src/devices/bus/bbc/1mhzbus/ide.cpp +++ b/src/devices/bus/bbc/1mhzbus/ide.cpp @@ -215,7 +215,7 @@ void bbc_beebide_device::jim_w(offs_t offset, uint8_t data) m_1mhzbus->jim_w(offset, data); } -WRITE_LINE_MEMBER(bbc_beebide_device::irq_w) +void bbc_beebide_device::irq_w(int state) { if (BIT(m_links->read(), 0)) { diff --git a/src/devices/bus/bbc/1mhzbus/ide.h b/src/devices/bus/bbc/1mhzbus/ide.h index d326c199ce9..49a5eddb4f7 100644 --- a/src/devices/bus/bbc/1mhzbus/ide.h +++ b/src/devices/bus/bbc/1mhzbus/ide.h @@ -68,7 +68,7 @@ protected: virtual void jim_w(offs_t offset, uint8_t data) override; private: - DECLARE_WRITE_LINE_MEMBER(irq_w); + void irq_w(int state); required_device m_ide; required_device m_1mhzbus; diff --git a/src/devices/bus/bbc/1mhzbus/m2000.cpp b/src/devices/bus/bbc/1mhzbus/m2000.cpp index 8203cada22e..30eb4b472e5 100644 --- a/src/devices/bus/bbc/1mhzbus/m2000.cpp +++ b/src/devices/bus/bbc/1mhzbus/m2000.cpp @@ -155,7 +155,7 @@ void bbc_m2000_device::jim_w(offs_t offset, uint8_t data) m_1mhzbus->jim_w(offset, data); } -WRITE_LINE_MEMBER(bbc_m2000_device::write_acia_clock) +void bbc_m2000_device::write_acia_clock(int state) { m_acia1->write_txc(state); m_acia1->write_rxc(state); diff --git a/src/devices/bus/bbc/1mhzbus/m2000.h b/src/devices/bus/bbc/1mhzbus/m2000.h index eeee1034a4e..71638d3029d 100644 --- a/src/devices/bus/bbc/1mhzbus/m2000.h +++ b/src/devices/bus/bbc/1mhzbus/m2000.h @@ -44,7 +44,7 @@ protected: virtual void jim_w(offs_t offset, uint8_t data) override; private: - DECLARE_WRITE_LINE_MEMBER(write_acia_clock); + void write_acia_clock(int state); required_device m_1mhzbus; required_device m_acia1; diff --git a/src/devices/bus/bbc/1mhzbus/sasi.cpp b/src/devices/bus/bbc/1mhzbus/sasi.cpp index 9a55916f8f1..4550a6791c6 100644 --- a/src/devices/bus/bbc/1mhzbus/sasi.cpp +++ b/src/devices/bus/bbc/1mhzbus/sasi.cpp @@ -164,12 +164,12 @@ void bbc_sasi_device::jim_w(offs_t offset, uint8_t data) } } -WRITE_LINE_MEMBER(bbc_sasi_device::req_w) +void bbc_sasi_device::req_w(int state) { m_sasi->ack_w(0); } -WRITE_LINE_MEMBER(bbc_sasi_device::sel_w) +void bbc_sasi_device::sel_w(int state) { m_sel_state = state; } diff --git a/src/devices/bus/bbc/1mhzbus/sasi.h b/src/devices/bus/bbc/1mhzbus/sasi.h index e1b81125ecd..f7bbb985e27 100644 --- a/src/devices/bus/bbc/1mhzbus/sasi.h +++ b/src/devices/bus/bbc/1mhzbus/sasi.h @@ -26,8 +26,8 @@ public: // construction/destruction bbc_sasi_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - DECLARE_WRITE_LINE_MEMBER(req_w); - DECLARE_WRITE_LINE_MEMBER(sel_w); + void req_w(int state); + void sel_w(int state); protected: bbc_sasi_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); diff --git a/src/devices/bus/bbc/1mhzbus/scsi.cpp b/src/devices/bus/bbc/1mhzbus/scsi.cpp index 26c640467b3..f565dd7eee9 100644 --- a/src/devices/bus/bbc/1mhzbus/scsi.cpp +++ b/src/devices/bus/bbc/1mhzbus/scsi.cpp @@ -160,12 +160,12 @@ void bbc_scsi_device::fred_w(offs_t offset, uint8_t data) } } -WRITE_LINE_MEMBER(bbc_scsi_device::bsy_w) +void bbc_scsi_device::bsy_w(int state) { m_scsi->sel_w(0); } -WRITE_LINE_MEMBER(bbc_scsi_device::req_w) +void bbc_scsi_device::req_w(int state) { m_scsi->ack_w(0); diff --git a/src/devices/bus/bbc/1mhzbus/scsi.h b/src/devices/bus/bbc/1mhzbus/scsi.h index 8a4dabbe113..77cb6a44aae 100644 --- a/src/devices/bus/bbc/1mhzbus/scsi.h +++ b/src/devices/bus/bbc/1mhzbus/scsi.h @@ -26,8 +26,8 @@ public: // construction/destruction bbc_scsi_device(const machine_config& mconfig, const char* tag, device_t* owner, uint32_t clock); - DECLARE_WRITE_LINE_MEMBER(bsy_w); - DECLARE_WRITE_LINE_MEMBER(req_w); + void bsy_w(int state); + void req_w(int state); protected: bbc_scsi_device(const machine_config& mconfig, device_type type, const char* tag, device_t* owner, uint32_t clock); diff --git a/src/devices/bus/bbc/analogue/analogue.h b/src/devices/bus/bbc/analogue/analogue.h index bb58d2d0148..767223e4dd6 100644 --- a/src/devices/bus/bbc/analogue/analogue.h +++ b/src/devices/bus/bbc/analogue/analogue.h @@ -60,7 +60,7 @@ public: // callbacks auto lpstb_handler() { return m_lpstb_handler.bind(); } - DECLARE_WRITE_LINE_MEMBER(lpstb_w) { m_lpstb_handler(state); } + void lpstb_w(int state) { m_lpstb_handler(state); } uint8_t ch_r(int channel); uint8_t pb_r(); diff --git a/src/devices/bus/bbc/exp/exp.h b/src/devices/bus/bbc/exp/exp.h index f7d695b59a5..56c9d0b6838 100644 --- a/src/devices/bus/bbc/exp/exp.h +++ b/src/devices/bus/bbc/exp/exp.h @@ -82,12 +82,12 @@ public: uint8_t sheila_r(offs_t offset); void sheila_w(offs_t offset, uint8_t data); - DECLARE_WRITE_LINE_MEMBER( irq_w ) { m_irq_handler(state); } - DECLARE_WRITE_LINE_MEMBER( nmi_w ) { m_nmi_handler(state); } + void irq_w(int state) { m_irq_handler(state); } + void nmi_w(int state) { m_nmi_handler(state); } // additional handlers for mertec device - DECLARE_WRITE_LINE_MEMBER(cb1_w) { m_cb1_handler(state); } - DECLARE_WRITE_LINE_MEMBER(cb2_w) { m_cb2_handler(state); } + void cb1_w(int state) { m_cb1_handler(state); } + void cb2_w(int state) { m_cb2_handler(state); } uint8_t pb_r(); void pb_w(uint8_t data); diff --git a/src/devices/bus/bbc/fdc/acorn.cpp b/src/devices/bus/bbc/fdc/acorn.cpp index 22b2cc027c8..66e351cd973 100644 --- a/src/devices/bus/bbc/fdc/acorn.cpp +++ b/src/devices/bus/bbc/fdc/acorn.cpp @@ -196,14 +196,14 @@ void bbc_acorn8271_device::write(offs_t offset, uint8_t data) } } -WRITE_LINE_MEMBER(bbc_acorn8271_device::motor_w) +void bbc_acorn8271_device::motor_w(int state) { if (m_floppy[0]->get_device()) m_floppy[0]->get_device()->mon_w(!state); if (m_floppy[1]->get_device()) m_floppy[1]->get_device()->mon_w(!state); m_fdc->ready_w(!state); } -WRITE_LINE_MEMBER(bbc_acorn8271_device::side_w) +void bbc_acorn8271_device::side_w(int state) { if (m_floppy[0]->get_device()) m_floppy[0]->get_device()->ss_w(state); if (m_floppy[1]->get_device()) m_floppy[1]->get_device()->ss_w(state); @@ -255,12 +255,12 @@ void bbc_acorn1770_device::write(offs_t offset, uint8_t data) } } -WRITE_LINE_MEMBER(bbc_acorn1770_device::fdc_intrq_w) +void bbc_acorn1770_device::fdc_intrq_w(int state) { m_slot->intrq_w((state && m_fdc_ie) ? ASSERT_LINE : CLEAR_LINE); } -WRITE_LINE_MEMBER(bbc_acorn1770_device::fdc_drq_w) +void bbc_acorn1770_device::fdc_drq_w(int state) { m_slot->drq_w((state && m_fdc_ie) ? ASSERT_LINE : CLEAR_LINE); } diff --git a/src/devices/bus/bbc/fdc/acorn.h b/src/devices/bus/bbc/fdc/acorn.h index 347368ff29f..1f10b956581 100644 --- a/src/devices/bus/bbc/fdc/acorn.h +++ b/src/devices/bus/bbc/fdc/acorn.h @@ -46,8 +46,8 @@ protected: virtual void write(offs_t offset, uint8_t data) override; private: - DECLARE_WRITE_LINE_MEMBER(motor_w); - DECLARE_WRITE_LINE_MEMBER(side_w); + void motor_w(int state); + void side_w(int state); required_device m_fdc; required_device_array m_floppy; @@ -73,8 +73,8 @@ protected: virtual void write(offs_t offset, uint8_t data) override; private: - DECLARE_WRITE_LINE_MEMBER(fdc_intrq_w); - DECLARE_WRITE_LINE_MEMBER(fdc_drq_w); + void fdc_intrq_w(int state); + void fdc_drq_w(int state); required_device m_fdc; required_device_array m_floppy; diff --git a/src/devices/bus/bbc/fdc/ams.cpp b/src/devices/bus/bbc/fdc/ams.cpp index ef64eabd75c..3a6463f0cdc 100644 --- a/src/devices/bus/bbc/fdc/ams.cpp +++ b/src/devices/bus/bbc/fdc/ams.cpp @@ -122,14 +122,14 @@ void bbc_ams3_device::write(offs_t offset, uint8_t data) } } -WRITE_LINE_MEMBER(bbc_ams3_device::motor_w) +void bbc_ams3_device::motor_w(int state) { if (m_floppy[0]->get_device()) m_floppy[0]->get_device()->mon_w(!state); if (m_floppy[1]->get_device()) m_floppy[1]->get_device()->mon_w(!state); m_fdc->ready_w(!state); } -WRITE_LINE_MEMBER(bbc_ams3_device::side_w) +void bbc_ams3_device::side_w(int state) { if (m_floppy[0]->get_device()) m_floppy[0]->get_device()->ss_w(state); if (m_floppy[1]->get_device()) m_floppy[1]->get_device()->ss_w(state); diff --git a/src/devices/bus/bbc/fdc/ams.h b/src/devices/bus/bbc/fdc/ams.h index a1bdcc27696..8a92fc266b5 100644 --- a/src/devices/bus/bbc/fdc/ams.h +++ b/src/devices/bus/bbc/fdc/ams.h @@ -43,9 +43,9 @@ protected: virtual void write(offs_t offset, uint8_t data) override; private: - DECLARE_WRITE_LINE_MEMBER(fdc_intrq_w); - DECLARE_WRITE_LINE_MEMBER(motor_w); - DECLARE_WRITE_LINE_MEMBER(side_w); + void fdc_intrq_w(int state); + void motor_w(int state); + void side_w(int state); required_device m_fdc; required_device_array m_floppy; diff --git a/src/devices/bus/bbc/fdc/cumana.cpp b/src/devices/bus/bbc/fdc/cumana.cpp index 2db9b4b2f2a..006fb904192 100644 --- a/src/devices/bus/bbc/fdc/cumana.cpp +++ b/src/devices/bus/bbc/fdc/cumana.cpp @@ -204,19 +204,19 @@ void bbc_cumanafdc_device::write(offs_t offset, uint8_t data) } } -WRITE_LINE_MEMBER(bbc_cumanafdc_device::fdc_intrq_w) +void bbc_cumanafdc_device::fdc_intrq_w(int state) { if (m_fdc_ie) m_slot->intrq_w(state); } -WRITE_LINE_MEMBER(bbc_cumanafdc_device::fdc_drq_w) +void bbc_cumanafdc_device::fdc_drq_w(int state) { if (m_fdc_ie) m_slot->drq_w(state); } -WRITE_LINE_MEMBER(bbc_cumanafdc_device::motor_w) +void bbc_cumanafdc_device::motor_w(int state) { if (m_floppy[0]->get_device()) m_floppy[0]->get_device()->mon_w(!state); if (m_floppy[1]->get_device()) m_floppy[1]->get_device()->mon_w(!state); diff --git a/src/devices/bus/bbc/fdc/cumana.h b/src/devices/bus/bbc/fdc/cumana.h index d775a68e622..128900d0dd4 100644 --- a/src/devices/bus/bbc/fdc/cumana.h +++ b/src/devices/bus/bbc/fdc/cumana.h @@ -28,9 +28,9 @@ class bbc_cumanafdc_device : public: static void floppy_formats(format_registration &fr); - DECLARE_WRITE_LINE_MEMBER(fdc_intrq_w); - DECLARE_WRITE_LINE_MEMBER(fdc_drq_w); - DECLARE_WRITE_LINE_MEMBER(motor_w); + void fdc_intrq_w(int state); + void fdc_drq_w(int state); + void motor_w(int state); protected: // construction/destruction diff --git a/src/devices/bus/bbc/fdc/cv1797.cpp b/src/devices/bus/bbc/fdc/cv1797.cpp index 32d517f35cb..5407d2f9613 100644 --- a/src/devices/bus/bbc/fdc/cv1797.cpp +++ b/src/devices/bus/bbc/fdc/cv1797.cpp @@ -144,12 +144,12 @@ void bbc_cv1797_device::write(offs_t offset, uint8_t data) } } -WRITE_LINE_MEMBER(bbc_cv1797_device::fdc_sso_w) +void bbc_cv1797_device::fdc_sso_w(int state) { // TODO: schematic required to confirm usage. } -WRITE_LINE_MEMBER(bbc_cv1797_device::fdc_hld_w) +void bbc_cv1797_device::fdc_hld_w(int state) { if (m_floppy) m_floppy->mon_w(!state); diff --git a/src/devices/bus/bbc/fdc/cv1797.h b/src/devices/bus/bbc/fdc/cv1797.h index 16b870f963c..23894267a2f 100644 --- a/src/devices/bus/bbc/fdc/cv1797.h +++ b/src/devices/bus/bbc/fdc/cv1797.h @@ -44,8 +44,8 @@ protected: private: static void floppy_formats(format_registration &fr); - DECLARE_WRITE_LINE_MEMBER(fdc_sso_w); - DECLARE_WRITE_LINE_MEMBER(fdc_hld_w); + void fdc_sso_w(int state); + void fdc_hld_w(int state); required_device m_fdc; required_device_array m_floppies; diff --git a/src/devices/bus/bbc/fdc/fdc.h b/src/devices/bus/bbc/fdc/fdc.h index 7138ced7ad1..4ee6c6ec717 100644 --- a/src/devices/bus/bbc/fdc/fdc.h +++ b/src/devices/bus/bbc/fdc/fdc.h @@ -48,8 +48,8 @@ public: uint8_t read(offs_t offset); void write(offs_t offset, uint8_t data); - DECLARE_WRITE_LINE_MEMBER( intrq_w ) { m_intrq_cb(state); } - DECLARE_WRITE_LINE_MEMBER( drq_w) { m_drq_cb(state); } + void intrq_w(int state) { m_intrq_cb(state); } + void drq_w(int state) { m_drq_cb(state); } protected: // device-level overrides diff --git a/src/devices/bus/bbc/fdc/kenda.cpp b/src/devices/bus/bbc/fdc/kenda.cpp index 801dd731200..1e41f1bfe18 100644 --- a/src/devices/bus/bbc/fdc/kenda.cpp +++ b/src/devices/bus/bbc/fdc/kenda.cpp @@ -161,7 +161,7 @@ void bbc_kenda_device::write(offs_t offset, uint8_t data) } } -WRITE_LINE_MEMBER(bbc_kenda_device::motor_w) +void bbc_kenda_device::motor_w(int state) { if (m_floppy[0]->get_device()) m_floppy[0]->get_device()->mon_w(!state); if (m_floppy[1]->get_device()) m_floppy[1]->get_device()->mon_w(!state); diff --git a/src/devices/bus/bbc/fdc/kenda.h b/src/devices/bus/bbc/fdc/kenda.h index 99868f062fb..f3e9951a67f 100644 --- a/src/devices/bus/bbc/fdc/kenda.h +++ b/src/devices/bus/bbc/fdc/kenda.h @@ -41,7 +41,7 @@ protected: private: static void floppy_formats(format_registration &fr); - DECLARE_WRITE_LINE_MEMBER(motor_w); + void motor_w(int state); required_device m_fdc; required_device_array m_floppy; diff --git a/src/devices/bus/bbc/fdc/opus.cpp b/src/devices/bus/bbc/fdc/opus.cpp index 2851fc3de3c..6b7266ba631 100644 --- a/src/devices/bus/bbc/fdc/opus.cpp +++ b/src/devices/bus/bbc/fdc/opus.cpp @@ -316,7 +316,7 @@ void bbc_opusfdc_device::write(offs_t offset, uint8_t data) } } -WRITE_LINE_MEMBER(bbc_opusfdc_device::motor_w) +void bbc_opusfdc_device::motor_w(int state) { if (m_floppy[0]->get_device()) m_floppy[0]->get_device()->mon_w(!state); if (m_floppy[1]->get_device()) m_floppy[1]->get_device()->mon_w(!state); diff --git a/src/devices/bus/bbc/fdc/opus.h b/src/devices/bus/bbc/fdc/opus.h index 5cca5a5c701..24ac082ba5d 100644 --- a/src/devices/bus/bbc/fdc/opus.h +++ b/src/devices/bus/bbc/fdc/opus.h @@ -52,7 +52,7 @@ class bbc_opusfdc_device : public: static void floppy_formats(format_registration &fr); - DECLARE_WRITE_LINE_MEMBER(motor_w); + void motor_w(int state); protected: // construction/destruction diff --git a/src/devices/bus/bbc/fdc/solidisk.cpp b/src/devices/bus/bbc/fdc/solidisk.cpp index c342fc64355..a9b0b403217 100644 --- a/src/devices/bus/bbc/fdc/solidisk.cpp +++ b/src/devices/bus/bbc/fdc/solidisk.cpp @@ -226,14 +226,14 @@ INPUT_CHANGED_MEMBER(bbc_stlfdc_device::fdc_changed) device_reset(); } -WRITE_LINE_MEMBER(bbc_stlfdc_device::motor_w) +void bbc_stlfdc_device::motor_w(int state) { if (m_floppy[0]->get_device()) m_floppy[0]->get_device()->mon_w(!state); if (m_floppy[1]->get_device()) m_floppy[1]->get_device()->mon_w(!state); m_i8271->ready_w(!state); } -WRITE_LINE_MEMBER(bbc_stlfdc_device::side_w) +void bbc_stlfdc_device::side_w(int state) { if (m_floppy[0]->get_device()) m_floppy[0]->get_device()->ss_w(state); if (m_floppy[1]->get_device()) m_floppy[1]->get_device()->ss_w(state); diff --git a/src/devices/bus/bbc/fdc/solidisk.h b/src/devices/bus/bbc/fdc/solidisk.h index 025db9ca332..67723f91975 100644 --- a/src/devices/bus/bbc/fdc/solidisk.h +++ b/src/devices/bus/bbc/fdc/solidisk.h @@ -35,8 +35,8 @@ protected: // construction/destruction bbc_stlfdc_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); - DECLARE_WRITE_LINE_MEMBER(motor_w); - DECLARE_WRITE_LINE_MEMBER(side_w); + void motor_w(int state); + void side_w(int state); required_device m_wd1770; optional_device m_i8271; diff --git a/src/devices/bus/bbc/fdc/udm.cpp b/src/devices/bus/bbc/fdc/udm.cpp index dc078aa8dfa..da9b10e6556 100644 --- a/src/devices/bus/bbc/fdc/udm.cpp +++ b/src/devices/bus/bbc/fdc/udm.cpp @@ -151,17 +151,17 @@ void bbc_udm_device::write(offs_t offset, uint8_t data) } } -WRITE_LINE_MEMBER(bbc_udm_device::intrq_w) +void bbc_udm_device::intrq_w(int state) { m_slot->intrq_w((state && m_fdc_ie) ? ASSERT_LINE : CLEAR_LINE); } -WRITE_LINE_MEMBER(bbc_udm_device::drq_w) +void bbc_udm_device::drq_w(int state) { m_slot->drq_w((state && m_fdc_ie) ? ASSERT_LINE : CLEAR_LINE); } -WRITE_LINE_MEMBER(bbc_udm_device::motor_w) +void bbc_udm_device::motor_w(int state) { if (m_floppy[0]->get_device()) m_floppy[0]->get_device()->mon_w(!state); if (m_floppy[1]->get_device()) m_floppy[1]->get_device()->mon_w(!state); diff --git a/src/devices/bus/bbc/fdc/udm.h b/src/devices/bus/bbc/fdc/udm.h index 8e21917efb8..a5212a66cf5 100644 --- a/src/devices/bus/bbc/fdc/udm.h +++ b/src/devices/bus/bbc/fdc/udm.h @@ -44,9 +44,9 @@ protected: private: static void floppy_formats(format_registration &fr); - DECLARE_WRITE_LINE_MEMBER(intrq_w); - DECLARE_WRITE_LINE_MEMBER(drq_w); - DECLARE_WRITE_LINE_MEMBER(motor_w); + void intrq_w(int state); + void drq_w(int state); + void motor_w(int state); required_device m_fdc; required_device_array m_floppy; diff --git a/src/devices/bus/bbc/internal/cumana68k.cpp b/src/devices/bus/bbc/internal/cumana68k.cpp index 19e71ee8692..22e0e446d7b 100644 --- a/src/devices/bus/bbc/internal/cumana68k.cpp +++ b/src/devices/bus/bbc/internal/cumana68k.cpp @@ -197,13 +197,13 @@ void bbc_cumana68k_device::device_reset_after_children() // IMPLEMENTATION //************************************************************************** -WRITE_LINE_MEMBER(bbc_cumana68k_device::reset68008_w) +void bbc_cumana68k_device::reset68008_w(int state) { m_m68008->set_input_line(INPUT_LINE_HALT, state); m_m68008->set_input_line(INPUT_LINE_RESET, state); } -WRITE_LINE_MEMBER(bbc_cumana68k_device::irq6502_w) +void bbc_cumana68k_device::irq6502_w(int state) { m_m68008->set_input_line(M68K_IRQ_2, state); } @@ -255,7 +255,7 @@ void bbc_cumana68k_device::mem6502_w(offs_t offset, uint8_t data) } -WRITE_LINE_MEMBER(bbc_cumana68k_device::rtc_ce_w) +void bbc_cumana68k_device::rtc_ce_w(int state) { m_mc146818_ce = !state; } diff --git a/src/devices/bus/bbc/internal/cumana68k.h b/src/devices/bus/bbc/internal/cumana68k.h index 84f545db295..1fbdd8aee04 100644 --- a/src/devices/bus/bbc/internal/cumana68k.h +++ b/src/devices/bus/bbc/internal/cumana68k.h @@ -51,11 +51,11 @@ protected: virtual void device_add_mconfig(machine_config &config) override; virtual const tiny_rom_entry *device_rom_region() const override; - DECLARE_WRITE_LINE_MEMBER(irq6502_w) override; + void irq6502_w(int state) override; private: - DECLARE_WRITE_LINE_MEMBER(reset68008_w); - DECLARE_WRITE_LINE_MEMBER(rtc_ce_w); + void reset68008_w(int state); + void rtc_ce_w(int state); required_device m_m68008; required_device m_pia_sasi; diff --git a/src/devices/bus/bbc/internal/internal.cpp b/src/devices/bus/bbc/internal/internal.cpp index a365b5729dc..50e0e6e0a12 100644 --- a/src/devices/bus/bbc/internal/internal.cpp +++ b/src/devices/bus/bbc/internal/internal.cpp @@ -146,7 +146,7 @@ void bbc_internal_slot_device::latch_fe60_w(uint8_t data) m_card->latch_fe60_w(data); } -WRITE_LINE_MEMBER(bbc_internal_slot_device::irq6502_w) +void bbc_internal_slot_device::irq6502_w(int state) { if (m_card) m_card->irq6502_w(state); diff --git a/src/devices/bus/bbc/internal/internal.h b/src/devices/bus/bbc/internal/internal.h index 3042dd30a0b..7b3210a556e 100644 --- a/src/devices/bus/bbc/internal/internal.h +++ b/src/devices/bus/bbc/internal/internal.h @@ -39,7 +39,7 @@ public: virtual void mos_w(offs_t offset, uint8_t data) { } virtual void latch_fe60_w(uint8_t data) { } - virtual DECLARE_WRITE_LINE_MEMBER(irq6502_w) { } + virtual void irq6502_w(int state) { } protected: device_bbc_internal_interface(const machine_config &mconfig, device_t &device); @@ -75,8 +75,8 @@ public: auto irq_handler() { return m_irq_handler.bind(); } auto nmi_handler() { return m_nmi_handler.bind(); } - DECLARE_WRITE_LINE_MEMBER(irq_w) { m_irq_handler(state); } - DECLARE_WRITE_LINE_MEMBER(nmi_w) { m_nmi_handler(state); } + void irq_w(int state) { m_irq_handler(state); } + void nmi_w(int state) { m_nmi_handler(state); } virtual bool overrides_ram() { return m_card ? m_card->overrides_ram() : false; } virtual bool overrides_rom() { return m_card ? m_card->overrides_rom() : false; } @@ -91,7 +91,7 @@ public: virtual void mos_w(offs_t offset, uint8_t data); virtual void latch_fe60_w(uint8_t data); - virtual DECLARE_WRITE_LINE_MEMBER(irq6502_w); + virtual void irq6502_w(int state); protected: // device-level overrides diff --git a/src/devices/bus/bbc/joyport/joyport.h b/src/devices/bus/bbc/joyport/joyport.h index 15d81243d84..1463d38eab9 100644 --- a/src/devices/bus/bbc/joyport/joyport.h +++ b/src/devices/bus/bbc/joyport/joyport.h @@ -62,8 +62,8 @@ public: auto cb2_handler() { return m_cb2_handler.bind(); } // from slot - DECLARE_WRITE_LINE_MEMBER(cb1_w) { m_cb1_handler(state); } - DECLARE_WRITE_LINE_MEMBER(cb2_w) { m_cb2_handler(state); } + void cb1_w(int state) { m_cb1_handler(state); } + void cb2_w(int state) { m_cb2_handler(state); } // from host uint8_t pb_r(); diff --git a/src/devices/bus/bbc/modem/modem.h b/src/devices/bus/bbc/modem/modem.h index 6c1e7840637..702981f4ddb 100644 --- a/src/devices/bus/bbc/modem/modem.h +++ b/src/devices/bus/bbc/modem/modem.h @@ -68,7 +68,7 @@ public: virtual uint8_t read(offs_t offset); virtual void write(offs_t offset, uint8_t data); - DECLARE_WRITE_LINE_MEMBER( irq_w ) { m_irq_handler(state); } + void irq_w(int state) { m_irq_handler(state); } protected: // device-level overrides diff --git a/src/devices/bus/bbc/modem/scsiaiv.cpp b/src/devices/bus/bbc/modem/scsiaiv.cpp index 603b36c9a8a..b3979acb9f9 100644 --- a/src/devices/bus/bbc/modem/scsiaiv.cpp +++ b/src/devices/bus/bbc/modem/scsiaiv.cpp @@ -128,12 +128,12 @@ void bbc_scsiaiv_device::write(offs_t offset, uint8_t data) } } -WRITE_LINE_MEMBER(bbc_scsiaiv_device::bsy_w) +void bbc_scsiaiv_device::bsy_w(int state) { m_scsi->sel_w(0); } -WRITE_LINE_MEMBER(bbc_scsiaiv_device::req_w) +void bbc_scsiaiv_device::req_w(int state) { m_scsi->ack_w(0); diff --git a/src/devices/bus/bbc/modem/scsiaiv.h b/src/devices/bus/bbc/modem/scsiaiv.h index 0b244bb71e3..81f73f8c369 100644 --- a/src/devices/bus/bbc/modem/scsiaiv.h +++ b/src/devices/bus/bbc/modem/scsiaiv.h @@ -26,8 +26,8 @@ public: // construction/destruction bbc_scsiaiv_device(const machine_config& mconfig, const char* tag, device_t* owner, uint32_t clock); - DECLARE_WRITE_LINE_MEMBER(bsy_w); - DECLARE_WRITE_LINE_MEMBER(req_w); + void bsy_w(int state); + void req_w(int state); protected: bbc_scsiaiv_device(const machine_config& mconfig, device_type type, const char* tag, device_t* owner, uint32_t clock); diff --git a/src/devices/bus/bbc/tube/tube.h b/src/devices/bus/bbc/tube/tube.h index 97c18ab0d34..e6b461ed855 100644 --- a/src/devices/bus/bbc/tube/tube.h +++ b/src/devices/bus/bbc/tube/tube.h @@ -73,7 +73,7 @@ public: uint8_t host_r(offs_t offset); void host_w(offs_t offset, uint8_t data); - DECLARE_WRITE_LINE_MEMBER( irq_w ) { m_irq_handler(state); } + void irq_w(int state) { m_irq_handler(state); } protected: // device-level overrides diff --git a/src/devices/bus/bbc/tube/tube_32016.cpp b/src/devices/bus/bbc/tube/tube_32016.cpp index e62e3003998..01019302aec 100644 --- a/src/devices/bus/bbc/tube/tube_32016.cpp +++ b/src/devices/bus/bbc/tube/tube_32016.cpp @@ -268,7 +268,7 @@ void bbc_tube_32016_device::device_reset() // IMPLEMENTATION //************************************************************************** -WRITE_LINE_MEMBER(bbc_tube_32016_device::prst_w) +void bbc_tube_32016_device::prst_w(int state) { device_reset(); diff --git a/src/devices/bus/bbc/tube/tube_32016.h b/src/devices/bus/bbc/tube/tube_32016.h index 242b4eb773b..3feea1970de 100644 --- a/src/devices/bus/bbc/tube/tube_32016.h +++ b/src/devices/bus/bbc/tube/tube_32016.h @@ -61,7 +61,7 @@ protected: void tube_32016_mem(address_map &map); - DECLARE_WRITE_LINE_MEMBER(prst_w); + void prst_w(int state); }; diff --git a/src/devices/bus/bbc/tube/tube_6502.cpp b/src/devices/bus/bbc/tube/tube_6502.cpp index e7cc3157c90..d3b296defc6 100644 --- a/src/devices/bus/bbc/tube/tube_6502.cpp +++ b/src/devices/bus/bbc/tube/tube_6502.cpp @@ -263,7 +263,7 @@ void bbc_tube_6502_device::device_reset() // IMPLEMENTATION //************************************************************************** -WRITE_LINE_MEMBER(bbc_tube_6502_device::prst_w) +void bbc_tube_6502_device::prst_w(int state) { device_reset(); diff --git a/src/devices/bus/bbc/tube/tube_6502.h b/src/devices/bus/bbc/tube/tube_6502.h index a68e9c3f51e..f2b12a5c3f0 100644 --- a/src/devices/bus/bbc/tube/tube_6502.h +++ b/src/devices/bus/bbc/tube/tube_6502.h @@ -60,7 +60,7 @@ protected: required_device m_ram; required_memory_region m_rom; - DECLARE_WRITE_LINE_MEMBER(prst_w); + void prst_w(int state); }; diff --git a/src/devices/bus/bbc/tube/tube_80186.cpp b/src/devices/bus/bbc/tube/tube_80186.cpp index 07456c67a38..245cd3ff0e1 100644 --- a/src/devices/bus/bbc/tube/tube_80186.cpp +++ b/src/devices/bus/bbc/tube/tube_80186.cpp @@ -169,7 +169,7 @@ void bbc_tube_pcplus_device::device_reset() // IMPLEMENTATION //************************************************************************** -WRITE_LINE_MEMBER(bbc_tube_80186_device::prst_w) +void bbc_tube_80186_device::prst_w(int state) { device_reset(); diff --git a/src/devices/bus/bbc/tube/tube_80186.h b/src/devices/bus/bbc/tube/tube_80186.h index 448ef06cc7f..a9c2f446fd8 100644 --- a/src/devices/bus/bbc/tube/tube_80186.h +++ b/src/devices/bus/bbc/tube/tube_80186.h @@ -53,7 +53,7 @@ protected: void tube_80186_io(address_map &map); void tube_80186_mem(address_map &map); - DECLARE_WRITE_LINE_MEMBER(prst_w); + void prst_w(int state); }; diff --git a/src/devices/bus/bbc/tube/tube_80286.cpp b/src/devices/bus/bbc/tube/tube_80286.cpp index ffdfc0edb6f..34917acf629 100644 --- a/src/devices/bus/bbc/tube/tube_80286.cpp +++ b/src/devices/bus/bbc/tube/tube_80286.cpp @@ -129,7 +129,7 @@ void bbc_tube_80286_device::device_reset() // IMPLEMENTATION //************************************************************************** -WRITE_LINE_MEMBER(bbc_tube_80286_device::prst_w) +void bbc_tube_80286_device::prst_w(int state) { device_reset(); diff --git a/src/devices/bus/bbc/tube/tube_80286.h b/src/devices/bus/bbc/tube/tube_80286.h index 6ac75975fa7..0cadfb708e1 100644 --- a/src/devices/bus/bbc/tube/tube_80286.h +++ b/src/devices/bus/bbc/tube/tube_80286.h @@ -55,7 +55,7 @@ private: void tube_80286_io(address_map &map); void tube_80286_mem(address_map &map); - DECLARE_WRITE_LINE_MEMBER(prst_w); + void prst_w(int state); }; diff --git a/src/devices/bus/bbc/tube/tube_a500.cpp b/src/devices/bus/bbc/tube/tube_a500.cpp index f9406f2d2f0..904cc4aeda1 100644 --- a/src/devices/bus/bbc/tube/tube_a500.cpp +++ b/src/devices/bus/bbc/tube/tube_a500.cpp @@ -140,7 +140,7 @@ void bbc_tube_a500_device::device_start() // IMPLEMENTATION //************************************************************************** -WRITE_LINE_MEMBER(bbc_tube_a500_device::prst_w) +void bbc_tube_a500_device::prst_w(int state) { m_maincpu->set_input_line(INPUT_LINE_RESET, state); } diff --git a/src/devices/bus/bbc/tube/tube_a500.h b/src/devices/bus/bbc/tube/tube_a500.h index 31af8f227f1..eba73708d60 100644 --- a/src/devices/bus/bbc/tube/tube_a500.h +++ b/src/devices/bus/bbc/tube/tube_a500.h @@ -61,7 +61,7 @@ private: void arm_mem(address_map &map); void a500_map(address_map &map); - DECLARE_WRITE_LINE_MEMBER(prst_w); + void prst_w(int state); }; diff --git a/src/devices/bus/bbc/tube/tube_arm.cpp b/src/devices/bus/bbc/tube/tube_arm.cpp index c015871ffa5..f550a245e6e 100644 --- a/src/devices/bus/bbc/tube/tube_arm.cpp +++ b/src/devices/bus/bbc/tube/tube_arm.cpp @@ -134,7 +134,7 @@ void bbc_tube_arm_device::device_reset() // IMPLEMENTATION //************************************************************************** -WRITE_LINE_MEMBER(bbc_tube_arm_device::prst_w) +void bbc_tube_arm_device::prst_w(int state) { device_reset(); diff --git a/src/devices/bus/bbc/tube/tube_arm.h b/src/devices/bus/bbc/tube/tube_arm.h index c84ddc97748..f2af17b0f54 100644 --- a/src/devices/bus/bbc/tube/tube_arm.h +++ b/src/devices/bus/bbc/tube/tube_arm.h @@ -51,7 +51,7 @@ private: void tube_arm_mem(address_map &map); - DECLARE_WRITE_LINE_MEMBER(prst_w); + void prst_w(int state); }; diff --git a/src/devices/bus/bbc/tube/tube_arm7.cpp b/src/devices/bus/bbc/tube/tube_arm7.cpp index e79b83ad997..f67c89e4c77 100644 --- a/src/devices/bus/bbc/tube/tube_arm7.cpp +++ b/src/devices/bus/bbc/tube/tube_arm7.cpp @@ -132,7 +132,7 @@ void bbc_tube_arm7_device::device_reset() // IMPLEMENTATION //************************************************************************** -WRITE_LINE_MEMBER(bbc_tube_arm7_device::prst_w) +void bbc_tube_arm7_device::prst_w(int state) { device_reset(); @@ -159,13 +159,13 @@ void bbc_tube_arm7_device::update_interrupts() m_maincpu->set_input_line(ARM7_IRQ_LINE, irq ? ASSERT_LINE : CLEAR_LINE); } -WRITE_LINE_MEMBER(bbc_tube_arm7_device::efiq_w) +void bbc_tube_arm7_device::efiq_w(int state) { m_efiq_state = state; update_interrupts(); } -WRITE_LINE_MEMBER(bbc_tube_arm7_device::exint3_w) +void bbc_tube_arm7_device::exint3_w(int state) { m_exint3_state = state; if (state) diff --git a/src/devices/bus/bbc/tube/tube_arm7.h b/src/devices/bus/bbc/tube/tube_arm7.h index e203c26388a..ff290127395 100644 --- a/src/devices/bus/bbc/tube/tube_arm7.h +++ b/src/devices/bus/bbc/tube/tube_arm7.h @@ -67,7 +67,7 @@ private: void arm7_map(address_map& map); - DECLARE_WRITE_LINE_MEMBER(prst_w); + void prst_w(int state); uint32_t oki_reg_r(offs_t offset); void oki_reg_w(offs_t offset, uint32_t data); @@ -79,8 +79,8 @@ private: void update_bank0(); void update_interrupts(); - DECLARE_WRITE_LINE_MEMBER(efiq_w); - DECLARE_WRITE_LINE_MEMBER(exint3_w); + void efiq_w(int state); + void exint3_w(int state); int m_efiq_state; int m_exint3_state; diff --git a/src/devices/bus/bbc/tube/tube_rc6502.cpp b/src/devices/bus/bbc/tube/tube_rc6502.cpp index 7aeeee283a2..85f3fce1f11 100644 --- a/src/devices/bus/bbc/tube/tube_rc6502.cpp +++ b/src/devices/bus/bbc/tube/tube_rc6502.cpp @@ -234,7 +234,7 @@ void bbc_tube_rc6502_device::device_reset() // IMPLEMENTATION //************************************************************************** -WRITE_LINE_MEMBER(bbc_tube_rc6502_device::prst_w) +void bbc_tube_rc6502_device::prst_w(int state) { device_reset(); diff --git a/src/devices/bus/bbc/tube/tube_rc6502.h b/src/devices/bus/bbc/tube/tube_rc6502.h index cc1e12d71c8..0d47f0862dd 100644 --- a/src/devices/bus/bbc/tube/tube_rc6502.h +++ b/src/devices/bus/bbc/tube/tube_rc6502.h @@ -63,7 +63,7 @@ protected: required_device m_ram; required_ioport m_config; - DECLARE_WRITE_LINE_MEMBER(prst_w); + void prst_w(int state); private: void tube_rc6502_mem(address_map &map); diff --git a/src/devices/bus/bbc/tube/tube_z80.cpp b/src/devices/bus/bbc/tube/tube_z80.cpp index f273c2f37d4..a16ff13b4a5 100644 --- a/src/devices/bus/bbc/tube/tube_z80.cpp +++ b/src/devices/bus/bbc/tube/tube_z80.cpp @@ -155,7 +155,7 @@ void bbc_tube_z80_device::device_reset() // IMPLEMENTATION //************************************************************************** -WRITE_LINE_MEMBER(bbc_tube_z80_device::prst_w) +void bbc_tube_z80_device::prst_w(int state) { device_reset(); diff --git a/src/devices/bus/bbc/tube/tube_z80.h b/src/devices/bus/bbc/tube/tube_z80.h index e878f61627d..508f3812cce 100644 --- a/src/devices/bus/bbc/tube/tube_z80.h +++ b/src/devices/bus/bbc/tube/tube_z80.h @@ -63,7 +63,7 @@ private: void tube_z80_io(address_map &map); void tube_z80_mem(address_map &map); - DECLARE_WRITE_LINE_MEMBER(prst_w); + void prst_w(int state); }; diff --git a/src/devices/bus/bbc/userport/beebspch.cpp b/src/devices/bus/bbc/userport/beebspch.cpp index 728d8ae6658..f3cfa608203 100644 --- a/src/devices/bus/bbc/userport/beebspch.cpp +++ b/src/devices/bus/bbc/userport/beebspch.cpp @@ -100,12 +100,12 @@ void bbc_beebspch_device::pb_w(uint8_t data) m_nsp->ald_w(data & 0x3f); } -WRITE_LINE_MEMBER(bbc_beebspch_device::cb1_w) +void bbc_beebspch_device::cb1_w(int state) { m_slot->cb1_w(state); } -WRITE_LINE_MEMBER(bbc_beebspch_device::cb2_w) +void bbc_beebspch_device::cb2_w(int state) { m_slot->cb2_w(state); } diff --git a/src/devices/bus/bbc/userport/beebspch.h b/src/devices/bus/bbc/userport/beebspch.h index 79e6abf64ab..1f4eea20ef7 100644 --- a/src/devices/bus/bbc/userport/beebspch.h +++ b/src/devices/bus/bbc/userport/beebspch.h @@ -27,8 +27,8 @@ public: // construction/destruction bbc_beebspch_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - DECLARE_WRITE_LINE_MEMBER(cb1_w); - DECLARE_WRITE_LINE_MEMBER(cb2_w); + void cb1_w(int state); + void cb2_w(int state); protected: // device-level overrides diff --git a/src/devices/bus/bbc/userport/userport.h b/src/devices/bus/bbc/userport/userport.h index 29374eb9058..dba6c7b6e98 100644 --- a/src/devices/bus/bbc/userport/userport.h +++ b/src/devices/bus/bbc/userport/userport.h @@ -62,8 +62,8 @@ public: auto cb2_handler() { return m_cb2_handler.bind(); } // from slot - DECLARE_WRITE_LINE_MEMBER(cb1_w) { m_cb1_handler(state); } - DECLARE_WRITE_LINE_MEMBER(cb2_w) { m_cb2_handler(state); } + void cb1_w(int state) { m_cb1_handler(state); } + void cb2_w(int state) { m_cb2_handler(state); } // from host uint8_t pb_r(); diff --git a/src/devices/bus/bbc/userport/usersplit.cpp b/src/devices/bus/bbc/userport/usersplit.cpp index 520abaebdb9..38d2c3b197f 100644 --- a/src/devices/bus/bbc/userport/usersplit.cpp +++ b/src/devices/bus/bbc/userport/usersplit.cpp @@ -109,25 +109,25 @@ void bbc_usersplit_device::write_cb2(int state) } -WRITE_LINE_MEMBER(bbc_usersplit_device::cb1a_w) +void bbc_usersplit_device::cb1a_w(int state) { if (m_selected == 0x00) m_slot->cb1_w(state); } -WRITE_LINE_MEMBER(bbc_usersplit_device::cb2a_w) +void bbc_usersplit_device::cb2a_w(int state) { if (m_selected == 0x00) m_slot->cb2_w(state); } -WRITE_LINE_MEMBER(bbc_usersplit_device::cb1b_w) +void bbc_usersplit_device::cb1b_w(int state) { if (m_selected == 0x01) m_slot->cb1_w(state); } -WRITE_LINE_MEMBER(bbc_usersplit_device::cb2b_w) +void bbc_usersplit_device::cb2b_w(int state) { if (m_selected == 0x01) m_slot->cb2_w(state); diff --git a/src/devices/bus/bbc/userport/usersplit.h b/src/devices/bus/bbc/userport/usersplit.h index 27ce11a9fde..01b1ed5de08 100644 --- a/src/devices/bus/bbc/userport/usersplit.h +++ b/src/devices/bus/bbc/userport/usersplit.h @@ -44,10 +44,10 @@ protected: virtual void write_cb2(int state) override; private: - DECLARE_WRITE_LINE_MEMBER(cb1a_w); - DECLARE_WRITE_LINE_MEMBER(cb2a_w); - DECLARE_WRITE_LINE_MEMBER(cb1b_w); - DECLARE_WRITE_LINE_MEMBER(cb2b_w); + void cb1a_w(int state); + void cb2a_w(int state); + void cb1b_w(int state); + void cb2b_w(int state); required_device_array m_userport; uint8_t m_selected; diff --git a/src/devices/bus/bml3/bml3bus.cpp b/src/devices/bus/bml3/bml3bus.cpp index 98701c0794c..2eab8a3f008 100644 --- a/src/devices/bus/bml3/bml3bus.cpp +++ b/src/devices/bus/bml3/bml3bus.cpp @@ -184,9 +184,9 @@ void bml3bus_device::set_firq_line(int state) } // interrupt request from bml3bus card -WRITE_LINE_MEMBER( bml3bus_device::nmi_w ) { m_out_nmi_cb(state); } -WRITE_LINE_MEMBER( bml3bus_device::irq_w ) { m_out_irq_cb(state); } -WRITE_LINE_MEMBER( bml3bus_device::firq_w ) { m_out_firq_cb(state); } +void bml3bus_device::nmi_w(int state) { m_out_nmi_cb(state); } +void bml3bus_device::irq_w(int state) { m_out_irq_cb(state); } +void bml3bus_device::firq_w(int state) { m_out_firq_cb(state); } //************************************************************************** // DEVICE CONFIG BML3BUS CARD INTERFACE diff --git a/src/devices/bus/bml3/bml3bus.h b/src/devices/bus/bml3/bml3bus.h index fe7288c8b47..3663c4d3b61 100644 --- a/src/devices/bus/bml3/bml3bus.h +++ b/src/devices/bus/bml3/bml3bus.h @@ -84,9 +84,9 @@ public: void map_exrom(address_space_installer &space); void map_io(address_space_installer &space); - DECLARE_WRITE_LINE_MEMBER( nmi_w ); - DECLARE_WRITE_LINE_MEMBER( irq_w ); - DECLARE_WRITE_LINE_MEMBER( firq_w ); + void nmi_w(int state); + void irq_w(int state); + void firq_w(int state); protected: bml3bus_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); diff --git a/src/devices/bus/bml3/bml3mp1802.cpp b/src/devices/bus/bml3/bml3mp1802.cpp index 7757042cdc3..9ee4c8a3248 100644 --- a/src/devices/bus/bml3/bml3mp1802.cpp +++ b/src/devices/bus/bml3/bml3mp1802.cpp @@ -30,7 +30,7 @@ static void mp1802_floppies(device_slot_interface &device) device.option_add("dd", FLOPPY_525_DD); } -WRITE_LINE_MEMBER( bml3bus_mp1802_device::nmi_w ) +void bml3bus_mp1802_device::nmi_w(int state) { if (state) raise_slot_nmi(); diff --git a/src/devices/bus/bml3/bml3mp1802.h b/src/devices/bus/bml3/bml3mp1802.h index 3bf79b9edaa..ecc379261c6 100644 --- a/src/devices/bus/bml3/bml3mp1802.h +++ b/src/devices/bus/bml3/bml3mp1802.h @@ -47,7 +47,7 @@ protected: virtual void map_io(address_space_installer &space) override; private: - DECLARE_WRITE_LINE_MEMBER(nmi_w); + void nmi_w(int state); required_device m_fdc; required_device_array m_floppy; diff --git a/src/devices/bus/c64/4dxh.h b/src/devices/bus/c64/4dxh.h index 620228e4942..0e39bf15f08 100644 --- a/src/devices/bus/c64/4dxh.h +++ b/src/devices/bus/c64/4dxh.h @@ -32,8 +32,8 @@ public: virtual ioport_constructor device_input_ports() const override; // device_pet_user_port_interface overrides - virtual WRITE_LINE_MEMBER( input_4 ) override { output_6(state); } - virtual WRITE_LINE_MEMBER( input_6 ) override { output_4(state); } + virtual void input_4(int state) override { output_6(state); } + virtual void input_6(int state) override { output_4(state); } protected: // device-level overrides diff --git a/src/devices/bus/c64/4ksa.h b/src/devices/bus/c64/4ksa.h index 6208ab201d2..1951b6d90c4 100644 --- a/src/devices/bus/c64/4ksa.h +++ b/src/devices/bus/c64/4ksa.h @@ -32,8 +32,8 @@ public: virtual ioport_constructor device_input_ports() const override; // device_pet_user_port_interface overrides - virtual WRITE_LINE_MEMBER( input_4 ) override { output_6(state); } - virtual WRITE_LINE_MEMBER( input_6 ) override { output_4(state); } + virtual void input_4(int state) override { output_6(state); } + virtual void input_6(int state) override { output_4(state); } protected: // device-level overrides diff --git a/src/devices/bus/c64/4tba.h b/src/devices/bus/c64/4tba.h index dc4f3b2186c..699edc5b77f 100644 --- a/src/devices/bus/c64/4tba.h +++ b/src/devices/bus/c64/4tba.h @@ -32,8 +32,8 @@ public: virtual ioport_constructor device_input_ports() const override; // device_pet_user_port_interface overrides - virtual WRITE_LINE_MEMBER( input_4 ) override { output_6(state); } - virtual WRITE_LINE_MEMBER( input_6 ) override { output_4(state); } + virtual void input_4(int state) override { output_6(state); } + virtual void input_6(int state) override { output_4(state); } protected: // device-level overrides diff --git a/src/devices/bus/c64/bn1541.cpp b/src/devices/bus/c64/bn1541.cpp index ffdf84b77d1..ec89d07edb4 100644 --- a/src/devices/bus/c64/bn1541.cpp +++ b/src/devices/bus/c64/bn1541.cpp @@ -140,7 +140,7 @@ void c64_bn1541_device::update_output() // input_8 - CIA2 PC write //------------------------------------------------- -WRITE_LINE_MEMBER(c64_bn1541_device::input_8) +void c64_bn1541_device::input_8(int state) { if (LOG) logerror("C64 parallel strobe %u\n", state); diff --git a/src/devices/bus/c64/bn1541.h b/src/devices/bus/c64/bn1541.h index af6fedd7c97..f98f0a96684 100644 --- a/src/devices/bus/c64/bn1541.h +++ b/src/devices/bus/c64/bn1541.h @@ -58,15 +58,15 @@ protected: virtual void parallel_strobe_w(int state) override; // device_pet_user_port_interface overrides - virtual DECLARE_WRITE_LINE_MEMBER(input_8) override; - virtual WRITE_LINE_MEMBER(input_c) override { if (state) m_parallel_output |= 1; else m_parallel_output &= ~1; update_output(); } - virtual WRITE_LINE_MEMBER(input_d) override { if (state) m_parallel_output |= 2; else m_parallel_output &= ~2; update_output(); } - virtual WRITE_LINE_MEMBER(input_e) override { if (state) m_parallel_output |= 4; else m_parallel_output &= ~4; update_output(); } - virtual WRITE_LINE_MEMBER(input_f) override { if (state) m_parallel_output |= 8; else m_parallel_output &= ~8; update_output(); } - virtual WRITE_LINE_MEMBER(input_h) override { if (state) m_parallel_output |= 16; else m_parallel_output &= ~16; update_output(); } - virtual WRITE_LINE_MEMBER(input_j) override { if (state) m_parallel_output |= 32; else m_parallel_output &= ~32; update_output(); } - virtual WRITE_LINE_MEMBER(input_k) override { if (state) m_parallel_output |= 64; else m_parallel_output &= ~64; update_output(); } - virtual WRITE_LINE_MEMBER(input_l) override { if (state) m_parallel_output |= 128; else m_parallel_output &= ~128; update_output(); } + virtual void input_8(int state) override; + virtual void input_c(int state) override { if (state) m_parallel_output |= 1; else m_parallel_output &= ~1; update_output(); } + virtual void input_d(int state) override { if (state) m_parallel_output |= 2; else m_parallel_output &= ~2; update_output(); } + virtual void input_e(int state) override { if (state) m_parallel_output |= 4; else m_parallel_output &= ~4; update_output(); } + virtual void input_f(int state) override { if (state) m_parallel_output |= 8; else m_parallel_output &= ~8; update_output(); } + virtual void input_h(int state) override { if (state) m_parallel_output |= 16; else m_parallel_output &= ~16; update_output(); } + virtual void input_j(int state) override { if (state) m_parallel_output |= 32; else m_parallel_output &= ~32; update_output(); } + virtual void input_k(int state) override { if (state) m_parallel_output |= 64; else m_parallel_output &= ~64; update_output(); } + virtual void input_l(int state) override { if (state) m_parallel_output |= 128; else m_parallel_output &= ~128; update_output(); } private: void update_output(); diff --git a/src/devices/bus/c64/buscard.cpp b/src/devices/bus/c64/buscard.cpp index aef66ef022b..11402ad69ce 100644 --- a/src/devices/bus/c64/buscard.cpp +++ b/src/devices/bus/c64/buscard.cpp @@ -210,7 +210,7 @@ void c64_buscard_device::ppi_pc_w(uint8_t data) // Centronics interface //------------------------------------------------- -WRITE_LINE_MEMBER( c64_buscard_device::busy_w ) +void c64_buscard_device::busy_w(int state) { m_busy = state; } diff --git a/src/devices/bus/c64/buscard.h b/src/devices/bus/c64/buscard.h index 151598060ad..f51bbb38658 100644 --- a/src/devices/bus/c64/buscard.h +++ b/src/devices/bus/c64/buscard.h @@ -71,7 +71,7 @@ private: void ppi_pb_w(uint8_t data); uint8_t ppi_pc_r(); void ppi_pc_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER( busy_w ); + void busy_w(int state); bool pd_pgm1(offs_t offset, int sphi2); bool pd_pgm234(offs_t offset, int sphi2, int bank); diff --git a/src/devices/bus/c64/buscard2.h b/src/devices/bus/c64/buscard2.h index faa11e0a8a7..71621a4295e 100644 --- a/src/devices/bus/c64/buscard2.h +++ b/src/devices/bus/c64/buscard2.h @@ -61,7 +61,7 @@ private: bool m_busy; - DECLARE_WRITE_LINE_MEMBER( busy_w ) { m_busy = state; } + void busy_w(int state) { m_busy = state; } }; diff --git a/src/devices/bus/c64/c128_partner.cpp b/src/devices/bus/c64/c128_partner.cpp index 7c6cf1aea97..1c53ed4036d 100644 --- a/src/devices/bus/c64/c128_partner.cpp +++ b/src/devices/bus/c64/c128_partner.cpp @@ -44,7 +44,7 @@ DEFINE_DEVICE_TYPE(C128_PARTNER, c128_partner_cartridge_device, "c128_partner", // INPUT_PORTS( c128_partner ) //------------------------------------------------- -WRITE_LINE_MEMBER( c128_partner_cartridge_device::nmi_w ) +void c128_partner_cartridge_device::nmi_w(int state) { if (state) { diff --git a/src/devices/bus/c64/c128_partner.h b/src/devices/bus/c64/c128_partner.h index 3f91afbb0e9..faf8a2a8b11 100644 --- a/src/devices/bus/c64/c128_partner.h +++ b/src/devices/bus/c64/c128_partner.h @@ -33,7 +33,7 @@ public: // optional information overrides virtual ioport_constructor device_input_ports() const override; - DECLARE_WRITE_LINE_MEMBER( nmi_w ); + void nmi_w(int state); protected: // device-level overrides diff --git a/src/devices/bus/c64/exp.h b/src/devices/bus/c64/exp.h index 5473e1ab265..a63f73d14ce 100644 --- a/src/devices/bus/c64/exp.h +++ b/src/devices/bus/c64/exp.h @@ -83,10 +83,10 @@ public: // cartridge interface uint8_t dma_cd_r(offs_t offset) { return m_read_dma_cd(offset); } void dma_cd_w(offs_t offset, uint8_t data) { m_write_dma_cd(offset, data); } - DECLARE_WRITE_LINE_MEMBER( irq_w ) { m_write_irq(state); } - DECLARE_WRITE_LINE_MEMBER( nmi_w ) { m_write_nmi(state); } - DECLARE_WRITE_LINE_MEMBER( dma_w ) { m_write_dma(state); } - DECLARE_WRITE_LINE_MEMBER( reset_w ) { m_write_reset(state); } + void irq_w(int state) { m_write_irq(state); } + void nmi_w(int state) { m_write_nmi(state); } + void dma_w(int state) { m_write_dma(state); } + void reset_w(int state) { m_write_reset(state); } int phi2() { return clock(); } int dotclock() { return phi2() * 8; } int hiram() { return m_hiram; } diff --git a/src/devices/bus/c64/fcc.h b/src/devices/bus/c64/fcc.h index 33baea0707c..b60087b2165 100644 --- a/src/devices/bus/c64/fcc.h +++ b/src/devices/bus/c64/fcc.h @@ -57,7 +57,7 @@ private: uint8_t m_bank; int m_hidden; - DECLARE_WRITE_LINE_MEMBER(mainlatch_int) { m_slot->nmi_w(state); } + void mainlatch_int(int state) { m_slot->nmi_w(state); } uint8_t rom_r(offs_t offset) { return m_romx[offset]; } // cartridge cpu rom uint8_t nvram_r(offs_t offset) { return m_nvram[offset & 0x1fff]; } void nvram_w(offs_t offset, uint8_t data) { m_nvram[offset & 0x1fff] = data; } diff --git a/src/devices/bus/c64/geocable.h b/src/devices/bus/c64/geocable.h index 587a94ad80c..d4a9d543ea6 100644 --- a/src/devices/bus/c64/geocable.h +++ b/src/devices/bus/c64/geocable.h @@ -37,15 +37,15 @@ protected: virtual void device_add_mconfig(machine_config &config) override; // device_pet_user_port_interface overrides - virtual DECLARE_WRITE_LINE_MEMBER(input_c) override { m_centronics->write_data0(state); } - virtual DECLARE_WRITE_LINE_MEMBER(input_d) override { m_centronics->write_data1(state); } - virtual DECLARE_WRITE_LINE_MEMBER(input_e) override { m_centronics->write_data2(state); } - virtual DECLARE_WRITE_LINE_MEMBER(input_f) override { m_centronics->write_data3(state); } - virtual DECLARE_WRITE_LINE_MEMBER(input_h) override { m_centronics->write_data4(state); } - virtual DECLARE_WRITE_LINE_MEMBER(input_j) override { m_centronics->write_data5(state); } - virtual DECLARE_WRITE_LINE_MEMBER(input_k) override { m_centronics->write_data6(state); } - virtual DECLARE_WRITE_LINE_MEMBER(input_l) override { m_centronics->write_data7(state); } - virtual DECLARE_WRITE_LINE_MEMBER(input_m) override { m_centronics->write_strobe(state); } + virtual void input_c(int state) override { m_centronics->write_data0(state); } + virtual void input_d(int state) override { m_centronics->write_data1(state); } + virtual void input_e(int state) override { m_centronics->write_data2(state); } + virtual void input_f(int state) override { m_centronics->write_data3(state); } + virtual void input_h(int state) override { m_centronics->write_data4(state); } + virtual void input_j(int state) override { m_centronics->write_data5(state); } + virtual void input_k(int state) override { m_centronics->write_data6(state); } + virtual void input_l(int state) override { m_centronics->write_data7(state); } + virtual void input_m(int state) override { m_centronics->write_strobe(state); } private: required_device m_centronics; diff --git a/src/devices/bus/c64/magic_formel.cpp b/src/devices/bus/c64/magic_formel.cpp index 1e6c38d1685..5a276ab79b8 100644 --- a/src/devices/bus/c64/magic_formel.cpp +++ b/src/devices/bus/c64/magic_formel.cpp @@ -83,7 +83,7 @@ void c64_magic_formel_cartridge_device::pia_pb_w(uint8_t data) m_pb7 = BIT(data, 7); } -WRITE_LINE_MEMBER( c64_magic_formel_cartridge_device::pia_cb2_w ) +void c64_magic_formel_cartridge_device::pia_cb2_w(int state) { if (!state) { diff --git a/src/devices/bus/c64/magic_formel.h b/src/devices/bus/c64/magic_formel.h index ab16d4a0e34..15123d6b453 100644 --- a/src/devices/bus/c64/magic_formel.h +++ b/src/devices/bus/c64/magic_formel.h @@ -48,7 +48,7 @@ protected: private: void pia_pa_w(uint8_t data); void pia_pb_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER( pia_cb2_w ); + void pia_cb2_w(int state); required_device m_pia; memory_share_creator m_ram; diff --git a/src/devices/bus/c64/magic_voice.cpp b/src/devices/bus/c64/magic_voice.cpp index faac3bc0a33..b9e0949ed3d 100644 --- a/src/devices/bus/c64/magic_voice.cpp +++ b/src/devices/bus/c64/magic_voice.cpp @@ -73,7 +73,7 @@ DEFINE_DEVICE_TYPE(C64_MAGIC_VOICE, c64_magic_voice_cartridge_device, "c64_magic // tpi6525_interface tpi_intf //------------------------------------------------- -WRITE_LINE_MEMBER( c64_magic_voice_cartridge_device::tpi_irq_w ) +void c64_magic_voice_cartridge_device::tpi_irq_w(int state) { m_slot->nmi_w(state); } @@ -174,12 +174,12 @@ void c64_magic_voice_cartridge_device::tpi_pb_w(uint8_t data) m_tpi_pb = data; } -WRITE_LINE_MEMBER( c64_magic_voice_cartridge_device::tpi_ca_w ) +void c64_magic_voice_cartridge_device::tpi_ca_w(int state) { m_tpi_pc6 = state; } -WRITE_LINE_MEMBER( c64_magic_voice_cartridge_device::tpi_cb_w ) +void c64_magic_voice_cartridge_device::tpi_cb_w(int state) { m_exrom = state; } @@ -188,7 +188,7 @@ WRITE_LINE_MEMBER( c64_magic_voice_cartridge_device::tpi_cb_w ) // t6721_interface //------------------------------------------------- -WRITE_LINE_MEMBER( c64_magic_voice_cartridge_device::phi2_w ) +void c64_magic_voice_cartridge_device::phi2_w(int state) { if (state) { @@ -198,14 +198,14 @@ WRITE_LINE_MEMBER( c64_magic_voice_cartridge_device::phi2_w ) } } -WRITE_LINE_MEMBER( c64_magic_voice_cartridge_device::dtrd_w ) +void c64_magic_voice_cartridge_device::dtrd_w(int state) { m_fifo->so_w(!state); m_pd = m_fifo->read(); } -WRITE_LINE_MEMBER( c64_magic_voice_cartridge_device::apd_w ) +void c64_magic_voice_cartridge_device::apd_w(int state) { if (state) { diff --git a/src/devices/bus/c64/magic_voice.h b/src/devices/bus/c64/magic_voice.h index f6c4a4d138e..ac489f45f7c 100644 --- a/src/devices/bus/c64/magic_voice.h +++ b/src/devices/bus/c64/magic_voice.h @@ -47,17 +47,17 @@ protected: private: offs_t get_offset(offs_t offset); - DECLARE_WRITE_LINE_MEMBER( tpi_irq_w ); + void tpi_irq_w(int state); uint8_t tpi_pa_r(); void tpi_pa_w(uint8_t data); uint8_t tpi_pb_r(); void tpi_pb_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER( tpi_ca_w ); - DECLARE_WRITE_LINE_MEMBER( tpi_cb_w ); + void tpi_ca_w(int state); + void tpi_cb_w(int state); - DECLARE_WRITE_LINE_MEMBER( phi2_w ); - DECLARE_WRITE_LINE_MEMBER( dtrd_w ); - DECLARE_WRITE_LINE_MEMBER( apd_w ); + void phi2_w(int state); + void dtrd_w(int state); + void apd_w(int state); required_device m_vslsi; required_device m_tpi; diff --git a/src/devices/bus/c64/midi_maplin.cpp b/src/devices/bus/c64/midi_maplin.cpp index adc8556a7bd..d276c3f5bb2 100644 --- a/src/devices/bus/c64/midi_maplin.cpp +++ b/src/devices/bus/c64/midi_maplin.cpp @@ -28,12 +28,12 @@ DEFINE_DEVICE_TYPE(C64_MIDI_MAPLIN, c64_maplin_midi_cartridge_device, "c64_midimap", "C64 Maplin MIDI") -WRITE_LINE_MEMBER( c64_maplin_midi_cartridge_device::acia_irq_w ) +void c64_maplin_midi_cartridge_device::acia_irq_w(int state) { m_slot->irq_w(state); } -WRITE_LINE_MEMBER( c64_maplin_midi_cartridge_device::write_acia_clock ) +void c64_maplin_midi_cartridge_device::write_acia_clock(int state) { m_acia->write_txc(state); m_acia->write_rxc(state); diff --git a/src/devices/bus/c64/midi_maplin.h b/src/devices/bus/c64/midi_maplin.h index d0798d9217f..285088a9b46 100644 --- a/src/devices/bus/c64/midi_maplin.h +++ b/src/devices/bus/c64/midi_maplin.h @@ -41,8 +41,8 @@ protected: virtual void c64_cd_w(offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2) override; private: - DECLARE_WRITE_LINE_MEMBER( acia_irq_w ); - DECLARE_WRITE_LINE_MEMBER( write_acia_clock ); + void acia_irq_w(int state); + void write_acia_clock(int state); required_device m_acia; }; diff --git a/src/devices/bus/c64/midi_namesoft.cpp b/src/devices/bus/c64/midi_namesoft.cpp index d4e7c8b59ac..980b0bd1b0d 100644 --- a/src/devices/bus/c64/midi_namesoft.cpp +++ b/src/devices/bus/c64/midi_namesoft.cpp @@ -28,12 +28,12 @@ DEFINE_DEVICE_TYPE(C64_MIDI_NAMESOFT, c64_namesoft_midi_cartridge_device, "c64_midins", "C64 Namesoft MIDI") -WRITE_LINE_MEMBER( c64_namesoft_midi_cartridge_device::acia_irq_w ) +void c64_namesoft_midi_cartridge_device::acia_irq_w(int state) { m_slot->nmi_w(state); } -WRITE_LINE_MEMBER( c64_namesoft_midi_cartridge_device::write_acia_clock ) +void c64_namesoft_midi_cartridge_device::write_acia_clock(int state) { m_acia->write_txc(state); m_acia->write_rxc(state); diff --git a/src/devices/bus/c64/midi_namesoft.h b/src/devices/bus/c64/midi_namesoft.h index d2183d271d0..276afff80b6 100644 --- a/src/devices/bus/c64/midi_namesoft.h +++ b/src/devices/bus/c64/midi_namesoft.h @@ -41,8 +41,8 @@ protected: virtual void c64_cd_w(offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2) override; private: - DECLARE_WRITE_LINE_MEMBER( acia_irq_w ); - DECLARE_WRITE_LINE_MEMBER( write_acia_clock ); + void acia_irq_w(int state); + void write_acia_clock(int state); required_device m_acia; }; diff --git a/src/devices/bus/c64/midi_passport.cpp b/src/devices/bus/c64/midi_passport.cpp index 05a3fbb1a36..81a5edbf59c 100644 --- a/src/devices/bus/c64/midi_passport.cpp +++ b/src/devices/bus/c64/midi_passport.cpp @@ -33,21 +33,21 @@ DEFINE_DEVICE_TYPE(C64_MIDI_PASSPORT, c64_passport_midi_cartridge_device, "c64_m // ptm6840_interface ptm_intf //------------------------------------------------- -WRITE_LINE_MEMBER( c64_passport_midi_cartridge_device::ptm_irq_w ) +void c64_passport_midi_cartridge_device::ptm_irq_w(int state) { m_ptm_irq = state; m_slot->irq_w(m_ptm_irq || m_acia_irq); } -WRITE_LINE_MEMBER( c64_passport_midi_cartridge_device::acia_irq_w ) +void c64_passport_midi_cartridge_device::acia_irq_w(int state) { m_acia_irq = state; m_slot->irq_w(m_ptm_irq || m_acia_irq); } -WRITE_LINE_MEMBER( c64_passport_midi_cartridge_device::write_acia_clock ) +void c64_passport_midi_cartridge_device::write_acia_clock(int state) { m_acia->write_txc(state); m_acia->write_rxc(state); diff --git a/src/devices/bus/c64/midi_passport.h b/src/devices/bus/c64/midi_passport.h index d6b4cf16eb7..42bf7a3d90a 100644 --- a/src/devices/bus/c64/midi_passport.h +++ b/src/devices/bus/c64/midi_passport.h @@ -42,9 +42,9 @@ protected: virtual void c64_cd_w(offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2) override; private: - DECLARE_WRITE_LINE_MEMBER( ptm_irq_w ); - DECLARE_WRITE_LINE_MEMBER( acia_irq_w ); - DECLARE_WRITE_LINE_MEMBER( write_acia_clock ); + void ptm_irq_w(int state); + void acia_irq_w(int state); + void write_acia_clock(int state); required_device m_acia; required_device m_ptm; diff --git a/src/devices/bus/c64/midi_sci.cpp b/src/devices/bus/c64/midi_sci.cpp index 14309ee5e7c..d6d4c92c7fa 100644 --- a/src/devices/bus/c64/midi_sci.cpp +++ b/src/devices/bus/c64/midi_sci.cpp @@ -28,12 +28,12 @@ DEFINE_DEVICE_TYPE(C64_MIDI_SCI, c64_sequential_midi_cartridge_device, "c64_midisci", "C64 Sequential Circuits MIDI") -WRITE_LINE_MEMBER( c64_sequential_midi_cartridge_device::acia_irq_w ) +void c64_sequential_midi_cartridge_device::acia_irq_w(int state) { m_slot->irq_w(state); } -WRITE_LINE_MEMBER( c64_sequential_midi_cartridge_device::write_acia_clock ) +void c64_sequential_midi_cartridge_device::write_acia_clock(int state) { m_acia->write_txc(state); m_acia->write_rxc(state); diff --git a/src/devices/bus/c64/midi_sci.h b/src/devices/bus/c64/midi_sci.h index 5ab0d8d45db..d455b53e5d4 100644 --- a/src/devices/bus/c64/midi_sci.h +++ b/src/devices/bus/c64/midi_sci.h @@ -41,8 +41,8 @@ protected: virtual void c64_cd_w(offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2) override; private: - DECLARE_WRITE_LINE_MEMBER( acia_irq_w ); - DECLARE_WRITE_LINE_MEMBER( write_acia_clock ); + void acia_irq_w(int state); + void write_acia_clock(int state); required_device m_acia; }; diff --git a/src/devices/bus/c64/midi_siel.cpp b/src/devices/bus/c64/midi_siel.cpp index eea7a4b333d..343eff94f69 100644 --- a/src/devices/bus/c64/midi_siel.cpp +++ b/src/devices/bus/c64/midi_siel.cpp @@ -28,12 +28,12 @@ DEFINE_DEVICE_TYPE(C64_MIDI_SIEL, c64_siel_midi_cartridge_device, "c64_midisiel", "C64 Siel MIDI") -WRITE_LINE_MEMBER( c64_siel_midi_cartridge_device::acia_irq_w ) +void c64_siel_midi_cartridge_device::acia_irq_w(int state) { m_slot->irq_w(state); } -WRITE_LINE_MEMBER( c64_siel_midi_cartridge_device::write_acia_clock ) +void c64_siel_midi_cartridge_device::write_acia_clock(int state) { m_acia->write_txc(state); m_acia->write_rxc(state); diff --git a/src/devices/bus/c64/midi_siel.h b/src/devices/bus/c64/midi_siel.h index 412d1a224b7..32e77b1f997 100644 --- a/src/devices/bus/c64/midi_siel.h +++ b/src/devices/bus/c64/midi_siel.h @@ -41,8 +41,8 @@ protected: virtual void c64_cd_w(offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2) override; private: - DECLARE_WRITE_LINE_MEMBER( acia_irq_w ); - DECLARE_WRITE_LINE_MEMBER( write_acia_clock ); + void acia_irq_w(int state); + void write_acia_clock(int state); required_device m_acia; }; diff --git a/src/devices/bus/c64/partner.cpp b/src/devices/bus/c64/partner.cpp index b77cf610d17..631a7a1c370 100644 --- a/src/devices/bus/c64/partner.cpp +++ b/src/devices/bus/c64/partner.cpp @@ -43,7 +43,7 @@ DEFINE_DEVICE_TYPE(C64_PARTNER, c64_partner_cartridge_device, "c64_partner", "C6 // INPUT_PORTS( c64_partner ) //------------------------------------------------- -WRITE_LINE_MEMBER( c64_partner_cartridge_device::nmi_w ) +void c64_partner_cartridge_device::nmi_w(int state) { if (!state && !m_a6 && !m_nmi) { diff --git a/src/devices/bus/c64/partner.h b/src/devices/bus/c64/partner.h index 4dd71542571..e28274a34bd 100644 --- a/src/devices/bus/c64/partner.h +++ b/src/devices/bus/c64/partner.h @@ -31,7 +31,7 @@ public: // optional information overrides virtual ioport_constructor device_input_ports() const override; - DECLARE_WRITE_LINE_MEMBER( nmi_w ); + void nmi_w(int state); protected: // device-level overrides diff --git a/src/devices/bus/c64/sfx_sound_expander.cpp b/src/devices/bus/c64/sfx_sound_expander.cpp index a85b93bccbf..99d5922e9c2 100644 --- a/src/devices/bus/c64/sfx_sound_expander.cpp +++ b/src/devices/bus/c64/sfx_sound_expander.cpp @@ -31,7 +31,7 @@ DEFINE_DEVICE_TYPE(C64_SFX_SOUND_EXPANDER, c64_sfx_sound_expander_cartridge_devi // ym3526_interface ym3526_config //------------------------------------------------- -WRITE_LINE_MEMBER( c64_sfx_sound_expander_cartridge_device::opl_irq_w ) +void c64_sfx_sound_expander_cartridge_device::opl_irq_w(int state) { m_slot->irq_w(state); } diff --git a/src/devices/bus/c64/sfx_sound_expander.h b/src/devices/bus/c64/sfx_sound_expander.h index 52e006ce686..8b0a454fdc8 100644 --- a/src/devices/bus/c64/sfx_sound_expander.h +++ b/src/devices/bus/c64/sfx_sound_expander.h @@ -45,7 +45,7 @@ protected: virtual int c64_exrom_r(offs_t offset, int sphi2, int ba, int rw) override; private: - DECLARE_WRITE_LINE_MEMBER( opl_irq_w ); + void opl_irq_w(int state); required_device m_opl; required_device m_exp; diff --git a/src/devices/bus/c64/swiftlink.cpp b/src/devices/bus/c64/swiftlink.cpp index 3855da85ca3..f9698e192b6 100644 --- a/src/devices/bus/c64/swiftlink.cpp +++ b/src/devices/bus/c64/swiftlink.cpp @@ -156,7 +156,7 @@ void c64_swiftlink_cartridge_device::c64_cd_w(offs_t offset, uint8_t data, int s // acia_irq_w - //------------------------------------------------- -WRITE_LINE_MEMBER( c64_swiftlink_cartridge_device::acia_irq_w ) +void c64_swiftlink_cartridge_device::acia_irq_w(int state) { switch (m_irq) { diff --git a/src/devices/bus/c64/swiftlink.h b/src/devices/bus/c64/swiftlink.h index 409cfafa33a..65c25d97b73 100644 --- a/src/devices/bus/c64/swiftlink.h +++ b/src/devices/bus/c64/swiftlink.h @@ -45,7 +45,7 @@ protected: virtual void c64_cd_w(offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2) override; private: - DECLARE_WRITE_LINE_MEMBER( acia_irq_w ); + void acia_irq_w(int state); required_device m_acia; required_ioport m_io_cs; diff --git a/src/devices/bus/c64/turbo232.cpp b/src/devices/bus/c64/turbo232.cpp index f9113bed1c5..2bcacce91b7 100644 --- a/src/devices/bus/c64/turbo232.cpp +++ b/src/devices/bus/c64/turbo232.cpp @@ -200,7 +200,7 @@ void c64_turbo232_cartridge_device::c64_cd_w(offs_t offset, uint8_t data, int sp // acia_irq_w - //------------------------------------------------- -WRITE_LINE_MEMBER( c64_turbo232_cartridge_device::acia_irq_w ) +void c64_turbo232_cartridge_device::acia_irq_w(int state) { switch (m_irq) { diff --git a/src/devices/bus/c64/turbo232.h b/src/devices/bus/c64/turbo232.h index 4f5638f88fa..68d0929f629 100644 --- a/src/devices/bus/c64/turbo232.h +++ b/src/devices/bus/c64/turbo232.h @@ -45,7 +45,7 @@ protected: virtual void c64_cd_w(offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2) override; private: - DECLARE_WRITE_LINE_MEMBER( acia_irq_w ); + void acia_irq_w(int state); required_device m_acia; required_device m_rs232; diff --git a/src/devices/bus/cbm2/user.h b/src/devices/bus/cbm2/user.h index 4a49807118d..8f5de9555a9 100644 --- a/src/devices/bus/cbm2/user.h +++ b/src/devices/bus/cbm2/user.h @@ -92,19 +92,19 @@ public: void d1_w(uint8_t data) { if (m_card != nullptr) m_card->cbm2_d1_w(data); } uint8_t d2_r() { uint8_t data = 0xff; if (m_card != nullptr) data = m_card->cbm2_d2_r(); return data; } void d2_w(uint8_t data) { if (m_card != nullptr) m_card->cbm2_d2_w(data); } - DECLARE_READ_LINE_MEMBER( pb2_r ) { return m_card ? m_card->cbm2_pb2_r() : 1; } - DECLARE_WRITE_LINE_MEMBER( pb2_w ) { if (m_card != nullptr) m_card->cbm2_pb2_w(state); } - DECLARE_READ_LINE_MEMBER( pb3_r ) { return m_card ? m_card->cbm2_pb3_r() : 1; } - DECLARE_WRITE_LINE_MEMBER( pb3_w ) { if (m_card != nullptr) m_card->cbm2_pb3_w(state); } - DECLARE_WRITE_LINE_MEMBER( pc_w ) { if (m_card != nullptr) m_card->cbm2_pc_w(state); } - DECLARE_WRITE_LINE_MEMBER( cnt_w ) { if (m_card != nullptr) m_card->cbm2_cnt_w(state); } - DECLARE_WRITE_LINE_MEMBER( sp_w ) { if (m_card != nullptr) m_card->cbm2_sp_w(state); } + int pb2_r() { return m_card ? m_card->cbm2_pb2_r() : 1; } + void pb2_w(int state) { if (m_card != nullptr) m_card->cbm2_pb2_w(state); } + int pb3_r() { return m_card ? m_card->cbm2_pb3_r() : 1; } + void pb3_w(int state) { if (m_card != nullptr) m_card->cbm2_pb3_w(state); } + void pc_w(int state) { if (m_card != nullptr) m_card->cbm2_pc_w(state); } + void cnt_w(int state) { if (m_card != nullptr) m_card->cbm2_cnt_w(state); } + void sp_w(int state) { if (m_card != nullptr) m_card->cbm2_sp_w(state); } // cartridge interface - DECLARE_WRITE_LINE_MEMBER( irq_w ) { m_write_irq(state); } - DECLARE_WRITE_LINE_MEMBER( cia_sp_w ) { m_write_sp(state); } - DECLARE_WRITE_LINE_MEMBER( cia_cnt_w ) { m_write_cnt(state); } - DECLARE_WRITE_LINE_MEMBER( flag_w ) { m_write_flag(state); } + void irq_w(int state) { m_write_irq(state); } + void cia_sp_w(int state) { m_write_sp(state); } + void cia_cnt_w(int state) { m_write_cnt(state); } + void flag_w(int state) { m_write_flag(state); } protected: // device-level overrides diff --git a/src/devices/bus/cbmiec/c1541.cpp b/src/devices/bus/cbmiec/c1541.cpp index 15c3fa8684a..94632ee7a6f 100644 --- a/src/devices/bus/cbmiec/c1541.cpp +++ b/src/devices/bus/cbmiec/c1541.cpp @@ -710,7 +710,7 @@ void c1541_prologic_dos_classic_device::c1541pdc_mem(address_map &map) } -WRITE_LINE_MEMBER( c1541_device_base::via0_irq_w ) +void c1541_device_base::via0_irq_w(int state) { m_via0_irq = state; @@ -792,7 +792,7 @@ void c1541_device_base::via0_pb_w(uint8_t data) m_bus->clk_w(this, !BIT(data, 3)); } -WRITE_LINE_MEMBER( c1541_device_base::via0_ca2_w ) +void c1541_device_base::via0_ca2_w(int state) { if (m_other != nullptr) { @@ -821,7 +821,7 @@ uint8_t c1541c_device::via0_pa_r() } -WRITE_LINE_MEMBER( c1541_device_base::via1_irq_w ) +void c1541_device_base::via1_irq_w(int state) { m_via1_irq = state; @@ -891,12 +891,12 @@ void c1541_device_base::via1_pb_w(uint8_t data) // C64H156_INTERFACE( ga_intf ) //------------------------------------------------- -WRITE_LINE_MEMBER( c1541_device_base::atn_w ) +void c1541_device_base::atn_w(int state) { set_iec_data(); } -WRITE_LINE_MEMBER( c1541_device_base::byte_w ) +void c1541_device_base::byte_w(int state) { m_maincpu->set_input_line(M6502_SET_OVERFLOW, state); diff --git a/src/devices/bus/cbmiec/c1541.h b/src/devices/bus/cbmiec/c1541.h index de79cc95f90..09e12a0f265 100644 --- a/src/devices/bus/cbmiec/c1541.h +++ b/src/devices/bus/cbmiec/c1541.h @@ -68,17 +68,17 @@ private: inline void set_iec_data(); - DECLARE_WRITE_LINE_MEMBER( via0_irq_w ); + void via0_irq_w(int state); virtual uint8_t via0_pa_r(); void via0_pa_w(uint8_t data); uint8_t via0_pb_r(); void via0_pb_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER( via0_ca2_w ); - DECLARE_WRITE_LINE_MEMBER( via1_irq_w ); + void via0_ca2_w(int state); + void via1_irq_w(int state); uint8_t via1_pb_r(); void via1_pb_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER( atn_w ); - DECLARE_WRITE_LINE_MEMBER( byte_w ); + void atn_w(int state); + void byte_w(int state); static void floppy_formats(format_registration &fr); diff --git a/src/devices/bus/cbmiec/c1571.cpp b/src/devices/bus/cbmiec/c1571.cpp index df8f15eb202..b69bc1f709d 100644 --- a/src/devices/bus/cbmiec/c1571.cpp +++ b/src/devices/bus/cbmiec/c1571.cpp @@ -172,7 +172,7 @@ void mini_chief_device::mini_chief_mem(address_map &map) } -WRITE_LINE_MEMBER( c1571_device::via0_irq_w ) +void c1571_device::via0_irq_w(int state) { m_via0_irq = state; @@ -400,7 +400,7 @@ void c1571_device::via1_w(offs_t offset, uint8_t data) m_ga->ted_w(1); } -WRITE_LINE_MEMBER( c1571_device::via1_irq_w ) +void c1571_device::via1_irq_w(int state) { m_via1_irq = state; @@ -470,14 +470,14 @@ void c1571_device::via1_pb_w(uint8_t data) // MOS6526_INTERFACE( cia_intf ) //------------------------------------------------- -WRITE_LINE_MEMBER( c1571_device::cia_irq_w ) +void c1571_device::cia_irq_w(int state) { m_cia_irq = state; m_maincpu->set_input_line(INPUT_LINE_IRQ0, (m_via0_irq || m_via1_irq || m_cia_irq) ? ASSERT_LINE : CLEAR_LINE); } -WRITE_LINE_MEMBER( c1571_device::cia_pc_w ) +void c1571_device::cia_pc_w(int state) { if (m_other != nullptr) { @@ -485,14 +485,14 @@ WRITE_LINE_MEMBER( c1571_device::cia_pc_w ) } } -WRITE_LINE_MEMBER( c1571_device::cia_cnt_w ) +void c1571_device::cia_cnt_w(int state) { m_cnt_out = state; update_iec(); } -WRITE_LINE_MEMBER( c1571_device::cia_sp_w ) +void c1571_device::cia_sp_w(int state) { m_sp_out = state; @@ -552,7 +552,7 @@ void mini_chief_device::cia_pb_w(uint8_t data) // C64H156_INTERFACE( ga_intf ) //------------------------------------------------- -WRITE_LINE_MEMBER( c1571_device::byte_w ) +void c1571_device::byte_w(int state) { m_via1->write_ca1(state); diff --git a/src/devices/bus/cbmiec/c1571.h b/src/devices/bus/cbmiec/c1571.h index 103da690a2c..0b83fccfb21 100644 --- a/src/devices/bus/cbmiec/c1571.h +++ b/src/devices/bus/cbmiec/c1571.h @@ -43,7 +43,7 @@ public: // construction/destruction c1571_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - DECLARE_WRITE_LINE_MEMBER( via0_irq_w ); + void via0_irq_w(int state); uint8_t via0_pa_r(); void via0_pa_w(uint8_t data); uint8_t via0_pb_r(); @@ -51,18 +51,18 @@ public: uint8_t via1_r(offs_t offset); void via1_w(offs_t offset, uint8_t data); - DECLARE_WRITE_LINE_MEMBER( via1_irq_w ); + void via1_irq_w(int state); uint8_t via1_pb_r(); void via1_pb_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER( cia_irq_w ); - DECLARE_WRITE_LINE_MEMBER( cia_pc_w ); - DECLARE_WRITE_LINE_MEMBER( cia_cnt_w ); - DECLARE_WRITE_LINE_MEMBER( cia_sp_w ); + void cia_irq_w(int state); + void cia_pc_w(int state); + void cia_cnt_w(int state); + void cia_sp_w(int state); uint8_t cia_pb_r(); void cia_pb_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER( byte_w ); + void byte_w(int state); static void floppy_formats(format_registration &fr); diff --git a/src/devices/bus/cbmiec/c1581.cpp b/src/devices/bus/cbmiec/c1581.cpp index b139a272266..bcf937e2b99 100644 --- a/src/devices/bus/cbmiec/c1581.cpp +++ b/src/devices/bus/cbmiec/c1581.cpp @@ -102,14 +102,14 @@ void c1581_device::c1581_mem(address_map &map) // MOS8520_INTERFACE( cia_intf ) //------------------------------------------------- -WRITE_LINE_MEMBER( c1581_device::cnt_w ) +void c1581_device::cnt_w(int state) { m_cnt_out = state; update_iec(); } -WRITE_LINE_MEMBER( c1581_device::sp_w ) +void c1581_device::sp_w(int state) { m_sp_out = state; diff --git a/src/devices/bus/cbmiec/c1581.h b/src/devices/bus/cbmiec/c1581.h index 1fef8579460..c75259fdc86 100644 --- a/src/devices/bus/cbmiec/c1581.h +++ b/src/devices/bus/cbmiec/c1581.h @@ -67,8 +67,8 @@ private: void update_iec(); - DECLARE_WRITE_LINE_MEMBER( cnt_w ); - DECLARE_WRITE_LINE_MEMBER( sp_w ); + void cnt_w(int state); + void sp_w(int state); uint8_t cia_pa_r(); void cia_pa_w(uint8_t data); uint8_t cia_pb_r(); diff --git a/src/devices/bus/cbmiec/cbmiec.h b/src/devices/bus/cbmiec/cbmiec.h index 0683a98b4f8..732be55fe19 100644 --- a/src/devices/bus/cbmiec/cbmiec.h +++ b/src/devices/bus/cbmiec/cbmiec.h @@ -50,18 +50,18 @@ public: void add_device(cbm_iec_slot_device *slot, device_t *target); // reads for both host and peripherals - DECLARE_READ_LINE_MEMBER( srq_r ) { return get_signal(SRQ); } - DECLARE_READ_LINE_MEMBER( atn_r ) { return get_signal(ATN); } - DECLARE_READ_LINE_MEMBER( clk_r ) { return get_signal(CLK); } - DECLARE_READ_LINE_MEMBER( data_r ) { return get_signal(DATA); } - DECLARE_READ_LINE_MEMBER( reset_r ) { return get_signal(RESET); } + int srq_r() { return get_signal(SRQ); } + int atn_r() { return get_signal(ATN); } + int clk_r() { return get_signal(CLK); } + int data_r() { return get_signal(DATA); } + int reset_r() { return get_signal(RESET); } // writes for host (driver_device) - DECLARE_WRITE_LINE_MEMBER( host_srq_w ) { set_signal(this, SRQ, state); } - DECLARE_WRITE_LINE_MEMBER( host_atn_w ) { set_signal(this, ATN, state); } - DECLARE_WRITE_LINE_MEMBER( host_clk_w ) { set_signal(this, CLK, state); } - DECLARE_WRITE_LINE_MEMBER( host_data_w ) { set_signal(this, DATA, state); } - DECLARE_WRITE_LINE_MEMBER( host_reset_w ) { set_signal(this, RESET, state); } + void host_srq_w(int state) { set_signal(this, SRQ, state); } + void host_atn_w(int state) { set_signal(this, ATN, state); } + void host_clk_w(int state) { set_signal(this, CLK, state); } + void host_data_w(int state) { set_signal(this, DATA, state); } + void host_reset_w(int state) { set_signal(this, RESET, state); } // writes for peripherals (device_t) void srq_w(device_t *device, int state) { set_signal(device, SRQ, state); } diff --git a/src/devices/bus/cbmiec/mps1200.cpp b/src/devices/bus/cbmiec/mps1200.cpp index 87cf3b3d9b2..6ceac358d2e 100644 --- a/src/devices/bus/cbmiec/mps1200.cpp +++ b/src/devices/bus/cbmiec/mps1200.cpp @@ -69,7 +69,7 @@ void mps1200_device::device_start() // cbm_iec_atn - ATN line handler //------------------------------------------------- -WRITE_LINE_MEMBER(mps1200_device::cbm_iec_atn) +void mps1200_device::cbm_iec_atn(int state) { // TODO } @@ -79,7 +79,7 @@ WRITE_LINE_MEMBER(mps1200_device::cbm_iec_atn) // cbm_iec_data - serial data line handler //------------------------------------------------- -WRITE_LINE_MEMBER(mps1200_device::cbm_iec_data) +void mps1200_device::cbm_iec_data(int state) { // TODO } @@ -89,7 +89,7 @@ WRITE_LINE_MEMBER(mps1200_device::cbm_iec_data) // cbm_iec_reset - reset line handler //------------------------------------------------- -WRITE_LINE_MEMBER(mps1200_device::cbm_iec_reset) +void mps1200_device::cbm_iec_reset(int state) { // TODO } diff --git a/src/devices/bus/cbmiec/mps1200.h b/src/devices/bus/cbmiec/mps1200.h index 3727d1827ed..7d72b70d3ee 100644 --- a/src/devices/bus/cbmiec/mps1200.h +++ b/src/devices/bus/cbmiec/mps1200.h @@ -38,9 +38,9 @@ protected: virtual const tiny_rom_entry *device_rom_region() const override; // device_cbm_iec_interface overrides - DECLARE_WRITE_LINE_MEMBER(cbm_iec_atn) override; - DECLARE_WRITE_LINE_MEMBER(cbm_iec_data) override; - DECLARE_WRITE_LINE_MEMBER(cbm_iec_reset) override; + void cbm_iec_atn(int state) override; + void cbm_iec_data(int state) override; + void cbm_iec_reset(int state) override; private: void mem_map(address_map &map); diff --git a/src/devices/bus/cbus/mpu_pc98.cpp b/src/devices/bus/cbus/mpu_pc98.cpp index 2ba192d4b0d..bd06c177aae 100644 --- a/src/devices/bus/cbus/mpu_pc98.cpp +++ b/src/devices/bus/cbus/mpu_pc98.cpp @@ -30,7 +30,7 @@ DIP-SWs 1 irq3 */ -WRITE_LINE_MEMBER( mpu_pc98_device::mpu_irq_out ) +void mpu_pc98_device::mpu_irq_out(int state) { } diff --git a/src/devices/bus/cbus/mpu_pc98.h b/src/devices/bus/cbus/mpu_pc98.h index 798f8b8f11e..59bbf542166 100644 --- a/src/devices/bus/cbus/mpu_pc98.h +++ b/src/devices/bus/cbus/mpu_pc98.h @@ -30,7 +30,7 @@ protected: private: // called back by the MPU401 core to set the IRQ line state - DECLARE_WRITE_LINE_MEMBER(mpu_irq_out); + void mpu_irq_out(int state); void map(address_map &map); diff --git a/src/devices/bus/cbus/pc9801_118.cpp b/src/devices/bus/cbus/pc9801_118.cpp index 403a23b4658..c1326270ffc 100644 --- a/src/devices/bus/cbus/pc9801_118.cpp +++ b/src/devices/bus/cbus/pc9801_118.cpp @@ -37,7 +37,7 @@ // device type definition DEFINE_DEVICE_TYPE(PC9801_118, pc9801_118_device, "pc9801_118", "NEC PC-9801-118") -WRITE_LINE_MEMBER(pc9801_118_device::sound_irq) +void pc9801_118_device::sound_irq(int state) { // TODO: sometimes misfired irq causes sound or even host hang m_bus->int_w<5>(state); diff --git a/src/devices/bus/cbus/pc9801_118.h b/src/devices/bus/cbus/pc9801_118.h index 94ac3bfe24c..f847307413f 100644 --- a/src/devices/bus/cbus/pc9801_118.h +++ b/src/devices/bus/cbus/pc9801_118.h @@ -52,7 +52,7 @@ private: uint8_t m_ext_reg; - DECLARE_WRITE_LINE_MEMBER(sound_irq); + void sound_irq(int state); }; diff --git a/src/devices/bus/cbus/pc9801_26.cpp b/src/devices/bus/cbus/pc9801_26.cpp index 8f8b15740bd..c98e6d56ca2 100644 --- a/src/devices/bus/cbus/pc9801_26.cpp +++ b/src/devices/bus/cbus/pc9801_26.cpp @@ -27,7 +27,7 @@ // device type definition DEFINE_DEVICE_TYPE(PC9801_26, pc9801_26_device, "pc9801_26", "NEC PC-9801-26") -WRITE_LINE_MEMBER(pc9801_26_device::sound_irq) +void pc9801_26_device::sound_irq(int state) { // TODO: sometimes misfired irq causes sound or even host hang m_bus->int_w<5>(state); diff --git a/src/devices/bus/cbus/pc9801_26.h b/src/devices/bus/cbus/pc9801_26.h index 80cd57a20cd..3b18abfd66d 100644 --- a/src/devices/bus/cbus/pc9801_26.h +++ b/src/devices/bus/cbus/pc9801_26.h @@ -45,7 +45,7 @@ private: required_device m_bus; required_device m_opn; - DECLARE_WRITE_LINE_MEMBER(sound_irq); + void sound_irq(int state); u32 m_rom_base; }; diff --git a/src/devices/bus/cbus/pc9801_55.cpp b/src/devices/bus/cbus/pc9801_55.cpp index 879ad2f1a66..f9cee085d2c 100644 --- a/src/devices/bus/cbus/pc9801_55.cpp +++ b/src/devices/bus/cbus/pc9801_55.cpp @@ -56,7 +56,7 @@ const tiny_rom_entry *pc9801_55l_device::device_rom_region() const // device_add_mconfig - add device configuration //------------------------------------------------- -WRITE_LINE_MEMBER(pc9801_55_device::scsi_irq_w) +void pc9801_55_device::scsi_irq_w(int state) { // TODO: should be INT3, but BIOS configures as INT0 somewhere (unhandled dip reading?) m_bus->int_w<0>(state); diff --git a/src/devices/bus/cbus/pc9801_55.h b/src/devices/bus/cbus/pc9801_55.h index b74c754c2b8..0b20fc1f588 100644 --- a/src/devices/bus/cbus/pc9801_55.h +++ b/src/devices/bus/cbus/pc9801_55.h @@ -31,7 +31,7 @@ public: static constexpr feature_type unemulated_features() { return feature::DISK; } - DECLARE_WRITE_LINE_MEMBER(scsi_irq_w); + void scsi_irq_w(int state); protected: // device-level overrides diff --git a/src/devices/bus/cbus/pc9801_86.cpp b/src/devices/bus/cbus/pc9801_86.cpp index 740906357c5..a474e33cc6d 100644 --- a/src/devices/bus/cbus/pc9801_86.cpp +++ b/src/devices/bus/cbus/pc9801_86.cpp @@ -44,7 +44,7 @@ // device type definition DEFINE_DEVICE_TYPE(PC9801_86, pc9801_86_device, "pc9801_86", "NEC PC-9801-86") -WRITE_LINE_MEMBER(pc9801_86_device::sound_irq) +void pc9801_86_device::sound_irq(int state) { m_fmirq = state ? true : false; // TODO: sometimes misfired irq causes sound or even host hang diff --git a/src/devices/bus/cbus/pc9801_86.h b/src/devices/bus/cbus/pc9801_86.h index 7903f11e0b9..70102a03907 100644 --- a/src/devices/bus/cbus/pc9801_86.h +++ b/src/devices/bus/cbus/pc9801_86.h @@ -29,7 +29,7 @@ public: pc9801_86_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); pc9801_86_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); - DECLARE_WRITE_LINE_MEMBER(sound_irq); + void sound_irq(int state); protected: // device-level overrides diff --git a/src/devices/bus/centronics/chessmec.h b/src/devices/bus/centronics/chessmec.h index 07bbd8970c3..60596c347cc 100644 --- a/src/devices/bus/centronics/chessmec.h +++ b/src/devices/bus/centronics/chessmec.h @@ -27,9 +27,9 @@ protected: virtual void device_start() override { } virtual void device_add_mconfig(machine_config &config) override; - virtual DECLARE_WRITE_LINE_MEMBER(input_data0) override { if (started()) m_chessm->data0_w(state); } - virtual DECLARE_WRITE_LINE_MEMBER(input_data1) override { if (started()) m_chessm->reset_w(state); } - virtual DECLARE_WRITE_LINE_MEMBER(input_data7) override { if (started()) m_chessm->data1_w(state); } + virtual void input_data0(int state) override { if (started()) m_chessm->data0_w(state); } + virtual void input_data1(int state) override { if (started()) m_chessm->reset_w(state); } + virtual void input_data7(int state) override { if (started()) m_chessm->data1_w(state); } private: required_device m_chessm; diff --git a/src/devices/bus/centronics/comxpl80.h b/src/devices/bus/centronics/comxpl80.h index f64a31da6d0..f01bb29008a 100644 --- a/src/devices/bus/centronics/comxpl80.h +++ b/src/devices/bus/centronics/comxpl80.h @@ -38,14 +38,14 @@ protected: virtual void device_add_mconfig(machine_config &config) override; virtual ioport_constructor device_input_ports() const override; - virtual DECLARE_WRITE_LINE_MEMBER( input_data0 ) override { if (state) m_data |= 0x01; else m_data &= ~0x01; } - virtual DECLARE_WRITE_LINE_MEMBER( input_data1 ) override { if (state) m_data |= 0x02; else m_data &= ~0x02; } - virtual DECLARE_WRITE_LINE_MEMBER( input_data2 ) override { if (state) m_data |= 0x04; else m_data &= ~0x04; } - virtual DECLARE_WRITE_LINE_MEMBER( input_data3 ) override { if (state) m_data |= 0x08; else m_data &= ~0x08; } - virtual DECLARE_WRITE_LINE_MEMBER( input_data4 ) override { if (state) m_data |= 0x10; else m_data &= ~0x10; } - virtual DECLARE_WRITE_LINE_MEMBER( input_data5 ) override { if (state) m_data |= 0x20; else m_data &= ~0x20; } - virtual DECLARE_WRITE_LINE_MEMBER( input_data6 ) override { if (state) m_data |= 0x40; else m_data &= ~0x40; } - virtual DECLARE_WRITE_LINE_MEMBER( input_data7 ) override { if (state) m_data |= 0x80; else m_data &= ~0x80; } + virtual void input_data0(int state) override { if (state) m_data |= 0x01; else m_data &= ~0x01; } + virtual void input_data1(int state) override { if (state) m_data |= 0x02; else m_data &= ~0x02; } + virtual void input_data2(int state) override { if (state) m_data |= 0x04; else m_data &= ~0x04; } + virtual void input_data3(int state) override { if (state) m_data |= 0x08; else m_data &= ~0x08; } + virtual void input_data4(int state) override { if (state) m_data |= 0x10; else m_data &= ~0x10; } + virtual void input_data5(int state) override { if (state) m_data |= 0x20; else m_data &= ~0x20; } + virtual void input_data6(int state) override { if (state) m_data |= 0x40; else m_data &= ~0x40; } + virtual void input_data7(int state) override { if (state) m_data |= 0x80; else m_data &= ~0x80; } private: required_memory_region m_plotter; diff --git a/src/devices/bus/centronics/covox.h b/src/devices/bus/centronics/covox.h index da6ed1063aa..54f80e857a0 100644 --- a/src/devices/bus/centronics/covox.h +++ b/src/devices/bus/centronics/covox.h @@ -30,14 +30,14 @@ protected: // optional information overrides virtual void device_add_mconfig(machine_config &config) override; - virtual DECLARE_WRITE_LINE_MEMBER( input_data0 ) override { if (state) m_data |= 0x01; else m_data &= ~0x01; update_dac(); } - virtual DECLARE_WRITE_LINE_MEMBER( input_data1 ) override { if (state) m_data |= 0x02; else m_data &= ~0x02; update_dac(); } - virtual DECLARE_WRITE_LINE_MEMBER( input_data2 ) override { if (state) m_data |= 0x04; else m_data &= ~0x04; update_dac(); } - virtual DECLARE_WRITE_LINE_MEMBER( input_data3 ) override { if (state) m_data |= 0x08; else m_data &= ~0x08; update_dac(); } - virtual DECLARE_WRITE_LINE_MEMBER( input_data4 ) override { if (state) m_data |= 0x10; else m_data &= ~0x10; update_dac(); } - virtual DECLARE_WRITE_LINE_MEMBER( input_data5 ) override { if (state) m_data |= 0x20; else m_data &= ~0x20; update_dac(); } - virtual DECLARE_WRITE_LINE_MEMBER( input_data6 ) override { if (state) m_data |= 0x40; else m_data &= ~0x40; update_dac(); } - virtual DECLARE_WRITE_LINE_MEMBER( input_data7 ) override { if (state) m_data |= 0x80; else m_data &= ~0x80; update_dac(); } + virtual void input_data0(int state) override { if (state) m_data |= 0x01; else m_data &= ~0x01; update_dac(); } + virtual void input_data1(int state) override { if (state) m_data |= 0x02; else m_data &= ~0x02; update_dac(); } + virtual void input_data2(int state) override { if (state) m_data |= 0x04; else m_data &= ~0x04; update_dac(); } + virtual void input_data3(int state) override { if (state) m_data |= 0x08; else m_data &= ~0x08; update_dac(); } + virtual void input_data4(int state) override { if (state) m_data |= 0x10; else m_data &= ~0x10; update_dac(); } + virtual void input_data5(int state) override { if (state) m_data |= 0x20; else m_data &= ~0x20; update_dac(); } + virtual void input_data6(int state) override { if (state) m_data |= 0x40; else m_data &= ~0x40; update_dac(); } + virtual void input_data7(int state) override { if (state) m_data |= 0x80; else m_data &= ~0x80; update_dac(); } private: required_device m_dac; @@ -66,16 +66,16 @@ protected: // optional information overrides virtual void device_add_mconfig(machine_config &config) override; - virtual DECLARE_WRITE_LINE_MEMBER( input_strobe ) override { m_strobe = state; update_dac(); } - virtual DECLARE_WRITE_LINE_MEMBER( input_data0 ) override { if (state) m_data |= 0x01; else m_data &= ~0x01; update_dac(); } - virtual DECLARE_WRITE_LINE_MEMBER( input_data1 ) override { if (state) m_data |= 0x02; else m_data &= ~0x02; update_dac(); } - virtual DECLARE_WRITE_LINE_MEMBER( input_data2 ) override { if (state) m_data |= 0x04; else m_data &= ~0x04; update_dac(); } - virtual DECLARE_WRITE_LINE_MEMBER( input_data3 ) override { if (state) m_data |= 0x08; else m_data &= ~0x08; update_dac(); } - virtual DECLARE_WRITE_LINE_MEMBER( input_data4 ) override { if (state) m_data |= 0x10; else m_data &= ~0x10; update_dac(); } - virtual DECLARE_WRITE_LINE_MEMBER( input_data5 ) override { if (state) m_data |= 0x20; else m_data &= ~0x20; update_dac(); } - virtual DECLARE_WRITE_LINE_MEMBER( input_data6 ) override { if (state) m_data |= 0x40; else m_data &= ~0x40; update_dac(); } - virtual DECLARE_WRITE_LINE_MEMBER( input_data7 ) override { if (state) m_data |= 0x80; else m_data &= ~0x80; update_dac(); if (started()) output_busy(state); } - virtual DECLARE_WRITE_LINE_MEMBER( input_autofd ) override { m_autofd = state; update_dac(); } + virtual void input_strobe(int state) override { m_strobe = state; update_dac(); } + virtual void input_data0(int state) override { if (state) m_data |= 0x01; else m_data &= ~0x01; update_dac(); } + virtual void input_data1(int state) override { if (state) m_data |= 0x02; else m_data &= ~0x02; update_dac(); } + virtual void input_data2(int state) override { if (state) m_data |= 0x04; else m_data &= ~0x04; update_dac(); } + virtual void input_data3(int state) override { if (state) m_data |= 0x08; else m_data &= ~0x08; update_dac(); } + virtual void input_data4(int state) override { if (state) m_data |= 0x10; else m_data &= ~0x10; update_dac(); } + virtual void input_data5(int state) override { if (state) m_data |= 0x20; else m_data &= ~0x20; update_dac(); } + virtual void input_data6(int state) override { if (state) m_data |= 0x40; else m_data &= ~0x40; update_dac(); } + virtual void input_data7(int state) override { if (state) m_data |= 0x80; else m_data &= ~0x80; update_dac(); if (started()) output_busy(state); } + virtual void input_autofd(int state) override { m_autofd = state; update_dac(); } private: required_device m_ldac; diff --git a/src/devices/bus/centronics/ctronics.cpp b/src/devices/bus/centronics/ctronics.cpp index d30d31cf441..1c23644fa1b 100644 --- a/src/devices/bus/centronics/ctronics.cpp +++ b/src/devices/bus/centronics/ctronics.cpp @@ -104,23 +104,23 @@ void centronics_device::set_output_latch(output_latch_device &latch) latch.bit_handler<7>().set(*this, FUNC(centronics_device::write_data7)); } -WRITE_LINE_MEMBER( centronics_device::write_strobe ) { if (m_dev) m_dev->input_strobe(state); } -WRITE_LINE_MEMBER( centronics_device::write_data0 ) { if (m_dev) m_dev->input_data0(state); } -WRITE_LINE_MEMBER( centronics_device::write_data1 ) { if (m_dev) m_dev->input_data1(state); } -WRITE_LINE_MEMBER( centronics_device::write_data2 ) { if (m_dev) m_dev->input_data2(state); } -WRITE_LINE_MEMBER( centronics_device::write_data3 ) { if (m_dev) m_dev->input_data3(state); } -WRITE_LINE_MEMBER( centronics_device::write_data4 ) { if (m_dev) m_dev->input_data4(state); } -WRITE_LINE_MEMBER( centronics_device::write_data5 ) { if (m_dev) m_dev->input_data5(state); } -WRITE_LINE_MEMBER( centronics_device::write_data6 ) { if (m_dev) m_dev->input_data6(state); } -WRITE_LINE_MEMBER( centronics_device::write_data7 ) { if (m_dev) m_dev->input_data7(state); } -WRITE_LINE_MEMBER( centronics_device::write_ack ) { if (m_dev) m_dev->input_ack(state); } -WRITE_LINE_MEMBER( centronics_device::write_busy ) { if (m_dev) m_dev->input_busy(state); } -WRITE_LINE_MEMBER( centronics_device::write_perror ) { if (m_dev) m_dev->input_perror(state); } -WRITE_LINE_MEMBER( centronics_device::write_select ) { if (m_dev) m_dev->input_select(state); } -WRITE_LINE_MEMBER( centronics_device::write_autofd ) { if (m_dev) m_dev->input_autofd(state); } -WRITE_LINE_MEMBER( centronics_device::write_fault ) { if (m_dev) m_dev->input_fault(state); } -WRITE_LINE_MEMBER( centronics_device::write_init ) { if (m_dev) m_dev->input_init(state); } -WRITE_LINE_MEMBER( centronics_device::write_select_in ) { if (m_dev) m_dev->input_select_in(state); } +void centronics_device::write_strobe(int state) { if (m_dev) m_dev->input_strobe(state); } +void centronics_device::write_data0(int state) { if (m_dev) m_dev->input_data0(state); } +void centronics_device::write_data1(int state) { if (m_dev) m_dev->input_data1(state); } +void centronics_device::write_data2(int state) { if (m_dev) m_dev->input_data2(state); } +void centronics_device::write_data3(int state) { if (m_dev) m_dev->input_data3(state); } +void centronics_device::write_data4(int state) { if (m_dev) m_dev->input_data4(state); } +void centronics_device::write_data5(int state) { if (m_dev) m_dev->input_data5(state); } +void centronics_device::write_data6(int state) { if (m_dev) m_dev->input_data6(state); } +void centronics_device::write_data7(int state) { if (m_dev) m_dev->input_data7(state); } +void centronics_device::write_ack(int state) { if (m_dev) m_dev->input_ack(state); } +void centronics_device::write_busy(int state) { if (m_dev) m_dev->input_busy(state); } +void centronics_device::write_perror(int state) { if (m_dev) m_dev->input_perror(state); } +void centronics_device::write_select(int state) { if (m_dev) m_dev->input_select(state); } +void centronics_device::write_autofd(int state) { if (m_dev) m_dev->input_autofd(state); } +void centronics_device::write_fault(int state) { if (m_dev) m_dev->input_fault(state); } +void centronics_device::write_init(int state) { if (m_dev) m_dev->input_init(state); } +void centronics_device::write_select_in(int state) { if (m_dev) m_dev->input_select_in(state); } // class device_centronics_peripheral_interface diff --git a/src/devices/bus/centronics/ctronics.h b/src/devices/bus/centronics/ctronics.h index 44de7930cc8..15e17e3782b 100644 --- a/src/devices/bus/centronics/ctronics.h +++ b/src/devices/bus/centronics/ctronics.h @@ -60,23 +60,23 @@ public: void set_output_latch(output_latch_device &latch); - DECLARE_WRITE_LINE_MEMBER( write_strobe ); - DECLARE_WRITE_LINE_MEMBER( write_data0 ); - DECLARE_WRITE_LINE_MEMBER( write_data1 ); - DECLARE_WRITE_LINE_MEMBER( write_data2 ); - DECLARE_WRITE_LINE_MEMBER( write_data3 ); - DECLARE_WRITE_LINE_MEMBER( write_data4 ); - DECLARE_WRITE_LINE_MEMBER( write_data5 ); - DECLARE_WRITE_LINE_MEMBER( write_data6 ); - DECLARE_WRITE_LINE_MEMBER( write_data7 ); - DECLARE_WRITE_LINE_MEMBER( write_ack ); - DECLARE_WRITE_LINE_MEMBER( write_busy ); - DECLARE_WRITE_LINE_MEMBER( write_perror ); - DECLARE_WRITE_LINE_MEMBER( write_select ); - DECLARE_WRITE_LINE_MEMBER( write_autofd ); - DECLARE_WRITE_LINE_MEMBER( write_fault ); - DECLARE_WRITE_LINE_MEMBER( write_init ); - DECLARE_WRITE_LINE_MEMBER( write_select_in ); + void write_strobe(int state); + void write_data0(int state); + void write_data1(int state); + void write_data2(int state); + void write_data3(int state); + void write_data4(int state); + void write_data5(int state); + void write_data6(int state); + void write_data7(int state); + void write_ack(int state); + void write_busy(int state); + void write_perror(int state); + void write_select(int state); + void write_autofd(int state); + void write_fault(int state); + void write_init(int state); + void write_select_in(int state); protected: // device-level overrides @@ -115,44 +115,44 @@ class device_centronics_peripheral_interface : public device_interface public: virtual ~device_centronics_peripheral_interface(); - DECLARE_WRITE_LINE_MEMBER( output_strobe ) { m_slot->m_strobe_handler(state); } - DECLARE_WRITE_LINE_MEMBER( output_data0 ) { m_slot->m_data0_handler(state); } - DECLARE_WRITE_LINE_MEMBER( output_data1 ) { m_slot->m_data1_handler(state); } - DECLARE_WRITE_LINE_MEMBER( output_data2 ) { m_slot->m_data2_handler(state); } - DECLARE_WRITE_LINE_MEMBER( output_data3 ) { m_slot->m_data3_handler(state); } - DECLARE_WRITE_LINE_MEMBER( output_data4 ) { m_slot->m_data4_handler(state); } - DECLARE_WRITE_LINE_MEMBER( output_data5 ) { m_slot->m_data5_handler(state); } - DECLARE_WRITE_LINE_MEMBER( output_data6 ) { m_slot->m_data6_handler(state); } - DECLARE_WRITE_LINE_MEMBER( output_data7 ) { m_slot->m_data7_handler(state); } - DECLARE_WRITE_LINE_MEMBER( output_ack ) { m_slot->m_ack_handler(state); } - DECLARE_WRITE_LINE_MEMBER( output_busy ) { m_slot->m_busy_handler(state); } - DECLARE_WRITE_LINE_MEMBER( output_perror ) { m_slot->m_perror_handler(state); } - DECLARE_WRITE_LINE_MEMBER( output_select ) { m_slot->m_select_handler(state); } - DECLARE_WRITE_LINE_MEMBER( output_autofd ) { m_slot->m_autofd_handler(state); } - DECLARE_WRITE_LINE_MEMBER( output_fault ) { m_slot->m_fault_handler(state); } - DECLARE_WRITE_LINE_MEMBER( output_init ) { m_slot->m_init_handler(state); } - DECLARE_WRITE_LINE_MEMBER( output_select_in ) { m_slot->m_select_in_handler(state); } + void output_strobe(int state) { m_slot->m_strobe_handler(state); } + void output_data0(int state) { m_slot->m_data0_handler(state); } + void output_data1(int state) { m_slot->m_data1_handler(state); } + void output_data2(int state) { m_slot->m_data2_handler(state); } + void output_data3(int state) { m_slot->m_data3_handler(state); } + void output_data4(int state) { m_slot->m_data4_handler(state); } + void output_data5(int state) { m_slot->m_data5_handler(state); } + void output_data6(int state) { m_slot->m_data6_handler(state); } + void output_data7(int state) { m_slot->m_data7_handler(state); } + void output_ack(int state) { m_slot->m_ack_handler(state); } + void output_busy(int state) { m_slot->m_busy_handler(state); } + void output_perror(int state) { m_slot->m_perror_handler(state); } + void output_select(int state) { m_slot->m_select_handler(state); } + void output_autofd(int state) { m_slot->m_autofd_handler(state); } + void output_fault(int state) { m_slot->m_fault_handler(state); } + void output_init(int state) { m_slot->m_init_handler(state); } + void output_select_in(int state) { m_slot->m_select_in_handler(state); } protected: device_centronics_peripheral_interface(const machine_config &mconfig, device_t &device); - virtual DECLARE_WRITE_LINE_MEMBER( input_strobe ) { } - virtual DECLARE_WRITE_LINE_MEMBER( input_data0 ) { } - virtual DECLARE_WRITE_LINE_MEMBER( input_data1 ) { } - virtual DECLARE_WRITE_LINE_MEMBER( input_data2 ) { } - virtual DECLARE_WRITE_LINE_MEMBER( input_data3 ) { } - virtual DECLARE_WRITE_LINE_MEMBER( input_data4 ) { } - virtual DECLARE_WRITE_LINE_MEMBER( input_data5 ) { } - virtual DECLARE_WRITE_LINE_MEMBER( input_data6 ) { } - virtual DECLARE_WRITE_LINE_MEMBER( input_data7 ) { } - virtual DECLARE_WRITE_LINE_MEMBER( input_ack ) { } - virtual DECLARE_WRITE_LINE_MEMBER( input_busy ) { } - virtual DECLARE_WRITE_LINE_MEMBER( input_perror ) { } - virtual DECLARE_WRITE_LINE_MEMBER( input_select ) { } - virtual DECLARE_WRITE_LINE_MEMBER( input_autofd ) { } - virtual DECLARE_WRITE_LINE_MEMBER( input_fault ) { } - virtual DECLARE_WRITE_LINE_MEMBER( input_init ) { } - virtual DECLARE_WRITE_LINE_MEMBER( input_select_in ) { } + virtual void input_strobe(int state) { } + virtual void input_data0(int state) { } + virtual void input_data1(int state) { } + virtual void input_data2(int state) { } + virtual void input_data3(int state) { } + virtual void input_data4(int state) { } + virtual void input_data5(int state) { } + virtual void input_data6(int state) { } + virtual void input_data7(int state) { } + virtual void input_ack(int state) { } + virtual void input_busy(int state) { } + virtual void input_perror(int state) { } + virtual void input_select(int state) { } + virtual void input_autofd(int state) { } + virtual void input_fault(int state) { } + virtual void input_init(int state) { } + virtual void input_select_in(int state) { } virtual bool supports_pin35_5v() { return false; } diff --git a/src/devices/bus/centronics/digiblst.h b/src/devices/bus/centronics/digiblst.h index 00a8246b802..cae7d7b5767 100644 --- a/src/devices/bus/centronics/digiblst.h +++ b/src/devices/bus/centronics/digiblst.h @@ -36,14 +36,14 @@ protected: // optional information overrides virtual void device_add_mconfig(machine_config &config) override; - virtual DECLARE_WRITE_LINE_MEMBER( input_data0 ) override { if (state) m_data |= 0x01; else m_data &= ~0x01; update_dac(); } - virtual DECLARE_WRITE_LINE_MEMBER( input_data1 ) override { if (state) m_data |= 0x02; else m_data &= ~0x02; update_dac(); } - virtual DECLARE_WRITE_LINE_MEMBER( input_data2 ) override { if (state) m_data |= 0x04; else m_data &= ~0x04; update_dac(); } - virtual DECLARE_WRITE_LINE_MEMBER( input_data3 ) override { if (state) m_data |= 0x08; else m_data &= ~0x08; update_dac(); } - virtual DECLARE_WRITE_LINE_MEMBER( input_data4 ) override { if (state) m_data |= 0x10; else m_data &= ~0x10; update_dac(); } - virtual DECLARE_WRITE_LINE_MEMBER( input_data5 ) override { if (state) m_data |= 0x20; else m_data &= ~0x20; update_dac(); } - virtual DECLARE_WRITE_LINE_MEMBER( input_data6 ) override { if (state) m_data |= 0x40; else m_data &= ~0x40; update_dac(); } - virtual DECLARE_WRITE_LINE_MEMBER( input_strobe ) override { if (state) m_data &= ~0x80; else m_data |= 0x80; update_dac(); } + virtual void input_data0(int state) override { if (state) m_data |= 0x01; else m_data &= ~0x01; update_dac(); } + virtual void input_data1(int state) override { if (state) m_data |= 0x02; else m_data &= ~0x02; update_dac(); } + virtual void input_data2(int state) override { if (state) m_data |= 0x04; else m_data &= ~0x04; update_dac(); } + virtual void input_data3(int state) override { if (state) m_data |= 0x08; else m_data &= ~0x08; update_dac(); } + virtual void input_data4(int state) override { if (state) m_data |= 0x10; else m_data &= ~0x10; update_dac(); } + virtual void input_data5(int state) override { if (state) m_data |= 0x20; else m_data &= ~0x20; update_dac(); } + virtual void input_data6(int state) override { if (state) m_data |= 0x40; else m_data &= ~0x40; update_dac(); } + virtual void input_strobe(int state) override { if (state) m_data &= ~0x80; else m_data |= 0x80; update_dac(); } private: required_device m_dac; diff --git a/src/devices/bus/centronics/dsjoy.h b/src/devices/bus/centronics/dsjoy.h index bcb91afceed..0ae1486f1e3 100644 --- a/src/devices/bus/centronics/dsjoy.h +++ b/src/devices/bus/centronics/dsjoy.h @@ -25,12 +25,12 @@ protected: virtual void device_start() override; virtual ioport_constructor device_input_ports() const override; - virtual DECLARE_WRITE_LINE_MEMBER( input_data0 ) override { if (state) m_data |= 0x01; else m_data &= ~0x01; update_perror(); } - virtual DECLARE_WRITE_LINE_MEMBER( input_data1 ) override { if (state) m_data |= 0x02; else m_data &= ~0x02; update_perror(); } - virtual DECLARE_WRITE_LINE_MEMBER( input_data2 ) override { if (state) m_data |= 0x04; else m_data &= ~0x04; update_perror(); } - virtual DECLARE_WRITE_LINE_MEMBER( input_data3 ) override { if (state) m_data |= 0x08; else m_data &= ~0x08; update_perror(); } - virtual DECLARE_WRITE_LINE_MEMBER( input_data4 ) override { if (state) m_data |= 0x10; else m_data &= ~0x10; update_perror(); } - virtual DECLARE_WRITE_LINE_MEMBER( input_data5 ) override { if (state) m_data |= 0x20; else m_data &= ~0x20; update_perror(); } + virtual void input_data0(int state) override { if (state) m_data |= 0x01; else m_data &= ~0x01; update_perror(); } + virtual void input_data1(int state) override { if (state) m_data |= 0x02; else m_data &= ~0x02; update_perror(); } + virtual void input_data2(int state) override { if (state) m_data |= 0x04; else m_data &= ~0x04; update_perror(); } + virtual void input_data3(int state) override { if (state) m_data |= 0x08; else m_data &= ~0x08; update_perror(); } + virtual void input_data4(int state) override { if (state) m_data |= 0x10; else m_data &= ~0x10; update_perror(); } + virtual void input_data5(int state) override { if (state) m_data |= 0x20; else m_data &= ~0x20; update_perror(); } private: required_ioport m_lptjoy; diff --git a/src/devices/bus/centronics/epson_lx800.cpp b/src/devices/bus/centronics/epson_lx800.cpp index 3733c92cb2b..9022f0befa4 100644 --- a/src/devices/bus/centronics/epson_lx800.cpp +++ b/src/devices/bus/centronics/epson_lx800.cpp @@ -274,32 +274,32 @@ void epson_lx800_device::portc_w(offs_t offset, uint8_t data) m_beep->set_state(!BIT(data, 7)); } -READ_LINE_MEMBER( epson_lx800_device::an0_r ) +int epson_lx800_device::an0_r() { return BIT(ioport("DIPSW2")->read(), 0); } -READ_LINE_MEMBER( epson_lx800_device::an1_r ) +int epson_lx800_device::an1_r() { return BIT(ioport("DIPSW2")->read(), 1); } -READ_LINE_MEMBER( epson_lx800_device::an2_r ) +int epson_lx800_device::an2_r() { return BIT(ioport("DIPSW2")->read(), 2); } -READ_LINE_MEMBER( epson_lx800_device::an3_r ) +int epson_lx800_device::an3_r() { return BIT(ioport("DIPSW2")->read(), 3); // can also read an external line AUTO_FEED_XT } -READ_LINE_MEMBER( epson_lx800_device::an4_r ) +int epson_lx800_device::an4_r() { return 0; // Printer select line (0=always selected) } -READ_LINE_MEMBER( epson_lx800_device::an5_r ) +int epson_lx800_device::an5_r() { return 1; // Monitors 24v line, should return 4.08 volts } @@ -315,12 +315,12 @@ uint8_t epson_lx800_device::centronics_data_r() return 0x55; } -WRITE_LINE_MEMBER( epson_lx800_device::centronics_pe_w ) +void epson_lx800_device::centronics_pe_w(int state) { logerror("centronics: pe = %d\n", state); } -WRITE_LINE_MEMBER( epson_lx800_device::reset_w ) +void epson_lx800_device::reset_w(int state) { logerror("cpu reset"); m_maincpu->reset(); diff --git a/src/devices/bus/centronics/epson_lx800.h b/src/devices/bus/centronics/epson_lx800.h index c6534f3d62f..b1ec0b7ce82 100644 --- a/src/devices/bus/centronics/epson_lx800.h +++ b/src/devices/bus/centronics/epson_lx800.h @@ -50,16 +50,16 @@ private: uint8_t portc_r(offs_t offset); void portc_w(offs_t offset, uint8_t data); - DECLARE_READ_LINE_MEMBER(an0_r); - DECLARE_READ_LINE_MEMBER(an1_r); - DECLARE_READ_LINE_MEMBER(an2_r); - DECLARE_READ_LINE_MEMBER(an3_r); - DECLARE_READ_LINE_MEMBER(an4_r); - DECLARE_READ_LINE_MEMBER(an5_r); + int an0_r(); + int an1_r(); + int an2_r(); + int an3_r(); + int an4_r(); + int an5_r(); uint8_t centronics_data_r(); - DECLARE_WRITE_LINE_MEMBER(centronics_pe_w); - DECLARE_WRITE_LINE_MEMBER(reset_w); + void centronics_pe_w(int state); + void reset_w(int state); void lx800_mem(address_map &map); diff --git a/src/devices/bus/centronics/epson_lx810l.cpp b/src/devices/bus/centronics/epson_lx810l.cpp index 24f9b90c50f..bdbb9ffaa06 100644 --- a/src/devices/bus/centronics/epson_lx810l.cpp +++ b/src/devices/bus/centronics/epson_lx810l.cpp @@ -522,7 +522,7 @@ void epson_lx810l_device::cr_stepper(uint8_t data) } } -WRITE_LINE_MEMBER( epson_lx810l_device::e05a30_ready ) +void epson_lx810l_device::e05a30_ready(int state) { // must be longer than attotime::zero - 0.09 is minimum to initialize properly m_maincpu->pulse_input_line(INPUT_LINE_NMI, attotime::from_double(0.09)); @@ -533,7 +533,7 @@ WRITE_LINE_MEMBER( epson_lx810l_device::e05a30_ready ) Extended Timer Output ***************************************************************************/ -WRITE_LINE_MEMBER( epson_lx810l_device::co0_w ) +void epson_lx810l_device::co0_w(int state) { /* Printhead is being fired on !state. */ if (!state) { diff --git a/src/devices/bus/centronics/epson_lx810l.h b/src/devices/bus/centronics/epson_lx810l.h index 1b5581a606b..37383771b5d 100644 --- a/src/devices/bus/centronics/epson_lx810l.h +++ b/src/devices/bus/centronics/epson_lx810l.h @@ -34,16 +34,16 @@ public: epson_lx810l_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); /* Centronics stuff */ - virtual DECLARE_WRITE_LINE_MEMBER( input_strobe ) override { m_e05a30->centronics_input_strobe(state); } - virtual DECLARE_WRITE_LINE_MEMBER( input_data0 ) override { m_e05a30->centronics_input_data0(state); } - virtual DECLARE_WRITE_LINE_MEMBER( input_data1 ) override { m_e05a30->centronics_input_data1(state); } - virtual DECLARE_WRITE_LINE_MEMBER( input_data2 ) override { m_e05a30->centronics_input_data2(state); } - virtual DECLARE_WRITE_LINE_MEMBER( input_data3 ) override { m_e05a30->centronics_input_data3(state); } - virtual DECLARE_WRITE_LINE_MEMBER( input_data4 ) override { m_e05a30->centronics_input_data4(state); } - virtual DECLARE_WRITE_LINE_MEMBER( input_data5 ) override { m_e05a30->centronics_input_data5(state); } - virtual DECLARE_WRITE_LINE_MEMBER( input_data6 ) override { m_e05a30->centronics_input_data6(state); } - virtual DECLARE_WRITE_LINE_MEMBER( input_data7 ) override { m_e05a30->centronics_input_data7(state); } - virtual DECLARE_WRITE_LINE_MEMBER( input_init ) override { m_e05a30->centronics_input_init(state); } + virtual void input_strobe(int state) override { m_e05a30->centronics_input_strobe(state); } + virtual void input_data0(int state) override { m_e05a30->centronics_input_data0(state); } + virtual void input_data1(int state) override { m_e05a30->centronics_input_data1(state); } + virtual void input_data2(int state) override { m_e05a30->centronics_input_data2(state); } + virtual void input_data3(int state) override { m_e05a30->centronics_input_data3(state); } + virtual void input_data4(int state) override { m_e05a30->centronics_input_data4(state); } + virtual void input_data5(int state) override { m_e05a30->centronics_input_data5(state); } + virtual void input_data6(int state) override { m_e05a30->centronics_input_data6(state); } + virtual void input_data7(int state) override { m_e05a30->centronics_input_data7(state); } + virtual void input_init(int state) override { m_e05a30->centronics_input_init(state); } /* Panel buttons */ DECLARE_INPUT_CHANGED_MEMBER(online_sw); @@ -80,7 +80,7 @@ private: void fakemem_w(uint8_t data); /* Extended Timer Output */ - DECLARE_WRITE_LINE_MEMBER(co0_w); + void co0_w(int state); /* ADC */ uint8_t an0_r(); @@ -97,17 +97,17 @@ private: void printhead(uint16_t data); void pf_stepper(uint8_t data); void cr_stepper(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(e05a30_ready); + void e05a30_ready(int state); - DECLARE_WRITE_LINE_MEMBER(e05a30_centronics_ack) { output_ack(state); } - DECLARE_WRITE_LINE_MEMBER(e05a30_centronics_busy) { output_busy(state); } - DECLARE_WRITE_LINE_MEMBER(e05a30_centronics_perror) { output_perror(state); } - DECLARE_WRITE_LINE_MEMBER(e05a30_centronics_fault) { output_fault(state); } - DECLARE_WRITE_LINE_MEMBER(e05a30_centronics_select) { output_select(state); } + void e05a30_centronics_ack(int state) { output_ack(state); } + void e05a30_centronics_busy(int state) { output_busy(state); } + void e05a30_centronics_perror(int state) { output_perror(state); } + void e05a30_centronics_fault(int state) { output_fault(state); } + void e05a30_centronics_select(int state) { output_select(state); } - DECLARE_WRITE_LINE_MEMBER(e05a30_cpu_reset) { if (!state) m_maincpu->pulse_input_line(INPUT_LINE_RESET, attotime::zero); } // reset cpu + void e05a30_cpu_reset(int state) { if (!state) m_maincpu->pulse_input_line(INPUT_LINE_RESET, attotime::zero); } // reset cpu - DECLARE_WRITE_LINE_MEMBER(e05a30_ready_led) + void e05a30_ready_led(int state) { m_ready_led = state; m_bitmap_printer->set_led_state(bitmap_printer_device::LED_READY, m_ready_led); diff --git a/src/devices/bus/centronics/nlq401.cpp b/src/devices/bus/centronics/nlq401.cpp index c8cdbdea969..92325fd11bf 100644 --- a/src/devices/bus/centronics/nlq401.cpp +++ b/src/devices/bus/centronics/nlq401.cpp @@ -50,7 +50,7 @@ void nlq401_device::device_start() // input_data0 - DATA1 line handler //------------------------------------------------- -WRITE_LINE_MEMBER(nlq401_device::input_data0) +void nlq401_device::input_data0(int state) { // TODO } @@ -59,7 +59,7 @@ WRITE_LINE_MEMBER(nlq401_device::input_data0) // input_data1 - DATA2 line handler //------------------------------------------------- -WRITE_LINE_MEMBER(nlq401_device::input_data1) +void nlq401_device::input_data1(int state) { // TODO } @@ -68,7 +68,7 @@ WRITE_LINE_MEMBER(nlq401_device::input_data1) // input_data2 - DATA3 line handler //------------------------------------------------- -WRITE_LINE_MEMBER(nlq401_device::input_data2) +void nlq401_device::input_data2(int state) { // TODO } @@ -77,7 +77,7 @@ WRITE_LINE_MEMBER(nlq401_device::input_data2) // input_data3 - DATA4 line handler //------------------------------------------------- -WRITE_LINE_MEMBER(nlq401_device::input_data3) +void nlq401_device::input_data3(int state) { // TODO } @@ -86,7 +86,7 @@ WRITE_LINE_MEMBER(nlq401_device::input_data3) // input_data4 - DATA5 line handler //------------------------------------------------- -WRITE_LINE_MEMBER(nlq401_device::input_data4) +void nlq401_device::input_data4(int state) { // TODO } @@ -95,7 +95,7 @@ WRITE_LINE_MEMBER(nlq401_device::input_data4) // input_data5 - DATA6 line handler //------------------------------------------------- -WRITE_LINE_MEMBER(nlq401_device::input_data5) +void nlq401_device::input_data5(int state) { // TODO } @@ -104,7 +104,7 @@ WRITE_LINE_MEMBER(nlq401_device::input_data5) // input_data6 - DATA7 line handler //------------------------------------------------- -WRITE_LINE_MEMBER(nlq401_device::input_data6) +void nlq401_device::input_data6(int state) { // TODO } @@ -113,7 +113,7 @@ WRITE_LINE_MEMBER(nlq401_device::input_data6) // input_data7 - DATA8 line handler //------------------------------------------------- -WRITE_LINE_MEMBER(nlq401_device::input_data7) +void nlq401_device::input_data7(int state) { // TODO } @@ -122,7 +122,7 @@ WRITE_LINE_MEMBER(nlq401_device::input_data7) // input_strobe - DATA STROBE line handler //------------------------------------------------- -WRITE_LINE_MEMBER(nlq401_device::input_strobe) +void nlq401_device::input_strobe(int state) { // TODO } @@ -131,7 +131,7 @@ WRITE_LINE_MEMBER(nlq401_device::input_strobe) // input_init - INIT line handler //------------------------------------------------- -WRITE_LINE_MEMBER(nlq401_device::input_init) +void nlq401_device::input_init(int state) { // TODO } diff --git a/src/devices/bus/centronics/nlq401.h b/src/devices/bus/centronics/nlq401.h index 85442a2160b..291a10cb0bf 100644 --- a/src/devices/bus/centronics/nlq401.h +++ b/src/devices/bus/centronics/nlq401.h @@ -32,16 +32,16 @@ protected: virtual const tiny_rom_entry *device_rom_region() const override; // device_centronics_peripheral_interface overrides - virtual DECLARE_WRITE_LINE_MEMBER(input_data0) override; - virtual DECLARE_WRITE_LINE_MEMBER(input_data1) override; - virtual DECLARE_WRITE_LINE_MEMBER(input_data2) override; - virtual DECLARE_WRITE_LINE_MEMBER(input_data3) override; - virtual DECLARE_WRITE_LINE_MEMBER(input_data4) override; - virtual DECLARE_WRITE_LINE_MEMBER(input_data5) override; - virtual DECLARE_WRITE_LINE_MEMBER(input_data6) override; - virtual DECLARE_WRITE_LINE_MEMBER(input_data7) override; - virtual DECLARE_WRITE_LINE_MEMBER(input_strobe) override; - virtual DECLARE_WRITE_LINE_MEMBER(input_init) override; + virtual void input_data0(int state) override; + virtual void input_data1(int state) override; + virtual void input_data2(int state) override; + virtual void input_data3(int state) override; + virtual void input_data4(int state) override; + virtual void input_data5(int state) override; + virtual void input_data6(int state) override; + virtual void input_data7(int state) override; + virtual void input_strobe(int state) override; + virtual void input_init(int state) override; virtual bool supports_pin35_5v() override { return true; } private: diff --git a/src/devices/bus/centronics/printer.cpp b/src/devices/bus/centronics/printer.cpp index b1b136cfc66..25deb42cdd1 100644 --- a/src/devices/bus/centronics/printer.cpp +++ b/src/devices/bus/centronics/printer.cpp @@ -65,7 +65,7 @@ void centronics_printer_device::device_reset() sets us busy when the printer goes offline -------------------------------------------------*/ -WRITE_LINE_MEMBER(centronics_printer_device::printer_online) +void centronics_printer_device::printer_online(int state) { output_perror(!state); } @@ -116,7 +116,7 @@ TIMER_CALLBACK_MEMBER(centronics_printer_device::busy_timer_tick) ready -------------------------------------------------*/ -WRITE_LINE_MEMBER( centronics_printer_device::input_strobe ) +void centronics_printer_device::input_strobe(int state) { /* look for a high -> low transition */ if (m_strobe == true && state == false && m_busy == false) @@ -134,7 +134,7 @@ WRITE_LINE_MEMBER( centronics_printer_device::input_strobe ) printer (centronics mode) -------------------------------------------------*/ -WRITE_LINE_MEMBER(centronics_printer_device::input_init) +void centronics_printer_device::input_init(int state) { /* reset printer if line is low */ if (state == false) diff --git a/src/devices/bus/centronics/printer.h b/src/devices/bus/centronics/printer.h index e959959be0c..ff4d0e3fe16 100644 --- a/src/devices/bus/centronics/printer.h +++ b/src/devices/bus/centronics/printer.h @@ -17,16 +17,16 @@ public: // construction/destruction centronics_printer_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - virtual DECLARE_WRITE_LINE_MEMBER( input_strobe ) override; - virtual DECLARE_WRITE_LINE_MEMBER( input_data0 ) override { if (state) m_data |= 0x01; else m_data &= ~0x01; } - virtual DECLARE_WRITE_LINE_MEMBER( input_data1 ) override { if (state) m_data |= 0x02; else m_data &= ~0x02; } - virtual DECLARE_WRITE_LINE_MEMBER( input_data2 ) override { if (state) m_data |= 0x04; else m_data &= ~0x04; } - virtual DECLARE_WRITE_LINE_MEMBER( input_data3 ) override { if (state) m_data |= 0x08; else m_data &= ~0x08; } - virtual DECLARE_WRITE_LINE_MEMBER( input_data4 ) override { if (state) m_data |= 0x10; else m_data &= ~0x10; } - virtual DECLARE_WRITE_LINE_MEMBER( input_data5 ) override { if (state) m_data |= 0x20; else m_data &= ~0x20; } - virtual DECLARE_WRITE_LINE_MEMBER( input_data6 ) override { if (state) m_data |= 0x40; else m_data &= ~0x40; } - virtual DECLARE_WRITE_LINE_MEMBER( input_data7 ) override { if (state) m_data |= 0x80; else m_data &= ~0x80; } - virtual DECLARE_WRITE_LINE_MEMBER( input_init ) override; + virtual void input_strobe(int state) override; + virtual void input_data0(int state) override { if (state) m_data |= 0x01; else m_data &= ~0x01; } + virtual void input_data1(int state) override { if (state) m_data |= 0x02; else m_data &= ~0x02; } + virtual void input_data2(int state) override { if (state) m_data |= 0x04; else m_data &= ~0x04; } + virtual void input_data3(int state) override { if (state) m_data |= 0x08; else m_data &= ~0x08; } + virtual void input_data4(int state) override { if (state) m_data |= 0x10; else m_data &= ~0x10; } + virtual void input_data5(int state) override { if (state) m_data |= 0x20; else m_data &= ~0x20; } + virtual void input_data6(int state) override { if (state) m_data |= 0x40; else m_data &= ~0x40; } + virtual void input_data7(int state) override { if (state) m_data |= 0x80; else m_data &= ~0x80; } + virtual void input_init(int state) override; protected: // device-level overrides @@ -37,7 +37,7 @@ protected: virtual bool supports_pin35_5v() override { return true; } private: - DECLARE_WRITE_LINE_MEMBER( printer_online ); + void printer_online(int state); TIMER_CALLBACK_MEMBER(ack_timer_tick); TIMER_CALLBACK_MEMBER(busy_timer_tick); diff --git a/src/devices/bus/centronics/samdac.cpp b/src/devices/bus/centronics/samdac.cpp index 01b18963e44..46a7682f4ba 100644 --- a/src/devices/bus/centronics/samdac.cpp +++ b/src/devices/bus/centronics/samdac.cpp @@ -64,7 +64,7 @@ void centronics_samdac_device::device_start() // IMPLEMENTATION //************************************************************************** -WRITE_LINE_MEMBER( centronics_samdac_device::input_strobe ) +void centronics_samdac_device::input_strobe(int state) { // raising edge, write to left channel if (m_strobe == 0 && state == 1) diff --git a/src/devices/bus/centronics/samdac.h b/src/devices/bus/centronics/samdac.h index 79cd654e267..7c793d59a0a 100644 --- a/src/devices/bus/centronics/samdac.h +++ b/src/devices/bus/centronics/samdac.h @@ -28,15 +28,15 @@ public: centronics_samdac_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); // from centronics port - virtual DECLARE_WRITE_LINE_MEMBER( input_strobe ) override; - virtual DECLARE_WRITE_LINE_MEMBER( input_data0 ) override { update_data(0, state); } - virtual DECLARE_WRITE_LINE_MEMBER( input_data1 ) override { update_data(1, state); } - virtual DECLARE_WRITE_LINE_MEMBER( input_data2 ) override { update_data(2, state); } - virtual DECLARE_WRITE_LINE_MEMBER( input_data3 ) override { update_data(3, state); } - virtual DECLARE_WRITE_LINE_MEMBER( input_data4 ) override { update_data(4, state); } - virtual DECLARE_WRITE_LINE_MEMBER( input_data5 ) override { update_data(5, state); } - virtual DECLARE_WRITE_LINE_MEMBER( input_data6 ) override { update_data(6, state); } - virtual DECLARE_WRITE_LINE_MEMBER( input_data7 ) override { update_data(7, state); } + virtual void input_strobe(int state) override; + virtual void input_data0(int state) override { update_data(0, state); } + virtual void input_data1(int state) override { update_data(1, state); } + virtual void input_data2(int state) override { update_data(2, state); } + virtual void input_data3(int state) override { update_data(3, state); } + virtual void input_data4(int state) override { update_data(4, state); } + virtual void input_data5(int state) override { update_data(5, state); } + virtual void input_data6(int state) override { update_data(6, state); } + virtual void input_data7(int state) override { update_data(7, state); } protected: virtual void device_add_mconfig(machine_config &config) override; diff --git a/src/devices/bus/centronics/smartboard.h b/src/devices/bus/centronics/smartboard.h index 4988086b11f..25131141b3f 100644 --- a/src/devices/bus/centronics/smartboard.h +++ b/src/devices/bus/centronics/smartboard.h @@ -27,8 +27,8 @@ protected: virtual void device_start() override { } virtual void device_add_mconfig(machine_config &config) override; - virtual DECLARE_WRITE_LINE_MEMBER(input_data0) override { if (started()) m_smartboard->data0_w(state); } - virtual DECLARE_WRITE_LINE_MEMBER(input_data7) override { if (started()) m_smartboard->data1_w(state); } + virtual void input_data0(int state) override { if (started()) m_smartboard->data0_w(state); } + virtual void input_data7(int state) override { if (started()) m_smartboard->data1_w(state); } private: required_device m_smartboard; diff --git a/src/devices/bus/centronics/spjoy.h b/src/devices/bus/centronics/spjoy.h index d13f2f90555..1095f242def 100644 --- a/src/devices/bus/centronics/spjoy.h +++ b/src/devices/bus/centronics/spjoy.h @@ -25,14 +25,14 @@ protected: virtual void device_start() override; virtual ioport_constructor device_input_ports() const override; - virtual DECLARE_WRITE_LINE_MEMBER( input_data0 ) override { if (state) m_data |= 0x01; else m_data &= ~0x01; update_busy_ack(); } - virtual DECLARE_WRITE_LINE_MEMBER( input_data1 ) override { if (state) m_data |= 0x02; else m_data &= ~0x02; update_busy_ack(); } - virtual DECLARE_WRITE_LINE_MEMBER( input_data2 ) override { if (state) m_data |= 0x04; else m_data &= ~0x04; update_busy_ack(); } - virtual DECLARE_WRITE_LINE_MEMBER( input_data3 ) override { if (state) m_data |= 0x08; else m_data &= ~0x08; update_busy_ack(); } - virtual DECLARE_WRITE_LINE_MEMBER( input_data4 ) override { if (state) m_data |= 0x10; else m_data &= ~0x10; update_busy_ack(); } - virtual DECLARE_WRITE_LINE_MEMBER( input_data5 ) override { if (state) m_data |= 0x20; else m_data &= ~0x20; update_busy_ack(); } - virtual DECLARE_WRITE_LINE_MEMBER( input_data6 ) override { if (state) m_data |= 0x40; else m_data &= ~0x40; update_busy_ack(); } - virtual DECLARE_WRITE_LINE_MEMBER( input_data7 ) override { if (state) m_data |= 0x80; else m_data &= ~0x80; update_busy_ack(); } + virtual void input_data0(int state) override { if (state) m_data |= 0x01; else m_data &= ~0x01; update_busy_ack(); } + virtual void input_data1(int state) override { if (state) m_data |= 0x02; else m_data &= ~0x02; update_busy_ack(); } + virtual void input_data2(int state) override { if (state) m_data |= 0x04; else m_data &= ~0x04; update_busy_ack(); } + virtual void input_data3(int state) override { if (state) m_data |= 0x08; else m_data &= ~0x08; update_busy_ack(); } + virtual void input_data4(int state) override { if (state) m_data |= 0x10; else m_data &= ~0x10; update_busy_ack(); } + virtual void input_data5(int state) override { if (state) m_data |= 0x20; else m_data &= ~0x20; update_busy_ack(); } + virtual void input_data6(int state) override { if (state) m_data |= 0x40; else m_data &= ~0x40; update_busy_ack(); } + virtual void input_data7(int state) override { if (state) m_data |= 0x80; else m_data &= ~0x80; update_busy_ack(); } private: required_ioport_array<2> m_joy; diff --git a/src/devices/bus/cgenie/expansion/expansion.h b/src/devices/bus/cgenie/expansion/expansion.h index 5d128128fa8..c8284b43a70 100644 --- a/src/devices/bus/cgenie/expansion/expansion.h +++ b/src/devices/bus/cgenie/expansion/expansion.h @@ -73,9 +73,9 @@ public: auto reset_handler() { return m_reset_handler.bind(); } // called from cart device - DECLARE_WRITE_LINE_MEMBER( int_w ) { m_int_handler(state); } - DECLARE_WRITE_LINE_MEMBER( nmi_w ) { m_nmi_handler(state); } - DECLARE_WRITE_LINE_MEMBER( reset_w ) { m_reset_handler(state); } + void int_w(int state) { m_int_handler(state); } + void nmi_w(int state) { m_nmi_handler(state); } + void reset_w(int state) { m_reset_handler(state); } required_address_space m_program; required_address_space m_io; diff --git a/src/devices/bus/cgenie/expansion/floppy.cpp b/src/devices/bus/cgenie/expansion/floppy.cpp index e0b9a565648..a52b39a9ea5 100644 --- a/src/devices/bus/cgenie/expansion/floppy.cpp +++ b/src/devices/bus/cgenie/expansion/floppy.cpp @@ -188,7 +188,7 @@ DEVICE_IMAGE_LOAD_MEMBER( cgenie_fdc_device::socket_load ) return std::make_pair(std::error_condition(), std::string()); } -WRITE_LINE_MEMBER( cgenie_fdc_device::intrq_w ) +void cgenie_fdc_device::intrq_w(int state) { if (VERBOSE) logerror("cgenie_fdc_device::intrq_w: %d\n", state); diff --git a/src/devices/bus/cgenie/expansion/floppy.h b/src/devices/bus/cgenie/expansion/floppy.h index ca64b39f0d7..81e45bd2eb9 100644 --- a/src/devices/bus/cgenie/expansion/floppy.h +++ b/src/devices/bus/cgenie/expansion/floppy.h @@ -39,7 +39,7 @@ protected: private: DECLARE_DEVICE_IMAGE_LOAD_MEMBER(socket_load); - DECLARE_WRITE_LINE_MEMBER(intrq_w); + void intrq_w(int state); TIMER_DEVICE_CALLBACK_MEMBER(timer_callback); diff --git a/src/devices/bus/cgenie/parallel/printer.cpp b/src/devices/bus/cgenie/parallel/printer.cpp index 9a3e9df5dc4..57c666183cc 100644 --- a/src/devices/bus/cgenie/parallel/printer.cpp +++ b/src/devices/bus/cgenie/parallel/printer.cpp @@ -81,22 +81,22 @@ void cgenie_printer_device::device_reset() // IMPLEMENTATION //************************************************************************** -WRITE_LINE_MEMBER( cgenie_printer_device::busy_w ) +void cgenie_printer_device::busy_w(int state) { m_centronics_busy = state; } -WRITE_LINE_MEMBER( cgenie_printer_device::perror_w ) +void cgenie_printer_device::perror_w(int state) { m_centronics_out_of_paper = state; } -WRITE_LINE_MEMBER( cgenie_printer_device::select_w ) +void cgenie_printer_device::select_w(int state) { m_centronics_unit_sel = state; } -WRITE_LINE_MEMBER( cgenie_printer_device::fault_w ) +void cgenie_printer_device::fault_w(int state) { m_centronics_ready = state; } diff --git a/src/devices/bus/cgenie/parallel/printer.h b/src/devices/bus/cgenie/parallel/printer.h index 6da59e68ea0..6d1d49ad61e 100644 --- a/src/devices/bus/cgenie/parallel/printer.h +++ b/src/devices/bus/cgenie/parallel/printer.h @@ -37,10 +37,10 @@ protected: virtual void pb_w(uint8_t data) override; private: - DECLARE_WRITE_LINE_MEMBER(busy_w); - DECLARE_WRITE_LINE_MEMBER(perror_w); - DECLARE_WRITE_LINE_MEMBER(select_w); - DECLARE_WRITE_LINE_MEMBER(fault_w); + void busy_w(int state); + void perror_w(int state); + void select_w(int state); + void fault_w(int state); required_device m_centronics; required_device m_latch; diff --git a/src/devices/bus/coco/coco_dcmodem.cpp b/src/devices/bus/coco/coco_dcmodem.cpp index fc26e61fb1f..0618c2fdbad 100644 --- a/src/devices/bus/coco/coco_dcmodem.cpp +++ b/src/devices/bus/coco/coco_dcmodem.cpp @@ -49,7 +49,7 @@ namespace virtual void device_add_mconfig(machine_config &config) override; // callbacks - WRITE_LINE_MEMBER(uart_irq_w) + void uart_irq_w(int state) { set_line_value(line::CART, state != 0); } diff --git a/src/devices/bus/coco/coco_fdc.h b/src/devices/bus/coco/coco_fdc.h index b52f14908b0..486b28b637e 100644 --- a/src/devices/bus/coco/coco_fdc.h +++ b/src/devices/bus/coco/coco_fdc.h @@ -26,8 +26,8 @@ class coco_family_fdc_device_base : public device_cococart_interface { public: - DECLARE_WRITE_LINE_MEMBER(fdc_intrq_w) { m_intrq = state; update_lines(); } - DECLARE_WRITE_LINE_MEMBER(fdc_drq_w) { m_drq = state; update_lines(); } + void fdc_intrq_w(int state) { m_intrq = state; update_lines(); } + void fdc_drq_w(int state) { m_drq = state; update_lines(); } static void floppy_formats(format_registration &fr); diff --git a/src/devices/bus/coco/coco_midi.cpp b/src/devices/bus/coco/coco_midi.cpp index 0e6e38b839b..965ca3d261a 100644 --- a/src/devices/bus/coco/coco_midi.cpp +++ b/src/devices/bus/coco/coco_midi.cpp @@ -35,7 +35,7 @@ class coco_midi_device : // optional information overrides virtual void device_add_mconfig(machine_config &config) override; required_device m_acia; - DECLARE_WRITE_LINE_MEMBER( acia_irq_w ); + void acia_irq_w(int state); private: required_device m_mdthru; @@ -88,7 +88,7 @@ void coco_midi_device::device_start() write8sm_delegate(m_acia, FUNC(acia6850_device::write))); } -WRITE_LINE_MEMBER(coco_midi_device::acia_irq_w) +void coco_midi_device::acia_irq_w(int state) { set_line_value(line::CART, state == 0); } diff --git a/src/devices/bus/coco/coco_rs232.cpp b/src/devices/bus/coco/coco_rs232.cpp index 90f7c6f7be7..2c747caf6a8 100644 --- a/src/devices/bus/coco/coco_rs232.cpp +++ b/src/devices/bus/coco/coco_rs232.cpp @@ -47,7 +47,7 @@ namespace // optional information overrides virtual void device_add_mconfig(machine_config &config) override; - WRITE_LINE_MEMBER(uart_irq_w) + void uart_irq_w(int state) { set_line_value(line::CART, state != 0); } diff --git a/src/devices/bus/coco/coco_t4426.cpp b/src/devices/bus/coco/coco_t4426.cpp index fe68e5a94f6..fd29785a80e 100644 --- a/src/devices/bus/coco/coco_t4426.cpp +++ b/src/devices/bus/coco/coco_t4426.cpp @@ -106,15 +106,15 @@ namespace // Clocks void write_acia_clocks(int id, int state); - DECLARE_WRITE_LINE_MEMBER (write_f1_clock){ write_acia_clocks(mc14411_device::TIMER_F1, state); } - DECLARE_WRITE_LINE_MEMBER (write_f3_clock){ write_acia_clocks(mc14411_device::TIMER_F3, state); } - DECLARE_WRITE_LINE_MEMBER (write_f5_clock){ write_acia_clocks(mc14411_device::TIMER_F5, state); } - DECLARE_WRITE_LINE_MEMBER (write_f7_clock){ write_acia_clocks(mc14411_device::TIMER_F7, state); } - DECLARE_WRITE_LINE_MEMBER (write_f8_clock){ write_acia_clocks(mc14411_device::TIMER_F8, state); } - DECLARE_WRITE_LINE_MEMBER (write_f9_clock){ write_acia_clocks(mc14411_device::TIMER_F9, state); } - DECLARE_WRITE_LINE_MEMBER (write_f11_clock){ write_acia_clocks(mc14411_device::TIMER_F11, state); } - DECLARE_WRITE_LINE_MEMBER (write_f13_clock){ write_acia_clocks(mc14411_device::TIMER_F13, state); } - DECLARE_WRITE_LINE_MEMBER (write_f15_clock){ write_acia_clocks(mc14411_device::TIMER_F15, state); } + void write_f1_clock(int state) { write_acia_clocks(mc14411_device::TIMER_F1, state); } + void write_f3_clock(int state) { write_acia_clocks(mc14411_device::TIMER_F3, state); } + void write_f5_clock(int state) { write_acia_clocks(mc14411_device::TIMER_F5, state); } + void write_f7_clock(int state) { write_acia_clocks(mc14411_device::TIMER_F7, state); } + void write_f8_clock(int state) { write_acia_clocks(mc14411_device::TIMER_F8, state); } + void write_f9_clock(int state) { write_acia_clocks(mc14411_device::TIMER_F9, state); } + void write_f11_clock(int state) { write_acia_clocks(mc14411_device::TIMER_F11, state); } + void write_f13_clock(int state) { write_acia_clocks(mc14411_device::TIMER_F13, state); } + void write_f15_clock(int state) { write_acia_clocks(mc14411_device::TIMER_F15, state); } protected: coco_t4426_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock); diff --git a/src/devices/bus/coco/dragon_claw.cpp b/src/devices/bus/coco/dragon_claw.cpp index a4c00b0f71a..54d99c6dc9a 100644 --- a/src/devices/bus/coco/dragon_claw.cpp +++ b/src/devices/bus/coco/dragon_claw.cpp @@ -123,7 +123,7 @@ void dragon_claw_device::device_add_mconfig(machine_config &config) m_slot->halt_callback().set([this](int state) { set_line_value(line::HALT, state); }); } -WRITE_LINE_MEMBER(dragon_claw_device::irq_w) +void dragon_claw_device::irq_w(int state) { if (m_links->read() & 0x04) set_line_value(line::CART, state); diff --git a/src/devices/bus/coco/dragon_claw.h b/src/devices/bus/coco/dragon_claw.h index 9743b5b0b3c..69df7b2e303 100644 --- a/src/devices/bus/coco/dragon_claw.h +++ b/src/devices/bus/coco/dragon_claw.h @@ -45,7 +45,7 @@ protected: virtual address_space &cartridge_space() override; private: - DECLARE_WRITE_LINE_MEMBER(irq_w); + void irq_w(int state); required_device m_via; required_device m_slot; diff --git a/src/devices/bus/coco/dragon_jcbspch.cpp b/src/devices/bus/coco/dragon_jcbspch.cpp index a82d122d275..4924028059f 100644 --- a/src/devices/bus/coco/dragon_jcbspch.cpp +++ b/src/devices/bus/coco/dragon_jcbspch.cpp @@ -143,12 +143,12 @@ void dragon_jcbspch_device::scs_write(offs_t offset, u8 data) } } -WRITE_LINE_MEMBER(dragon_jcbspch_device::pia_cb2_w) +void dragon_jcbspch_device::pia_cb2_w(int state) { // TODO: what does this do? } -WRITE_LINE_MEMBER(dragon_jcbspch_device::nmi_w) +void dragon_jcbspch_device::nmi_w(int state) { // set the NMI line set_line_value(line::NMI, state); diff --git a/src/devices/bus/coco/dragon_jcbspch.h b/src/devices/bus/coco/dragon_jcbspch.h index e8761dec2d8..b94c10f6915 100644 --- a/src/devices/bus/coco/dragon_jcbspch.h +++ b/src/devices/bus/coco/dragon_jcbspch.h @@ -37,8 +37,8 @@ protected: virtual void scs_write(offs_t offset, u8 data) override; private: - DECLARE_WRITE_LINE_MEMBER(pia_cb2_w); - DECLARE_WRITE_LINE_MEMBER(nmi_w); + void pia_cb2_w(int state); + void nmi_w(int state); required_memory_region m_eprom; required_device m_pia; diff --git a/src/devices/bus/coco/dragon_serial.cpp b/src/devices/bus/coco/dragon_serial.cpp index 8967bed816c..cb9127959b5 100644 --- a/src/devices/bus/coco/dragon_serial.cpp +++ b/src/devices/bus/coco/dragon_serial.cpp @@ -147,7 +147,7 @@ void dragon_serial_device::scs_write(offs_t offset, u8 data) } } -WRITE_LINE_MEMBER(dragon_serial_device::write_acia_clock) +void dragon_serial_device::write_acia_clock(int state) { m_acia->write_txc(state); m_acia->write_rxc(state); diff --git a/src/devices/bus/coco/dragon_serial.h b/src/devices/bus/coco/dragon_serial.h index 7f33a61de67..0dcb75b6575 100644 --- a/src/devices/bus/coco/dragon_serial.h +++ b/src/devices/bus/coco/dragon_serial.h @@ -39,7 +39,7 @@ protected: virtual void scs_write(offs_t offset, u8 data) override; private: - DECLARE_WRITE_LINE_MEMBER(write_acia_clock); + void write_acia_clock(int state); required_memory_region m_eprom; required_device m_acia; diff --git a/src/devices/bus/coco/dragon_sprites.cpp b/src/devices/bus/coco/dragon_sprites.cpp index a33d9648715..c04167d8b03 100644 --- a/src/devices/bus/coco/dragon_sprites.cpp +++ b/src/devices/bus/coco/dragon_sprites.cpp @@ -111,7 +111,7 @@ void dragon_sprites_device::cts_write(offs_t offset, u8 data) } -WRITE_LINE_MEMBER(dragon_sprites_device::nmi_w) +void dragon_sprites_device::nmi_w(int state) { // set the NMI line set_line_value(line::NMI, state); diff --git a/src/devices/bus/coco/dragon_sprites.h b/src/devices/bus/coco/dragon_sprites.h index 1236912396e..032c8531e9e 100644 --- a/src/devices/bus/coco/dragon_sprites.h +++ b/src/devices/bus/coco/dragon_sprites.h @@ -38,7 +38,7 @@ private: required_memory_region m_eprom; required_device m_vdp; - DECLARE_WRITE_LINE_MEMBER(nmi_w); + void nmi_w(int state); }; diff --git a/src/devices/bus/coco/meb_intrf.cpp b/src/devices/bus/coco/meb_intrf.cpp index 74583f5109f..48e4b02d27f 100644 --- a/src/devices/bus/coco/meb_intrf.cpp +++ b/src/devices/bus/coco/meb_intrf.cpp @@ -101,7 +101,7 @@ void distomeb_slot_device::meb_write(offs_t offset, u8 data) // set_cart_line //------------------------------------------------- -WRITE_LINE_MEMBER(distomeb_slot_device::set_cart_line) +void distomeb_slot_device::set_cart_line(int state) { m_cart_line = state; m_cart_callback(state); diff --git a/src/devices/bus/coco/meb_intrf.h b/src/devices/bus/coco/meb_intrf.h index 6b2b2c7a403..e1b99d4d818 100644 --- a/src/devices/bus/coco/meb_intrf.h +++ b/src/devices/bus/coco/meb_intrf.h @@ -44,8 +44,8 @@ public: void meb_write(offs_t offset, u8 data); // manipulation of CART signal - DECLARE_WRITE_LINE_MEMBER(set_cart_line); - DECLARE_READ_LINE_MEMBER(get_cart_line) { return m_cart_line; } + void set_cart_line(int state); + int get_cart_line() { return m_cart_line; } protected: // device-level overrides diff --git a/src/devices/bus/coco/meb_rtime.cpp b/src/devices/bus/coco/meb_rtime.cpp index 8f9da72d15f..496072eb86e 100644 --- a/src/devices/bus/coco/meb_rtime.cpp +++ b/src/devices/bus/coco/meb_rtime.cpp @@ -38,7 +38,7 @@ namespace virtual void meb_write(offs_t offset, u8 data) override; private: - DECLARE_WRITE_LINE_MEMBER(busy_w); + void busy_w(int state); required_device m_rtc; u8 m_rtc_address; @@ -159,7 +159,7 @@ namespace // busy_w - centronics busy call back //------------------------------------------------- - WRITE_LINE_MEMBER( disto_rtime_device::busy_w ) + void disto_rtime_device::busy_w(int state) { m_centronics_busy = state; } diff --git a/src/devices/bus/coleco/controller/ctrl.h b/src/devices/bus/coleco/controller/ctrl.h index 3d87a19b355..7c10ad1321a 100644 --- a/src/devices/bus/coleco/controller/ctrl.h +++ b/src/devices/bus/coleco/controller/ctrl.h @@ -65,8 +65,8 @@ public: // computer interface uint8_t read() { uint8_t data = 0xff; if (exists()) data = m_device->joy_r(); return data; } - DECLARE_WRITE_LINE_MEMBER( common0_w ) { if (exists()) m_device->common0_w(state); } - DECLARE_WRITE_LINE_MEMBER( common1_w ) { if (exists()) m_device->common1_w(state); } + void common0_w(int state) { if (exists()) m_device->common0_w(state); } + void common1_w(int state) { if (exists()) m_device->common1_w(state); } bool exists() { return m_device != nullptr; } diff --git a/src/devices/bus/compis/graphics.h b/src/devices/bus/compis/graphics.h index 3f0c8e41cb9..0509fb8746c 100644 --- a/src/devices/bus/compis/graphics.h +++ b/src/devices/bus/compis/graphics.h @@ -75,7 +75,7 @@ public: void dma_ack_w(offs_t offset, uint8_t data) { if (m_card) m_card->dma_ack_w(offset, data); } // card interface - DECLARE_WRITE_LINE_MEMBER( dma_request_w ) { m_write_dma_request(state); } + void dma_request_w(int state) { m_write_dma_request(state); } protected: // device-level overrides diff --git a/src/devices/bus/compucolor/floppy.h b/src/devices/bus/compucolor/floppy.h index 66247ac9601..2ac39a3629c 100644 --- a/src/devices/bus/compucolor/floppy.h +++ b/src/devices/bus/compucolor/floppy.h @@ -50,9 +50,9 @@ public: } compucolor_floppy_port_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - DECLARE_WRITE_LINE_MEMBER( rw_w ) { if (m_dev) m_dev->rw_w(state); } + void rw_w(int state) { if (m_dev) m_dev->rw_w(state); } void stepper_w(uint8_t data) { if (m_dev) m_dev->stepper_w(data); } - DECLARE_WRITE_LINE_MEMBER( select_w ) { if (m_dev) m_dev->select_w(state); } + void select_w(int state) { if (m_dev) m_dev->select_w(state); } protected: // device-level overrides diff --git a/src/devices/bus/comx35/exp.cpp b/src/devices/bus/comx35/exp.cpp index 9c5095e5fd1..d358c0f7e4d 100644 --- a/src/devices/bus/comx35/exp.cpp +++ b/src/devices/bus/comx35/exp.cpp @@ -120,7 +120,7 @@ void comx_expansion_slot_device::io_w(offs_t offset, uint8_t data) // ds_w - device select write //------------------------------------------------- -WRITE_LINE_MEMBER(comx_expansion_slot_device::ds_w) +void comx_expansion_slot_device::ds_w(int state) { if (m_card != nullptr) m_card->comx_ds_w(state); @@ -131,7 +131,7 @@ WRITE_LINE_MEMBER(comx_expansion_slot_device::ds_w) // q_w - Q write //------------------------------------------------- -WRITE_LINE_MEMBER(comx_expansion_slot_device::q_w) +void comx_expansion_slot_device::q_w(int state) { if (m_card != nullptr) m_card->comx_q_w(state); @@ -142,7 +142,7 @@ WRITE_LINE_MEMBER(comx_expansion_slot_device::q_w) // ef4_r - EF4 poll //------------------------------------------------- -READ_LINE_MEMBER(comx_expansion_slot_device::ef4_r) +int comx_expansion_slot_device::ef4_r() { int state = CLEAR_LINE; @@ -168,7 +168,7 @@ void comx_expansion_slot_device::sc_w(offs_t offset, uint8_t data) // tpb_w - TPB write //------------------------------------------------- -WRITE_LINE_MEMBER(comx_expansion_slot_device::tpb_w) +void comx_expansion_slot_device::tpb_w(int state) { if (m_card != nullptr) m_card->comx_tpb_w(state); diff --git a/src/devices/bus/comx35/exp.h b/src/devices/bus/comx35/exp.h index 8f99edae4fd..fbb104a4ab4 100644 --- a/src/devices/bus/comx35/exp.h +++ b/src/devices/bus/comx35/exp.h @@ -66,15 +66,15 @@ public: uint8_t io_r(offs_t offset); void io_w(offs_t offset, uint8_t data); - DECLARE_READ_LINE_MEMBER(ef4_r); + int ef4_r(); - DECLARE_WRITE_LINE_MEMBER(ds_w); - DECLARE_WRITE_LINE_MEMBER(q_w); + void ds_w(int state); + void q_w(int state); - DECLARE_WRITE_LINE_MEMBER(irq_w) { m_write_irq(state); } + void irq_w(int state) { m_write_irq(state); } void sc_w(offs_t offset, uint8_t data); - DECLARE_WRITE_LINE_MEMBER(tpb_w); + void tpb_w(int state); protected: // device-level overrides diff --git a/src/devices/bus/comx35/expbox.h b/src/devices/bus/comx35/expbox.h index c4c89b4f2bc..b53ae5a885f 100644 --- a/src/devices/bus/comx35/expbox.h +++ b/src/devices/bus/comx35/expbox.h @@ -56,10 +56,10 @@ protected: void set_irq() { m_slot->irq_w(m_irq[0] || m_irq[1] || m_irq[2] || m_irq[3]); } private: - DECLARE_WRITE_LINE_MEMBER( slot1_irq_w ) { m_irq[0] = state; set_irq(); } - DECLARE_WRITE_LINE_MEMBER( slot2_irq_w ) { m_irq[1] = state; set_irq(); } - DECLARE_WRITE_LINE_MEMBER( slot3_irq_w ) { m_irq[2] = state; set_irq(); } - DECLARE_WRITE_LINE_MEMBER( slot4_irq_w ) { m_irq[3] = state; set_irq(); } + void slot1_irq_w(int state) { m_irq[0] = state; set_irq(); } + void slot2_irq_w(int state) { m_irq[1] = state; set_irq(); } + void slot3_irq_w(int state) { m_irq[2] = state; set_irq(); } + void slot4_irq_w(int state) { m_irq[3] = state; set_irq(); } required_memory_region m_rom; diff --git a/src/devices/bus/cpc/cpc_rs232.cpp b/src/devices/bus/cpc/cpc_rs232.cpp index 4e387f9ab85..e3be3af93d3 100644 --- a/src/devices/bus/cpc/cpc_rs232.cpp +++ b/src/devices/bus/cpc/cpc_rs232.cpp @@ -119,17 +119,17 @@ void cpc_rs232_device::device_reset() } -WRITE_LINE_MEMBER(cpc_rs232_device::pit_out0_w) +void cpc_rs232_device::pit_out0_w(int state) { m_dart->txca_w(state); } -WRITE_LINE_MEMBER(cpc_rs232_device::pit_out1_w) +void cpc_rs232_device::pit_out1_w(int state) { m_dart->rxca_w(state); } -WRITE_LINE_MEMBER(cpc_rs232_device::pit_out2_w) +void cpc_rs232_device::pit_out2_w(int state) { m_dart->txcb_w(state); m_dart->rxcb_w(state); diff --git a/src/devices/bus/cpc/cpc_rs232.h b/src/devices/bus/cpc/cpc_rs232.h index fabbbd2001b..1e577e8008e 100644 --- a/src/devices/bus/cpc/cpc_rs232.h +++ b/src/devices/bus/cpc/cpc_rs232.h @@ -43,9 +43,9 @@ protected: required_device m_rs232; private: - DECLARE_WRITE_LINE_MEMBER(pit_out0_w); - DECLARE_WRITE_LINE_MEMBER(pit_out1_w); - DECLARE_WRITE_LINE_MEMBER(pit_out2_w); + void pit_out0_w(int state); + void pit_out1_w(int state); + void pit_out2_w(int state); cpc_expansion_slot_device *m_slot; }; diff --git a/src/devices/bus/cpc/cpc_ssa1.cpp b/src/devices/bus/cpc/cpc_ssa1.cpp index 40cfcccf0da..cfe5c88d29d 100644 --- a/src/devices/bus/cpc/cpc_ssa1.cpp +++ b/src/devices/bus/cpc/cpc_ssa1.cpp @@ -61,22 +61,22 @@ void cpc_dkspeech_device::dkspeech_w(uint8_t data) m_sp0256_device->ald_w(data & 0x3f); } -WRITE_LINE_MEMBER(cpc_ssa1_device::lrq_cb) +void cpc_ssa1_device::lrq_cb(int state) { set_lrq(state); } -WRITE_LINE_MEMBER(cpc_ssa1_device::sby_cb) +void cpc_ssa1_device::sby_cb(int state) { set_sby(state); } -WRITE_LINE_MEMBER(cpc_dkspeech_device::lrq_cb) +void cpc_dkspeech_device::lrq_cb(int state) { set_lrq(state); } -WRITE_LINE_MEMBER(cpc_dkspeech_device::sby_cb) +void cpc_dkspeech_device::sby_cb(int state) { set_sby(state); } diff --git a/src/devices/bus/cpc/cpc_ssa1.h b/src/devices/bus/cpc/cpc_ssa1.h index 7157d9a0475..b0ebc35d9cf 100644 --- a/src/devices/bus/cpc/cpc_ssa1.h +++ b/src/devices/bus/cpc/cpc_ssa1.h @@ -74,8 +74,8 @@ protected: virtual void device_add_mconfig(machine_config &config) override; private: - DECLARE_WRITE_LINE_MEMBER(lrq_cb); - DECLARE_WRITE_LINE_MEMBER(sby_cb); + void lrq_cb(int state); + void sby_cb(int state); cpc_expansion_slot_device *m_slot; @@ -111,8 +111,8 @@ protected: virtual void device_add_mconfig(machine_config &config) override; private: - DECLARE_WRITE_LINE_MEMBER(lrq_cb); - DECLARE_WRITE_LINE_MEMBER(sby_cb); + void lrq_cb(int state); + void sby_cb(int state); cpc_expansion_slot_device *m_slot; diff --git a/src/devices/bus/cpc/cpcexp.cpp b/src/devices/bus/cpc/cpcexp.cpp index a8e1420f22d..c4761f44e7a 100644 --- a/src/devices/bus/cpc/cpcexp.cpp +++ b/src/devices/bus/cpc/cpcexp.cpp @@ -92,8 +92,8 @@ void cpc_expansion_slot_device::device_config_complete() } -WRITE_LINE_MEMBER( cpc_expansion_slot_device::irq_w ) { m_out_irq_cb(state); } -WRITE_LINE_MEMBER( cpc_expansion_slot_device::nmi_w ) { m_out_nmi_cb(state); } -WRITE_LINE_MEMBER( cpc_expansion_slot_device::reset_w ) { m_out_reset_cb(state); } -WRITE_LINE_MEMBER( cpc_expansion_slot_device::romdis_w ) { m_out_romdis_cb(state); } +void cpc_expansion_slot_device::irq_w(int state) { m_out_irq_cb(state); } +void cpc_expansion_slot_device::nmi_w(int state) { m_out_nmi_cb(state); } +void cpc_expansion_slot_device::reset_w(int state) { m_out_reset_cb(state); } +void cpc_expansion_slot_device::romdis_w(int state) { m_out_romdis_cb(state); } void cpc_expansion_slot_device::rom_select(uint8_t data) { m_out_rom_select(data); } diff --git a/src/devices/bus/cpc/cpcexp.h b/src/devices/bus/cpc/cpcexp.h index 6793a116e6e..9f83c10eb75 100644 --- a/src/devices/bus/cpc/cpcexp.h +++ b/src/devices/bus/cpc/cpcexp.h @@ -71,8 +71,8 @@ public: // reset virtual void cpc_reset_w() { } - virtual WRITE_LINE_MEMBER( cursor_w ) { } - virtual WRITE_LINE_MEMBER( romen_w ) { } + virtual void cursor_w(int state) { } + virtual void romen_w(int state) { } void set_rom_bank(uint8_t sel) { m_rom_sel = sel; } // tell device the currently selected ROM uint8_t get_rom_bank() { return m_rom_sel; } @@ -112,16 +112,16 @@ public: auto romdis_callback() { return m_out_romdis_cb.bind(); } auto rom_select_callback() { return m_out_rom_select.bind(); } - DECLARE_WRITE_LINE_MEMBER( irq_w ); - DECLARE_WRITE_LINE_MEMBER( nmi_w ); - DECLARE_WRITE_LINE_MEMBER( reset_w ); - DECLARE_WRITE_LINE_MEMBER( romdis_w ); + void irq_w(int state); + void nmi_w(int state); + void reset_w(int state); + void romdis_w(int state); void rom_select(uint8_t data); void set_rom_bank(uint8_t sel) { if(m_card) m_card->set_rom_bank(sel); } // tell device the currently selected ROM void set_mapping(uint8_t type) { if(m_card) m_card->set_mapping(type); } // tell device to enable any ROM or RAM mapping - DECLARE_WRITE_LINE_MEMBER( cursor_w ) { if(m_card) m_card->cursor_w(state); } // pass on CRTC Cursor signal - DECLARE_WRITE_LINE_MEMBER( romen_w ) { if(m_card) m_card->romen_w(state); } // pass on /ROMEN signal + void cursor_w(int state) { if(m_card) m_card->cursor_w(state); } // pass on CRTC Cursor signal + void romen_w(int state) { if(m_card) m_card->romen_w(state); } // pass on /ROMEN signal cpu_device &cpu() const { return *m_cpu; } diff --git a/src/devices/bus/cpc/ddi1.h b/src/devices/bus/cpc/ddi1.h index ab25ce454d3..6ec347224e7 100644 --- a/src/devices/bus/cpc/ddi1.h +++ b/src/devices/bus/cpc/ddi1.h @@ -37,7 +37,7 @@ protected: virtual const tiny_rom_entry *device_rom_region() const override; virtual void device_add_mconfig(machine_config &config) override; virtual void set_mapping(uint8_t type) override; - virtual WRITE_LINE_MEMBER( romen_w ) override { m_romen = state; } + virtual void romen_w(int state) override { m_romen = state; } private: cpc_expansion_slot_device *m_slot; diff --git a/src/devices/bus/cpc/hd20.cpp b/src/devices/bus/cpc/hd20.cpp index 81fa6d90c43..ae9751f3c51 100644 --- a/src/devices/bus/cpc/hd20.cpp +++ b/src/devices/bus/cpc/hd20.cpp @@ -117,7 +117,7 @@ void cpc_hd20_device::hdc_w(offs_t offset, uint8_t data) } } -WRITE_LINE_MEMBER(cpc_hd20_device::irq_w) +void cpc_hd20_device::irq_w(int state) { // if(state) // m_hdc->set_ready(); diff --git a/src/devices/bus/cpc/hd20.h b/src/devices/bus/cpc/hd20.h index 684f7c90901..de7d2ba5cef 100644 --- a/src/devices/bus/cpc/hd20.h +++ b/src/devices/bus/cpc/hd20.h @@ -39,7 +39,7 @@ protected: virtual const tiny_rom_entry *device_rom_region() const override; private: - DECLARE_WRITE_LINE_MEMBER(irq_w); + void irq_w(int state); cpc_expansion_slot_device *m_slot; diff --git a/src/devices/bus/cpc/magicsound.cpp b/src/devices/bus/cpc/magicsound.cpp index 194791f4a38..23828254aac 100644 --- a/src/devices/bus/cpc/magicsound.cpp +++ b/src/devices/bus/cpc/magicsound.cpp @@ -138,22 +138,22 @@ void al_magicsound_device::mapper_w(offs_t offset, uint8_t data) set_timer_gate(true); } -WRITE_LINE_MEMBER(al_magicsound_device::da0_w) +void al_magicsound_device::da0_w(int state) { m_dac->write(m_output[m_current_output++]); if(m_current_output > 3) m_current_output = 0; } -WRITE_LINE_MEMBER(al_magicsound_device::dack0_w) { m_dack[0] = state; } -WRITE_LINE_MEMBER(al_magicsound_device::dack1_w) { m_dack[1] = state; } -WRITE_LINE_MEMBER(al_magicsound_device::dack2_w) { m_dack[2] = state; } -WRITE_LINE_MEMBER(al_magicsound_device::dack3_w) { m_dack[3] = state; } +void al_magicsound_device::dack0_w(int state) { m_dack[0] = state; } +void al_magicsound_device::dack1_w(int state) { m_dack[1] = state; } +void al_magicsound_device::dack2_w(int state) { m_dack[2] = state; } +void al_magicsound_device::dack3_w(int state) { m_dack[3] = state; } -WRITE_LINE_MEMBER(al_magicsound_device::sam0_w) { m_current_channel = 0; if(m_dack[0] && state) m_dmac->dreq0_w(1); } -WRITE_LINE_MEMBER(al_magicsound_device::sam1_w) { m_current_channel = 1; if(m_dack[1] && state) m_dmac->dreq1_w(1); } -WRITE_LINE_MEMBER(al_magicsound_device::sam2_w) { m_current_channel = 2; if(m_dack[2] && state) m_dmac->dreq2_w(1); } -WRITE_LINE_MEMBER(al_magicsound_device::sam3_w) { m_current_channel = 3; if(m_dack[3] && state) m_dmac->dreq3_w(1); } +void al_magicsound_device::sam0_w(int state) { m_current_channel = 0; if(m_dack[0] && state) m_dmac->dreq0_w(1); } +void al_magicsound_device::sam1_w(int state) { m_current_channel = 1; if(m_dack[1] && state) m_dmac->dreq1_w(1); } +void al_magicsound_device::sam2_w(int state) { m_current_channel = 2; if(m_dack[2] && state) m_dmac->dreq2_w(1); } +void al_magicsound_device::sam3_w(int state) { m_current_channel = 3; if(m_dack[3] && state) m_dmac->dreq3_w(1); } uint8_t al_magicsound_device::dma_read_byte(offs_t offset) { diff --git a/src/devices/bus/cpc/magicsound.h b/src/devices/bus/cpc/magicsound.h index e40b6230d41..f3e41275e56 100644 --- a/src/devices/bus/cpc/magicsound.h +++ b/src/devices/bus/cpc/magicsound.h @@ -56,17 +56,17 @@ protected: virtual void device_add_mconfig(machine_config &config) override; private: - DECLARE_WRITE_LINE_MEMBER(da0_w); + void da0_w(int state); uint8_t dma_read_byte(offs_t offset); void dma_write_byte(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(dack0_w); - DECLARE_WRITE_LINE_MEMBER(dack1_w); - DECLARE_WRITE_LINE_MEMBER(dack2_w); - DECLARE_WRITE_LINE_MEMBER(dack3_w); - DECLARE_WRITE_LINE_MEMBER(sam0_w); - DECLARE_WRITE_LINE_MEMBER(sam1_w); - DECLARE_WRITE_LINE_MEMBER(sam2_w); - DECLARE_WRITE_LINE_MEMBER(sam3_w); + void dack0_w(int state); + void dack1_w(int state); + void dack2_w(int state); + void dack3_w(int state); + void sam0_w(int state); + void sam1_w(int state); + void sam2_w(int state); + void sam3_w(int state); cpc_expansion_slot_device *m_slot; diff --git a/src/devices/bus/cpc/musicmachine.cpp b/src/devices/bus/cpc/musicmachine.cpp index a02be0c70b7..a513e9d5fd3 100644 --- a/src/devices/bus/cpc/musicmachine.cpp +++ b/src/devices/bus/cpc/musicmachine.cpp @@ -116,7 +116,7 @@ void cpc_musicmachine_device::irqsel_w(uint8_t data) m_irq_select = false; } -WRITE_LINE_MEMBER(cpc_musicmachine_device::irq_w) +void cpc_musicmachine_device::irq_w(int state) { if(m_irq_select) m_slot->nmi_w(state); diff --git a/src/devices/bus/cpc/musicmachine.h b/src/devices/bus/cpc/musicmachine.h index 57c1b6f5273..46f7f5cbc40 100644 --- a/src/devices/bus/cpc/musicmachine.h +++ b/src/devices/bus/cpc/musicmachine.h @@ -27,7 +27,7 @@ public: uint8_t acia_r(offs_t offset); void acia_w(offs_t offset, uint8_t data); void irqsel_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(irq_w); + void irq_w(int state); void write_acia_clock(u8 data) { m_acia->write_txc(data); m_acia->write_rxc(data); } diff --git a/src/devices/bus/cpc/playcity.h b/src/devices/bus/cpc/playcity.h index 5dd8459e986..684268e9707 100644 --- a/src/devices/bus/cpc/playcity.h +++ b/src/devices/bus/cpc/playcity.h @@ -39,7 +39,7 @@ public: uint8_t ymz1_data_r(); uint8_t ymz2_data_r(); - virtual WRITE_LINE_MEMBER(cursor_w) override { m_ctc->trg1(state); } + virtual void cursor_w(int state) override { m_ctc->trg1(state); } protected: // device-level overrides @@ -50,8 +50,8 @@ protected: virtual void device_add_mconfig(machine_config &config) override; private: - DECLARE_WRITE_LINE_MEMBER(ctc_zc1_cb) { if(state) { m_slot->nmi_w(1); m_slot->nmi_w(0); } } - DECLARE_WRITE_LINE_MEMBER(ctc_intr_cb) { m_slot->irq_w(state); } + void ctc_zc1_cb(int state) { if(state) { m_slot->nmi_w(1); m_slot->nmi_w(0); } } + void ctc_intr_cb(int state) { m_slot->irq_w(state); } cpc_expansion_slot_device *m_slot; diff --git a/src/devices/bus/cpc/transtape.h b/src/devices/bus/cpc/transtape.h index 451c3b1bd2a..15ccf0db4fc 100644 --- a/src/devices/bus/cpc/transtape.h +++ b/src/devices/bus/cpc/transtape.h @@ -26,7 +26,7 @@ public: virtual ioport_constructor device_input_ports() const override; virtual void set_mapping(uint8_t type) override; - virtual WRITE_LINE_MEMBER( romen_w ) override { m_romen = state; } + virtual void romen_w(int state) override { m_romen = state; } uint8_t input_r(); void output_w(uint8_t data); diff --git a/src/devices/bus/dmv/k012.h b/src/devices/bus/dmv/k012.h index b450b5f125b..0f262b6ca74 100644 --- a/src/devices/bus/dmv/k012.h +++ b/src/devices/bus/dmv/k012.h @@ -38,7 +38,7 @@ protected: virtual void io_read(int ifsel, offs_t offset, uint8_t &data) override; virtual void io_write(int ifsel, offs_t offset, uint8_t data) override; - DECLARE_WRITE_LINE_MEMBER(hdc_intrq_w); + void hdc_intrq_w(int state); private: required_device m_hdc; diff --git a/src/devices/bus/dmv/k210.cpp b/src/devices/bus/dmv/k210.cpp index 90f39e5bf0e..0f2371fedea 100644 --- a/src/devices/bus/dmv/k210.cpp +++ b/src/devices/bus/dmv/k210.cpp @@ -158,11 +158,11 @@ void dmv_k210_device::portc_w(uint8_t data) out_irq(BIT(data, 3)); } -WRITE_LINE_MEMBER( dmv_k210_device::cent_ack_w ) { if (state) m_portb |= 0x04; else m_portb &= ~0x04; m_ppi->pc6_w(state); } -WRITE_LINE_MEMBER( dmv_k210_device::cent_slct_w ) { if (state) m_portb |= 0x10; else m_portb &= ~0x10; } -WRITE_LINE_MEMBER( dmv_k210_device::cent_busy_w ) { if (state) m_portb |= 0x20; else m_portb &= ~0x20; } -WRITE_LINE_MEMBER( dmv_k210_device::cent_pe_w ) { if (state) m_portb |= 0x40; else m_portb &= ~0x40; } -WRITE_LINE_MEMBER( dmv_k210_device::cent_fault_w ) { if (state) m_portb |= 0x80; else m_portb &= ~0x80; } - -WRITE_LINE_MEMBER( dmv_k210_device::cent_autofd_w ) { if (state) m_portc |= 0x02; else m_portc &= ~0x02; } -WRITE_LINE_MEMBER( dmv_k210_device::cent_init_w ) { if (state) m_portc |= 0x04; else m_portc &= ~0x04; } +void dmv_k210_device::cent_ack_w(int state) { if (state) m_portb |= 0x04; else m_portb &= ~0x04; m_ppi->pc6_w(state); } +void dmv_k210_device::cent_slct_w(int state) { if (state) m_portb |= 0x10; else m_portb &= ~0x10; } +void dmv_k210_device::cent_busy_w(int state) { if (state) m_portb |= 0x20; else m_portb &= ~0x20; } +void dmv_k210_device::cent_pe_w(int state) { if (state) m_portb |= 0x40; else m_portb &= ~0x40; } +void dmv_k210_device::cent_fault_w(int state) { if (state) m_portb |= 0x80; else m_portb &= ~0x80; } + +void dmv_k210_device::cent_autofd_w(int state) { if (state) m_portc |= 0x02; else m_portc &= ~0x02; } +void dmv_k210_device::cent_init_w(int state) { if (state) m_portc |= 0x04; else m_portc &= ~0x04; } diff --git a/src/devices/bus/dmv/k210.h b/src/devices/bus/dmv/k210.h index d49673b2415..6d69aa93511 100644 --- a/src/devices/bus/dmv/k210.h +++ b/src/devices/bus/dmv/k210.h @@ -44,13 +44,13 @@ private: void portb_w(uint8_t data); void portc_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(cent_ack_w); - DECLARE_WRITE_LINE_MEMBER(cent_busy_w); - DECLARE_WRITE_LINE_MEMBER(cent_slct_w); - DECLARE_WRITE_LINE_MEMBER(cent_pe_w); - DECLARE_WRITE_LINE_MEMBER(cent_fault_w); - DECLARE_WRITE_LINE_MEMBER(cent_autofd_w); - DECLARE_WRITE_LINE_MEMBER(cent_init_w); + void cent_ack_w(int state); + void cent_busy_w(int state); + void cent_slct_w(int state); + void cent_pe_w(int state); + void cent_fault_w(int state); + void cent_autofd_w(int state); + void cent_init_w(int state); TIMER_CALLBACK_MEMBER(strobe_tick); diff --git a/src/devices/bus/dmv/k220.cpp b/src/devices/bus/dmv/k220.cpp index 64df90c21d8..89f579ccf27 100644 --- a/src/devices/bus/dmv/k220.cpp +++ b/src/devices/bus/dmv/k220.cpp @@ -264,18 +264,18 @@ void dmv_k220_device::portc_w(uint8_t data) } -WRITE_LINE_MEMBER( dmv_k220_device::write_out0 ) +void dmv_k220_device::write_out0(int state) { m_pit->write_clk1(state); m_pit->write_clk2(state); } -WRITE_LINE_MEMBER( dmv_k220_device::write_out1 ) +void dmv_k220_device::write_out1(int state) { } -WRITE_LINE_MEMBER( dmv_k220_device::write_out2 ) +void dmv_k220_device::write_out2(int state) { } diff --git a/src/devices/bus/dmv/k220.h b/src/devices/bus/dmv/k220.h index b58777df15e..3ab23800bae 100644 --- a/src/devices/bus/dmv/k220.h +++ b/src/devices/bus/dmv/k220.h @@ -41,9 +41,9 @@ protected: private: void porta_w(uint8_t data); void portc_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(write_out0); - DECLARE_WRITE_LINE_MEMBER(write_out1); - DECLARE_WRITE_LINE_MEMBER(write_out2); + void write_out0(int state); + void write_out1(int state); + void write_out2(int state); required_device m_pit; required_device m_ppi; diff --git a/src/devices/bus/dmv/k801.cpp b/src/devices/bus/dmv/k801.cpp index 4465a45227b..02bb59aa662 100644 --- a/src/devices/bus/dmv/k801.cpp +++ b/src/devices/bus/dmv/k801.cpp @@ -206,7 +206,7 @@ ioport_constructor dmv_k213_device::device_input_ports() const return INPUT_PORTS_NAME( dmv_k213 ); } -WRITE_LINE_MEMBER(dmv_k801_device::pci_irq_w) +void dmv_k801_device::pci_irq_w(int state) { out_irq(state); } diff --git a/src/devices/bus/dmv/k801.h b/src/devices/bus/dmv/k801.h index 41f72aaacf8..d03e6d0b786 100644 --- a/src/devices/bus/dmv/k801.h +++ b/src/devices/bus/dmv/k801.h @@ -47,7 +47,7 @@ protected: required_ioport m_dsw; private: - DECLARE_WRITE_LINE_MEMBER(pci_irq_w); + void pci_irq_w(int state); }; diff --git a/src/devices/bus/dmv/k803.cpp b/src/devices/bus/dmv/k803.cpp index d2a72f22441..87d7ef6bcbd 100644 --- a/src/devices/bus/dmv/k803.cpp +++ b/src/devices/bus/dmv/k803.cpp @@ -119,7 +119,7 @@ void dmv_k803_device::io_write(int ifsel, offs_t offset, uint8_t data) } } -WRITE_LINE_MEMBER(dmv_k803_device::rtc_irq_w) +void dmv_k803_device::rtc_irq_w(int state) { m_rtc_int = state; update_int(); diff --git a/src/devices/bus/dmv/k803.h b/src/devices/bus/dmv/k803.h index 60a8cd91ced..2e9df0c07ec 100644 --- a/src/devices/bus/dmv/k803.h +++ b/src/devices/bus/dmv/k803.h @@ -38,7 +38,7 @@ protected: void update_int(); private: - DECLARE_WRITE_LINE_MEMBER(rtc_irq_w); + void rtc_irq_w(int state); required_device m_rtc; required_ioport m_dsw; diff --git a/src/devices/bus/dmv/k806.cpp b/src/devices/bus/dmv/k806.cpp index 89802ca43bd..5f160dd6809 100644 --- a/src/devices/bus/dmv/k806.cpp +++ b/src/devices/bus/dmv/k806.cpp @@ -175,7 +175,7 @@ uint8_t dmv_k806_device::port1_r() return data; } -READ_LINE_MEMBER( dmv_k806_device::portt1_r ) +int dmv_k806_device::portt1_r() { return BIT(m_jumpers->read(), 7) ? 0 : 1; } diff --git a/src/devices/bus/dmv/k806.h b/src/devices/bus/dmv/k806.h index 8c7c3618f69..36a859d1346 100644 --- a/src/devices/bus/dmv/k806.h +++ b/src/devices/bus/dmv/k806.h @@ -40,7 +40,7 @@ protected: virtual void io_write(int ifsel, offs_t offset, uint8_t data) override; private: - DECLARE_READ_LINE_MEMBER(portt1_r); + int portt1_r(); uint8_t port1_r(); void port2_w(uint8_t data); diff --git a/src/devices/bus/ecbbus/ecbbus.h b/src/devices/bus/ecbbus/ecbbus.h index bee5201a2fc..6f655a7b7f1 100644 --- a/src/devices/bus/ecbbus/ecbbus.h +++ b/src/devices/bus/ecbbus/ecbbus.h @@ -116,8 +116,8 @@ public: uint8_t io_r(offs_t offset); void io_w(offs_t offset, uint8_t data); - DECLARE_WRITE_LINE_MEMBER( irq_w ) { m_write_irq(state); } - DECLARE_WRITE_LINE_MEMBER( nmi_w ) { m_write_nmi(state); } + void irq_w(int state) { m_write_irq(state); } + void nmi_w(int state) { m_write_nmi(state); } protected: // device-level overrides diff --git a/src/devices/bus/ecbbus/grip.cpp b/src/devices/bus/ecbbus/grip.cpp index 6de51191cd5..d4f83e61edd 100644 --- a/src/devices/bus/ecbbus/grip.cpp +++ b/src/devices/bus/ecbbus/grip.cpp @@ -317,7 +317,7 @@ void ecb_grip21_device::ppi_pc_w(uint8_t data) // Z80STI_INTERFACE( sti_intf ) //------------------------------------------------- -WRITE_LINE_MEMBER(ecb_grip21_device::write_centronics_busy) +void ecb_grip21_device::write_centronics_busy(int state) { m_centronics_busy = state; } @@ -359,7 +359,7 @@ uint8_t ecb_grip21_device::sti_gpio_r() return data; } -WRITE_LINE_MEMBER( ecb_grip21_device::speaker_w ) +void ecb_grip21_device::speaker_w(int state) { int level = state && ((m_vol1 << 1) | m_vol0); @@ -680,7 +680,7 @@ void ecb_grip21_device::page_w(uint8_t data) // stat_r - //------------------------------------------------- -WRITE_LINE_MEMBER(ecb_grip21_device::write_centronics_fault) +void ecb_grip21_device::write_centronics_fault(int state) { m_centronics_fault = state; } diff --git a/src/devices/bus/ecbbus/grip.h b/src/devices/bus/ecbbus/grip.h index 024a820e4e3..289b91eb850 100644 --- a/src/devices/bus/ecbbus/grip.h +++ b/src/devices/bus/ecbbus/grip.h @@ -57,12 +57,12 @@ private: uint8_t ppi_pb_r(); void ppi_pc_w(uint8_t data); uint8_t sti_gpio_r(); - DECLARE_WRITE_LINE_MEMBER( speaker_w ); + void speaker_w(int state); void kb_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER( write_centronics_busy ); - DECLARE_WRITE_LINE_MEMBER( write_centronics_fault ); + void write_centronics_busy(int state); + void write_centronics_fault(int state); MC6845_UPDATE_ROW( crtc_update_row ); diff --git a/src/devices/bus/econet/e01.cpp b/src/devices/bus/econet/e01.cpp index 256e545c702..fb542805048 100644 --- a/src/devices/bus/econet/e01.cpp +++ b/src/devices/bus/econet/e01.cpp @@ -133,7 +133,7 @@ const tiny_rom_entry *econet_e01_device::device_rom_region() const // MC146818_INTERFACE( rtc_intf ) //------------------------------------------------- -WRITE_LINE_MEMBER(econet_e01_device::rtc_irq_w) +void econet_e01_device::rtc_irq_w(int state) { m_rtc_irq = state; @@ -145,26 +145,26 @@ WRITE_LINE_MEMBER(econet_e01_device::rtc_irq_w) // mc6854_interface adlc_intf //------------------------------------------------- -WRITE_LINE_MEMBER( econet_e01_device::adlc_irq_w ) +void econet_e01_device::adlc_irq_w(int state) { m_adlc_irq = state; update_interrupts(); } -WRITE_LINE_MEMBER( econet_e01_device::econet_data_w ) +void econet_e01_device::econet_data_w(int state) { m_econet->data_w(this, state); } -WRITE_LINE_MEMBER(econet_e01_device::via_irq_w) +void econet_e01_device::via_irq_w(int state) { m_via_irq = state; update_interrupts(); } -WRITE_LINE_MEMBER( econet_e01_device::clk_en_w ) +void econet_e01_device::clk_en_w(int state) { m_clk_en = state; } @@ -174,21 +174,21 @@ void econet_e01_device::floppy_formats_afs(format_registration &fr) fr.add(FLOPPY_AFS_FORMAT); } -WRITE_LINE_MEMBER( econet_e01_device::fdc_irq_w ) +void econet_e01_device::fdc_irq_w(int state) { m_fdc_irq = state; update_interrupts(); } -WRITE_LINE_MEMBER( econet_e01_device::fdc_drq_w ) +void econet_e01_device::fdc_drq_w(int state) { m_fdc_drq = state; update_interrupts(); } -WRITE_LINE_MEMBER( econet_e01_device::scsi_bsy_w ) +void econet_e01_device::scsi_bsy_w(int state) { m_scsi_ctrl_in->write_bit1(state); @@ -198,7 +198,7 @@ WRITE_LINE_MEMBER( econet_e01_device::scsi_bsy_w ) } } -WRITE_LINE_MEMBER( econet_e01_device::scsi_req_w ) +void econet_e01_device::scsi_req_w(int state) { m_scsi_ctrl_in->write_bit5(state); diff --git a/src/devices/bus/econet/e01.h b/src/devices/bus/econet/e01.h index 695e18c47cd..8e3d6777565 100644 --- a/src/devices/bus/econet/e01.h +++ b/src/devices/bus/econet/e01.h @@ -55,15 +55,15 @@ protected: virtual void econet_clk(int state) override; private: - DECLARE_WRITE_LINE_MEMBER( rtc_irq_w ); - DECLARE_WRITE_LINE_MEMBER( adlc_irq_w ); - DECLARE_WRITE_LINE_MEMBER( econet_data_w ); - DECLARE_WRITE_LINE_MEMBER( via_irq_w ); - DECLARE_WRITE_LINE_MEMBER( clk_en_w ); - DECLARE_WRITE_LINE_MEMBER( fdc_irq_w ); - DECLARE_WRITE_LINE_MEMBER( fdc_drq_w ); - DECLARE_WRITE_LINE_MEMBER( scsi_bsy_w ); - DECLARE_WRITE_LINE_MEMBER( scsi_req_w ); + void rtc_irq_w(int state); + void adlc_irq_w(int state); + void econet_data_w(int state); + void via_irq_w(int state); + void clk_en_w(int state); + void fdc_irq_w(int state); + void fdc_drq_w(int state); + void scsi_bsy_w(int state); + void scsi_req_w(int state); TIMER_CALLBACK_MEMBER(clk_tick); diff --git a/src/devices/bus/econet/econet.cpp b/src/devices/bus/econet/econet.cpp index 629e6df2fbb..49fda7dbefa 100644 --- a/src/devices/bus/econet/econet.cpp +++ b/src/devices/bus/econet/econet.cpp @@ -237,7 +237,7 @@ econet_device::daisy_entry::daisy_entry(device_econet_interface &device) : // clk_w - //------------------------------------------------- -WRITE_LINE_MEMBER( econet_device::host_clk_w ) +void econet_device::host_clk_w(int state) { set_signal(this, CLK, state); } @@ -247,7 +247,7 @@ WRITE_LINE_MEMBER( econet_device::host_clk_w ) // data_w - //------------------------------------------------- -WRITE_LINE_MEMBER( econet_device::host_data_w ) +void econet_device::host_data_w(int state) { set_signal(this, DATA, state); } diff --git a/src/devices/bus/econet/econet.h b/src/devices/bus/econet/econet.h index 9d4f4bc095d..063ca8b78c7 100644 --- a/src/devices/bus/econet/econet.h +++ b/src/devices/bus/econet/econet.h @@ -35,8 +35,8 @@ public: void add_device(device_econet_interface &target, int address); // writes for host (driver_device) - DECLARE_WRITE_LINE_MEMBER( host_clk_w ); - DECLARE_WRITE_LINE_MEMBER( host_data_w ); + void host_clk_w(int state); + void host_data_w(int state); // writes for peripherals (device_t) void clk_w(device_t *device, int state); diff --git a/src/devices/bus/einstein/pipe/pipe.cpp b/src/devices/bus/einstein/pipe/pipe.cpp index f54092e9587..5ec71fc1744 100644 --- a/src/devices/bus/einstein/pipe/pipe.cpp +++ b/src/devices/bus/einstein/pipe/pipe.cpp @@ -91,7 +91,7 @@ void tatung_pipe_device::device_start() // host to module interface //------------------------------------------------- -WRITE_LINE_MEMBER( tatung_pipe_device::host_int_w ) +void tatung_pipe_device::host_int_w(int state) { if (m_card) m_card->int_w(state); diff --git a/src/devices/bus/einstein/pipe/pipe.h b/src/devices/bus/einstein/pipe/pipe.h index 7b2a2fdcbad..6adb988a018 100644 --- a/src/devices/bus/einstein/pipe/pipe.h +++ b/src/devices/bus/einstein/pipe/pipe.h @@ -77,12 +77,12 @@ public: auto reset_handler() { return m_reset_handler.bind(); } // called from host - DECLARE_WRITE_LINE_MEMBER( host_int_w ); + void host_int_w(int state); // called from card device - DECLARE_WRITE_LINE_MEMBER( int_w ) { m_int_handler(state); } - DECLARE_WRITE_LINE_MEMBER( nmi_w ) { m_nmi_handler(state); } - DECLARE_WRITE_LINE_MEMBER( reset_w ) { m_reset_handler(state); } + void int_w(int state) { m_int_handler(state); } + void nmi_w(int state) { m_nmi_handler(state); } + void reset_w(int state) { m_reset_handler(state); } protected: // device-level overrides diff --git a/src/devices/bus/einstein/pipe/speculator.cpp b/src/devices/bus/einstein/pipe/speculator.cpp index e99d3978cb4..ae73b030577 100644 --- a/src/devices/bus/einstein/pipe/speculator.cpp +++ b/src/devices/bus/einstein/pipe/speculator.cpp @@ -116,7 +116,7 @@ void einstein_speculator_device::device_reset() // IMPLEMENTATION //************************************************************************** -WRITE_LINE_MEMBER( einstein_speculator_device::ic5a_q_w ) +void einstein_speculator_device::ic5a_q_w(int state) { m_ic5b->a_w(state); @@ -127,7 +127,7 @@ WRITE_LINE_MEMBER( einstein_speculator_device::ic5a_q_w ) } } -WRITE_LINE_MEMBER( einstein_speculator_device::ic5b_q_w ) +void einstein_speculator_device::ic5b_q_w(int state) { if (m_nmisel == 0) { diff --git a/src/devices/bus/einstein/pipe/speculator.h b/src/devices/bus/einstein/pipe/speculator.h index c66b2e0122e..b542edf9fd5 100644 --- a/src/devices/bus/einstein/pipe/speculator.h +++ b/src/devices/bus/einstein/pipe/speculator.h @@ -39,8 +39,8 @@ public: uint8_t tape_r(); void nmi_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(ic5a_q_w); - DECLARE_WRITE_LINE_MEMBER(ic5b_q_w); + void ic5a_q_w(int state); + void ic5b_q_w(int state); protected: virtual void device_add_mconfig(machine_config &config) override; diff --git a/src/devices/bus/einstein/pipe/tk02.cpp b/src/devices/bus/einstein/pipe/tk02.cpp index 74cd880e151..4b14e9b3391 100644 --- a/src/devices/bus/einstein/pipe/tk02.cpp +++ b/src/devices/bus/einstein/pipe/tk02.cpp @@ -196,7 +196,7 @@ MC6845_UPDATE_ROW( tk02_device::crtc_update_row ) } } -WRITE_LINE_MEMBER( tk02_device::de_w ) +void tk02_device::de_w(int state) { m_de = state; } diff --git a/src/devices/bus/einstein/pipe/tk02.h b/src/devices/bus/einstein/pipe/tk02.h index 3834585ed2a..2c78bd97834 100644 --- a/src/devices/bus/einstein/pipe/tk02.h +++ b/src/devices/bus/einstein/pipe/tk02.h @@ -38,7 +38,7 @@ protected: private: void map(address_map &map); - DECLARE_WRITE_LINE_MEMBER(de_w); + void de_w(int state); uint8_t ram_r(offs_t offset); void ram_w(offs_t offset, uint8_t data); diff --git a/src/devices/bus/einstein/userport/userport.cpp b/src/devices/bus/einstein/userport/userport.cpp index e2fdd06acd2..0a464e28ac7 100644 --- a/src/devices/bus/einstein/userport/userport.cpp +++ b/src/devices/bus/einstein/userport/userport.cpp @@ -76,7 +76,7 @@ void einstein_userport_device::write(uint8_t data) m_card->write(data); } -WRITE_LINE_MEMBER( einstein_userport_device::brdy_w ) +void einstein_userport_device::brdy_w(int state) { if (m_card) m_card->brdy_w(state); diff --git a/src/devices/bus/einstein/userport/userport.h b/src/devices/bus/einstein/userport/userport.h index d543f14d7c6..ced90c8dad7 100644 --- a/src/devices/bus/einstein/userport/userport.h +++ b/src/devices/bus/einstein/userport/userport.h @@ -52,11 +52,11 @@ public: auto bstb_handler() { return m_bstb_handler.bind(); } // called from card device - DECLARE_WRITE_LINE_MEMBER( bstb_w ) { m_bstb_handler(state); } + void bstb_w(int state) { m_bstb_handler(state); } uint8_t read(); void write(uint8_t data); - DECLARE_WRITE_LINE_MEMBER( brdy_w ); + void brdy_w(int state); protected: // device-level overrides diff --git a/src/devices/bus/ekara/rom.cpp b/src/devices/bus/ekara/rom.cpp index f4458c63efd..b08f5cc2fc4 100644 --- a/src/devices/bus/ekara/rom.cpp +++ b/src/devices/bus/ekara/rom.cpp @@ -198,17 +198,17 @@ void ekara_rom_i2c_24lc02_gc0010_device::write_extra(offs_t offset, uint8_t data } -WRITE_LINE_MEMBER(ekara_rom_i2c_24lc02_gc0010_device::write_sda) +void ekara_rom_i2c_24lc02_gc0010_device::write_sda(int state) { m_i2cmem->write_sda(state); } -WRITE_LINE_MEMBER(ekara_rom_i2c_24lc02_gc0010_device::write_scl) +void ekara_rom_i2c_24lc02_gc0010_device::write_scl(int state) { m_i2cmem->write_scl(state); } -READ_LINE_MEMBER(ekara_rom_i2c_24lc02_gc0010_device::read_sda ) +int ekara_rom_i2c_24lc02_gc0010_device::read_sda() { return m_i2cmem->read_sda(); } diff --git a/src/devices/bus/ekara/rom.h b/src/devices/bus/ekara/rom.h index 890136f26ef..d28584cf2a0 100644 --- a/src/devices/bus/ekara/rom.h +++ b/src/devices/bus/ekara/rom.h @@ -122,9 +122,9 @@ protected: bool is_write_access_not_rom(void) override; uint8_t read_extra(offs_t offset) override; void write_extra(offs_t offset, uint8_t data) override; - DECLARE_WRITE_LINE_MEMBER(write_sda) override; - DECLARE_WRITE_LINE_MEMBER(write_scl) override; - DECLARE_READ_LINE_MEMBER(read_sda ) override; + void write_sda(int state) override; + void write_scl(int state) override; + int read_sda() override; }; class ekara_rom_i2c_24lc08_evio_device : public ekara_rom_i2c_24lc02_gc0010_device diff --git a/src/devices/bus/ekara/slot.cpp b/src/devices/bus/ekara/slot.cpp index 2f95580dd12..0d10882ef13 100644 --- a/src/devices/bus/ekara/slot.cpp +++ b/src/devices/bus/ekara/slot.cpp @@ -258,17 +258,17 @@ bool ekara_cart_slot_device::is_write_access_not_rom(void) direct seeprom access (popira2, gc0010) -------------------------------------------------*/ -WRITE_LINE_MEMBER(ekara_cart_slot_device::write_sda) +void ekara_cart_slot_device::write_sda(int state) { m_cart->write_sda(state); } -WRITE_LINE_MEMBER(ekara_cart_slot_device::write_scl) +void ekara_cart_slot_device::write_scl(int state) { m_cart->write_scl(state); } -READ_LINE_MEMBER(ekara_cart_slot_device::read_sda ) +int ekara_cart_slot_device::read_sda() { return m_cart->read_sda(); } diff --git a/src/devices/bus/ekara/slot.h b/src/devices/bus/ekara/slot.h index 69ccaa7ed03..b4248bf6fbd 100644 --- a/src/devices/bus/ekara/slot.h +++ b/src/devices/bus/ekara/slot.h @@ -36,10 +36,10 @@ public: virtual uint8_t read_extra(offs_t offset) { return 0xff; } virtual void write_extra(offs_t offset, uint8_t data) { } - virtual DECLARE_WRITE_LINE_MEMBER(write_sda) { } - virtual DECLARE_WRITE_LINE_MEMBER(write_scl) { } - //virtual DECLARE_WRITE_LINE_MEMBER( write_wc ) - virtual DECLARE_READ_LINE_MEMBER( read_sda ) { return 0; } + virtual void write_sda(int state) { } + virtual void write_scl(int state) { } + //virtual void write_wc(int state) + virtual int read_sda() { return 0; } virtual void write_bus_control(offs_t offset, uint8_t data) { } @@ -101,10 +101,10 @@ public: uint8_t read_extra(offs_t offset); void write_extra(offs_t offset, uint8_t data); - DECLARE_WRITE_LINE_MEMBER(write_sda); - DECLARE_WRITE_LINE_MEMBER(write_scl); - //DECLARE_WRITE_LINE_MEMBER( write_wc ); - DECLARE_READ_LINE_MEMBER( read_sda ); + void write_sda(int state); + void write_scl(int state); + //void write_wc(int state); + int read_sda(); void write_bus_control(offs_t offset, uint8_t data); diff --git a/src/devices/bus/electron/cart/peg400.cpp b/src/devices/bus/electron/cart/peg400.cpp index cba69099613..6e2b27b9d11 100644 --- a/src/devices/bus/electron/cart/peg400.cpp +++ b/src/devices/bus/electron/cart/peg400.cpp @@ -171,7 +171,7 @@ void electron_peg400_device::wd1770_control_w(uint8_t data) // bit 5: head load } -WRITE_LINE_MEMBER(electron_peg400_device::fdc_drq_w) +void electron_peg400_device::fdc_drq_w(int state) { m_slot->nmi_w((state && m_fdc_ie) ? ASSERT_LINE : CLEAR_LINE); } diff --git a/src/devices/bus/electron/cart/peg400.h b/src/devices/bus/electron/cart/peg400.h index 141cc1fe02f..0d7542a19df 100644 --- a/src/devices/bus/electron/cart/peg400.h +++ b/src/devices/bus/electron/cart/peg400.h @@ -40,7 +40,7 @@ protected: private: void wd1770_control_w(uint8_t data); static void floppy_formats(format_registration &fr); - DECLARE_WRITE_LINE_MEMBER(fdc_drq_w); + void fdc_drq_w(int state); required_device m_fdc; required_device m_floppy0; diff --git a/src/devices/bus/electron/cart/slot.h b/src/devices/bus/electron/cart/slot.h index 170272fa9e7..0da6bf10610 100644 --- a/src/devices/bus/electron/cart/slot.h +++ b/src/devices/bus/electron/cart/slot.h @@ -154,8 +154,8 @@ public: virtual bool present() { return is_loaded() || loaded_through_softlist(); } - DECLARE_WRITE_LINE_MEMBER(irq_w) { m_irq_handler(state); } - DECLARE_WRITE_LINE_MEMBER(nmi_w) { m_nmi_handler(state); } + void irq_w(int state) { m_irq_handler(state); } + void nmi_w(int state) { m_nmi_handler(state); } protected: electron_cartslot_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); diff --git a/src/devices/bus/electron/exp.h b/src/devices/bus/electron/exp.h index ea0c435a4be..12b98356e14 100644 --- a/src/devices/bus/electron/exp.h +++ b/src/devices/bus/electron/exp.h @@ -120,8 +120,8 @@ public: uint8_t expbus_r(offs_t offset); void expbus_w(offs_t offset, uint8_t data); - DECLARE_WRITE_LINE_MEMBER( irq_w ) { m_irq_handler(state); } - DECLARE_WRITE_LINE_MEMBER( nmi_w ) { m_nmi_handler(state); } + void irq_w(int state) { m_irq_handler(state); } + void nmi_w(int state) { m_nmi_handler(state); } protected: // device-level overrides diff --git a/src/devices/bus/electron/mode7.cpp b/src/devices/bus/electron/mode7.cpp index 408b6a92300..056883d78b1 100644 --- a/src/devices/bus/electron/mode7.cpp +++ b/src/devices/bus/electron/mode7.cpp @@ -223,7 +223,7 @@ MC6845_UPDATE_ROW(electron_mode7_device::crtc_update_row) } } -WRITE_LINE_MEMBER(electron_mode7_device::vsync_changed) +void electron_mode7_device::vsync_changed(int state) { m_trom->dew_w(state); } diff --git a/src/devices/bus/electron/mode7.h b/src/devices/bus/electron/mode7.h index b3c447ee87d..e4551e10bfe 100644 --- a/src/devices/bus/electron/mode7.h +++ b/src/devices/bus/electron/mode7.h @@ -53,7 +53,7 @@ private: std::unique_ptr m_videoram; MC6845_UPDATE_ROW(crtc_update_row); - DECLARE_WRITE_LINE_MEMBER(vsync_changed); + void vsync_changed(int state); uint8_t m_romsel; }; diff --git a/src/devices/bus/electron/voxbox.cpp b/src/devices/bus/electron/voxbox.cpp index 7d73d21ea92..15cdb09437f 100644 --- a/src/devices/bus/electron/voxbox.cpp +++ b/src/devices/bus/electron/voxbox.cpp @@ -90,7 +90,7 @@ void electron_voxbox_device::expbus_w(offs_t offset, uint8_t data) } } -WRITE_LINE_MEMBER(electron_voxbox_device::lrq_cb) +void electron_voxbox_device::lrq_cb(int state) { if (state != m_nmi) { diff --git a/src/devices/bus/electron/voxbox.h b/src/devices/bus/electron/voxbox.h index cf6d136f2a6..5bab288b8ca 100644 --- a/src/devices/bus/electron/voxbox.h +++ b/src/devices/bus/electron/voxbox.h @@ -41,7 +41,7 @@ protected: private: required_device m_nsp; - DECLARE_WRITE_LINE_MEMBER(lrq_cb); + void lrq_cb(int state); int m_nmi; }; diff --git a/src/devices/bus/ep64/exp.h b/src/devices/bus/ep64/exp.h index 354d6f0691e..8a39bf315f8 100644 --- a/src/devices/bus/ep64/exp.h +++ b/src/devices/bus/ep64/exp.h @@ -81,9 +81,9 @@ public: auto nmi_wr() { return m_write_nmi.bind(); } auto wait_wr() { return m_write_wait.bind(); } - DECLARE_WRITE_LINE_MEMBER( irq_w ) { m_write_irq(state); } - DECLARE_WRITE_LINE_MEMBER( nmi_w ) { m_write_nmi(state); } - DECLARE_WRITE_LINE_MEMBER( wait_w ) { m_write_wait(state); } + void irq_w(int state) { m_write_irq(state); } + void nmi_w(int state) { m_write_nmi(state); } + void wait_w(int state) { m_write_wait(state); } address_space &program() { return *m_program_space; } address_space &io() { return *m_io_space; } diff --git a/src/devices/bus/epson_qx/keyboard/keyboard.cpp b/src/devices/bus/epson_qx/keyboard/keyboard.cpp index 3ab60b15ef7..8a2669e41da 100644 --- a/src/devices/bus/epson_qx/keyboard/keyboard.cpp +++ b/src/devices/bus/epson_qx/keyboard/keyboard.cpp @@ -64,7 +64,7 @@ void keyboard_port_device::device_reset() m_kbd = get_card_device(); } -WRITE_LINE_MEMBER( keyboard_port_device::txd_w ) +void keyboard_port_device::txd_w(int state) { m_txd_handler(state); } @@ -74,13 +74,13 @@ WRITE_LINE_MEMBER( keyboard_port_device::txd_w ) // host to module interface //------------------------------------------------- -WRITE_LINE_MEMBER( keyboard_port_device::rxd_w ) +void keyboard_port_device::rxd_w(int state) { if (m_kbd) m_kbd->rxd_w(state); } -WRITE_LINE_MEMBER( keyboard_port_device::clk_w ) +void keyboard_port_device::clk_w(int state) { if (m_kbd) m_kbd->clk_w(state); @@ -150,12 +150,12 @@ void keyboard_device::mcu_p2_w(uint8_t data) } } -WRITE_LINE_MEMBER(keyboard_device::rxd_w) +void keyboard_device::rxd_w(int state) { m_rxd = state; } -WRITE_LINE_MEMBER(keyboard_device::clk_w) +void keyboard_device::clk_w(int state) { m_clk_state = !state; } diff --git a/src/devices/bus/epson_qx/keyboard/keyboard.h b/src/devices/bus/epson_qx/keyboard/keyboard.h index d3df81158b4..d45bf4c0a62 100644 --- a/src/devices/bus/epson_qx/keyboard/keyboard.h +++ b/src/devices/bus/epson_qx/keyboard/keyboard.h @@ -38,14 +38,14 @@ public: } keyboard_port_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = 0U); - DECLARE_WRITE_LINE_MEMBER(txd_w); + void txd_w(int state); // callbacks auto txd_handler() { return m_txd_handler.bind(); } // called from host - DECLARE_WRITE_LINE_MEMBER(rxd_w); - DECLARE_WRITE_LINE_MEMBER(clk_w); + void rxd_w(int state); + void clk_w(int state); protected: // device-level overrides @@ -62,8 +62,8 @@ class keyboard_device : public device_t, public device_interface { public: - DECLARE_WRITE_LINE_MEMBER(rxd_w); - DECLARE_WRITE_LINE_MEMBER(clk_w); + void rxd_w(int state); + void clk_w(int state); protected: keyboard_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); diff --git a/src/devices/bus/epson_qx/option.cpp b/src/devices/bus/epson_qx/option.cpp index 620570e2b22..de97df07e6a 100644 --- a/src/devices/bus/epson_qx/option.cpp +++ b/src/devices/bus/epson_qx/option.cpp @@ -60,18 +60,18 @@ void option_slot_device::device_start() m_bus->add_slot(*this); } -WRITE_LINE_MEMBER(option_slot_device::eopf) { m_eopf_cb(state); } -WRITE_LINE_MEMBER(option_slot_device::eops) { m_eops_cb(state); } +void option_slot_device::eopf(int state) { m_eopf_cb(state); } +void option_slot_device::eops(int state) { m_eops_cb(state); } -WRITE_LINE_MEMBER(option_slot_device::inth1_w) { (*m_bus).set_inth1_line(state, m_slot); } -WRITE_LINE_MEMBER(option_slot_device::inth2_w) { (*m_bus).set_inth2_line(state, m_slot); } -WRITE_LINE_MEMBER(option_slot_device::intl_w) { (*m_bus).set_intl_line(state, m_slot); } +void option_slot_device::inth1_w(int state) { (*m_bus).set_inth1_line(state, m_slot); } +void option_slot_device::inth2_w(int state) { (*m_bus).set_inth2_line(state, m_slot); } +void option_slot_device::intl_w(int state) { (*m_bus).set_intl_line(state, m_slot); } -WRITE_LINE_MEMBER(option_slot_device::drqf_w) { (*m_bus).set_drqf_line(state, m_slot); } -WRITE_LINE_MEMBER(option_slot_device::drqs_w) { (*m_bus).set_drqs_line(state, m_slot); } +void option_slot_device::drqf_w(int state) { (*m_bus).set_drqf_line(state, m_slot); } +void option_slot_device::drqs_w(int state) { (*m_bus).set_drqs_line(state, m_slot); } -WRITE_LINE_MEMBER(option_slot_device::rdyf_w) { (*m_bus).set_rdyf_line(state, m_slot); } -WRITE_LINE_MEMBER(option_slot_device::rdys_w) { (*m_bus).set_rdys_line(state, m_slot); } +void option_slot_device::rdyf_w(int state) { (*m_bus).set_rdyf_line(state, m_slot); } +void option_slot_device::rdys_w(int state) { (*m_bus).set_rdys_line(state, m_slot); } //************************************************************************** // EPSON OPTION BUS DEVICE diff --git a/src/devices/bus/epson_qx/option.h b/src/devices/bus/epson_qx/option.h index db74d46deb3..5950a88ce79 100644 --- a/src/devices/bus/epson_qx/option.h +++ b/src/devices/bus/epson_qx/option.h @@ -138,18 +138,18 @@ public: } option_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - DECLARE_WRITE_LINE_MEMBER(inth1_w); - DECLARE_WRITE_LINE_MEMBER(inth2_w); - DECLARE_WRITE_LINE_MEMBER(intl_w); + void inth1_w(int state); + void inth2_w(int state); + void intl_w(int state); - DECLARE_WRITE_LINE_MEMBER(drqf_w); - DECLARE_WRITE_LINE_MEMBER(drqs_w); + void drqf_w(int state); + void drqs_w(int state); - DECLARE_WRITE_LINE_MEMBER(rdyf_w); - DECLARE_WRITE_LINE_MEMBER(rdys_w); + void rdyf_w(int state); + void rdys_w(int state); - DECLARE_WRITE_LINE_MEMBER(eopf); - DECLARE_WRITE_LINE_MEMBER(eops); + void eopf(int state); + void eops(int state); auto dmas_w_callback() { m_dmas_w_cb.bind(); } auto dmas_r_callback() { m_dmas_r_cb.bind(); } diff --git a/src/devices/bus/epson_qx/sound_card.cpp b/src/devices/bus/epson_qx/sound_card.cpp index 14580436f38..95e833fac03 100644 --- a/src/devices/bus/epson_qx/sound_card.cpp +++ b/src/devices/bus/epson_qx/sound_card.cpp @@ -107,7 +107,7 @@ void ym2149_sound_card_device::map(address_map &map) map(0x02, 0x03).rw(m_mpu401, FUNC(mpu401_device::mpu_r), FUNC(mpu401_device::mpu_w)); } -WRITE_LINE_MEMBER(ym2149_sound_card_device::mpu_irq_out) +void ym2149_sound_card_device::mpu_irq_out(int state) { switch(m_irqline) { case 1: diff --git a/src/devices/bus/epson_qx/sound_card.h b/src/devices/bus/epson_qx/sound_card.h index 9f28ec2f48a..e85e1e0b7da 100644 --- a/src/devices/bus/epson_qx/sound_card.h +++ b/src/devices/bus/epson_qx/sound_card.h @@ -43,7 +43,7 @@ protected: private: uint8_t m_irqline; - DECLARE_WRITE_LINE_MEMBER(mpu_irq_out); + void mpu_irq_out(int state); required_device m_mpu401; required_device m_ssg; diff --git a/src/devices/bus/epson_sio/epson_sio.cpp b/src/devices/bus/epson_sio/epson_sio.cpp index adb75b853b7..846d42fff86 100644 --- a/src/devices/bus/epson_sio/epson_sio.cpp +++ b/src/devices/bus/epson_sio/epson_sio.cpp @@ -85,13 +85,13 @@ void epson_sio_device::device_start() } -WRITE_LINE_MEMBER( epson_sio_device::tx_w ) +void epson_sio_device::tx_w(int state) { if (m_cart != nullptr) m_cart->tx_w(state); } -WRITE_LINE_MEMBER( epson_sio_device::pout_w ) +void epson_sio_device::pout_w(int state) { if (m_cart != nullptr) m_cart->pout_w(state); diff --git a/src/devices/bus/epson_sio/epson_sio.h b/src/devices/bus/epson_sio/epson_sio.h index 99bf6bce7a3..9cdf940b9ac 100644 --- a/src/devices/bus/epson_sio/epson_sio.h +++ b/src/devices/bus/epson_sio/epson_sio.h @@ -42,12 +42,12 @@ public: auto pin_callback() { return m_write_pin.bind(); } // called from owner - DECLARE_WRITE_LINE_MEMBER( tx_w ); - DECLARE_WRITE_LINE_MEMBER( pout_w ); + void tx_w(int state); + void pout_w(int state); // called from subdevice - DECLARE_WRITE_LINE_MEMBER( rx_w ) { m_write_rx(state); } - DECLARE_WRITE_LINE_MEMBER( pin_w ) { m_write_pin(state); } + void rx_w(int state) { m_write_rx(state); } + void pin_w(int state) { m_write_pin(state); } protected: // device-level overrides diff --git a/src/devices/bus/epson_sio/pf10.cpp b/src/devices/bus/epson_sio/pf10.cpp index 067931da4e8..03bf047ecbf 100644 --- a/src/devices/bus/epson_sio/pf10.cpp +++ b/src/devices/bus/epson_sio/pf10.cpp @@ -185,7 +185,7 @@ void epson_pf10_device::fdc_tc_w(uint8_t data) // rxc_w - rx input //------------------------------------------------- -WRITE_LINE_MEMBER( epson_pf10_device::rxc_w ) +void epson_pf10_device::rxc_w(int state) { m_rxc = state; m_sio_input->rx_w(m_hd6303_tx & m_rxc); @@ -195,7 +195,7 @@ WRITE_LINE_MEMBER( epson_pf10_device::rxc_w ) // pinc_w - pin input //------------------------------------------------- -WRITE_LINE_MEMBER( epson_pf10_device::pinc_w ) +void epson_pf10_device::pinc_w(int state) { m_pinc = state; m_sio_input->pin_w(m_pinc); @@ -205,7 +205,7 @@ WRITE_LINE_MEMBER( epson_pf10_device::pinc_w ) // hd6303_tx_w - rx output //------------------------------------------------- -WRITE_LINE_MEMBER( epson_pf10_device::hd6303_tx_w ) +void epson_pf10_device::hd6303_tx_w(int state) { m_hd6303_tx = state; m_sio_input->rx_w(m_hd6303_tx & m_rxc); diff --git a/src/devices/bus/epson_sio/pf10.h b/src/devices/bus/epson_sio/pf10.h index ce5f2ee6f3d..36d6daa58b8 100644 --- a/src/devices/bus/epson_sio/pf10.h +++ b/src/devices/bus/epson_sio/pf10.h @@ -45,11 +45,11 @@ protected: private: // serial output from main cpu - DECLARE_WRITE_LINE_MEMBER( hd6303_tx_w ); + void hd6303_tx_w(int state); // from sio output - DECLARE_WRITE_LINE_MEMBER( rxc_w ); - DECLARE_WRITE_LINE_MEMBER( pinc_w ); + void rxc_w(int state); + void pinc_w(int state); // floppy disk controller uint8_t fdc_r(offs_t offset); diff --git a/src/devices/bus/epson_sio/tf20.cpp b/src/devices/bus/epson_sio/tf20.cpp index a2f9c2e9320..596b70021b9 100644 --- a/src/devices/bus/epson_sio/tf20.cpp +++ b/src/devices/bus/epson_sio/tf20.cpp @@ -262,7 +262,7 @@ void epson_tf20_device::fdc_control_w(uint8_t data) // rxc_w - rx input //------------------------------------------------- -WRITE_LINE_MEMBER( epson_tf20_device::rxc_w ) +void epson_tf20_device::rxc_w(int state) { m_rxc = state; m_sio_input->rx_w(m_txda && m_rxc); @@ -272,7 +272,7 @@ WRITE_LINE_MEMBER( epson_tf20_device::rxc_w ) // pinc_w - pin input //------------------------------------------------- -WRITE_LINE_MEMBER( epson_tf20_device::pinc_w ) +void epson_tf20_device::pinc_w(int state) { m_pinc = state; m_sio_input->pin_w(!m_dtra || m_pinc); @@ -282,7 +282,7 @@ WRITE_LINE_MEMBER( epson_tf20_device::pinc_w ) // txda_w - rx output //------------------------------------------------- -WRITE_LINE_MEMBER( epson_tf20_device::txda_w ) +void epson_tf20_device::txda_w(int state) { m_txda = state; m_sio_input->rx_w(m_txda && m_rxc); @@ -292,7 +292,7 @@ WRITE_LINE_MEMBER( epson_tf20_device::txda_w ) // dtra_w - pin output //------------------------------------------------- -WRITE_LINE_MEMBER( epson_tf20_device::dtra_w ) +void epson_tf20_device::dtra_w(int state) { m_dtra = state; m_sio_input->pin_w(!m_dtra || m_pinc); diff --git a/src/devices/bus/epson_sio/tf20.h b/src/devices/bus/epson_sio/tf20.h index 906ae0a4b9c..30dcc914f15 100644 --- a/src/devices/bus/epson_sio/tf20.h +++ b/src/devices/bus/epson_sio/tf20.h @@ -48,12 +48,12 @@ protected: private: IRQ_CALLBACK_MEMBER( irq_callback ); - DECLARE_WRITE_LINE_MEMBER( txda_w ); - DECLARE_WRITE_LINE_MEMBER( dtra_w ); + void txda_w(int state); + void dtra_w(int state); // from sio output - DECLARE_WRITE_LINE_MEMBER( rxc_w ); - DECLARE_WRITE_LINE_MEMBER( pinc_w ); + void rxc_w(int state); + void pinc_w(int state); uint8_t rom_disable_r(); uint8_t upd765_tc_r(); diff --git a/src/devices/bus/gamate/gamate_protection.cpp b/src/devices/bus/gamate/gamate_protection.cpp index 4218a237a3f..263c4b8113d 100644 --- a/src/devices/bus/gamate/gamate_protection.cpp +++ b/src/devices/bus/gamate/gamate_protection.cpp @@ -46,7 +46,7 @@ bool gamate_protection_device::is_protection_passed() return m_is_protection_passed; } -WRITE_LINE_MEMBER(gamate_protection_device::prot_w) +void gamate_protection_device::prot_w(int state) { LOG("write to protection %01x\n", state); @@ -88,7 +88,7 @@ WRITE_LINE_MEMBER(gamate_protection_device::prot_w) } } -READ_LINE_MEMBER(gamate_protection_device::prot_r) +int gamate_protection_device::prot_r() { if (m_passed_write) diff --git a/src/devices/bus/gamate/gamate_protection.h b/src/devices/bus/gamate/gamate_protection.h index 5ee37ff3e20..dd12764dd2c 100644 --- a/src/devices/bus/gamate/gamate_protection.h +++ b/src/devices/bus/gamate/gamate_protection.h @@ -16,8 +16,8 @@ public: bool is_protection_passed(); - DECLARE_WRITE_LINE_MEMBER( prot_w ); - DECLARE_READ_LINE_MEMBER( prot_r ); + void prot_w(int state); + int prot_r(); protected: virtual void device_start() override; diff --git a/src/devices/bus/gio64/gio64.h b/src/devices/bus/gio64/gio64.h index df99dc70dd9..59b3a3fe679 100644 --- a/src/devices/bus/gio64/gio64.h +++ b/src/devices/bus/gio64/gio64.h @@ -107,7 +107,7 @@ public: } } - template DECLARE_WRITE_LINE_MEMBER(interrupt) { m_interrupt_cb[N](state); } + template void interrupt(int state) { m_interrupt_cb[N](state); } u64 read(offs_t offset, u64 mem_mask); void write(offs_t offset, u64 data, u64 mem_mask); diff --git a/src/devices/bus/gio64/newport.cpp b/src/devices/bus/gio64/newport.cpp index 97a5f2be5b3..00cf965c04d 100644 --- a/src/devices/bus/gio64/newport.cpp +++ b/src/devices/bus/gio64/newport.cpp @@ -816,7 +816,7 @@ uint8_t vc2_device::get_cursor_pixel(int x, int y) } } -WRITE_LINE_MEMBER(vc2_device::vblank_w) +void vc2_device::vblank_w(int state) { if (state) { @@ -1706,7 +1706,7 @@ void newport_base_device::ramdac_write(uint32_t data) } } -WRITE_LINE_MEMBER(newport_base_device::vrint_w) +void newport_base_device::vrint_w(int state) { if (state) { @@ -1716,7 +1716,7 @@ WRITE_LINE_MEMBER(newport_base_device::vrint_w) } // TOOD: Figure out a better way of doing this -WRITE_LINE_MEMBER(newport_base_device::update_screen_size) +void newport_base_device::update_screen_size(int state) { const int x_start = m_vc2->readout_x0(); const int y_start = m_vc2->readout_y0(); diff --git a/src/devices/bus/gio64/newport.h b/src/devices/bus/gio64/newport.h index 611372c5f4f..61df96dbe8f 100644 --- a/src/devices/bus/gio64/newport.h +++ b/src/devices/bus/gio64/newport.h @@ -139,7 +139,7 @@ public: uint16_t next_did_line_entry(); uint8_t get_cursor_pixel(int x, int y); - DECLARE_WRITE_LINE_MEMBER(vblank_w); + void vblank_w(int state); auto vert_int() { return m_vert_int.bind(); } auto screen_timing_changed() { return m_screen_timing_changed.bind(); } // Hack. TODO: Figure out a better way @@ -297,8 +297,8 @@ public: uint32_t screen_update(screen_device &device, bitmap_rgb32 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(vrint_w); - DECLARE_WRITE_LINE_MEMBER(update_screen_size); + void vrint_w(int state); + void update_screen_size(int state); auto write_mask() { return m_write_mask_w.bind(); } auto draw_flags() { return m_draw_flags_w.bind(); } diff --git a/src/devices/bus/hexbus/hx5102.cpp b/src/devices/bus/hexbus/hx5102.cpp index b18f5e9550e..b5960eab1e8 100644 --- a/src/devices/bus/hexbus/hx5102.cpp +++ b/src/devices/bus/hexbus/hx5102.cpp @@ -299,7 +299,7 @@ void hx5102_device::write(offs_t offset, uint8_t data) /* Clock line from the CPU. Used to control wait state generation. */ -WRITE_LINE_MEMBER( hx5102_device::clock_out ) +void hx5102_device::clock_out(int state) { m_readyff->clock_w(state); } @@ -316,7 +316,7 @@ void hx5102_device::hexbus_value_changed(uint8_t data) Propagate READY signals to the CPU. This is used to hold the CPU during DMA accesses. */ -WRITE_LINE_MEMBER( hx5102_device::board_ready ) +void hx5102_device::board_ready(int state) { if (m_ready_old != state) { @@ -330,7 +330,7 @@ WRITE_LINE_MEMBER( hx5102_device::board_ready ) /* Trigger RESET. */ -WRITE_LINE_MEMBER( hx5102_device::board_reset ) +void hx5102_device::board_reset(int state) { LOGMASKED(LOG_RESET, "Incoming RESET line = %d\n", state); @@ -345,7 +345,7 @@ WRITE_LINE_MEMBER( hx5102_device::board_reset ) /* Effect from the motor monoflop. */ -WRITE_LINE_MEMBER( hx5102_device::motor_w ) +void hx5102_device::motor_w(int state) { m_motor_on = (state==ASSERT_LINE); LOGMASKED(LOG_MOTOR, "Motor %s\n", m_motor_on? "start" : "stop"); @@ -359,7 +359,7 @@ WRITE_LINE_MEMBER( hx5102_device::motor_w ) Effect from the speed monoflop. This is essentially a watchdog to check whether the lock on the CPU must be released due to an error. */ -WRITE_LINE_MEMBER( hx5102_device::mspeed_w ) +void hx5102_device::mspeed_w(int state) { m_mspeed_on = (state==ASSERT_LINE); LOGMASKED(LOG_READY, "Speedcheck %s\n", m_mspeed_on? "on" : "off"); @@ -448,7 +448,7 @@ void hx5102_device::hexbus_out(uint8_t data) /* Latch the HSK* to low. */ -WRITE_LINE_MEMBER(hx5102_device::hsklatch_out) +void hx5102_device::hsklatch_out(int state) { LOGMASKED(LOG_HEXBUS, "Latching HSK*\n"); m_myvalue &= ~HEXBUS_LINE_HSK; @@ -483,27 +483,27 @@ uint8_t hx5102_device::cruread(offs_t offset) /* CRU write access. */ -WRITE_LINE_MEMBER(hx5102_device::nocomp_w) +void hx5102_device::nocomp_w(int state) { // unused right now LOGMASKED(LOG_CRU, "Set precompensation = %d\n", state); } -WRITE_LINE_MEMBER(hx5102_device::diren_w) +void hx5102_device::diren_w(int state) { LOGMASKED(LOG_CRU, "Set step direction = %d\n", state); if (m_current_floppy != nullptr) m_current_floppy->dir_w((state==0)? 1 : 0); } -WRITE_LINE_MEMBER(hx5102_device::dacken_w) +void hx5102_device::dacken_w(int state) { if (state==1) LOGMASKED(LOG_CRU, "Assert DACK*\n"); m_dacken = (state != 0); } -WRITE_LINE_MEMBER(hx5102_device::stepen_w) +void hx5102_device::stepen_w(int state) { if (state==1) LOGMASKED(LOG_CRU, "Step pulse\n"); @@ -511,7 +511,7 @@ WRITE_LINE_MEMBER(hx5102_device::stepen_w) m_current_floppy->stp_w((state==0)? 1 : 0); } -WRITE_LINE_MEMBER(hx5102_device::ds1_w) +void hx5102_device::ds1_w(int state) { LOGMASKED(LOG_CRU, "Set drive select 0 to %d\n", state); if (state == 1) @@ -521,7 +521,7 @@ WRITE_LINE_MEMBER(hx5102_device::ds1_w) update_drive_select(); } -WRITE_LINE_MEMBER(hx5102_device::ds2_w) +void hx5102_device::ds2_w(int state) { LOGMASKED(LOG_CRU, "Set drive select 1 to %d\n", state); if (state == 1) @@ -531,25 +531,25 @@ WRITE_LINE_MEMBER(hx5102_device::ds2_w) update_drive_select(); } -WRITE_LINE_MEMBER(hx5102_device::ds3_w) +void hx5102_device::ds3_w(int state) { // External drive; not implemented LOGMASKED(LOG_CRU, "Set drive select 2 to %d\n", state); } -WRITE_LINE_MEMBER(hx5102_device::ds4_w) +void hx5102_device::ds4_w(int state) { // External drive; not implemented LOGMASKED(LOG_CRU, "Set drive select 3 to %d\n", state); } -WRITE_LINE_MEMBER(hx5102_device::aux_motor_w) +void hx5102_device::aux_motor_w(int state) { // External drive; not implemented LOGMASKED(LOG_CRU, "Set auxiliary motor line to %d\n", state); } -WRITE_LINE_MEMBER(hx5102_device::wait_w) +void hx5102_device::wait_w(int state) { m_wait = (state!=0); LOGMASKED(LOG_CRU, "READY circuit %s\n", m_wait? "active" : "inactive" ); @@ -602,7 +602,7 @@ void hx5102_device::device_reset() Callbacks from the i8272A chip Interrupt */ -WRITE_LINE_MEMBER( hx5102_device::fdc_irq_w ) +void hx5102_device::fdc_irq_w(int state) { line_state irq = state? ASSERT_LINE : CLEAR_LINE; LOGMASKED(LOG_SIGNALS, "INTRQ callback = %d\n", irq); @@ -614,7 +614,7 @@ WRITE_LINE_MEMBER( hx5102_device::fdc_irq_w ) Callbacks from the i8272A chip DMA request */ -WRITE_LINE_MEMBER( hx5102_device::fdc_drq_w ) +void hx5102_device::fdc_drq_w(int state) { line_state drq = state? ASSERT_LINE : CLEAR_LINE; LOGMASKED(LOG_SIGNALS, "DRQ callback = %d\n", drq); diff --git a/src/devices/bus/hexbus/hx5102.h b/src/devices/bus/hexbus/hx5102.h index 15d717bd028..34c3bc6f705 100644 --- a/src/devices/bus/hexbus/hx5102.h +++ b/src/devices/bus/hexbus/hx5102.h @@ -43,9 +43,9 @@ protected: void crumap(address_map &map); void memmap(address_map &map); void external_operation(offs_t offset, uint8_t data); - DECLARE_WRITE_LINE_MEMBER( clock_out ); - DECLARE_WRITE_LINE_MEMBER( board_ready ); - DECLARE_WRITE_LINE_MEMBER( board_reset ); + void clock_out(int state); + void board_ready(int state); + void board_reset(int state); static void floppy_formats(format_registration &fr); void device_start() override; @@ -59,29 +59,29 @@ private: uint8_t read(offs_t offset); void write(offs_t offset, uint8_t data); - DECLARE_WRITE_LINE_MEMBER(fdc_irq_w); - DECLARE_WRITE_LINE_MEMBER(fdc_drq_w); - DECLARE_WRITE_LINE_MEMBER(motor_w); - DECLARE_WRITE_LINE_MEMBER(mspeed_w); + void fdc_irq_w(int state); + void fdc_drq_w(int state); + void motor_w(int state); + void mspeed_w(int state); uint8_t fdc_read(offs_t offset); void fdc_write(offs_t offset, uint8_t data); uint8_t ibc_read(offs_t offset); void ibc_write(offs_t offset, uint8_t data); void hexbus_out(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(hsklatch_out); + void hsklatch_out(int state); uint8_t cruread(offs_t offset); - DECLARE_WRITE_LINE_MEMBER(nocomp_w); - DECLARE_WRITE_LINE_MEMBER(diren_w); - DECLARE_WRITE_LINE_MEMBER(dacken_w); - DECLARE_WRITE_LINE_MEMBER(stepen_w); - DECLARE_WRITE_LINE_MEMBER(ds1_w); - DECLARE_WRITE_LINE_MEMBER(ds2_w); - DECLARE_WRITE_LINE_MEMBER(ds3_w); - DECLARE_WRITE_LINE_MEMBER(ds4_w); - DECLARE_WRITE_LINE_MEMBER(aux_motor_w); - DECLARE_WRITE_LINE_MEMBER(wait_w); + void nocomp_w(int state); + void diren_w(int state); + void dacken_w(int state); + void stepen_w(int state); + void ds1_w(int state); + void ds2_w(int state); + void ds3_w(int state); + void ds4_w(int state); + void aux_motor_w(int state); + void wait_w(int state); void update_drive_select(); // Operate the floppy motors diff --git a/src/devices/bus/hp80_io/82900.cpp b/src/devices/bus/hp80_io/82900.cpp index 72b9c08c092..b910e36b1c6 100644 --- a/src/devices/bus/hp80_io/82900.cpp +++ b/src/devices/bus/hp80_io/82900.cpp @@ -85,7 +85,7 @@ ROM_START(hp82900) ROM_LOAD("82900-60002.bin" , 0 , 0x800 , CRC(48745bbb) SHA1(fb4427f729eedba5ac01809718b841c7bdd85e1f)) ROM_END -WRITE_LINE_MEMBER(hp82900_io_card_device::reset_w) +void hp82900_io_card_device::reset_w(int state) { LOG("reset_w %d\n" , state); m_cpu->set_input_line(INPUT_LINE_RESET , state); diff --git a/src/devices/bus/hp80_io/82900.h b/src/devices/bus/hp80_io/82900.h index 613783cbc3f..8abd63a1519 100644 --- a/src/devices/bus/hp80_io/82900.h +++ b/src/devices/bus/hp80_io/82900.h @@ -51,7 +51,7 @@ private: bool m_rom_enabled; uint8_t m_addr_latch; - DECLARE_WRITE_LINE_MEMBER(reset_w); + void reset_w(int state); uint8_t cpu_mem_r(offs_t offset); void cpu_mem_w(offs_t offset, uint8_t data); uint8_t cpu_io_r(offs_t offset); diff --git a/src/devices/bus/hp80_io/82937.cpp b/src/devices/bus/hp80_io/82937.cpp index 24fae1d68c6..31fe00e8272 100644 --- a/src/devices/bus/hp80_io/82937.cpp +++ b/src/devices/bus/hp80_io/82937.cpp @@ -83,7 +83,7 @@ void hp82937_io_card_device::clear_service() m_translator->clear_service(); } -WRITE_LINE_MEMBER(hp82937_io_card_device::reset_w) +void hp82937_io_card_device::reset_w(int state) { m_cpu->set_input_line(INPUT_LINE_RESET , state); if (state) { @@ -92,7 +92,7 @@ WRITE_LINE_MEMBER(hp82937_io_card_device::reset_w) } } -READ_LINE_MEMBER(hp82937_io_card_device::t0_r) +int hp82937_io_card_device::t0_r() { return m_iatn; } @@ -179,7 +179,7 @@ void hp82937_io_card_device::latch_w(uint8_t data) update_data_out(); } -WRITE_LINE_MEMBER(hp82937_io_card_device::ieee488_ctrl_w) +void hp82937_io_card_device::ieee488_ctrl_w(int state) { update_signals(); update_data_out(); diff --git a/src/devices/bus/hp80_io/82937.h b/src/devices/bus/hp80_io/82937.h index 07f3dec991a..9847f1a94b2 100644 --- a/src/devices/bus/hp80_io/82937.h +++ b/src/devices/bus/hp80_io/82937.h @@ -51,13 +51,13 @@ private: uint8_t m_latch; // U3 bool m_updating; - DECLARE_WRITE_LINE_MEMBER(reset_w); - DECLARE_READ_LINE_MEMBER(t0_r); + void reset_w(int state); + int t0_r(); uint8_t p1_r(); void p1_w(uint8_t data); uint8_t dio_r(); void dio_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(ieee488_ctrl_w); + void ieee488_ctrl_w(int state); uint8_t switch_r(); void latch_w(uint8_t data); diff --git a/src/devices/bus/hp80_io/hp80_io.cpp b/src/devices/bus/hp80_io/hp80_io.cpp index 591435bafac..12742d1b3da 100644 --- a/src/devices/bus/hp80_io/hp80_io.cpp +++ b/src/devices/bus/hp80_io/hp80_io.cpp @@ -40,13 +40,13 @@ void hp80_io_slot_device::device_start() m_halt_cb_func.resolve_safe(); } -WRITE_LINE_MEMBER(hp80_io_slot_device::irl_w) +void hp80_io_slot_device::irl_w(int state) { LOG("irl_w slot %u=%d\n" , m_slot_no , state); m_irl_cb_func(m_slot_no , state , 0xff); } -WRITE_LINE_MEMBER(hp80_io_slot_device::halt_w) +void hp80_io_slot_device::halt_w(int state) { LOG("halt_w slot %u=%d\n" , m_slot_no , state); m_halt_cb_func(m_slot_no , state , 0xff); @@ -128,14 +128,14 @@ device_hp80_io_interface::~device_hp80_io_interface() { } -WRITE_LINE_MEMBER(device_hp80_io_interface::irl_w) +void device_hp80_io_interface::irl_w(int state) { if (VERBOSE & LOG_GENERAL) device().logerror("irl_w card=%d\n" , state); hp80_io_slot_device *slot = downcast(device().owner()); slot->irl_w(state); } -WRITE_LINE_MEMBER(device_hp80_io_interface::halt_w) +void device_hp80_io_interface::halt_w(int state) { if (VERBOSE & LOG_GENERAL) device().logerror("halt_w card=%d\n" , state); hp80_io_slot_device *slot = downcast(device().owner()); diff --git a/src/devices/bus/hp80_io/hp80_io.h b/src/devices/bus/hp80_io/hp80_io.h index 3963d56d29e..a65b298309d 100644 --- a/src/devices/bus/hp80_io/hp80_io.h +++ b/src/devices/bus/hp80_io/hp80_io.h @@ -62,8 +62,8 @@ public: void install_read_write_handlers(address_space& space); - DECLARE_WRITE_LINE_MEMBER(irl_w); - DECLARE_WRITE_LINE_MEMBER(halt_w); + void irl_w(int state); + void halt_w(int state); void inten(); void clear_service(); @@ -97,8 +97,8 @@ protected: required_ioport m_select_code_port; // card device handling - DECLARE_WRITE_LINE_MEMBER(irl_w); - DECLARE_WRITE_LINE_MEMBER(halt_w); + void irl_w(int state); + void halt_w(int state); }; // device type definition diff --git a/src/devices/bus/hp9845_io/98032.cpp b/src/devices/bus/hp9845_io/98032.cpp index cb4ab45388c..00cd9f2edb7 100644 --- a/src/devices/bus/hp9845_io/98032.cpp +++ b/src/devices/bus/hp9845_io/98032.cpp @@ -238,7 +238,7 @@ void hp98032_io_card_device::reg_w(address_space &space, offs_t offset, uint16_t } } -WRITE_LINE_MEMBER(hp98032_io_card_device::pflg_w) +void hp98032_io_card_device::pflg_w(int state) { bool prev_pready = m_pready; m_pready = state; @@ -263,7 +263,7 @@ WRITE_LINE_MEMBER(hp98032_io_card_device::pflg_w) } } -WRITE_LINE_MEMBER(hp98032_io_card_device::psts_w) +void hp98032_io_card_device::psts_w(int state) { bool sts = !state; if (m_gpio->is_jumper_present(hp98032_gpio_slot_device::JUMPER_5)) { @@ -273,7 +273,7 @@ WRITE_LINE_MEMBER(hp98032_io_card_device::psts_w) sts_w(sts); } -WRITE_LINE_MEMBER(hp98032_io_card_device::eir_w) +void hp98032_io_card_device::eir_w(int state) { m_eir = state; LOG("eir = %d\n" , m_eir); @@ -414,22 +414,22 @@ void hp98032_gpio_slot_device::ext_control_w(uint8_t data) } } -WRITE_LINE_MEMBER(hp98032_gpio_slot_device::pflg_w) +void hp98032_gpio_slot_device::pflg_w(int state) { m_pflg_handler(state); } -WRITE_LINE_MEMBER(hp98032_gpio_slot_device::psts_w) +void hp98032_gpio_slot_device::psts_w(int state) { m_psts_handler(state); } -WRITE_LINE_MEMBER(hp98032_gpio_slot_device::eir_w) +void hp98032_gpio_slot_device::eir_w(int state) { m_eir_handler(state); } -WRITE_LINE_MEMBER(hp98032_gpio_slot_device::pctl_w) +void hp98032_gpio_slot_device::pctl_w(int state) { device_hp98032_gpio_interface *card = get_card_device(); if (card != nullptr) { @@ -437,7 +437,7 @@ WRITE_LINE_MEMBER(hp98032_gpio_slot_device::pctl_w) } } -WRITE_LINE_MEMBER(hp98032_gpio_slot_device::io_w) +void hp98032_gpio_slot_device::io_w(int state) { device_hp98032_gpio_interface *card = get_card_device(); if (card != nullptr) { @@ -445,7 +445,7 @@ WRITE_LINE_MEMBER(hp98032_gpio_slot_device::io_w) } } -WRITE_LINE_MEMBER(hp98032_gpio_slot_device::preset_w) +void hp98032_gpio_slot_device::preset_w(int state) { device_hp98032_gpio_interface *card = get_card_device(); if (card != nullptr) { @@ -483,19 +483,19 @@ device_hp98032_gpio_interface::~device_hp98032_gpio_interface() { } -WRITE_LINE_MEMBER(device_hp98032_gpio_interface::pflg_w) +void device_hp98032_gpio_interface::pflg_w(int state) { hp98032_gpio_slot_device *slot = downcast(device().owner()); slot->pflg_w(state); } -WRITE_LINE_MEMBER(device_hp98032_gpio_interface::psts_w) +void device_hp98032_gpio_interface::psts_w(int state) { hp98032_gpio_slot_device *slot = downcast(device().owner()); slot->psts_w(state); } -WRITE_LINE_MEMBER(device_hp98032_gpio_interface::eir_w) +void device_hp98032_gpio_interface::eir_w(int state) { hp98032_gpio_slot_device *slot = downcast(device().owner()); slot->eir_w(state); @@ -551,17 +551,17 @@ void hp98032_gpio_loopback_device::ext_control_w(uint8_t data) m_ext_control = data; } -WRITE_LINE_MEMBER(hp98032_gpio_loopback_device::pctl_w) +void hp98032_gpio_loopback_device::pctl_w(int state) { pflg_w(state); } -WRITE_LINE_MEMBER(hp98032_gpio_loopback_device::io_w) +void hp98032_gpio_loopback_device::io_w(int state) { m_io = state; } -WRITE_LINE_MEMBER(hp98032_gpio_loopback_device::preset_w) +void hp98032_gpio_loopback_device::preset_w(int state) { eir_w(state); } diff --git a/src/devices/bus/hp9845_io/98032.h b/src/devices/bus/hp9845_io/98032.h index 059b0248ae9..9da205d1baf 100644 --- a/src/devices/bus/hp9845_io/98032.h +++ b/src/devices/bus/hp9845_io/98032.h @@ -48,9 +48,9 @@ private: bool m_auto_ah; bool m_eir; - DECLARE_WRITE_LINE_MEMBER(pflg_w); - DECLARE_WRITE_LINE_MEMBER(psts_w); - DECLARE_WRITE_LINE_MEMBER(eir_w); + void pflg_w(int state); + void psts_w(int state); + void eir_w(int state); void start_hs(); void set_busy(bool state); @@ -114,14 +114,14 @@ public: auto eir_cb() { return m_eir_handler.bind(); } // Write to input signals (for card devices) - DECLARE_WRITE_LINE_MEMBER(pflg_w); - DECLARE_WRITE_LINE_MEMBER(psts_w); - DECLARE_WRITE_LINE_MEMBER(eir_w); + void pflg_w(int state); + void psts_w(int state); + void eir_w(int state); // Write to output signals - DECLARE_WRITE_LINE_MEMBER(pctl_w); - DECLARE_WRITE_LINE_MEMBER(io_w); - DECLARE_WRITE_LINE_MEMBER(preset_w); + void pctl_w(int state); + void io_w(int state); + void preset_w(int state); protected: // device-level overrides @@ -146,16 +146,16 @@ public: virtual uint8_t ext_status_r() const = 0; virtual void output_w(uint16_t data) = 0; virtual void ext_control_w(uint8_t data) = 0; - virtual DECLARE_WRITE_LINE_MEMBER(pctl_w) = 0; - virtual DECLARE_WRITE_LINE_MEMBER(io_w) = 0; - virtual DECLARE_WRITE_LINE_MEMBER(preset_w) = 0; + virtual void pctl_w(int state) = 0; + virtual void io_w(int state) = 0; + virtual void preset_w(int state) = 0; protected: device_hp98032_gpio_interface(const machine_config &mconfig, device_t &device); - DECLARE_WRITE_LINE_MEMBER(pflg_w); - DECLARE_WRITE_LINE_MEMBER(psts_w); - DECLARE_WRITE_LINE_MEMBER(eir_w); + void pflg_w(int state); + void psts_w(int state); + void eir_w(int state); }; // GPIO loopback connector for HP98032 @@ -171,9 +171,9 @@ public: virtual uint8_t ext_status_r() const override; virtual void output_w(uint16_t data) override; virtual void ext_control_w(uint8_t data) override; - virtual DECLARE_WRITE_LINE_MEMBER(pctl_w) override; - virtual DECLARE_WRITE_LINE_MEMBER(io_w) override; - virtual DECLARE_WRITE_LINE_MEMBER(preset_w) override; + virtual void pctl_w(int state) override; + virtual void io_w(int state) override; + virtual void preset_w(int state) override; protected: // device-level overrides diff --git a/src/devices/bus/hp9845_io/98034.cpp b/src/devices/bus/hp9845_io/98034.cpp index 988d8e47705..61658c1ecf1 100644 --- a/src/devices/bus/hp9845_io/98034.cpp +++ b/src/devices/bus/hp9845_io/98034.cpp @@ -291,7 +291,7 @@ uint8_t hp98034_io_card_device::int_ack_r() return res; } -WRITE_LINE_MEMBER(hp98034_io_card_device::ieee488_ctrl_w) +void hp98034_io_card_device::ieee488_ctrl_w(int state) { update_clr_hpib(); } diff --git a/src/devices/bus/hp9845_io/98034.h b/src/devices/bus/hp9845_io/98034.h index c8cb5ff8765..d1fa42c5f0a 100644 --- a/src/devices/bus/hp9845_io/98034.h +++ b/src/devices/bus/hp9845_io/98034.h @@ -54,7 +54,7 @@ private: void np_io_map(address_map &map); void np_program_map(address_map &map); - DECLARE_WRITE_LINE_MEMBER(ieee488_ctrl_w); + void ieee488_ctrl_w(int state); required_device m_cpu; required_ioport m_sw1; diff --git a/src/devices/bus/hp9845_io/98036.cpp b/src/devices/bus/hp9845_io/98036.cpp index 6f328062152..cd1544b0379 100644 --- a/src/devices/bus/hp9845_io/98036.cpp +++ b/src/devices/bus/hp9845_io/98036.cpp @@ -299,7 +299,7 @@ void hp98036_io_card_device::device_reset() int_reset(); } -WRITE_LINE_MEMBER(hp98036_io_card_device::bit_rate_clock) +void hp98036_io_card_device::bit_rate_clock(int state) { if (m_half_baud) { if (state) { @@ -313,7 +313,7 @@ WRITE_LINE_MEMBER(hp98036_io_card_device::bit_rate_clock) } } -WRITE_LINE_MEMBER(hp98036_io_card_device::slow_clock) +void hp98036_io_card_device::slow_clock(int state) { switch (m_init_state) { case 0: @@ -347,7 +347,7 @@ WRITE_LINE_MEMBER(hp98036_io_card_device::slow_clock) } } -WRITE_LINE_MEMBER(hp98036_io_card_device::txd_w) +void hp98036_io_card_device::txd_w(int state) { if (m_loopback) { m_uart->write_rxd(state); @@ -356,7 +356,7 @@ WRITE_LINE_MEMBER(hp98036_io_card_device::txd_w) } } -WRITE_LINE_MEMBER(hp98036_io_card_device::dtr_w) +void hp98036_io_card_device::dtr_w(int state) { if (m_loopback) { m_uart->write_dsr(state); @@ -365,7 +365,7 @@ WRITE_LINE_MEMBER(hp98036_io_card_device::dtr_w) } } -WRITE_LINE_MEMBER(hp98036_io_card_device::rts_w) +void hp98036_io_card_device::rts_w(int state) { if (m_loopback) { m_uart->write_cts(state); @@ -374,7 +374,7 @@ WRITE_LINE_MEMBER(hp98036_io_card_device::rts_w) } } -WRITE_LINE_MEMBER(hp98036_io_card_device::txrdy_w) +void hp98036_io_card_device::txrdy_w(int state) { if (m_txrdy != state) { m_txrdy = state; @@ -385,7 +385,7 @@ WRITE_LINE_MEMBER(hp98036_io_card_device::txrdy_w) } } -WRITE_LINE_MEMBER(hp98036_io_card_device::rxrdy_w) +void hp98036_io_card_device::rxrdy_w(int state) { if (m_rxrdy != state) { m_rxrdy = state; @@ -396,21 +396,21 @@ WRITE_LINE_MEMBER(hp98036_io_card_device::rxrdy_w) } } -WRITE_LINE_MEMBER(hp98036_io_card_device::rxd_w) +void hp98036_io_card_device::rxd_w(int state) { if (!m_loopback) { m_uart->write_rxd(state); } } -WRITE_LINE_MEMBER(hp98036_io_card_device::dsr_w) +void hp98036_io_card_device::dsr_w(int state) { if (!m_loopback) { m_uart->write_dsr(state); } } -WRITE_LINE_MEMBER(hp98036_io_card_device::cts_w) +void hp98036_io_card_device::cts_w(int state) { if (!m_loopback && !BIT(m_s2_input->read(), 0)) { m_uart->write_cts(state); diff --git a/src/devices/bus/hp9845_io/98036.h b/src/devices/bus/hp9845_io/98036.h index c1ee6b351bd..b1c150a57fc 100644 --- a/src/devices/bus/hp9845_io/98036.h +++ b/src/devices/bus/hp9845_io/98036.h @@ -45,16 +45,16 @@ private: required_ioport m_jumper_input; required_ioport m_loopback_en; - DECLARE_WRITE_LINE_MEMBER(bit_rate_clock); - DECLARE_WRITE_LINE_MEMBER(slow_clock); - DECLARE_WRITE_LINE_MEMBER(txd_w); - DECLARE_WRITE_LINE_MEMBER(dtr_w); - DECLARE_WRITE_LINE_MEMBER(rts_w); - DECLARE_WRITE_LINE_MEMBER(txrdy_w); - DECLARE_WRITE_LINE_MEMBER(rxrdy_w); - DECLARE_WRITE_LINE_MEMBER(rxd_w); - DECLARE_WRITE_LINE_MEMBER(dsr_w); - DECLARE_WRITE_LINE_MEMBER(cts_w); + void bit_rate_clock(int state); + void slow_clock(int state); + void txd_w(int state); + void dtr_w(int state); + void rts_w(int state); + void txrdy_w(int state); + void rxrdy_w(int state); + void rxd_w(int state); + void dsr_w(int state); + void cts_w(int state); // State of initialization FSM // State U11A-Q U11B-Q diff --git a/src/devices/bus/hp9845_io/98046.cpp b/src/devices/bus/hp9845_io/98046.cpp index 8b7e601f0f4..4b40850d95d 100644 --- a/src/devices/bus/hp9845_io/98046.cpp +++ b/src/devices/bus/hp9845_io/98046.cpp @@ -446,7 +446,7 @@ void hp98046_io_card_device::p2_w(uint8_t data) } } -WRITE_LINE_MEMBER(hp98046_io_card_device::sio_int_w) +void hp98046_io_card_device::sio_int_w(int state) { if (m_sio_int != state) { LOG_SIO("SIO int=%d\n" , state); @@ -454,7 +454,7 @@ WRITE_LINE_MEMBER(hp98046_io_card_device::sio_int_w) m_sio_int = state; } -WRITE_LINE_MEMBER(hp98046_io_card_device::sio_txd_w) +void hp98046_io_card_device::sio_txd_w(int state) { m_sio->rxb_w(state); if (m_loopback) { @@ -464,42 +464,42 @@ WRITE_LINE_MEMBER(hp98046_io_card_device::sio_txd_w) } } -WRITE_LINE_MEMBER(hp98046_io_card_device::rs232_rxd_w) +void hp98046_io_card_device::rs232_rxd_w(int state) { if (!m_loopback) { m_sio->rxa_w(state); } } -WRITE_LINE_MEMBER(hp98046_io_card_device::rs232_dcd_w) +void hp98046_io_card_device::rs232_dcd_w(int state) { if (!m_loopback) { m_sio->dcda_w(state); } } -WRITE_LINE_MEMBER(hp98046_io_card_device::rs232_dsr_w) +void hp98046_io_card_device::rs232_dsr_w(int state) { if (!m_loopback) { m_sio->dcdb_w(state); } } -WRITE_LINE_MEMBER(hp98046_io_card_device::rs232_cts_w) +void hp98046_io_card_device::rs232_cts_w(int state) { if (!m_loopback) { m_sio->ctsa_w(state); } } -WRITE_LINE_MEMBER(hp98046_io_card_device::rs232_rxc_w) +void hp98046_io_card_device::rs232_rxc_w(int state) { if (!m_loopback) { machine().scheduler().synchronize(timer_expired_delegate(FUNC(hp98046_io_card_device::sync_rx_im_w) , this) , state); } } -WRITE_LINE_MEMBER(hp98046_io_card_device::rs232_txc_w) +void hp98046_io_card_device::rs232_txc_w(int state) { if (!m_loopback) { machine().scheduler().synchronize(timer_expired_delegate(FUNC(hp98046_io_card_device::sync_tx_im_w) , this) , state); @@ -630,7 +630,7 @@ uint8_t hp98046_io_card_device::get_hs_input() const return res; } -WRITE_LINE_MEMBER(hp98046_io_card_device::rxc_w) +void hp98046_io_card_device::rxc_w(int state) { if (m_last_rxc != bool(state)) { m_last_rxc = bool(state); @@ -641,7 +641,7 @@ WRITE_LINE_MEMBER(hp98046_io_card_device::rxc_w) } } -WRITE_LINE_MEMBER(hp98046_io_card_device::txc_w) +void hp98046_io_card_device::txc_w(int state) { if (m_last_txc != bool(state)) { m_last_txc = bool(state); diff --git a/src/devices/bus/hp9845_io/98046.h b/src/devices/bus/hp9845_io/98046.h index 90debbb8c03..dd19c6f29a0 100644 --- a/src/devices/bus/hp9845_io/98046.h +++ b/src/devices/bus/hp9845_io/98046.h @@ -79,14 +79,14 @@ private: void cpu_w(offs_t offset, uint8_t data); uint8_t p1_r(); void p2_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(sio_int_w); - DECLARE_WRITE_LINE_MEMBER(sio_txd_w); - DECLARE_WRITE_LINE_MEMBER(rs232_rxd_w); - DECLARE_WRITE_LINE_MEMBER(rs232_dcd_w); - DECLARE_WRITE_LINE_MEMBER(rs232_dsr_w); - DECLARE_WRITE_LINE_MEMBER(rs232_cts_w); - DECLARE_WRITE_LINE_MEMBER(rs232_rxc_w); - DECLARE_WRITE_LINE_MEMBER(rs232_txc_w); + void sio_int_w(int state); + void sio_txd_w(int state); + void rs232_rxd_w(int state); + void rs232_dcd_w(int state); + void rs232_dsr_w(int state); + void rs232_cts_w(int state); + void rs232_rxc_w(int state); + void rs232_txc_w(int state); bool rx_fifo_flag() const; bool tx_fifo_flag() const; void update_flg(); @@ -96,8 +96,8 @@ private: void load_tx_fifo(); void set_r6_r7_pending(bool state); uint8_t get_hs_input() const; - DECLARE_WRITE_LINE_MEMBER(rxc_w); - DECLARE_WRITE_LINE_MEMBER(txc_w); + void rxc_w(int state); + void txc_w(int state); TIMER_CALLBACK_MEMBER(sync_rx_im_w); TIMER_CALLBACK_MEMBER(sync_tx_im_w); }; diff --git a/src/devices/bus/hp9845_io/hp9845_io.cpp b/src/devices/bus/hp9845_io/hp9845_io.cpp index bf304622f24..b75e5857ff6 100644 --- a/src/devices/bus/hp9845_io/hp9845_io.cpp +++ b/src/devices/bus/hp9845_io/hp9845_io.cpp @@ -64,37 +64,37 @@ void hp9845_io_slot_device::device_start() } } -WRITE_LINE_MEMBER(hp9845_io_slot_device::irq_w) +void hp9845_io_slot_device::irq_w(int state) { m_irq_cb_func(state); } -WRITE_LINE_MEMBER(hp9845_io_slot_device::sts_w) +void hp9845_io_slot_device::sts_w(int state) { m_sts_cb_func(state); } -WRITE_LINE_MEMBER(hp9845_io_slot_device::flg_w) +void hp9845_io_slot_device::flg_w(int state) { m_flg_cb_func(state); } -WRITE_LINE_MEMBER(hp9845_io_slot_device::irq_nextsc_w) +void hp9845_io_slot_device::irq_nextsc_w(int state) { m_irq_nextsc_cb_func(state); } -WRITE_LINE_MEMBER(hp9845_io_slot_device::sts_nextsc_w) +void hp9845_io_slot_device::sts_nextsc_w(int state) { m_sts_nextsc_cb_func(state); } -WRITE_LINE_MEMBER(hp9845_io_slot_device::flg_nextsc_w) +void hp9845_io_slot_device::flg_nextsc_w(int state) { m_flg_nextsc_cb_func(state); } -WRITE_LINE_MEMBER(hp9845_io_slot_device::dmar_w) +void hp9845_io_slot_device::dmar_w(int state) { m_dmar_cb_func(state); } @@ -158,49 +158,49 @@ void device_hp9845_io_interface::interface_pre_start() throw device_missing_dependencies(); } -WRITE_LINE_MEMBER(device_hp9845_io_interface::irq_w) +void device_hp9845_io_interface::irq_w(int state) { if (m_slot_dev) { m_slot_dev->irq_w(state); } } -WRITE_LINE_MEMBER(device_hp9845_io_interface::sts_w) +void device_hp9845_io_interface::sts_w(int state) { if (m_slot_dev) { m_slot_dev->sts_w(state); } } -WRITE_LINE_MEMBER(device_hp9845_io_interface::flg_w) +void device_hp9845_io_interface::flg_w(int state) { if (m_slot_dev) { m_slot_dev->flg_w(state); } } -WRITE_LINE_MEMBER(device_hp9845_io_interface::irq_nextsc_w) +void device_hp9845_io_interface::irq_nextsc_w(int state) { if (m_slot_dev) { m_slot_dev->irq_nextsc_w(state); } } -WRITE_LINE_MEMBER(device_hp9845_io_interface::sts_nextsc_w) +void device_hp9845_io_interface::sts_nextsc_w(int state) { if (m_slot_dev) { m_slot_dev->sts_nextsc_w(state); } } -WRITE_LINE_MEMBER(device_hp9845_io_interface::flg_nextsc_w) +void device_hp9845_io_interface::flg_nextsc_w(int state) { if (m_slot_dev) { m_slot_dev->flg_nextsc_w(state); } } -WRITE_LINE_MEMBER(device_hp9845_io_interface::dmar_w) +void device_hp9845_io_interface::dmar_w(int state) { if (m_slot_dev) { m_slot_dev->dmar_w(state); diff --git a/src/devices/bus/hp9845_io/hp9845_io.h b/src/devices/bus/hp9845_io/hp9845_io.h index bebe12c3408..4821c1cd5c9 100644 --- a/src/devices/bus/hp9845_io/hp9845_io.h +++ b/src/devices/bus/hp9845_io/hp9845_io.h @@ -51,13 +51,13 @@ public: auto dmar() { return m_dmar_cb_func.bind(); } // irq/sts/flg/dmar signal handlers for card devices - DECLARE_WRITE_LINE_MEMBER(irq_w); - DECLARE_WRITE_LINE_MEMBER(sts_w); - DECLARE_WRITE_LINE_MEMBER(flg_w); - DECLARE_WRITE_LINE_MEMBER(irq_nextsc_w); - DECLARE_WRITE_LINE_MEMBER(sts_nextsc_w); - DECLARE_WRITE_LINE_MEMBER(flg_nextsc_w); - DECLARE_WRITE_LINE_MEMBER(dmar_w); + void irq_w(int state); + void sts_w(int state); + void flg_w(int state); + void irq_nextsc_w(int state); + void sts_nextsc_w(int state); + void flg_nextsc_w(int state); + void dmar_w(int state); // getter for r/w handlers // return value is SC (negative if no card is attached to slot) @@ -103,13 +103,13 @@ protected: required_ioport m_select_code_port; // card device handling - DECLARE_WRITE_LINE_MEMBER(irq_w); - DECLARE_WRITE_LINE_MEMBER(sts_w); - DECLARE_WRITE_LINE_MEMBER(flg_w); - DECLARE_WRITE_LINE_MEMBER(irq_nextsc_w); - DECLARE_WRITE_LINE_MEMBER(sts_nextsc_w); - DECLARE_WRITE_LINE_MEMBER(flg_nextsc_w); - DECLARE_WRITE_LINE_MEMBER(dmar_w); + void irq_w(int state); + void sts_w(int state); + void flg_w(int state); + void irq_nextsc_w(int state); + void sts_nextsc_w(int state); + void flg_nextsc_w(int state); + void dmar_w(int state); }; // device type definition diff --git a/src/devices/bus/hp9845_io/hp9871.cpp b/src/devices/bus/hp9845_io/hp9871.cpp index cee0b5957cf..a1eabbb8b91 100644 --- a/src/devices/bus/hp9845_io/hp9871.cpp +++ b/src/devices/bus/hp9845_io/hp9871.cpp @@ -59,7 +59,7 @@ void hp9871_device::ext_control_w(uint8_t data) // N/U } -WRITE_LINE_MEMBER(hp9871_device::pctl_w) +void hp9871_device::pctl_w(int state) { if (!state) { m_ibf = true; @@ -69,12 +69,12 @@ WRITE_LINE_MEMBER(hp9871_device::pctl_w) } } -WRITE_LINE_MEMBER(hp9871_device::io_w) +void hp9871_device::io_w(int state) { // N/U } -WRITE_LINE_MEMBER(hp9871_device::preset_w) +void hp9871_device::preset_w(int state) { // N/U } @@ -96,7 +96,7 @@ void hp9871_device::device_reset() psts_w(1); } -WRITE_LINE_MEMBER(hp9871_device::printer_online) +void hp9871_device::printer_online(int state) { output(state); } diff --git a/src/devices/bus/hp9845_io/hp9871.h b/src/devices/bus/hp9845_io/hp9871.h index 5b66b16d443..1321c8a69f2 100644 --- a/src/devices/bus/hp9845_io/hp9871.h +++ b/src/devices/bus/hp9845_io/hp9871.h @@ -28,9 +28,9 @@ public: virtual uint8_t ext_status_r() const override; virtual void output_w(uint16_t data) override; virtual void ext_control_w(uint8_t data) override; - virtual DECLARE_WRITE_LINE_MEMBER(pctl_w) override; - virtual DECLARE_WRITE_LINE_MEMBER(io_w) override; - virtual DECLARE_WRITE_LINE_MEMBER(preset_w) override; + virtual void pctl_w(int state) override; + virtual void io_w(int state) override; + virtual void preset_w(int state) override; protected: // device-level overrides @@ -44,7 +44,7 @@ private: uint8_t m_data; bool m_ibf; - DECLARE_WRITE_LINE_MEMBER(printer_online); + void printer_online(int state); void update_busy(); void output(bool printer_ready); }; diff --git a/src/devices/bus/hp9845_io/hp9885.cpp b/src/devices/bus/hp9845_io/hp9885.cpp index 039ef345cf3..e79d2af521e 100644 --- a/src/devices/bus/hp9845_io/hp9885.cpp +++ b/src/devices/bus/hp9845_io/hp9885.cpp @@ -280,7 +280,7 @@ void hp9885_device::ext_control_w(uint8_t data) } } -WRITE_LINE_MEMBER(hp9885_device::pctl_w) +void hp9885_device::pctl_w(int state) { m_pctl = state; if (m_pctl) { @@ -294,12 +294,12 @@ WRITE_LINE_MEMBER(hp9885_device::pctl_w) update_busy(); } -WRITE_LINE_MEMBER(hp9885_device::io_w) +void hp9885_device::io_w(int state) { LOG_HS("I/O = %d\n" , state); } -WRITE_LINE_MEMBER(hp9885_device::preset_w) +void hp9885_device::preset_w(int state) { LOG("PRESET = %d\n" , state); } diff --git a/src/devices/bus/hp9845_io/hp9885.h b/src/devices/bus/hp9845_io/hp9885.h index 1c9af5c3066..23e4cab60e0 100644 --- a/src/devices/bus/hp9845_io/hp9885.h +++ b/src/devices/bus/hp9845_io/hp9885.h @@ -29,9 +29,9 @@ public: virtual uint8_t ext_status_r() const override; virtual void output_w(uint16_t data) override; virtual void ext_control_w(uint8_t data) override; - virtual DECLARE_WRITE_LINE_MEMBER(pctl_w) override; - virtual DECLARE_WRITE_LINE_MEMBER(io_w) override; - virtual DECLARE_WRITE_LINE_MEMBER(preset_w) override; + virtual void pctl_w(int state) override; + virtual void io_w(int state) override; + virtual void preset_w(int state) override; protected: // device-level overrides diff --git a/src/devices/bus/hp_dio/hp98265a.cpp b/src/devices/bus/hp_dio/hp98265a.cpp index 5ca9d128b53..e52a72ca032 100644 --- a/src/devices/bus/hp_dio/hp98265a.cpp +++ b/src/devices/bus/hp_dio/hp98265a.cpp @@ -253,7 +253,7 @@ void dio16_98265a_device::update_irq(bool state) irq6_out(state && irq_level == 3); } -WRITE_LINE_MEMBER(dio16_98265a_device::irq_w) +void dio16_98265a_device::irq_w(int state) { LOG("%s: %s\n", __FUNCTION__, state ? "true" : "false"); @@ -288,7 +288,7 @@ void dio16_98265a_device::update_dma() dmar0_out((m_control & REG_CONTROL_DE0) && m_dmar0); dmar1_out((m_control & REG_CONTROL_DE1) && m_dmar0); } -WRITE_LINE_MEMBER(dio16_98265a_device::dmar0_w) +void dio16_98265a_device::dmar0_w(int state) { m_dmar0 = state; update_dma(); diff --git a/src/devices/bus/hp_dio/hp98265a.h b/src/devices/bus/hp_dio/hp98265a.h index 8246f9bb743..c21ad6e5bbe 100644 --- a/src/devices/bus/hp_dio/hp98265a.h +++ b/src/devices/bus/hp_dio/hp98265a.h @@ -40,9 +40,9 @@ protected: void dmack_w_in(int channel, uint8_t data) override; uint8_t dmack_r_in(int channel) override; - DECLARE_WRITE_LINE_MEMBER(dmar0_w); + void dmar0_w(int state); - DECLARE_WRITE_LINE_MEMBER(irq_w); + void irq_w(int state); required_device m_scsibus; required_device m_spc; diff --git a/src/devices/bus/hp_dio/hp98543.cpp b/src/devices/bus/hp_dio/hp98543.cpp index a2bfb82f5ee..a84abd856d8 100644 --- a/src/devices/bus/hp_dio/hp98543.cpp +++ b/src/devices/bus/hp_dio/hp98543.cpp @@ -166,31 +166,31 @@ void dio16_98543_device::vram_w(offs_t offset, uint16_t data, uint16_t mem_mask) tc->vram_w(offset, data, mem_mask); } -WRITE_LINE_MEMBER(dio16_98543_device::vblank_w) +void dio16_98543_device::vblank_w(int state) { for (auto &tc: m_topcat) tc->vblank_w(state); } -WRITE_LINE_MEMBER(dio16_98543_device::int0_w) +void dio16_98543_device::int0_w(int state) { m_ints[0] = state; update_int(); } -WRITE_LINE_MEMBER(dio16_98543_device::int1_w) +void dio16_98543_device::int1_w(int state) { m_ints[1] = state; update_int(); } -WRITE_LINE_MEMBER(dio16_98543_device::int2_w) +void dio16_98543_device::int2_w(int state) { m_ints[2] = state; update_int(); } -WRITE_LINE_MEMBER(dio16_98543_device::int3_w) +void dio16_98543_device::int3_w(int state) { m_ints[3] = state; diff --git a/src/devices/bus/hp_dio/hp98543.h b/src/devices/bus/hp_dio/hp98543.h index c1e86126880..56eb194d7e3 100644 --- a/src/devices/bus/hp_dio/hp98543.h +++ b/src/devices/bus/hp_dio/hp98543.h @@ -47,11 +47,11 @@ protected: virtual space_config_vector memory_space_config() const override; private: - WRITE_LINE_MEMBER(vblank_w); - WRITE_LINE_MEMBER(int0_w); - WRITE_LINE_MEMBER(int1_w); - WRITE_LINE_MEMBER(int2_w); - WRITE_LINE_MEMBER(int3_w); + void vblank_w(int state); + void int0_w(int state); + void int1_w(int state); + void int2_w(int state); + void int3_w(int state); const address_space_config m_space_config; void map(address_map &map); diff --git a/src/devices/bus/hp_dio/hp98544.cpp b/src/devices/bus/hp_dio/hp98544.cpp index 420dc93919f..ab566822293 100644 --- a/src/devices/bus/hp_dio/hp98544.cpp +++ b/src/devices/bus/hp_dio/hp98544.cpp @@ -138,12 +138,12 @@ void dio16_98544_device::rom_w(offs_t offset, uint16_t data) } } -WRITE_LINE_MEMBER(dio16_98544_device::vblank_w) +void dio16_98544_device::vblank_w(int state) { m_topcat->vblank_w(state); } -WRITE_LINE_MEMBER(dio16_98544_device::int_w) +void dio16_98544_device::int_w(int state) { int line = (m_intreg >> 3) & 7; diff --git a/src/devices/bus/hp_dio/hp98544.h b/src/devices/bus/hp_dio/hp98544.h index a490f765c84..8f18d54d76b 100644 --- a/src/devices/bus/hp_dio/hp98544.h +++ b/src/devices/bus/hp_dio/hp98544.h @@ -43,8 +43,8 @@ public: virtual space_config_vector memory_space_config() const override; private: - WRITE_LINE_MEMBER(vblank_w); - WRITE_LINE_MEMBER(int_w); + void vblank_w(int state); + void int_w(int state); static constexpr int m_v_pix = 768; static constexpr int m_h_pix = 1024; diff --git a/src/devices/bus/hp_dio/hp98550.cpp b/src/devices/bus/hp_dio/hp98550.cpp index 54b89418680..935c03eea6c 100644 --- a/src/devices/bus/hp_dio/hp98550.cpp +++ b/src/devices/bus/hp_dio/hp98550.cpp @@ -174,7 +174,7 @@ void dio32_98550_device::vram_w(offs_t offset, uint16_t data, uint16_t mem_mask) ce->vram_w(offset, data, mem_mask); } -WRITE_LINE_MEMBER(dio32_98550_device::vblank_w) +void dio32_98550_device::vblank_w(int state) { for (auto &ce: m_catseye) ce->vblank_w(state); diff --git a/src/devices/bus/hp_dio/hp98550.h b/src/devices/bus/hp_dio/hp98550.h index eca4da5bed6..a577cdb6388 100644 --- a/src/devices/bus/hp_dio/hp98550.h +++ b/src/devices/bus/hp_dio/hp98550.h @@ -48,7 +48,7 @@ protected: virtual space_config_vector memory_space_config() const override; - DECLARE_WRITE_LINE_MEMBER(vblank_w); + void vblank_w(int state); void int_w(offs_t offset, uint8_t data); const address_space_config m_space_config; diff --git a/src/devices/bus/hp_dio/hp98620.cpp b/src/devices/bus/hp_dio/hp98620.cpp index 88a8491fae8..0dc7add46c7 100644 --- a/src/devices/bus/hp_dio/hp98620.cpp +++ b/src/devices/bus/hp_dio/hp98620.cpp @@ -354,7 +354,7 @@ void dio16_98620_device::dma_transfer(int channel) m_regs[channel].subcount--; } -WRITE_LINE_MEMBER(dio16_98620_device::dmar0_in) +void dio16_98620_device::dmar0_in(int state) { LOG("%s: %d\n", __FUNCTION__, state); m_dmar[0] = state; @@ -364,7 +364,7 @@ WRITE_LINE_MEMBER(dio16_98620_device::dmar0_in) dma_transfer(0); } -WRITE_LINE_MEMBER(dio16_98620_device::dmar1_in) +void dio16_98620_device::dmar1_in(int state) { LOG("%s: %d\n", __FUNCTION__, state); m_dmar[1] = state; diff --git a/src/devices/bus/hp_dio/hp98620.h b/src/devices/bus/hp_dio/hp98620.h index d8779f0e852..7a4b65f34f0 100644 --- a/src/devices/bus/hp_dio/hp98620.h +++ b/src/devices/bus/hp_dio/hp98620.h @@ -29,7 +29,7 @@ protected: uint16_t dma_r(offs_t offset); void dma_w(offs_t offset, uint16_t data); - DECLARE_WRITE_LINE_MEMBER(irq_w); + void irq_w(int state); private: @@ -89,8 +89,8 @@ private: static constexpr int REG1_1TQ4_CONTROL = 0x208; static constexpr int REG1_1TQ4_STATUS = 0x20a; - WRITE_LINE_MEMBER(dmar0_in) override; - WRITE_LINE_MEMBER(dmar1_in) override; + void dmar0_in(int state) override; + void dmar1_in(int state) override; void dma_transfer(int channel); void update_irq(); diff --git a/src/devices/bus/hp_dio/hp98643.cpp b/src/devices/bus/hp_dio/hp98643.cpp index f665303097a..1d8934f739a 100644 --- a/src/devices/bus/hp_dio/hp98643.cpp +++ b/src/devices/bus/hp_dio/hp98643.cpp @@ -114,7 +114,7 @@ void dio16_98643_device::device_reset() m_sc |= get_irq_line() << 4; } -WRITE_LINE_MEMBER(dio16_98643_device::lance_int_w) +void dio16_98643_device::lance_int_w(int state) { if (state) m_sc &= ~REG_SC_IP; diff --git a/src/devices/bus/hp_dio/hp98643.h b/src/devices/bus/hp_dio/hp98643.h index c1944bb1b8f..e58a973ae8f 100644 --- a/src/devices/bus/hp_dio/hp98643.h +++ b/src/devices/bus/hp_dio/hp98643.h @@ -62,7 +62,7 @@ private: uint16_t novram_r(offs_t offset); void novram_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); - DECLARE_WRITE_LINE_MEMBER(lance_int_w); + void lance_int_w(int state); void lance_dma_out(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); uint16_t lance_dma_in(offs_t offset); diff --git a/src/devices/bus/hp_dio/hp_dio.cpp b/src/devices/bus/hp_dio/hp_dio.cpp index 647b28f83c9..36d4fc67e3c 100644 --- a/src/devices/bus/hp_dio/hp_dio.cpp +++ b/src/devices/bus/hp_dio/hp_dio.cpp @@ -245,7 +245,7 @@ uint8_t dio16_device::dmack_r_out(int index, int channel) return ret; } -WRITE_LINE_MEMBER(dio16_device::reset_in) +void dio16_device::reset_in(int state) { for (auto &card : m_cards) { if (card->get_index() != m_bus_index) diff --git a/src/devices/bus/hp_dio/hp_dio.h b/src/devices/bus/hp_dio/hp_dio.h index c3ad5e0d178..1b8c850c1c4 100644 --- a/src/devices/bus/hp_dio/hp_dio.h +++ b/src/devices/bus/hp_dio/hp_dio.h @@ -93,27 +93,27 @@ public: // IRQs 1, 2, and 7 are reserved for non-bus usage. // input lines - DECLARE_WRITE_LINE_MEMBER(dmar0_in) { set_dmar(m_bus_index, 0, state); } - DECLARE_WRITE_LINE_MEMBER(dmar1_in) { set_dmar(m_bus_index, 1, state); } - DECLARE_WRITE_LINE_MEMBER(irq1_in) { set_irq(m_bus_index, 0, state); } - DECLARE_WRITE_LINE_MEMBER(irq2_in) { set_irq(m_bus_index, 1, state); } - DECLARE_WRITE_LINE_MEMBER(irq3_in) { set_irq(m_bus_index, 2, state); } - DECLARE_WRITE_LINE_MEMBER(irq4_in) { set_irq(m_bus_index, 3, state); } - DECLARE_WRITE_LINE_MEMBER(irq5_in) { set_irq(m_bus_index, 4, state); } - DECLARE_WRITE_LINE_MEMBER(irq6_in) { set_irq(m_bus_index, 5, state); } - DECLARE_WRITE_LINE_MEMBER(irq7_in) { set_irq(m_bus_index, 6, state); } - DECLARE_WRITE_LINE_MEMBER(reset_in); + void dmar0_in(int state) { set_dmar(m_bus_index, 0, state); } + void dmar1_in(int state) { set_dmar(m_bus_index, 1, state); } + void irq1_in(int state) { set_irq(m_bus_index, 0, state); } + void irq2_in(int state) { set_irq(m_bus_index, 1, state); } + void irq3_in(int state) { set_irq(m_bus_index, 2, state); } + void irq4_in(int state) { set_irq(m_bus_index, 3, state); } + void irq5_in(int state) { set_irq(m_bus_index, 4, state); } + void irq6_in(int state) { set_irq(m_bus_index, 5, state); } + void irq7_in(int state) { set_irq(m_bus_index, 6, state); } + void reset_in(int state); // output lines - DECLARE_READ_LINE_MEMBER(irq1_out) const { return (m_irq[0] & ~m_bus_index) ? 1 : 0; } - DECLARE_READ_LINE_MEMBER(irq2_out) const { return (m_irq[1] & ~m_bus_index) ? 1 : 0; } - DECLARE_READ_LINE_MEMBER(irq3_out) const { return (m_irq[2] & ~m_bus_index) ? 1 : 0; } - DECLARE_READ_LINE_MEMBER(irq4_out) const { return (m_irq[3] & ~m_bus_index) ? 1 : 0; } - DECLARE_READ_LINE_MEMBER(irq5_out) const { return (m_irq[4] & ~m_bus_index) ? 1 : 0; } - DECLARE_READ_LINE_MEMBER(irq6_out) const { return (m_irq[5] & ~m_bus_index) ? 1 : 0; } - DECLARE_READ_LINE_MEMBER(irq7_out) const { return (m_irq[6] & ~m_bus_index) ? 1 : 0; } - DECLARE_READ_LINE_MEMBER(dmar0_out) const { return dmar0_r(); } - DECLARE_READ_LINE_MEMBER(dmar1_out) const { return dmar1_r(); } + int irq1_out() const { return (m_irq[0] & ~m_bus_index) ? 1 : 0; } + int irq2_out() const { return (m_irq[1] & ~m_bus_index) ? 1 : 0; } + int irq3_out() const { return (m_irq[2] & ~m_bus_index) ? 1 : 0; } + int irq4_out() const { return (m_irq[3] & ~m_bus_index) ? 1 : 0; } + int irq5_out() const { return (m_irq[4] & ~m_bus_index) ? 1 : 0; } + int irq6_out() const { return (m_irq[5] & ~m_bus_index) ? 1 : 0; } + int irq7_out() const { return (m_irq[6] & ~m_bus_index) ? 1 : 0; } + int dmar0_out() const { return dmar0_r(); } + int dmar1_out() const { return dmar1_r(); } bool dmar0_r() const { return (m_dmar[0] & ~m_bus_index) ? 1 : 0; } bool dmar1_r() const { return (m_dmar[1] & ~m_bus_index) ? 1 : 0; } @@ -187,32 +187,32 @@ protected: int get_index() { return m_index; } address_space &program_space() { return m_dio_dev->program_space(); } - DECLARE_WRITE_LINE_MEMBER(irq1_out) { m_dio_dev->set_irq(m_index, 0, state); } - DECLARE_WRITE_LINE_MEMBER(irq2_out) { m_dio_dev->set_irq(m_index, 1, state); } - DECLARE_WRITE_LINE_MEMBER(irq3_out) { m_dio_dev->set_irq(m_index, 2, state); } - DECLARE_WRITE_LINE_MEMBER(irq4_out) { m_dio_dev->set_irq(m_index, 3, state); } - DECLARE_WRITE_LINE_MEMBER(irq5_out) { m_dio_dev->set_irq(m_index, 4, state); } - DECLARE_WRITE_LINE_MEMBER(irq6_out) { m_dio_dev->set_irq(m_index, 5, state); } - DECLARE_WRITE_LINE_MEMBER(irq7_out) { m_dio_dev->set_irq(m_index, 6, state); } - DECLARE_WRITE_LINE_MEMBER(dmar0_out) { m_dio_dev->set_dmar(m_index, 0, state); } - DECLARE_WRITE_LINE_MEMBER(dmar1_out) { m_dio_dev->set_dmar(m_index, 1, state); } - - virtual DECLARE_WRITE_LINE_MEMBER(irq1_in) {} - virtual DECLARE_WRITE_LINE_MEMBER(irq2_in) {} - virtual DECLARE_WRITE_LINE_MEMBER(irq3_in) {} - virtual DECLARE_WRITE_LINE_MEMBER(irq4_in) {} - virtual DECLARE_WRITE_LINE_MEMBER(irq5_in) {} - virtual DECLARE_WRITE_LINE_MEMBER(irq6_in) {} - virtual DECLARE_WRITE_LINE_MEMBER(irq7_in) {} - virtual DECLARE_WRITE_LINE_MEMBER(dmar0_in) {} - virtual DECLARE_WRITE_LINE_MEMBER(dmar1_in) {} + void irq1_out(int state) { m_dio_dev->set_irq(m_index, 0, state); } + void irq2_out(int state) { m_dio_dev->set_irq(m_index, 1, state); } + void irq3_out(int state) { m_dio_dev->set_irq(m_index, 2, state); } + void irq4_out(int state) { m_dio_dev->set_irq(m_index, 3, state); } + void irq5_out(int state) { m_dio_dev->set_irq(m_index, 4, state); } + void irq6_out(int state) { m_dio_dev->set_irq(m_index, 5, state); } + void irq7_out(int state) { m_dio_dev->set_irq(m_index, 6, state); } + void dmar0_out(int state) { m_dio_dev->set_dmar(m_index, 0, state); } + void dmar1_out(int state) { m_dio_dev->set_dmar(m_index, 1, state); } + + virtual void irq1_in(int state) {} + virtual void irq2_in(int state) {} + virtual void irq3_in(int state) {} + virtual void irq4_in(int state) {} + virtual void irq5_in(int state) {} + virtual void irq6_in(int state) {} + virtual void irq7_in(int state) {} + virtual void dmar0_in(int state) {} + virtual void dmar1_in(int state) {} virtual uint8_t dmack_r_out(int channel) { return m_dio_dev->dmack_r_out(m_index, channel); } virtual void dmack_w_out(int channel, uint8_t data) { m_dio_dev->dmack_w_out(m_index, channel, data); } virtual uint8_t dmack_r_in(int channel) { return 0xff; } virtual void dmack_w_in(int channel, uint8_t data) {} - virtual DECLARE_WRITE_LINE_MEMBER(reset_in) {} + virtual void reset_in(int state) {} bool dmar0_r() const { return m_dio_dev->dmar0_r(); } bool dmar1_r() const { return m_dio_dev->dmar1_r(); } diff --git a/src/devices/bus/hp_dio/human_interface.cpp b/src/devices/bus/hp_dio/human_interface.cpp index a0957977f10..669c77e4ffb 100644 --- a/src/devices/bus/hp_dio/human_interface.cpp +++ b/src/devices/bus/hp_dio/human_interface.cpp @@ -166,7 +166,7 @@ void human_interface_device::device_reset() m_iocpu->reset(); } -WRITE_LINE_MEMBER(human_interface_device::reset_in) +void human_interface_device::reset_in(int state) { if (state) device_reset(); @@ -178,7 +178,7 @@ void human_interface_device::update_gpib_irq() ((m_ppoll_sc & (PPOLL_IR|PPOLL_IE)) == (PPOLL_IR|PPOLL_IE))) ? ASSERT_LINE : CLEAR_LINE); } -WRITE_LINE_MEMBER(human_interface_device::gpib_irq) +void human_interface_device::gpib_irq(int state) { m_gpib_irq_line = state; update_gpib_irq(); @@ -189,7 +189,7 @@ void human_interface_device::update_gpib_dma() dmar0_out(m_gpib_dma_enable && m_gpib_dma_line); } -WRITE_LINE_MEMBER(human_interface_device::gpib_dreq) +void human_interface_device::gpib_dreq(int state) { m_gpib_dma_line = state; update_gpib_dma(); @@ -338,7 +338,7 @@ uint8_t human_interface_device::iocpu_test0_r() return !m_mlc->get_int(); } -WRITE_LINE_MEMBER(human_interface_device::rtc_d0_w) +void human_interface_device::rtc_d0_w(int state) { if (state) m_rtc_data |= 1; @@ -347,7 +347,7 @@ WRITE_LINE_MEMBER(human_interface_device::rtc_d0_w) } -WRITE_LINE_MEMBER(human_interface_device::rtc_d1_w) +void human_interface_device::rtc_d1_w(int state) { if (state) m_rtc_data |= 2; @@ -355,7 +355,7 @@ WRITE_LINE_MEMBER(human_interface_device::rtc_d1_w) m_rtc_data &= ~2; } -WRITE_LINE_MEMBER(human_interface_device::rtc_d2_w) +void human_interface_device::rtc_d2_w(int state) { if (state) m_rtc_data |= 4; @@ -364,7 +364,7 @@ WRITE_LINE_MEMBER(human_interface_device::rtc_d2_w) } -WRITE_LINE_MEMBER(human_interface_device::rtc_d3_w) +void human_interface_device::rtc_d3_w(int state) { if (state) m_rtc_data |= 8; diff --git a/src/devices/bus/hp_dio/human_interface.h b/src/devices/bus/hp_dio/human_interface.h index 2e1d1376211..0f6f3d04106 100644 --- a/src/devices/bus/hp_dio/human_interface.h +++ b/src/devices/bus/hp_dio/human_interface.h @@ -46,16 +46,16 @@ private: void gpib_w(offs_t offset, uint8_t data); void ieee488_dio_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(gpib_irq); - DECLARE_WRITE_LINE_MEMBER(gpib_dreq); + void gpib_irq(int state); + void gpib_dreq(int state); /* RTC */ - DECLARE_WRITE_LINE_MEMBER(rtc_d0_w); - DECLARE_WRITE_LINE_MEMBER(rtc_d1_w); - DECLARE_WRITE_LINE_MEMBER(rtc_d2_w); - DECLARE_WRITE_LINE_MEMBER(rtc_d3_w); + void rtc_d0_w(int state); + void rtc_d1_w(int state); + void rtc_d2_w(int state); + void rtc_d3_w(int state); - DECLARE_WRITE_LINE_MEMBER(reset_in) override; + void reset_in(int state) override; void dmack_w_in(int channel, uint8_t data) override; uint8_t dmack_r_in(int channel) override; diff --git a/src/devices/bus/hp_hil/hp_hil.cpp b/src/devices/bus/hp_hil/hp_hil.cpp index e86b9b24a9c..9225edb31f6 100644 --- a/src/devices/bus/hp_hil/hp_hil.cpp +++ b/src/devices/bus/hp_hil/hp_hil.cpp @@ -225,7 +225,7 @@ void hp_hil_mlc_device::hil_write(uint16_t data) } } -WRITE_LINE_MEMBER(hp_hil_mlc_device::ap_w) +void hp_hil_mlc_device::ap_w(int state) { uint16_t data = HPMLC_W1_C | HPHIL_POL; if (state && (m_w3 & HPMLC_W3_APE)) diff --git a/src/devices/bus/hp_hil/hp_hil.h b/src/devices/bus/hp_hil/hp_hil.h index c50c4742340..b4302ac1895 100644 --- a/src/devices/bus/hp_hil/hp_hil.h +++ b/src/devices/bus/hp_hil/hp_hil.h @@ -127,7 +127,7 @@ public: uint8_t read(offs_t offset); void write(offs_t offset, uint8_t data); - DECLARE_WRITE_LINE_MEMBER(ap_w); + void ap_w(int state); void hil_write(uint16_t data); diff --git a/src/devices/bus/hp_ipc_io/82919.cpp b/src/devices/bus/hp_ipc_io/82919.cpp index e5835ebafc7..901350f5bdd 100644 --- a/src/devices/bus/hp_ipc_io/82919.cpp +++ b/src/devices/bus/hp_ipc_io/82919.cpp @@ -82,13 +82,13 @@ void hp82919_io_card_device::write(offs_t addr , uint8_t data) } } -WRITE_LINE_MEMBER(hp82919_io_card_device::uart_irq) +void hp82919_io_card_device::uart_irq(int state) { m_uart_int = state; update_irq(); } -WRITE_LINE_MEMBER(hp82919_io_card_device::uart_a_tx) +void hp82919_io_card_device::uart_a_tx(int state) { m_rs232_prim->write_txd(state); if (m_loopback) { @@ -96,7 +96,7 @@ WRITE_LINE_MEMBER(hp82919_io_card_device::uart_a_tx) } } -WRITE_LINE_MEMBER(hp82919_io_card_device::uart_b_tx) +void hp82919_io_card_device::uart_b_tx(int state) { m_rs232_sec->write_txd(state); if (m_loopback) { @@ -121,56 +121,56 @@ void hp82919_io_card_device::uart_output(uint8_t data) } } -WRITE_LINE_MEMBER(hp82919_io_card_device::prim_rxd) +void hp82919_io_card_device::prim_rxd(int state) { if (!m_loopback) { m_uart->rx_a_w(state); } } -WRITE_LINE_MEMBER(hp82919_io_card_device::prim_dcd) +void hp82919_io_card_device::prim_dcd(int state) { if (!m_loopback) { m_uart->ip3_w(state); } } -WRITE_LINE_MEMBER(hp82919_io_card_device::prim_dsr) +void hp82919_io_card_device::prim_dsr(int state) { if (!m_loopback) { m_uart->ip1_w(state); } } -WRITE_LINE_MEMBER(hp82919_io_card_device::prim_ri) +void hp82919_io_card_device::prim_ri(int state) { if (!m_loopback) { m_uart->ip2_w(state); } } -WRITE_LINE_MEMBER(hp82919_io_card_device::prim_cts) +void hp82919_io_card_device::prim_cts(int state) { if (!m_loopback) { m_uart->ip0_w(state); } } -WRITE_LINE_MEMBER(hp82919_io_card_device::sec_rxd) +void hp82919_io_card_device::sec_rxd(int state) { if (!m_loopback) { m_uart->rx_b_w(state); } } -WRITE_LINE_MEMBER(hp82919_io_card_device::sec_dcd) +void hp82919_io_card_device::sec_dcd(int state) { if (!m_loopback) { m_uart->ip5_w(state); } } -WRITE_LINE_MEMBER(hp82919_io_card_device::sec_cts) +void hp82919_io_card_device::sec_cts(int state) { if (!m_loopback) { m_uart->ip4_w(state); diff --git a/src/devices/bus/hp_ipc_io/82919.h b/src/devices/bus/hp_ipc_io/82919.h index 331a42b0b00..b6ff3ffa301 100644 --- a/src/devices/bus/hp_ipc_io/82919.h +++ b/src/devices/bus/hp_ipc_io/82919.h @@ -27,18 +27,18 @@ public: uint8_t read(offs_t addr); void write(offs_t addr , uint8_t data); - DECLARE_WRITE_LINE_MEMBER(uart_irq); - DECLARE_WRITE_LINE_MEMBER(uart_a_tx); - DECLARE_WRITE_LINE_MEMBER(uart_b_tx); + void uart_irq(int state); + void uart_a_tx(int state); + void uart_b_tx(int state); void uart_output(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(prim_rxd); - DECLARE_WRITE_LINE_MEMBER(prim_dcd); - DECLARE_WRITE_LINE_MEMBER(prim_dsr); - DECLARE_WRITE_LINE_MEMBER(prim_ri); - DECLARE_WRITE_LINE_MEMBER(prim_cts); - DECLARE_WRITE_LINE_MEMBER(sec_rxd); - DECLARE_WRITE_LINE_MEMBER(sec_dcd); - DECLARE_WRITE_LINE_MEMBER(sec_cts); + void prim_rxd(int state); + void prim_dcd(int state); + void prim_dsr(int state); + void prim_ri(int state); + void prim_cts(int state); + void sec_rxd(int state); + void sec_dcd(int state); + void sec_cts(int state); protected: virtual void device_start() override; diff --git a/src/devices/bus/ieee488/c2031.cpp b/src/devices/bus/ieee488/c2031.cpp index b23e09d8a9a..cc00db2bbf5 100644 --- a/src/devices/bus/ieee488/c2031.cpp +++ b/src/devices/bus/ieee488/c2031.cpp @@ -70,7 +70,7 @@ void c2031_device::c2031_mem(address_map &map) } -WRITE_LINE_MEMBER( c2031_device::via0_irq_w ) +void c2031_device::via0_irq_w(int state) { m_via0_irq = state; @@ -202,7 +202,7 @@ void c2031_device::via0_pb_w(uint8_t data) } -WRITE_LINE_MEMBER( c2031_device::via1_irq_w ) +void c2031_device::via1_irq_w(int state) { m_via1_irq = state; @@ -272,7 +272,7 @@ void c2031_device::via1_pb_w(uint8_t data) // C64H156_INTERFACE( ga_intf ) //------------------------------------------------- -WRITE_LINE_MEMBER( c2031_device::byte_w ) +void c2031_device::byte_w(int state) { m_maincpu->set_input_line(M6502_SET_OVERFLOW, state); diff --git a/src/devices/bus/ieee488/c2031.h b/src/devices/bus/ieee488/c2031.h index f3a0dc02074..8d2a646133b 100644 --- a/src/devices/bus/ieee488/c2031.h +++ b/src/devices/bus/ieee488/c2031.h @@ -49,15 +49,15 @@ protected: private: inline int get_device_number(); - DECLARE_WRITE_LINE_MEMBER( via0_irq_w ); + void via0_irq_w(int state); uint8_t via0_pa_r(); void via0_pa_w(uint8_t data); uint8_t via0_pb_r(); void via0_pb_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER( via1_irq_w ); + void via1_irq_w(int state); uint8_t via1_pb_r(); void via1_pb_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER( byte_w ); + void byte_w(int state); void c2031_mem(address_map &map); diff --git a/src/devices/bus/ieee488/c2040fdc.cpp b/src/devices/bus/ieee488/c2040fdc.cpp index 18c02bba831..4de4dc34757 100644 --- a/src/devices/bus/ieee488/c2040fdc.cpp +++ b/src/devices/bus/ieee488/c2040fdc.cpp @@ -467,19 +467,19 @@ void c2040_fdc_device::write(uint8_t data) } } -WRITE_LINE_MEMBER( c2040_fdc_device::ds0_w ) +void c2040_fdc_device::ds0_w(int state) { m_ds0 = state; } -WRITE_LINE_MEMBER( c2040_fdc_device::ds1_w ) +void c2040_fdc_device::ds1_w(int state) { m_ds1 = state; ds_w(m_ds1 << 1 | m_ds0); } -WRITE_LINE_MEMBER( c2040_fdc_device::drv_sel_w ) +void c2040_fdc_device::drv_sel_w(int state) { if (m_drv_sel != state) { @@ -491,7 +491,7 @@ WRITE_LINE_MEMBER( c2040_fdc_device::drv_sel_w ) } } -WRITE_LINE_MEMBER( c2040_fdc_device::mode_sel_w ) +void c2040_fdc_device::mode_sel_w(int state) { if (m_mode_sel != state) { @@ -503,7 +503,7 @@ WRITE_LINE_MEMBER( c2040_fdc_device::mode_sel_w ) } } -WRITE_LINE_MEMBER( c2040_fdc_device::rw_sel_w ) +void c2040_fdc_device::rw_sel_w(int state) { if (m_rw_sel != state) { @@ -520,7 +520,7 @@ WRITE_LINE_MEMBER( c2040_fdc_device::rw_sel_w ) } } -WRITE_LINE_MEMBER( c2040_fdc_device::mtr0_w ) +void c2040_fdc_device::mtr0_w(int state) { if (m_mtr0 != state) { @@ -542,7 +542,7 @@ WRITE_LINE_MEMBER( c2040_fdc_device::mtr0_w ) } } -WRITE_LINE_MEMBER( c2040_fdc_device::mtr1_w ) +void c2040_fdc_device::mtr1_w(int state) { if (m_mtr1 != state) { diff --git a/src/devices/bus/ieee488/c2040fdc.h b/src/devices/bus/ieee488/c2040fdc.h index 2198f6aa738..bc7d18961bf 100644 --- a/src/devices/bus/ieee488/c2040fdc.h +++ b/src/devices/bus/ieee488/c2040fdc.h @@ -37,16 +37,16 @@ public: uint8_t read(); void write(uint8_t data); - DECLARE_WRITE_LINE_MEMBER( ds0_w ); - DECLARE_WRITE_LINE_MEMBER( ds1_w ); - DECLARE_WRITE_LINE_MEMBER( drv_sel_w ); - DECLARE_WRITE_LINE_MEMBER( mode_sel_w ); - DECLARE_WRITE_LINE_MEMBER( rw_sel_w ); - DECLARE_WRITE_LINE_MEMBER( mtr0_w ); - DECLARE_WRITE_LINE_MEMBER( mtr1_w ); - - DECLARE_READ_LINE_MEMBER( wps_r ) { return checkpoint_live.drv_sel ? m_floppy1->wpt_r() : m_floppy0->wpt_r(); } - DECLARE_READ_LINE_MEMBER( sync_r ) { return checkpoint_live.sync; } + void ds0_w(int state); + void ds1_w(int state); + void drv_sel_w(int state); + void mode_sel_w(int state); + void rw_sel_w(int state); + void mtr0_w(int state); + void mtr1_w(int state); + + int wps_r() { return checkpoint_live.drv_sel ? m_floppy1->wpt_r() : m_floppy0->wpt_r(); } + int sync_r() { return checkpoint_live.sync; } void stp0_w(int stp); void stp1_w(int stp); diff --git a/src/devices/bus/ieee488/c8050fdc.cpp b/src/devices/bus/ieee488/c8050fdc.cpp index 780646460c1..75bd8146348 100644 --- a/src/devices/bus/ieee488/c8050fdc.cpp +++ b/src/devices/bus/ieee488/c8050fdc.cpp @@ -517,19 +517,19 @@ void c8050_fdc_device::write(uint8_t data) } } -WRITE_LINE_MEMBER( c8050_fdc_device::ds0_w ) +void c8050_fdc_device::ds0_w(int state) { m_ds0 = state; } -WRITE_LINE_MEMBER( c8050_fdc_device::ds1_w ) +void c8050_fdc_device::ds1_w(int state) { m_ds1 = state; ds_w(m_ds1 << 1 | m_ds0); } -WRITE_LINE_MEMBER( c8050_fdc_device::drv_sel_w ) +void c8050_fdc_device::drv_sel_w(int state) { if (m_drv_sel != state) { @@ -541,7 +541,7 @@ WRITE_LINE_MEMBER( c8050_fdc_device::drv_sel_w ) } } -WRITE_LINE_MEMBER( c8050_fdc_device::mode_sel_w ) +void c8050_fdc_device::mode_sel_w(int state) { if (m_mode_sel != state) { @@ -553,7 +553,7 @@ WRITE_LINE_MEMBER( c8050_fdc_device::mode_sel_w ) } } -WRITE_LINE_MEMBER( c8050_fdc_device::rw_sel_w ) +void c8050_fdc_device::rw_sel_w(int state) { if (m_rw_sel != state) { @@ -570,7 +570,7 @@ WRITE_LINE_MEMBER( c8050_fdc_device::rw_sel_w ) } } -WRITE_LINE_MEMBER( c8050_fdc_device::mtr0_w ) +void c8050_fdc_device::mtr0_w(int state) { if (m_mtr0 != state) { @@ -592,7 +592,7 @@ WRITE_LINE_MEMBER( c8050_fdc_device::mtr0_w ) } } -WRITE_LINE_MEMBER( c8050_fdc_device::mtr1_w ) +void c8050_fdc_device::mtr1_w(int state) { if (m_mtr1 != state) { @@ -614,7 +614,7 @@ WRITE_LINE_MEMBER( c8050_fdc_device::mtr1_w ) } } -WRITE_LINE_MEMBER( c8050_fdc_device::odd_hd_w ) +void c8050_fdc_device::odd_hd_w(int state) { if (m_odd_hd != state) { @@ -628,7 +628,7 @@ WRITE_LINE_MEMBER( c8050_fdc_device::odd_hd_w ) } } -WRITE_LINE_MEMBER( c8050_fdc_device::pull_sync_w ) +void c8050_fdc_device::pull_sync_w(int state) { LOGMASKED(LOG_MORE, "%s %s PULL SYNC %u\n", machine().time().as_string(), machine().describe_context(), state); } diff --git a/src/devices/bus/ieee488/c8050fdc.h b/src/devices/bus/ieee488/c8050fdc.h index dd390b1b7c5..2c58bbe55bc 100644 --- a/src/devices/bus/ieee488/c8050fdc.h +++ b/src/devices/bus/ieee488/c8050fdc.h @@ -38,17 +38,17 @@ public: uint8_t read(); void write(uint8_t data); - DECLARE_WRITE_LINE_MEMBER( ds0_w ); - DECLARE_WRITE_LINE_MEMBER( ds1_w ); - DECLARE_WRITE_LINE_MEMBER( drv_sel_w ); - DECLARE_WRITE_LINE_MEMBER( mode_sel_w ); - DECLARE_WRITE_LINE_MEMBER( rw_sel_w ); - DECLARE_WRITE_LINE_MEMBER( mtr0_w ); - DECLARE_WRITE_LINE_MEMBER( mtr1_w ); - DECLARE_WRITE_LINE_MEMBER( odd_hd_w ); - DECLARE_WRITE_LINE_MEMBER( pull_sync_w ); - - DECLARE_READ_LINE_MEMBER( wps_r ) { return checkpoint_live.drv_sel ? m_floppy1->wpt_r() : m_floppy0->wpt_r(); } + void ds0_w(int state); + void ds1_w(int state); + void drv_sel_w(int state); + void mode_sel_w(int state); + void rw_sel_w(int state); + void mtr0_w(int state); + void mtr1_w(int state); + void odd_hd_w(int state); + void pull_sync_w(int state); + + int wps_r() { return checkpoint_live.drv_sel ? m_floppy1->wpt_r() : m_floppy0->wpt_r(); } void stp0_w(int stp); void stp1_w(int stp); diff --git a/src/devices/bus/ieee488/d9060.cpp b/src/devices/bus/ieee488/d9060.cpp index 464db8cc902..502d97f78e1 100644 --- a/src/devices/bus/ieee488/d9060.cpp +++ b/src/devices/bus/ieee488/d9060.cpp @@ -328,12 +328,12 @@ void d9060_device_base::via_pb_w(uint8_t data) m_sasibus->write_rst(BIT(data, 1)); } -WRITE_LINE_MEMBER( d9060_device_base::ack_w ) +void d9060_device_base::ack_w(int state) { m_sasibus->write_ack(!state); } -WRITE_LINE_MEMBER( d9060_device_base::enable_w ) +void d9060_device_base::enable_w(int state) { m_enable = state; diff --git a/src/devices/bus/ieee488/d9060.h b/src/devices/bus/ieee488/d9060.h index a5da444dbcf..4c31760502a 100644 --- a/src/devices/bus/ieee488/d9060.h +++ b/src/devices/bus/ieee488/d9060.h @@ -61,8 +61,8 @@ private: uint8_t riot1_pb_r(); void riot1_pb_w(uint8_t data); void via_pb_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER( ack_w ); - DECLARE_WRITE_LINE_MEMBER( enable_w ); + void ack_w(int state); + void enable_w(int state); void scsi_data_w(uint8_t data); required_device m_maincpu; diff --git a/src/devices/bus/ieee488/hp9122c.cpp b/src/devices/bus/ieee488/hp9122c.cpp index f9619617ca1..1623eb60cca 100644 --- a/src/devices/bus/ieee488/hp9122c.cpp +++ b/src/devices/bus/ieee488/hp9122c.cpp @@ -155,65 +155,65 @@ void hp9122c_device::ieee488_ren(int state) m_i8291a->ren_w(state); } -WRITE_LINE_MEMBER(hp9122c_device::i8291a_eoi_w) +void hp9122c_device::i8291a_eoi_w(int state) { m_bus->eoi_w(this, state); } -WRITE_LINE_MEMBER(hp9122c_device::i8291a_dav_w) +void hp9122c_device::i8291a_dav_w(int state) { m_bus->dav_w(this, state); } -WRITE_LINE_MEMBER(hp9122c_device::i8291a_nrfd_w) +void hp9122c_device::i8291a_nrfd_w(int state) { m_bus->nrfd_w(this, state); } -WRITE_LINE_MEMBER(hp9122c_device::i8291a_ndac_w) +void hp9122c_device::i8291a_ndac_w(int state) { m_bus->ndac_w(this, state); } -WRITE_LINE_MEMBER(hp9122c_device::i8291a_ifc_w) +void hp9122c_device::i8291a_ifc_w(int state) { m_bus->ifc_w(this, state); } -WRITE_LINE_MEMBER(hp9122c_device::i8291a_srq_w) +void hp9122c_device::i8291a_srq_w(int state) { m_bus->srq_w(this, state); } -WRITE_LINE_MEMBER(hp9122c_device::i8291a_atn_w) +void hp9122c_device::i8291a_atn_w(int state) { m_bus->atn_w(this, state); } -WRITE_LINE_MEMBER(hp9122c_device::i8291a_ren_w) +void hp9122c_device::i8291a_ren_w(int state) { m_bus->ren_w(this, state); } -WRITE_LINE_MEMBER(hp9122c_device::i8291a_int_w) +void hp9122c_device::i8291a_int_w(int state) { m_i8291a_irq = state; update_intsel(); } -WRITE_LINE_MEMBER(hp9122c_device::i8291a_dreq_w) +void hp9122c_device::i8291a_dreq_w(int state) { m_i8291a_drq = state; update_intsel(); } -WRITE_LINE_MEMBER(hp9122c_device::fdc_intrq_w) +void hp9122c_device::fdc_intrq_w(int state) { m_fdc_irq = state; update_intsel(); } -WRITE_LINE_MEMBER(hp9122c_device::fdc_drq_w) +void hp9122c_device::fdc_drq_w(int state) { m_fdc_drq = state; update_intsel(); diff --git a/src/devices/bus/ieee488/hp9122c.h b/src/devices/bus/ieee488/hp9122c.h index 0c2d4854251..d763124cf98 100644 --- a/src/devices/bus/ieee488/hp9122c.h +++ b/src/devices/bus/ieee488/hp9122c.h @@ -91,23 +91,23 @@ private: constexpr static int REG_STATUS_DISKCHG = 1 << 5; constexpr static int REG_STATUS_LOW_DENSITY = 1 << 7; - DECLARE_WRITE_LINE_MEMBER(i8291a_eoi_w); - DECLARE_WRITE_LINE_MEMBER(i8291a_dav_w); - DECLARE_WRITE_LINE_MEMBER(i8291a_nrfd_w); - DECLARE_WRITE_LINE_MEMBER(i8291a_ndac_w); - DECLARE_WRITE_LINE_MEMBER(i8291a_ifc_w); - DECLARE_WRITE_LINE_MEMBER(i8291a_srq_w); - DECLARE_WRITE_LINE_MEMBER(i8291a_atn_w); - DECLARE_WRITE_LINE_MEMBER(i8291a_ren_w); + void i8291a_eoi_w(int state); + void i8291a_dav_w(int state); + void i8291a_nrfd_w(int state); + void i8291a_ndac_w(int state); + void i8291a_ifc_w(int state); + void i8291a_srq_w(int state); + void i8291a_atn_w(int state); + void i8291a_ren_w(int state); uint8_t i8291a_dio_r(); void i8291a_dio_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(i8291a_int_w); - DECLARE_WRITE_LINE_MEMBER(i8291a_dreq_w); + void i8291a_int_w(int state); + void i8291a_dreq_w(int state); - DECLARE_WRITE_LINE_MEMBER(fdc_intrq_w); - DECLARE_WRITE_LINE_MEMBER(fdc_drq_w); + void fdc_intrq_w(int state); + void fdc_drq_w(int state); void cmd_w(uint8_t data); uint8_t status_r(); diff --git a/src/devices/bus/ieee488/hp9895.cpp b/src/devices/bus/ieee488/hp9895.cpp index 94faf13d556..510ebfa734d 100644 --- a/src/devices/bus/ieee488/hp9895.cpp +++ b/src/devices/bus/ieee488/hp9895.cpp @@ -416,42 +416,42 @@ void hp9895_device::ieee488_ren(int state) m_phi->ren_w(state); } -WRITE_LINE_MEMBER(hp9895_device::phi_eoi_w) +void hp9895_device::phi_eoi_w(int state) { m_bus->eoi_w(this , state); } -WRITE_LINE_MEMBER(hp9895_device::phi_dav_w) +void hp9895_device::phi_dav_w(int state) { m_bus->dav_w(this , state); } -WRITE_LINE_MEMBER(hp9895_device::phi_nrfd_w) +void hp9895_device::phi_nrfd_w(int state) { m_bus->nrfd_w(this , state); } -WRITE_LINE_MEMBER(hp9895_device::phi_ndac_w) +void hp9895_device::phi_ndac_w(int state) { m_bus->ndac_w(this , state); } -WRITE_LINE_MEMBER(hp9895_device::phi_ifc_w) +void hp9895_device::phi_ifc_w(int state) { m_bus->ifc_w(this , state); } -WRITE_LINE_MEMBER(hp9895_device::phi_srq_w) +void hp9895_device::phi_srq_w(int state) { m_bus->srq_w(this , state); } -WRITE_LINE_MEMBER(hp9895_device::phi_atn_w) +void hp9895_device::phi_atn_w(int state) { m_bus->atn_w(this , state); } -WRITE_LINE_MEMBER(hp9895_device::phi_ren_w) +void hp9895_device::phi_ren_w(int state) { m_bus->ren_w(this , state); } @@ -466,7 +466,7 @@ void hp9895_device::phi_dio_w(uint8_t data) m_bus->dio_w(this , data); } -WRITE_LINE_MEMBER(hp9895_device::phi_int_w) +void hp9895_device::phi_int_w(int state) { m_cpu->set_input_line(INPUT_LINE_NMI , state); if (state) { diff --git a/src/devices/bus/ieee488/hp9895.h b/src/devices/bus/ieee488/hp9895.h index 1cb77d60090..cad61922e46 100644 --- a/src/devices/bus/ieee488/hp9895.h +++ b/src/devices/bus/ieee488/hp9895.h @@ -47,21 +47,21 @@ protected: private: // PHI write CBs - DECLARE_WRITE_LINE_MEMBER(phi_eoi_w); - DECLARE_WRITE_LINE_MEMBER(phi_dav_w); - DECLARE_WRITE_LINE_MEMBER(phi_nrfd_w); - DECLARE_WRITE_LINE_MEMBER(phi_ndac_w); - DECLARE_WRITE_LINE_MEMBER(phi_ifc_w); - DECLARE_WRITE_LINE_MEMBER(phi_srq_w); - DECLARE_WRITE_LINE_MEMBER(phi_atn_w); - DECLARE_WRITE_LINE_MEMBER(phi_ren_w); + void phi_eoi_w(int state); + void phi_dav_w(int state); + void phi_nrfd_w(int state); + void phi_ndac_w(int state); + void phi_ifc_w(int state); + void phi_srq_w(int state); + void phi_atn_w(int state); + void phi_ren_w(int state); // PHI DIO r/w CBs uint8_t phi_dio_r(); void phi_dio_w(uint8_t data); // PHI IRQ/Z80 NMI - DECLARE_WRITE_LINE_MEMBER(phi_int_w); + void phi_int_w(int state); // Z80 IRQ void z80_m1_w(uint8_t data); diff --git a/src/devices/bus/ieee488/ieee488.h b/src/devices/bus/ieee488/ieee488.h index 5a83d0fe927..3635c105de6 100644 --- a/src/devices/bus/ieee488/ieee488.h +++ b/src/devices/bus/ieee488/ieee488.h @@ -62,25 +62,25 @@ public: // reads for both host and peripherals uint8_t dio_r() { return get_data(); } - DECLARE_READ_LINE_MEMBER( eoi_r ) { return get_signal(EOI); } - DECLARE_READ_LINE_MEMBER( dav_r ) { return get_signal(DAV); } - DECLARE_READ_LINE_MEMBER( nrfd_r ) { return get_signal(NRFD); } - DECLARE_READ_LINE_MEMBER( ndac_r ) { return get_signal(NDAC); } - DECLARE_READ_LINE_MEMBER( ifc_r ) { return get_signal(IFC); } - DECLARE_READ_LINE_MEMBER( srq_r ) { return get_signal(SRQ); } - DECLARE_READ_LINE_MEMBER( atn_r ) { return get_signal(ATN); } - DECLARE_READ_LINE_MEMBER( ren_r ) { return get_signal(REN); } + int eoi_r() { return get_signal(EOI); } + int dav_r() { return get_signal(DAV); } + int nrfd_r() { return get_signal(NRFD); } + int ndac_r() { return get_signal(NDAC); } + int ifc_r() { return get_signal(IFC); } + int srq_r() { return get_signal(SRQ); } + int atn_r() { return get_signal(ATN); } + int ren_r() { return get_signal(REN); } // writes for host (driver_device) void host_dio_w(uint8_t data) { set_data(this, data); } - DECLARE_WRITE_LINE_MEMBER( host_eoi_w ) { set_signal(this, EOI, state); } - DECLARE_WRITE_LINE_MEMBER( host_dav_w ) { set_signal(this, DAV, state); } - DECLARE_WRITE_LINE_MEMBER( host_nrfd_w ) { set_signal(this, NRFD, state); } - DECLARE_WRITE_LINE_MEMBER( host_ndac_w ) { set_signal(this, NDAC, state); } - DECLARE_WRITE_LINE_MEMBER( host_ifc_w ) { set_signal(this, IFC, state); } - DECLARE_WRITE_LINE_MEMBER( host_srq_w ) { set_signal(this, SRQ, state); } - DECLARE_WRITE_LINE_MEMBER( host_atn_w ) { set_signal(this, ATN, state); } - DECLARE_WRITE_LINE_MEMBER( host_ren_w ) { set_signal(this, REN, state); } + void host_eoi_w(int state) { set_signal(this, EOI, state); } + void host_dav_w(int state) { set_signal(this, DAV, state); } + void host_nrfd_w(int state) { set_signal(this, NRFD, state); } + void host_ndac_w(int state) { set_signal(this, NDAC, state); } + void host_ifc_w(int state) { set_signal(this, IFC, state); } + void host_srq_w(int state) { set_signal(this, SRQ, state); } + void host_atn_w(int state) { set_signal(this, ATN, state); } + void host_ren_w(int state) { set_signal(this, REN, state); } // writes for peripherals (device_t) void dio_w(device_t *device, uint8_t data) { set_data(device, data); } diff --git a/src/devices/bus/imi7000/imi5000h.cpp b/src/devices/bus/imi7000/imi5000h.cpp index f32e7fdf2b3..fe70dcba6ac 100644 --- a/src/devices/bus/imi7000/imi5000h.cpp +++ b/src/devices/bus/imi7000/imi5000h.cpp @@ -108,18 +108,18 @@ static const z80_daisy_config z80_daisy_chain[] = // Z80CTC //------------------------------------------------- -WRITE_LINE_MEMBER( imi5000h_device::ctc_z0_w ) +void imi5000h_device::ctc_z0_w(int state) { m_ctc->trg1(state); } -WRITE_LINE_MEMBER( imi5000h_device::ctc_z1_w ) +void imi5000h_device::ctc_z1_w(int state) { m_ctc->trg2(state); m_ctc->trg3(state); } -WRITE_LINE_MEMBER( imi5000h_device::ctc_z2_w ) +void imi5000h_device::ctc_z2_w(int state) { //m_memory_enable = state; m_maincpu->set_input_line(INPUT_LINE_NMI, state); diff --git a/src/devices/bus/imi7000/imi5000h.h b/src/devices/bus/imi7000/imi5000h.h index 77d276b154b..1680677056a 100644 --- a/src/devices/bus/imi7000/imi5000h.h +++ b/src/devices/bus/imi7000/imi5000h.h @@ -45,9 +45,9 @@ protected: virtual ioport_constructor device_input_ports() const override; private: - DECLARE_WRITE_LINE_MEMBER( ctc_z0_w ); - DECLARE_WRITE_LINE_MEMBER( ctc_z1_w ); - DECLARE_WRITE_LINE_MEMBER( ctc_z2_w ); + void ctc_z0_w(int state); + void ctc_z1_w(int state); + void ctc_z2_w(int state); uint8_t pio0_pa_r(); void pio0_pa_w(uint8_t data); diff --git a/src/devices/bus/intellec4/insdatastor.cpp b/src/devices/bus/intellec4/insdatastor.cpp index 9473ca4ffb6..ccbac01904e 100644 --- a/src/devices/bus/intellec4/insdatastor.cpp +++ b/src/devices/bus/intellec4/insdatastor.cpp @@ -184,7 +184,7 @@ protected: virtual void device_start() override; virtual void device_reset() override; - virtual DECLARE_WRITE_LINE_MEMBER(reset_4002_in) override; + virtual void reset_4002_in(int state) override; private: void ram_out(offs_t offset, u8 data); @@ -271,7 +271,7 @@ void imm4_22_device::device_reset() } -WRITE_LINE_MEMBER(imm4_22_device::reset_4002_in) +void imm4_22_device::reset_4002_in(int state) { // FIXME: this takes several cycles to actually erase everything, and prevents writes while asserted if (!state) diff --git a/src/devices/bus/intellec4/intellec4.cpp b/src/devices/bus/intellec4/intellec4.cpp index f1eb0934448..b4da2185d0c 100644 --- a/src/devices/bus/intellec4/intellec4.cpp +++ b/src/devices/bus/intellec4/intellec4.cpp @@ -69,7 +69,7 @@ univ_bus_device::univ_bus_device(machine_config const &mconfig, char const *tag, input lines ----------------------------------*/ -WRITE_LINE_MEMBER(univ_bus_device::sync_in) +void univ_bus_device::sync_in(int state) { for (device_univ_card_interface *card : m_cards) { @@ -80,7 +80,7 @@ WRITE_LINE_MEMBER(univ_bus_device::sync_in) } } -WRITE_LINE_MEMBER(univ_bus_device::stop_acknowledge_in) +void univ_bus_device::stop_acknowledge_in(int state) { for (device_univ_card_interface *card : m_cards) { @@ -91,7 +91,7 @@ WRITE_LINE_MEMBER(univ_bus_device::stop_acknowledge_in) } } -WRITE_LINE_MEMBER(univ_bus_device::cpu_reset_in) +void univ_bus_device::cpu_reset_in(int state) { for (device_univ_card_interface *card : m_cards) { diff --git a/src/devices/bus/intellec4/intellec4.h b/src/devices/bus/intellec4/intellec4.h index 287c23681bf..206134dadfb 100644 --- a/src/devices/bus/intellec4/intellec4.h +++ b/src/devices/bus/intellec4/intellec4.h @@ -167,18 +167,18 @@ public: univ_bus_device(machine_config const &mconfig, char const *tag, device_t *owner, uint32_t clock); // input lines - DECLARE_WRITE_LINE_MEMBER(sync_in); - DECLARE_WRITE_LINE_MEMBER(test_in) {set_test(std::size(m_cards), state); } - DECLARE_WRITE_LINE_MEMBER(stop_in) {set_stop(std::size(m_cards), state); } - DECLARE_WRITE_LINE_MEMBER(stop_acknowledge_in); - DECLARE_WRITE_LINE_MEMBER(cpu_reset_in); - DECLARE_WRITE_LINE_MEMBER(reset_4002_in) { set_reset_4002(std::size(m_cards), state); } + void sync_in(int state); + void test_in(int state) {set_test(std::size(m_cards), state); } + void stop_in(int state) {set_stop(std::size(m_cards), state); } + void stop_acknowledge_in(int state); + void cpu_reset_in(int state); + void reset_4002_in(int state) { set_reset_4002(std::size(m_cards), state); } // output lines - DECLARE_READ_LINE_MEMBER(test_out) const { return (m_test & ~(u16(1U) << std::size(m_cards))) ? 0 : 1; } - DECLARE_READ_LINE_MEMBER(stop_out) const { return (m_stop & ~(u16(1U) << std::size(m_cards))) ? 0 : 1; } - DECLARE_READ_LINE_MEMBER(reset_4002_out) const { return (m_reset_4002 & ~(u16(1U) << std::size(m_cards))) ? 0 : 1; } - DECLARE_READ_LINE_MEMBER(user_reset_out) const { return (m_user_reset & ~(u16(1U) << std::size(m_cards))) ? 0 : 1; } + int test_out() const { return (m_test & ~(u16(1U) << std::size(m_cards))) ? 0 : 1; } + int stop_out() const { return (m_stop & ~(u16(1U) << std::size(m_cards))) ? 0 : 1; } + int reset_4002_out() const { return (m_reset_4002 & ~(u16(1U) << std::size(m_cards))) ? 0 : 1; } + int user_reset_out() const { return (m_user_reset & ~(u16(1U) << std::size(m_cards))) ? 0 : 1; } protected: // device_t implementation @@ -227,18 +227,18 @@ protected: address_space &status_space() { return *m_bus->m_status_space; } address_space &ram_ports_space() { return *m_bus->m_ram_ports_space; } - DECLARE_WRITE_LINE_MEMBER(test_out) { m_bus->set_test(m_index, state); } - DECLARE_WRITE_LINE_MEMBER(stop_out) { m_bus->set_stop(m_index, state); } - DECLARE_WRITE_LINE_MEMBER(reset_4002_out) { m_bus->set_reset_4002(m_index, state); } - DECLARE_WRITE_LINE_MEMBER(user_reset_out) { m_bus->set_user_reset(m_index, state); } - - virtual DECLARE_WRITE_LINE_MEMBER(sync_in) { } - virtual DECLARE_WRITE_LINE_MEMBER(test_in) { } - virtual DECLARE_WRITE_LINE_MEMBER(stop_in) { } - virtual DECLARE_WRITE_LINE_MEMBER(stop_acknowledge_in) { } - virtual DECLARE_WRITE_LINE_MEMBER(cpu_reset_in) { } - virtual DECLARE_WRITE_LINE_MEMBER(reset_4002_in) { } - virtual DECLARE_WRITE_LINE_MEMBER(user_reset_in) { } + void test_out(int state) { m_bus->set_test(m_index, state); } + void stop_out(int state) { m_bus->set_stop(m_index, state); } + void reset_4002_out(int state) { m_bus->set_reset_4002(m_index, state); } + void user_reset_out(int state) { m_bus->set_user_reset(m_index, state); } + + virtual void sync_in(int state) { } + virtual void test_in(int state) { } + virtual void stop_in(int state) { } + virtual void stop_acknowledge_in(int state) { } + virtual void cpu_reset_in(int state) { } + virtual void reset_4002_in(int state) { } + virtual void user_reset_in(int state) { } private: void set_bus(univ_bus_device &bus); diff --git a/src/devices/bus/intellec4/tapereader.cpp b/src/devices/bus/intellec4/tapereader.cpp index 3f77933b95f..ef42f617832 100644 --- a/src/devices/bus/intellec4/tapereader.cpp +++ b/src/devices/bus/intellec4/tapereader.cpp @@ -41,7 +41,7 @@ private: u8 rom6_in() { return ~m_data & 0x0fU; } u8 rom7_in() { return (~m_data >> 4) & 0x0fU; } void rom4_out(u8 data) { advance(BIT(data, 3)); } - DECLARE_WRITE_LINE_MEMBER(advance); + void advance(int state); TIMER_CALLBACK_MEMBER(step); emu_timer *m_step_timer; @@ -99,7 +99,7 @@ void imm4_90_device::device_start() } -DECLARE_WRITE_LINE_MEMBER(imm4_90_device::advance) +void imm4_90_device::advance(int state) { // this is edge-sensitive - CPU sends the narrowest pulse it can if (!m_advance && !bool(state) && !m_stepping) diff --git a/src/devices/bus/interpro/keyboard/hle.cpp b/src/devices/bus/interpro/keyboard/hle.cpp index 8d773a9fa85..9f2ddacdc39 100644 --- a/src/devices/bus/interpro/keyboard/hle.cpp +++ b/src/devices/bus/interpro/keyboard/hle.cpp @@ -272,7 +272,7 @@ hle_device_base::~hle_device_base() { } -WRITE_LINE_MEMBER(hle_device_base::input_txd) +void hle_device_base::input_txd(int state) { device_buffered_serial_interface::rx_w(state); } diff --git a/src/devices/bus/interpro/keyboard/hle.h b/src/devices/bus/interpro/keyboard/hle.h index 607b7b42087..ed50fafc956 100644 --- a/src/devices/bus/interpro/keyboard/hle.h +++ b/src/devices/bus/interpro/keyboard/hle.h @@ -21,7 +21,7 @@ class hle_device_base public: virtual ~hle_device_base() override; - virtual DECLARE_WRITE_LINE_MEMBER(input_txd) override; + virtual void input_txd(int state) override; protected: // constructor/destructor diff --git a/src/devices/bus/interpro/keyboard/keyboard.cpp b/src/devices/bus/interpro/keyboard/keyboard.cpp index 2e31ee7e258..fd3b694fc4a 100644 --- a/src/devices/bus/interpro/keyboard/keyboard.cpp +++ b/src/devices/bus/interpro/keyboard/keyboard.cpp @@ -27,7 +27,7 @@ void interpro_keyboard_port_device::device_start() m_rxd_handler.resolve_safe(); } -WRITE_LINE_MEMBER(interpro_keyboard_port_device::write_txd) +void interpro_keyboard_port_device::write_txd(int state) { if (m_dev) m_dev->input_txd(state); diff --git a/src/devices/bus/interpro/keyboard/keyboard.h b/src/devices/bus/interpro/keyboard/keyboard.h index a51c254d7f8..55ad0f95326 100644 --- a/src/devices/bus/interpro/keyboard/keyboard.h +++ b/src/devices/bus/interpro/keyboard/keyboard.h @@ -28,7 +28,7 @@ public: auto rxd_handler_cb() { return m_rxd_handler.bind(); } // input lines - DECLARE_WRITE_LINE_MEMBER(write_txd); + void write_txd(int state); protected: virtual void device_start() override; @@ -46,8 +46,8 @@ class device_interpro_keyboard_port_interface : public device_interface public: // input lines - virtual DECLARE_WRITE_LINE_MEMBER(input_txd) = 0; - DECLARE_WRITE_LINE_MEMBER(output_rxd) { m_port->m_rxd_handler(state); } + virtual void input_txd(int state) = 0; + void output_rxd(int state) { m_port->m_rxd_handler(state); } protected: device_interpro_keyboard_port_interface(machine_config const &mconfig, device_t &device); diff --git a/src/devices/bus/interpro/keyboard/lle.cpp b/src/devices/bus/interpro/keyboard/lle.cpp index 49084977d15..11deb78f137 100644 --- a/src/devices/bus/interpro/keyboard/lle.cpp +++ b/src/devices/bus/interpro/keyboard/lle.cpp @@ -486,7 +486,7 @@ void lle_device_base::ext_map(address_map &map) }, "write"); } -READ_LINE_MEMBER(lle_device_base::t0_r) +int lle_device_base::t0_r() { if ((VERBOSE & LOG_RXTX) && (m_mcu->pc() == 0x8e) && m_txd) { @@ -501,7 +501,7 @@ READ_LINE_MEMBER(lle_device_base::t0_r) return !m_txd; } -READ_LINE_MEMBER(lle_device_base::t1_r) +int lle_device_base::t1_r() { return BIT(m_lower[m_count >> 3]->read(), m_count & 0x7) ? ASSERT_LINE : CLEAR_LINE; } diff --git a/src/devices/bus/interpro/keyboard/lle.h b/src/devices/bus/interpro/keyboard/lle.h index 385f2484fab..ac9d0bc45fb 100644 --- a/src/devices/bus/interpro/keyboard/lle.h +++ b/src/devices/bus/interpro/keyboard/lle.h @@ -30,10 +30,10 @@ protected: virtual void io_map(address_map &map); virtual void ext_map(address_map &map); - DECLARE_WRITE_LINE_MEMBER(input_txd) override { m_txd = state; } + void input_txd(int state) override { m_txd = state; } - DECLARE_READ_LINE_MEMBER(t0_r); - DECLARE_READ_LINE_MEMBER(t1_r); + int t0_r(); + int t1_r(); void p1_w(u8 data); void p2_w(u8 data); u8 bus_r(); diff --git a/src/devices/bus/interpro/sr/edge.cpp b/src/devices/bus/interpro/sr/edge.cpp index 467f8f09444..45429a1e627 100644 --- a/src/devices/bus/interpro/sr/edge.cpp +++ b/src/devices/bus/interpro/sr/edge.cpp @@ -719,7 +719,7 @@ u32 mpcba63_device::screen_update(screen_device &screen, bitmap_rgb32 &bitmap, c return 0; } -WRITE_LINE_MEMBER(edge1_device_base::vblank) +void edge1_device_base::vblank(int state) { if (state) { @@ -779,7 +779,7 @@ void edge1_device_base::control_w(offs_t offset, u32 data, u32 mem_mask) m_dsp->set_input_line(TMS3203X_HOLD, ASSERT_LINE); } -WRITE_LINE_MEMBER(edge1_device_base::holda) +void edge1_device_base::holda(int state) { LOGMASKED(LOG_INTERRUPT, "hold acknowledge %d\n", state); @@ -811,7 +811,7 @@ void edge2plus_processor_device_base::control_w(offs_t offset, u32 data, u32 mem m_dsp1->set_input_line(TMS3203X_HOLD, ASSERT_LINE); } -WRITE_LINE_MEMBER(edge2plus_processor_device_base::holda) +void edge2plus_processor_device_base::holda(int state) { LOGMASKED(LOG_INTERRUPT, "hold acknowledge %d\n", state); @@ -854,7 +854,7 @@ void edge2plus_framebuffer_device_base::lut_select_w(u32 data) // lookup table 3 enables address range 92030000-92030fff, written with zeroes } -WRITE_LINE_MEMBER(edge1_device_base::scc_irq) +void edge1_device_base::scc_irq(int state) { if (state) m_reg0 |= SCC_INT; @@ -876,7 +876,7 @@ void edge1_device_base::kernel_w(offs_t offset, u32 data, u32 mem_mask) m_status |= KREG_IN_FULL; // FIXME: what clears this? } -WRITE_LINE_MEMBER(edge2plus_processor_device_base::scc_irq) +void edge2plus_processor_device_base::scc_irq(int state) { if (state) m_reg0 |= SCC_INT; diff --git a/src/devices/bus/interpro/sr/edge.h b/src/devices/bus/interpro/sr/edge.h index d96896dd187..1ab789174e8 100644 --- a/src/devices/bus/interpro/sr/edge.h +++ b/src/devices/bus/interpro/sr/edge.h @@ -17,8 +17,8 @@ class edge1_device_base : public device_t, public device_srx_card_interface { public: - DECLARE_WRITE_LINE_MEMBER(holda); - DECLARE_WRITE_LINE_MEMBER(vblank); + void holda(int state); + void vblank(int state); protected: edge1_device_base(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); @@ -29,7 +29,7 @@ protected: u32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(scc_irq); + void scc_irq(int state); u32 reg0_r(); void reg0_w(offs_t offset, u32 data, u32 mem_mask = ~0) { COMBINE_DATA(&m_reg0); } @@ -109,8 +109,8 @@ protected: virtual void device_start() override {} - DECLARE_WRITE_LINE_MEMBER(holda); - DECLARE_WRITE_LINE_MEMBER(scc_irq); + void holda(int state); + void scc_irq(int state); u32 control_r() { return m_control; } void control_w(offs_t offset, u32 data, u32 mem_mask = ~0); diff --git a/src/devices/bus/interpro/sr/gt.cpp b/src/devices/bus/interpro/sr/gt.cpp index b8e8772c3d4..bae9a72f739 100644 --- a/src/devices/bus/interpro/sr/gt.cpp +++ b/src/devices/bus/interpro/sr/gt.cpp @@ -1390,7 +1390,7 @@ void gtdb_device::srx_mapping_w(u32 data) m_bus->install_map(*this, srx_base, srx_base | 0xffffff, >db_device::map_dynamic); } -WRITE_LINE_MEMBER(gtdb_device::serial_irq) +void gtdb_device::serial_irq(int state) { if (state) m_mouse_int |= SERIAL; diff --git a/src/devices/bus/interpro/sr/gt.h b/src/devices/bus/interpro/sr/gt.h index aeeb70941ea..a48f3de698a 100644 --- a/src/devices/bus/interpro/sr/gt.h +++ b/src/devices/bus/interpro/sr/gt.h @@ -261,7 +261,7 @@ protected: virtual void map(address_map &map) override; virtual void map_dynamic(address_map &map); - DECLARE_WRITE_LINE_MEMBER(serial_irq); + void serial_irq(int state); void mouse_status_w(offs_t offset, u32 data, u32 mem_mask = ~0); void srx_mapping_w(u32 data); diff --git a/src/devices/bus/interpro/sr/sr.h b/src/devices/bus/interpro/sr/sr.h index 0d30905943b..f87d35b6171 100644 --- a/src/devices/bus/interpro/sr/sr.h +++ b/src/devices/bus/interpro/sr/sr.h @@ -19,10 +19,10 @@ public: auto out_irq2_cb() { return m_out_irq2_cb.bind(); } auto out_irq3_cb() { return m_out_irq3_cb.bind(); } - DECLARE_WRITE_LINE_MEMBER(irq0_w) { m_out_irq0_cb(state); } - DECLARE_WRITE_LINE_MEMBER(irq1_w) { m_out_irq1_cb(state); } - DECLARE_WRITE_LINE_MEMBER(irq2_w) { m_out_irq2_cb(state); } - DECLARE_WRITE_LINE_MEMBER(irq3_w) { m_out_irq3_cb(state); } + void irq0_w(int state) { m_out_irq0_cb(state); } + void irq1_w(int state) { m_out_irq1_cb(state); } + void irq2_w(int state) { m_out_irq2_cb(state); } + void irq3_w(int state) { m_out_irq3_cb(state); } protected: // construction/destruction @@ -126,10 +126,10 @@ protected: friend class cbus_slot_device; public: - DECLARE_WRITE_LINE_MEMBER(irq0) { m_bus->irq0_w(state); } - DECLARE_WRITE_LINE_MEMBER(irq1) { m_bus->irq1_w(state); } - DECLARE_WRITE_LINE_MEMBER(irq2) { m_bus->irq2_w(state); } - DECLARE_WRITE_LINE_MEMBER(irq3) { m_bus->irq3_w(state); } + void irq0(int state) { m_bus->irq0_w(state); } + void irq1(int state) { m_bus->irq1_w(state); } + void irq2(int state) { m_bus->irq2_w(state); } + void irq3(int state) { m_bus->irq3_w(state); } protected: device_cbus_card_interface(const machine_config &mconfig, device_t &device, const char *idprom_region = "idprom") @@ -238,10 +238,10 @@ protected: friend class srx_slot_device; public: - DECLARE_WRITE_LINE_MEMBER(irq0) { m_bus->irq0_w(state); } - DECLARE_WRITE_LINE_MEMBER(irq1) { m_bus->irq1_w(state); } - DECLARE_WRITE_LINE_MEMBER(irq2) { m_bus->irq2_w(state); } - DECLARE_WRITE_LINE_MEMBER(irq3) { m_bus->irq3_w(state); } + void irq0(int state) { m_bus->irq0_w(state); } + void irq1(int state) { m_bus->irq1_w(state); } + void irq2(int state) { m_bus->irq2_w(state); } + void irq3(int state) { m_bus->irq3_w(state); } protected: device_srx_card_interface(const machine_config &mconfig, device_t &device, const char *idprom_region = "idprom") diff --git a/src/devices/bus/isa/3c503.cpp b/src/devices/bus/isa/3c503.cpp index 8e95bb60220..041b403cabb 100644 --- a/src/devices/bus/isa/3c503.cpp +++ b/src/devices/bus/isa/3c503.cpp @@ -278,7 +278,7 @@ void el2_3c503_device::el2_3c503_hiport_w(offs_t offset, uint8_t data) { } } -WRITE_LINE_MEMBER(el2_3c503_device::el2_3c503_irq_w) { +void el2_3c503_device::el2_3c503_irq_w(int state) { m_irq_state = state; if(!(m_regs.gacfr & 0x80)) set_irq(state); } diff --git a/src/devices/bus/isa/aga.cpp b/src/devices/bus/isa/aga.cpp index 81e6ba053fe..daf44fa9750 100644 --- a/src/devices/bus/isa/aga.cpp +++ b/src/devices/bus/isa/aga.cpp @@ -205,13 +205,13 @@ void isa8_aga_pc200_device::device_start() gfx[i] = i; } -WRITE_LINE_MEMBER( isa8_aga_device::hsync_changed ) +void isa8_aga_device::hsync_changed(int state) { m_hsync = state ? 1 : 0; } -WRITE_LINE_MEMBER( isa8_aga_device::vsync_changed ) +void isa8_aga_device::vsync_changed(int state) { m_vsync = state ? 8 : 0; if (state) diff --git a/src/devices/bus/isa/aga.h b/src/devices/bus/isa/aga.h index b5f986e9a34..aa6aa16f5d0 100644 --- a/src/devices/bus/isa/aga.h +++ b/src/devices/bus/isa/aga.h @@ -62,8 +62,8 @@ protected: MC6845_UPDATE_ROW( cga_gfx_2bpp_update_row ); MC6845_UPDATE_ROW( cga_gfx_1bpp_update_row ); - DECLARE_WRITE_LINE_MEMBER( hsync_changed ); - DECLARE_WRITE_LINE_MEMBER( vsync_changed ); + void hsync_changed(int state); + void vsync_changed(int state); required_device m_palette; required_device m_mc6845; diff --git a/src/devices/bus/isa/aha1542b.cpp b/src/devices/bus/isa/aha1542b.cpp index bba0bb76d41..b61b6e59228 100644 --- a/src/devices/bus/isa/aha1542b.cpp +++ b/src/devices/bus/isa/aha1542b.cpp @@ -79,12 +79,12 @@ void aha1542a_device::scsi_rstreq_clear_w(u8 data) { } -READ_LINE_MEMBER(aha1542a_device::host_int_r) +int aha1542a_device::host_int_r() { return 0; } -READ_LINE_MEMBER(aha1542a_device::scsi_rstreq_r) +int aha1542a_device::scsi_rstreq_r() { return 0; } diff --git a/src/devices/bus/isa/aha1542b.h b/src/devices/bus/isa/aha1542b.h index c46f456bfe9..36ab1cf2094 100644 --- a/src/devices/bus/isa/aha1542b.h +++ b/src/devices/bus/isa/aha1542b.h @@ -41,8 +41,8 @@ public: static constexpr feature_type unemulated_features() { return feature::DISK; } - DECLARE_READ_LINE_MEMBER(host_int_r); - DECLARE_READ_LINE_MEMBER(scsi_rstreq_r); + int host_int_r(); + int scsi_rstreq_r(); protected: virtual ioport_constructor device_input_ports() const override; diff --git a/src/devices/bus/isa/asc88.cpp b/src/devices/bus/isa/asc88.cpp index 7bdb707f6a6..d809b4e4c8e 100644 --- a/src/devices/bus/isa/asc88.cpp +++ b/src/devices/bus/isa/asc88.cpp @@ -62,7 +62,7 @@ void asc88_device::device_reset() control_w(0); } -WRITE_LINE_MEMBER(asc88_device::irq_w) +void asc88_device::irq_w(int state) { if (m_irq != state) { @@ -76,7 +76,7 @@ WRITE_LINE_MEMBER(asc88_device::irq_w) } } -WRITE_LINE_MEMBER(asc88_device::drq_w) +void asc88_device::drq_w(int state) { if (m_drq != state) { diff --git a/src/devices/bus/isa/asc88.h b/src/devices/bus/isa/asc88.h index 8cfdd784b98..6b8a99f4b97 100644 --- a/src/devices/bus/isa/asc88.h +++ b/src/devices/bus/isa/asc88.h @@ -32,8 +32,8 @@ protected: virtual void dack_w(int line, u8 data) override; private: - DECLARE_WRITE_LINE_MEMBER(irq_w); - DECLARE_WRITE_LINE_MEMBER(drq_w); + void irq_w(int state); + void drq_w(int state); void control_w(u8 data); u8 eeprom_r(); diff --git a/src/devices/bus/isa/bblue2.cpp b/src/devices/bus/isa/bblue2.cpp index ad997664cc2..58ef846a897 100644 --- a/src/devices/bus/isa/bblue2.cpp +++ b/src/devices/bus/isa/bblue2.cpp @@ -244,7 +244,7 @@ void isa8_babyblue2_device::z80_control_w(offs_t offset, uint8_t data) } } -WRITE_LINE_MEMBER(isa8_babyblue2_device::lpt_irq) +void isa8_babyblue2_device::lpt_irq(int state) { if(m_h2->read() & 0x01) m_isa->irq5_w(state); diff --git a/src/devices/bus/isa/bblue2.h b/src/devices/bus/isa/bblue2.h index cdce099d883..a18e0a802b5 100644 --- a/src/devices/bus/isa/bblue2.h +++ b/src/devices/bus/isa/bblue2.h @@ -30,9 +30,9 @@ public: uint8_t z80_ram_r(offs_t offset) { return m_ram->read(offset); } void z80_ram_w(offs_t offset, uint8_t data) { m_ram->write(offset,data); } - DECLARE_WRITE_LINE_MEMBER(port1_irq) { m_isa->irq4_w(state); } - DECLARE_WRITE_LINE_MEMBER(port2_irq) { m_isa->irq3_w(state); } - DECLARE_WRITE_LINE_MEMBER(lpt_irq); + void port1_irq(int state) { m_isa->irq4_w(state); } + void port2_irq(int state) { m_isa->irq3_w(state); } + void lpt_irq(int state); protected: // device-level overrides virtual void device_start() override; diff --git a/src/devices/bus/isa/cga.cpp b/src/devices/bus/isa/cga.cpp index 77595bbbfb0..c431772bcb9 100644 --- a/src/devices/bus/isa/cga.cpp +++ b/src/devices/bus/isa/cga.cpp @@ -692,7 +692,7 @@ MC6845_UPDATE_ROW( isa8_cga_device::cga_gfx_1bpp_update_row ) } -WRITE_LINE_MEMBER( isa8_cga_device::hsync_changed ) +void isa8_cga_device::hsync_changed(int state) { m_hsync = state ? 1 : 0; if(state && !m_vsync) @@ -703,7 +703,7 @@ WRITE_LINE_MEMBER( isa8_cga_device::hsync_changed ) } -WRITE_LINE_MEMBER( isa8_cga_device::vsync_changed ) +void isa8_cga_device::vsync_changed(int state) { if ( state ) { diff --git a/src/devices/bus/isa/cga.h b/src/devices/bus/isa/cga.h index 029dc35095f..a5307fb815e 100644 --- a/src/devices/bus/isa/cga.h +++ b/src/devices/bus/isa/cga.h @@ -55,8 +55,8 @@ protected: virtual uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER( hsync_changed ); - DECLARE_WRITE_LINE_MEMBER( vsync_changed ); + void hsync_changed(int state); + void vsync_changed(int state); public: void mode_control_w(uint8_t data); diff --git a/src/devices/bus/isa/com.h b/src/devices/bus/isa/com.h index ff7b5e4eef8..0f77156f004 100644 --- a/src/devices/bus/isa/com.h +++ b/src/devices/bus/isa/com.h @@ -22,8 +22,8 @@ public: // construction/destruction isa8_com_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - DECLARE_WRITE_LINE_MEMBER(pc_com_interrupt_1) { m_isa->irq4_w(state); } - DECLARE_WRITE_LINE_MEMBER(pc_com_interrupt_2) { m_isa->irq3_w(state); } + void pc_com_interrupt_1(int state) { m_isa->irq4_w(state); } + void pc_com_interrupt_2(int state) { m_isa->irq3_w(state); } protected: isa8_com_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); diff --git a/src/devices/bus/isa/dectalk.cpp b/src/devices/bus/isa/dectalk.cpp index 9312d063158..a66896f51a4 100644 --- a/src/devices/bus/isa/dectalk.cpp +++ b/src/devices/bus/isa/dectalk.cpp @@ -98,7 +98,7 @@ void dectalk_isa_device::dsp_dma_w(uint16_t data) m_dsp_dma = data; } -READ_LINE_MEMBER(dectalk_isa_device::bio_line_r) +int dectalk_isa_device::bio_line_r() { // TODO: reading the bio line doesn't cause any direct external effects so this is wrong if(m_bio == ASSERT_LINE) @@ -111,7 +111,7 @@ void dectalk_isa_device::irq_line_w(uint16_t data) m_cpu->int1_w(0); } -WRITE_LINE_MEMBER(dectalk_isa_device::clock_w) +void dectalk_isa_device::clock_w(int state) { m_dsp->set_input_line(INPUT_LINE_IRQ0, (!(m_ctl & 0x20) || state) ? CLEAR_LINE : ASSERT_LINE); } diff --git a/src/devices/bus/isa/dectalk.h b/src/devices/bus/isa/dectalk.h index 674efa91d5d..ac153d4b1e5 100644 --- a/src/devices/bus/isa/dectalk.h +++ b/src/devices/bus/isa/dectalk.h @@ -26,8 +26,8 @@ protected: virtual void device_add_mconfig(machine_config &config) override; private: - DECLARE_READ_LINE_MEMBER(bio_line_r); - DECLARE_WRITE_LINE_MEMBER(clock_w); + int bio_line_r(); + void clock_w(int state); void write(offs_t offset, uint8_t data); uint8_t read(offs_t offset); diff --git a/src/devices/bus/isa/ega.cpp b/src/devices/bus/isa/ega.cpp index 1aca9ba7cb2..e1b2a8c3b26 100644 --- a/src/devices/bus/isa/ega.cpp +++ b/src/devices/bus/isa/ega.cpp @@ -764,19 +764,19 @@ CRTC_EGA_PIXEL_UPDATE( isa8_ega_device::ega_update_row ) } -WRITE_LINE_MEMBER( isa8_ega_device::de_changed ) +void isa8_ega_device::de_changed(int state) { m_display_enable = state ? 1 : 0; } -WRITE_LINE_MEMBER( isa8_ega_device::hsync_changed ) +void isa8_ega_device::hsync_changed(int state) { m_hsync = state ? 1 : 0; } -WRITE_LINE_MEMBER( isa8_ega_device::vsync_changed ) +void isa8_ega_device::vsync_changed(int state) { m_vsync = state ? 1 : 0; if ( state ) @@ -786,7 +786,7 @@ WRITE_LINE_MEMBER( isa8_ega_device::vsync_changed ) } -WRITE_LINE_MEMBER( isa8_ega_device::vblank_changed ) +void isa8_ega_device::vblank_changed(int state) { m_vblank = state ? 8 : 0; } diff --git a/src/devices/bus/isa/ega.h b/src/devices/bus/isa/ega.h index cea8667ba8e..71b63809d5e 100644 --- a/src/devices/bus/isa/ega.h +++ b/src/devices/bus/isa/ega.h @@ -50,10 +50,10 @@ protected: uint8_t alu_op( uint8_t data, uint8_t latch_data ); private: - DECLARE_WRITE_LINE_MEMBER(de_changed); - DECLARE_WRITE_LINE_MEMBER(hsync_changed); - DECLARE_WRITE_LINE_MEMBER(vsync_changed); - DECLARE_WRITE_LINE_MEMBER(vblank_changed); + void de_changed(int state); + void hsync_changed(int state); + void vsync_changed(int state); + void vblank_changed(int state); CRTC_EGA_PIXEL_UPDATE(ega_update_row); diff --git a/src/devices/bus/isa/eis_hgb107x.cpp b/src/devices/bus/isa/eis_hgb107x.cpp index ed3100c3e97..a42eb4aaddb 100644 --- a/src/devices/bus/isa/eis_hgb107x.cpp +++ b/src/devices/bus/isa/eis_hgb107x.cpp @@ -351,13 +351,13 @@ uint8_t isa8_epc_mda_device::io_read(offs_t offset) return data; } -WRITE_LINE_MEMBER( isa8_epc_mda_device::hsync_changed ) +void isa8_epc_mda_device::hsync_changed(int state) { m_hsync = state ? 1 : 0; } -WRITE_LINE_MEMBER( isa8_epc_mda_device::vsync_changed ) +void isa8_epc_mda_device::vsync_changed(int state) { m_vsync = state ? 0x80 : 0; if ( state ) diff --git a/src/devices/bus/isa/eis_hgb107x.h b/src/devices/bus/isa/eis_hgb107x.h index 6689e7db0a8..4a2d3391ce3 100644 --- a/src/devices/bus/isa/eis_hgb107x.h +++ b/src/devices/bus/isa/eis_hgb107x.h @@ -24,8 +24,8 @@ public: void io_write(offs_t offset, uint8_t data); uint8_t status_r(); void mode_control_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(hsync_changed); - DECLARE_WRITE_LINE_MEMBER(vsync_changed); + void hsync_changed(int state); + void vsync_changed(int state); /* Monitor */ DECLARE_INPUT_CHANGED_MEMBER(monitor_changed); diff --git a/src/devices/bus/isa/ex1280.cpp b/src/devices/bus/isa/ex1280.cpp index 2d9153616e9..d96b9d74d53 100644 --- a/src/devices/bus/isa/ex1280.cpp +++ b/src/devices/bus/isa/ex1280.cpp @@ -193,7 +193,7 @@ TMS340X0_FROM_SHIFTREG_CB_MEMBER(isa16_ex1280_device::from_shiftreg) // vblank_w - toggle vblank bit(?) //------------------------------------------------- -WRITE_LINE_MEMBER(isa16_ex1280_device::vblank_w) +void isa16_ex1280_device::vblank_w(int state) { //m_flags &= ~(1 << 1); //m_flags |= (state << 1); diff --git a/src/devices/bus/isa/ex1280.h b/src/devices/bus/isa/ex1280.h index a9637a1b1f6..d8c492a1908 100644 --- a/src/devices/bus/isa/ex1280.h +++ b/src/devices/bus/isa/ex1280.h @@ -39,7 +39,7 @@ protected: void vram_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); uint16_t regs_r(offs_t offset, uint16_t mem_mask = ~0); void regs_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); - DECLARE_WRITE_LINE_MEMBER(vblank_w); + void vblank_w(int state); required_device m_cpu; required_device m_ramdac; diff --git a/src/devices/bus/isa/fdc.cpp b/src/devices/bus/isa/fdc.cpp index a08ec8b899a..66f3a403e71 100644 --- a/src/devices/bus/isa/fdc.cpp +++ b/src/devices/bus/isa/fdc.cpp @@ -46,12 +46,12 @@ isa8_fdc_device::isa8_fdc_device(const machine_config &mconfig, device_type type { } -WRITE_LINE_MEMBER( isa8_fdc_device::irq_w ) +void isa8_fdc_device::irq_w(int state) { m_isa->irq6_w(state ? ASSERT_LINE : CLEAR_LINE); } -WRITE_LINE_MEMBER( isa8_fdc_device::drq_w ) +void isa8_fdc_device::drq_w(int state) { m_isa->drq2_w(state ? ASSERT_LINE : CLEAR_LINE); } @@ -148,13 +148,13 @@ uint8_t isa8_upd765_fdc_device::dir_r() return 0x00; } -WRITE_LINE_MEMBER(isa8_upd765_fdc_device::fdc_irq_w) +void isa8_upd765_fdc_device::fdc_irq_w(int state) { fdc_irq = state; check_irq(); } -WRITE_LINE_MEMBER(isa8_upd765_fdc_device::fdc_drq_w) +void isa8_upd765_fdc_device::fdc_drq_w(int state) { fdc_drq = state; check_drq(); @@ -325,7 +325,7 @@ void isa8_ec1841_0003_device::device_start() m_isa->install_device(0x023c, 0x023f, *m_bus_mouse, &bus_mouse_device::map); } -WRITE_LINE_MEMBER( isa8_ec1841_0003_device::aux_irq_w ) +void isa8_ec1841_0003_device::aux_irq_w(int state) { m_isa->irq4_w(state ? ASSERT_LINE : CLEAR_LINE); } diff --git a/src/devices/bus/isa/fdc.h b/src/devices/bus/isa/fdc.h index 00431ef3e5c..5bf094b2dce 100644 --- a/src/devices/bus/isa/fdc.h +++ b/src/devices/bus/isa/fdc.h @@ -26,8 +26,8 @@ class isa8_fdc_device : public device_isa8_card_interface { public: - DECLARE_WRITE_LINE_MEMBER( irq_w ); - DECLARE_WRITE_LINE_MEMBER( drq_w ); + void irq_w(int state); + void drq_w(int state); static void floppy_formats(format_registration &fr); protected: @@ -57,8 +57,8 @@ protected: uint8_t dir_r(); void ccr_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER( fdc_irq_w ); - DECLARE_WRITE_LINE_MEMBER( fdc_drq_w ); + void fdc_irq_w(int state); + void fdc_drq_w(int state); private: bool irq, drq, fdc_drq, fdc_irq; @@ -135,7 +135,7 @@ protected: virtual void device_start() override; virtual void device_add_mconfig(machine_config &config) override; - DECLARE_WRITE_LINE_MEMBER( aux_irq_w ); + void aux_irq_w(int state); required_device m_bus_mouse; }; diff --git a/src/devices/bus/isa/gus.cpp b/src/devices/bus/isa/gus.cpp index 7884ac37c8d..becce41d29a 100644 --- a/src/devices/bus/isa/gus.cpp +++ b/src/devices/bus/isa/gus.cpp @@ -1467,7 +1467,7 @@ void isa16_gus_device::joy_w(offs_t offset, uint8_t data) m_joy_time = machine().time(); } -WRITE_LINE_MEMBER(isa16_gus_device::wavetable_irq) +void isa16_gus_device::wavetable_irq(int state) { if(state) set_irq(IRQ_WAVETABLE); @@ -1475,7 +1475,7 @@ WRITE_LINE_MEMBER(isa16_gus_device::wavetable_irq) reset_irq(IRQ_WAVETABLE); } -WRITE_LINE_MEMBER(isa16_gus_device::volumeramp_irq) +void isa16_gus_device::volumeramp_irq(int state) { if(state) set_irq(IRQ_VOLUME_RAMP); @@ -1483,7 +1483,7 @@ WRITE_LINE_MEMBER(isa16_gus_device::volumeramp_irq) reset_irq(IRQ_VOLUME_RAMP); } -WRITE_LINE_MEMBER(isa16_gus_device::timer1_irq) +void isa16_gus_device::timer1_irq(int state) { if(state) set_irq(IRQ_TIMER1); @@ -1491,7 +1491,7 @@ WRITE_LINE_MEMBER(isa16_gus_device::timer1_irq) reset_irq(IRQ_TIMER1); } -WRITE_LINE_MEMBER(isa16_gus_device::timer2_irq) +void isa16_gus_device::timer2_irq(int state) { if(state) set_irq(IRQ_TIMER2); @@ -1499,7 +1499,7 @@ WRITE_LINE_MEMBER(isa16_gus_device::timer2_irq) reset_irq(IRQ_TIMER2); } -WRITE_LINE_MEMBER(isa16_gus_device::dma_irq) +void isa16_gus_device::dma_irq(int state) { if(state) set_irq(IRQ_DRAM_TC_DMA); @@ -1507,7 +1507,7 @@ WRITE_LINE_MEMBER(isa16_gus_device::dma_irq) reset_irq(IRQ_DRAM_TC_DMA); } -WRITE_LINE_MEMBER(isa16_gus_device::sb_irq) +void isa16_gus_device::sb_irq(int state) { if(state) set_midi_irq(IRQ_SB); @@ -1515,7 +1515,7 @@ WRITE_LINE_MEMBER(isa16_gus_device::sb_irq) reset_midi_irq(IRQ_SB); } -WRITE_LINE_MEMBER(isa16_gus_device::drq1_w) +void isa16_gus_device::drq1_w(int state) { m_isa->set_dma_channel(m_gf1->dma_channel1(), this, true); switch(m_gf1->dma_channel1()) @@ -1540,7 +1540,7 @@ WRITE_LINE_MEMBER(isa16_gus_device::drq1_w) } } -WRITE_LINE_MEMBER(isa16_gus_device::drq2_w) +void isa16_gus_device::drq2_w(int state) { m_isa->set_dma_channel(m_gf1->dma_channel2(), this, true); switch(m_gf1->dma_channel2()) @@ -1689,7 +1689,7 @@ void isa16_gus_device::reset_midi_irq(uint8_t source) logerror("GUS: Reset MIDI IRQ %02x\n",source); } -WRITE_LINE_MEMBER( isa16_gus_device::midi_txirq ) +void isa16_gus_device::midi_txirq(int state) { if (state) set_midi_irq(IRQ_MIDI_TRANSMIT); @@ -1697,7 +1697,7 @@ WRITE_LINE_MEMBER( isa16_gus_device::midi_txirq ) reset_midi_irq(IRQ_MIDI_TRANSMIT | IRQ_MIDI_RECEIVE); } -WRITE_LINE_MEMBER( isa16_gus_device::midi_rxirq ) +void isa16_gus_device::midi_rxirq(int state) { if (state) set_midi_irq(IRQ_MIDI_RECEIVE); @@ -1705,13 +1705,13 @@ WRITE_LINE_MEMBER( isa16_gus_device::midi_rxirq ) reset_midi_irq(IRQ_MIDI_TRANSMIT | IRQ_MIDI_RECEIVE); } -WRITE_LINE_MEMBER( isa16_gus_device::write_acia_clock ) +void isa16_gus_device::write_acia_clock(int state) { m_gf1->write_txc(state); m_gf1->write_rxc(state); } -WRITE_LINE_MEMBER( isa16_gus_device::nmi_w) +void isa16_gus_device::nmi_w(int state) { m_irq_status |= IRQ_SB; m_isa->nmi(); diff --git a/src/devices/bus/isa/gus.h b/src/devices/bus/isa/gus.h index c39695997da..9f652fd8ccb 100644 --- a/src/devices/bus/isa/gus.h +++ b/src/devices/bus/isa/gus.h @@ -253,18 +253,18 @@ protected: virtual ioport_constructor device_input_ports() const override; private: - DECLARE_WRITE_LINE_MEMBER(midi_txirq); - DECLARE_WRITE_LINE_MEMBER(midi_rxirq); - DECLARE_WRITE_LINE_MEMBER(wavetable_irq); - DECLARE_WRITE_LINE_MEMBER(volumeramp_irq); - DECLARE_WRITE_LINE_MEMBER(timer1_irq); - DECLARE_WRITE_LINE_MEMBER(timer2_irq); - DECLARE_WRITE_LINE_MEMBER(sb_irq); - DECLARE_WRITE_LINE_MEMBER(dma_irq); - DECLARE_WRITE_LINE_MEMBER(drq1_w); - DECLARE_WRITE_LINE_MEMBER(drq2_w); - DECLARE_WRITE_LINE_MEMBER(nmi_w); - DECLARE_WRITE_LINE_MEMBER(write_acia_clock); + void midi_txirq(int state); + void midi_rxirq(int state); + void wavetable_irq(int state); + void volumeramp_irq(int state); + void timer1_irq(int state); + void timer2_irq(int state); + void sb_irq(int state); + void dma_irq(int state); + void drq1_w(int state); + void drq2_w(int state); + void nmi_w(int state); + void write_acia_clock(int state); required_device m_gf1; diff --git a/src/devices/bus/isa/hdc.cpp b/src/devices/bus/isa/hdc.cpp index 58e2d6452c6..9ba9f3c9f6c 100644 --- a/src/devices/bus/isa/hdc.cpp +++ b/src/devices/bus/isa/hdc.cpp @@ -1076,7 +1076,7 @@ uint8_t isa8_hdc_device::pc_hdc_dipswitch_r() return m_dip; } -WRITE_LINE_MEMBER(isa8_hdc_device::irq_w) +void isa8_hdc_device::irq_w(int state) { if (BIT(m_dip, 6)) m_isa->irq5_w(state); @@ -1084,7 +1084,7 @@ WRITE_LINE_MEMBER(isa8_hdc_device::irq_w) m_isa->irq2_w(state); } -WRITE_LINE_MEMBER(isa8_hdc_device::drq_w) +void isa8_hdc_device::drq_w(int state) { m_isa->drq3_w(state); } diff --git a/src/devices/bus/isa/hdc.h b/src/devices/bus/isa/hdc.h index 72a63836498..059424fbb9e 100644 --- a/src/devices/bus/isa/hdc.h +++ b/src/devices/bus/isa/hdc.h @@ -159,8 +159,8 @@ protected: virtual const tiny_rom_entry *device_rom_region() const override; virtual ioport_constructor device_input_ports() const override; - DECLARE_WRITE_LINE_MEMBER(irq_w); - DECLARE_WRITE_LINE_MEMBER(drq_w); + void irq_w(int state); + void drq_w(int state); public: virtual uint8_t dack_r(int line) override; diff --git a/src/devices/bus/isa/hpblp.cpp b/src/devices/bus/isa/hpblp.cpp index 1caa07c9b08..40c98d77a44 100644 --- a/src/devices/bus/isa/hpblp.cpp +++ b/src/devices/bus/isa/hpblp.cpp @@ -258,7 +258,7 @@ void isa8_hpblp_device::update_gpib_irq() m_maincpu->set_input_line(M68K_IRQ_3, CLEAR_LINE); } -WRITE_LINE_MEMBER(isa8_hpblp_device::gpib_irq) +void isa8_hpblp_device::gpib_irq(int state) { if (state) { m_gpib_reg1 |= 0x40; @@ -276,7 +276,7 @@ void isa8_hpblp_device::m68map(address_map &map) map(0xc00000, 0xffffff).ram(); } -WRITE_LINE_MEMBER(isa8_hpblp_device::hpblp_interrupt) +void isa8_hpblp_device::hpblp_interrupt(int state) { switch(m_irq) { case 0: diff --git a/src/devices/bus/isa/hpblp.h b/src/devices/bus/isa/hpblp.h index f5166ac550e..10f9c2ea0cf 100644 --- a/src/devices/bus/isa/hpblp.h +++ b/src/devices/bus/isa/hpblp.h @@ -52,11 +52,11 @@ private: static uint8_t status_val(offs_t offset); - DECLARE_WRITE_LINE_MEMBER(hpblp_interrupt); + void hpblp_interrupt(int state); TIMER_CALLBACK_MEMBER(timer10ms); // M68000 part - DECLARE_WRITE_LINE_MEMBER(gpib_irq); + void gpib_irq(int state); void m68map(address_map &map); uint16_t bus_r(offs_t offset, uint16_t mem_mask); diff --git a/src/devices/bus/isa/ibm_mfc.cpp b/src/devices/bus/isa/ibm_mfc.cpp index a6dbfc81efa..9f57836fd3e 100644 --- a/src/devices/bus/isa/ibm_mfc.cpp +++ b/src/devices/bus/isa/ibm_mfc.cpp @@ -235,13 +235,13 @@ void isa8_ibm_mfc_device::ppi1_o_c(uint8_t data) // D8253 PIT //------------------------------------------------- -WRITE_LINE_MEMBER( isa8_ibm_mfc_device::d8253_out0 ) +void isa8_ibm_mfc_device::d8253_out0(int state) { if (m_tcr & TCR_TAE) set_pc_interrupt(PC_IRQ_TIMERA, 1); } -WRITE_LINE_MEMBER( isa8_ibm_mfc_device::d8253_out1 ) +void isa8_ibm_mfc_device::d8253_out1(int state) { if (m_tcr & TCR_TBE) set_pc_interrupt(PC_IRQ_TIMERB, 1); @@ -252,7 +252,7 @@ WRITE_LINE_MEMBER( isa8_ibm_mfc_device::d8253_out1 ) // uPD71051 USART //------------------------------------------------- -WRITE_LINE_MEMBER( isa8_ibm_mfc_device::write_usart_clock ) +void isa8_ibm_mfc_device::write_usart_clock(int state) { m_d71051->write_txc(state); m_d71051->write_rxc(state); @@ -263,7 +263,7 @@ WRITE_LINE_MEMBER( isa8_ibm_mfc_device::write_usart_clock ) //------------------------------------------------- -WRITE_LINE_MEMBER(isa8_ibm_mfc_device::ibm_mfc_ym_irq) +void isa8_ibm_mfc_device::ibm_mfc_ym_irq(int state) { set_z80_interrupt(Z80_IRQ_YM, state); } diff --git a/src/devices/bus/isa/ibm_mfc.h b/src/devices/bus/isa/ibm_mfc.h index c6efe79d0da..4af1acdfe1e 100644 --- a/src/devices/bus/isa/ibm_mfc.h +++ b/src/devices/bus/isa/ibm_mfc.h @@ -52,12 +52,12 @@ private: void ppi1_o_c(uint8_t data); - DECLARE_WRITE_LINE_MEMBER( d8253_out0 ); - DECLARE_WRITE_LINE_MEMBER( d8253_out1 ); + void d8253_out0(int state); + void d8253_out1(int state); - DECLARE_WRITE_LINE_MEMBER( write_usart_clock ); + void write_usart_clock(int state); - DECLARE_WRITE_LINE_MEMBER( ibm_mfc_ym_irq ); + void ibm_mfc_ym_irq(int state); uint8_t ibm_mfc_r(offs_t offset); void ibm_mfc_w(offs_t offset, uint8_t data); diff --git a/src/devices/bus/isa/ibm_speech.cpp b/src/devices/bus/isa/ibm_speech.cpp index 1052d2c8860..59c45fcaa19 100644 --- a/src/devices/bus/isa/ibm_speech.cpp +++ b/src/devices/bus/isa/ibm_speech.cpp @@ -328,7 +328,7 @@ void isa8_ibm_speech_device::channel_mux_w(uint8_t data) } } -WRITE_LINE_MEMBER(isa8_ibm_speech_device::lpc_interrupt_w) +void isa8_ibm_speech_device::lpc_interrupt_w(int state) { // Active low. @@ -365,7 +365,7 @@ WRITE_LINE_MEMBER(isa8_ibm_speech_device::lpc_interrupt_w) - ZM12 serial clock - PPI PORTC.3 ******************************************************************************/ -WRITE_LINE_MEMBER(isa8_ibm_speech_device::cvsd_clock_w) +void isa8_ibm_speech_device::cvsd_clock_w(int state) { m_cvsd_clock = state; @@ -387,7 +387,7 @@ WRITE_LINE_MEMBER(isa8_ibm_speech_device::cvsd_clock_w) This signal goes low for one clock every 8 CVSD bit clocks, which specifies how often a new byte gets latched into the CVSD shift register. ******************************************************************************/ -WRITE_LINE_MEMBER(isa8_ibm_speech_device::cvsd_frame_w) +void isa8_ibm_speech_device::cvsd_frame_w(int state) { // PIT CH1 is the CVSD FRAME signal. LOGMASKED(LOG_CVSD, "*** CVSD frame going %s\n", (state ? "high" : "low")); @@ -408,7 +408,7 @@ WRITE_LINE_MEMBER(isa8_ibm_speech_device::cvsd_frame_w) When INT_ENA is asserted, pulses IRQ7 when the 5220 raises an IRQ. When INT_ENA is cleared, the timer acts as a PC speaker-style beeper. ******************************************************************************/ -WRITE_LINE_MEMBER(isa8_ibm_speech_device::int_clock_w) +void isa8_ibm_speech_device::int_clock_w(int state) { if(!m_acl_int_ena) { @@ -421,7 +421,7 @@ WRITE_LINE_MEMBER(isa8_ibm_speech_device::int_clock_w) /****************************************************************************** CVSD Shift Register ******************************************************************************/ -WRITE_LINE_MEMBER(isa8_ibm_speech_device::cvsd_shiftreg_clk_w) +void isa8_ibm_speech_device::cvsd_shiftreg_clk_w(int state) { // If rising edge of the inverted signal... if(!m_sr_clk && state) diff --git a/src/devices/bus/isa/ibm_speech.h b/src/devices/bus/isa/ibm_speech.h index 92bb483b280..7e33fdb1c04 100644 --- a/src/devices/bus/isa/ibm_speech.h +++ b/src/devices/bus/isa/ibm_speech.h @@ -44,11 +44,11 @@ private: required_device m_speaker; required_region_ptr m_rom; - DECLARE_WRITE_LINE_MEMBER(cvsd_clock_w); // PIT CH0 - DECLARE_WRITE_LINE_MEMBER(cvsd_frame_w); // PIT CH1 - DECLARE_WRITE_LINE_MEMBER(int_clock_w); // PIT CH2 - DECLARE_WRITE_LINE_MEMBER(lpc_interrupt_w); // 5220 INT# - DECLARE_WRITE_LINE_MEMBER(cvsd_shiftreg_clk_w); // SRCLK + void cvsd_clock_w(int state); // PIT CH0 + void cvsd_frame_w(int state); // PIT CH1 + void int_clock_w(int state); // PIT CH2 + void lpc_interrupt_w(int state); // 5220 INT# + void cvsd_shiftreg_clk_w(int state); // SRCLK uint8_t porta_r(); uint8_t portc_r(); diff --git a/src/devices/bus/isa/ide.cpp b/src/devices/bus/isa/ide.cpp index 656995add4e..9565851fafc 100644 --- a/src/devices/bus/isa/ide.cpp +++ b/src/devices/bus/isa/ide.cpp @@ -35,7 +35,7 @@ void isa16_ide_device::alt_map(address_map &map) map(0x6, 0x6).rw(FUNC(isa16_ide_device::ide16_alt_r), FUNC(isa16_ide_device::ide16_alt_w)); } -WRITE_LINE_MEMBER(isa16_ide_device::ide_interrupt) +void isa16_ide_device::ide_interrupt(int state) { if (is_primary()) { diff --git a/src/devices/bus/isa/ide.h b/src/devices/bus/isa/ide.h index 5cdccca6d90..326b4c396cd 100644 --- a/src/devices/bus/isa/ide.h +++ b/src/devices/bus/isa/ide.h @@ -33,7 +33,7 @@ protected: virtual ioport_constructor device_input_ports() const override; private: - DECLARE_WRITE_LINE_MEMBER(ide_interrupt); + void ide_interrupt(int state); uint8_t ide16_alt_r(); void ide16_alt_w(uint8_t data); bool is_primary() { return m_is_primary; } diff --git a/src/devices/bus/isa/isa.cpp b/src/devices/bus/isa/isa.cpp index 5eae8ab0244..5ddfde0823e 100644 --- a/src/devices/bus/isa/isa.cpp +++ b/src/devices/bus/isa/isa.cpp @@ -401,17 +401,17 @@ void isa8_device::unmap_readwrite(offs_t start, offs_t end) } // interrupt request from isa card -WRITE_LINE_MEMBER( isa8_device::irq2_w ) { m_out_irq2_cb(state); } -WRITE_LINE_MEMBER( isa8_device::irq3_w ) { m_out_irq3_cb(state); } -WRITE_LINE_MEMBER( isa8_device::irq4_w ) { m_out_irq4_cb(state); } -WRITE_LINE_MEMBER( isa8_device::irq5_w ) { m_out_irq5_cb(state); } -WRITE_LINE_MEMBER( isa8_device::irq6_w ) { m_out_irq6_cb(state); } -WRITE_LINE_MEMBER( isa8_device::irq7_w ) { m_out_irq7_cb(state); } +void isa8_device::irq2_w(int state) { m_out_irq2_cb(state); } +void isa8_device::irq3_w(int state) { m_out_irq3_cb(state); } +void isa8_device::irq4_w(int state) { m_out_irq4_cb(state); } +void isa8_device::irq5_w(int state) { m_out_irq5_cb(state); } +void isa8_device::irq6_w(int state) { m_out_irq6_cb(state); } +void isa8_device::irq7_w(int state) { m_out_irq7_cb(state); } // dma request from isa card -WRITE_LINE_MEMBER( isa8_device::drq1_w ) { m_out_drq1_cb(state); } -WRITE_LINE_MEMBER( isa8_device::drq2_w ) { m_out_drq2_cb(state); } -WRITE_LINE_MEMBER( isa8_device::drq3_w ) { m_out_drq3_cb(state); } +void isa8_device::drq1_w(int state) { m_out_drq1_cb(state); } +void isa8_device::drq2_w(int state) { m_out_drq2_cb(state); } +void isa8_device::drq3_w(int state) { m_out_drq3_cb(state); } uint8_t isa8_device::dack_r(int line) { @@ -627,17 +627,17 @@ void isa16_device::io16_swap_w(offs_t offset, uint16_t data, uint16_t mem_mask) } // interrupt request from isa card -WRITE_LINE_MEMBER( isa16_device::irq10_w ) { m_out_irq10_cb(state); } -WRITE_LINE_MEMBER( isa16_device::irq11_w ) { m_out_irq11_cb(state); } -WRITE_LINE_MEMBER( isa16_device::irq12_w ) { m_out_irq12_cb(state); } -WRITE_LINE_MEMBER( isa16_device::irq14_w ) { m_out_irq14_cb(state); } -WRITE_LINE_MEMBER( isa16_device::irq15_w ) { m_out_irq15_cb(state); } +void isa16_device::irq10_w(int state) { m_out_irq10_cb(state); } +void isa16_device::irq11_w(int state) { m_out_irq11_cb(state); } +void isa16_device::irq12_w(int state) { m_out_irq12_cb(state); } +void isa16_device::irq14_w(int state) { m_out_irq14_cb(state); } +void isa16_device::irq15_w(int state) { m_out_irq15_cb(state); } // dma request from isa card -WRITE_LINE_MEMBER( isa16_device::drq0_w ) { m_out_drq0_cb(state); } -WRITE_LINE_MEMBER( isa16_device::drq5_w ) { m_out_drq5_cb(state); } -WRITE_LINE_MEMBER( isa16_device::drq6_w ) { m_out_drq6_cb(state); } -WRITE_LINE_MEMBER( isa16_device::drq7_w ) { m_out_drq7_cb(state); } +void isa16_device::drq0_w(int state) { m_out_drq0_cb(state); } +void isa16_device::drq5_w(int state) { m_out_drq5_cb(state); } +void isa16_device::drq6_w(int state) { m_out_drq6_cb(state); } +void isa16_device::drq7_w(int state) { m_out_drq7_cb(state); } uint16_t isa16_device::dack16_r(int line) { diff --git a/src/devices/bus/isa/isa.h b/src/devices/bus/isa/isa.h index 2cf5f26d5d2..3beb1804133 100644 --- a/src/devices/bus/isa/isa.h +++ b/src/devices/bus/isa/isa.h @@ -172,16 +172,16 @@ public: // FIXME: shouldn't need to expose this address_space &memspace() const { return *m_memspace; } - DECLARE_WRITE_LINE_MEMBER( irq2_w ); - DECLARE_WRITE_LINE_MEMBER( irq3_w ); - DECLARE_WRITE_LINE_MEMBER( irq4_w ); - DECLARE_WRITE_LINE_MEMBER( irq5_w ); - DECLARE_WRITE_LINE_MEMBER( irq6_w ); - DECLARE_WRITE_LINE_MEMBER( irq7_w ); + void irq2_w(int state); + void irq3_w(int state); + void irq4_w(int state); + void irq5_w(int state); + void irq6_w(int state); + void irq7_w(int state); - DECLARE_WRITE_LINE_MEMBER( drq1_w ); - DECLARE_WRITE_LINE_MEMBER( drq2_w ); - DECLARE_WRITE_LINE_MEMBER( drq3_w ); + void drq1_w(int state); + void drq2_w(int state); + void drq3_w(int state); // 8 bit accessors for ISA-defined address spaces uint8_t mem_r(offs_t offset); @@ -322,16 +322,16 @@ public: // for ISA16, put the 16-bit configs in the primary slots and the 8-bit configs in the secondary virtual space_config_vector memory_space_config() const override; - DECLARE_WRITE_LINE_MEMBER( irq10_w ); - DECLARE_WRITE_LINE_MEMBER( irq11_w ); - DECLARE_WRITE_LINE_MEMBER( irq12_w ); - DECLARE_WRITE_LINE_MEMBER( irq14_w ); - DECLARE_WRITE_LINE_MEMBER( irq15_w ); + void irq10_w(int state); + void irq11_w(int state); + void irq12_w(int state); + void irq14_w(int state); + void irq15_w(int state); - DECLARE_WRITE_LINE_MEMBER( drq0_w ); - DECLARE_WRITE_LINE_MEMBER( drq5_w ); - DECLARE_WRITE_LINE_MEMBER( drq6_w ); - DECLARE_WRITE_LINE_MEMBER( drq7_w ); + void drq0_w(int state); + void drq5_w(int state); + void drq6_w(int state); + void drq7_w(int state); uint16_t dack16_r(int line); void dack16_w(int line, uint16_t data); diff --git a/src/devices/bus/isa/lpt.cpp b/src/devices/bus/isa/lpt.cpp index 268ff2c9caf..548e3a57989 100644 --- a/src/devices/bus/isa/lpt.cpp +++ b/src/devices/bus/isa/lpt.cpp @@ -52,7 +52,7 @@ void isa8_lpt_device::device_reset() m_isa->install_device(0x0278, 0x027b, read8sm_delegate(lpt, FUNC(pc_lpt_device::read)), write8sm_delegate(lpt, FUNC(pc_lpt_device::write))); } -WRITE_LINE_MEMBER(isa8_lpt_device::pc_cpu_line) +void isa8_lpt_device::pc_cpu_line(int state) { if (is_primary()) m_isa->irq7_w(state); diff --git a/src/devices/bus/isa/lpt.h b/src/devices/bus/isa/lpt.h index 1aa2731bfaf..15f3259db52 100644 --- a/src/devices/bus/isa/lpt.h +++ b/src/devices/bus/isa/lpt.h @@ -39,7 +39,7 @@ protected: virtual ioport_constructor device_input_ports() const override; private: - WRITE_LINE_MEMBER(pc_cpu_line); + void pc_cpu_line(int state); // internal state bool m_is_primary; diff --git a/src/devices/bus/isa/mc1502_fdc.cpp b/src/devices/bus/isa/mc1502_fdc.cpp index ad1c1bd8b8c..12d86efa3cb 100644 --- a/src/devices/bus/isa/mc1502_fdc.cpp +++ b/src/devices/bus/isa/mc1502_fdc.cpp @@ -130,7 +130,7 @@ uint8_t mc1502_fdc_device::mc1502_wd17xx_motor_r() return motor_on; } -WRITE_LINE_MEMBER(mc1502_fdc_device::mc1502_fdc_irq_drq) +void mc1502_fdc_device::mc1502_fdc_irq_drq(int state) { if (state) m_isa->set_ready(CLEAR_LINE); // deassert I/O CH RDY diff --git a/src/devices/bus/isa/mc1502_fdc.h b/src/devices/bus/isa/mc1502_fdc.h index 45fde02945d..a589ca0c810 100644 --- a/src/devices/bus/isa/mc1502_fdc.h +++ b/src/devices/bus/isa/mc1502_fdc.h @@ -45,7 +45,7 @@ protected: virtual const tiny_rom_entry *device_rom_region() const override; private: - DECLARE_WRITE_LINE_MEMBER(mc1502_fdc_irq_drq); + void mc1502_fdc_irq_drq(int state); required_device m_fdc; int motor_on; diff --git a/src/devices/bus/isa/mda.cpp b/src/devices/bus/isa/mda.cpp index e3ff8e90f99..77ac7d6028e 100644 --- a/src/devices/bus/isa/mda.cpp +++ b/src/devices/bus/isa/mda.cpp @@ -96,7 +96,7 @@ static GFXDECODE_START( gfx_pcmda ) GFXDECODE_END -WRITE_LINE_MEMBER( isa8_mda_device::pc_cpu_line ) +void isa8_mda_device::pc_cpu_line(int state) { m_isa->irq7_w(state); } @@ -403,13 +403,13 @@ MC6845_UPDATE_ROW( isa8_hercules_device::crtc_update_row ) } -WRITE_LINE_MEMBER( isa8_mda_device::hsync_changed ) +void isa8_mda_device::hsync_changed(int state) { m_hsync = state ? 1 : 0; } -WRITE_LINE_MEMBER( isa8_mda_device::vsync_changed ) +void isa8_mda_device::vsync_changed(int state) { m_vsync = state ? 0x80 : 0; if ( state ) diff --git a/src/devices/bus/isa/mda.h b/src/devices/bus/isa/mda.h index e16c80e8ce1..97e08dfcf1b 100644 --- a/src/devices/bus/isa/mda.h +++ b/src/devices/bus/isa/mda.h @@ -31,8 +31,8 @@ public: virtual uint8_t status_r(); virtual void mode_control_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(hsync_changed); - DECLARE_WRITE_LINE_MEMBER(vsync_changed); + void hsync_changed(int state); + void vsync_changed(int state); virtual MC6845_UPDATE_ROW( crtc_update_row ); @@ -51,7 +51,7 @@ protected: optional_device m_lpt; private: - WRITE_LINE_MEMBER(pc_cpu_line); + void pc_cpu_line(int state); MC6845_UPDATE_ROW( mda_text_inten_update_row ); MC6845_UPDATE_ROW( mda_text_blink_update_row ); diff --git a/src/devices/bus/isa/mpu401.cpp b/src/devices/bus/isa/mpu401.cpp index 7f6a28b87b4..db482947789 100644 --- a/src/devices/bus/isa/mpu401.cpp +++ b/src/devices/bus/isa/mpu401.cpp @@ -34,7 +34,7 @@ DIP-SWs 1 irq7 */ -WRITE_LINE_MEMBER( isa8_mpu401_device::mpu_irq_out ) +void isa8_mpu401_device::mpu_irq_out(int state) { } diff --git a/src/devices/bus/isa/mpu401.h b/src/devices/bus/isa/mpu401.h index 89974be7b84..74054aad765 100644 --- a/src/devices/bus/isa/mpu401.h +++ b/src/devices/bus/isa/mpu401.h @@ -32,7 +32,7 @@ protected: private: // called back by the MPU401 core to set the IRQ line state - DECLARE_WRITE_LINE_MEMBER(mpu_irq_out); + void mpu_irq_out(int state); required_device m_mpu401; }; diff --git a/src/devices/bus/isa/mufdc.cpp b/src/devices/bus/isa/mufdc.cpp index 2a078f812f9..a17be9429ff 100644 --- a/src/devices/bus/isa/mufdc.cpp +++ b/src/devices/bus/isa/mufdc.cpp @@ -176,12 +176,12 @@ uint8_t mufdc_device::fdc_input_r() return ~m_config->read(); } -WRITE_LINE_MEMBER( mufdc_device::fdc_irq_w ) +void mufdc_device::fdc_irq_w(int state) { m_isa->irq6_w(state ? ASSERT_LINE : CLEAR_LINE); } -WRITE_LINE_MEMBER( mufdc_device::fdc_drq_w ) +void mufdc_device::fdc_drq_w(int state) { m_isa->drq2_w(state ? ASSERT_LINE : CLEAR_LINE); } diff --git a/src/devices/bus/isa/mufdc.h b/src/devices/bus/isa/mufdc.h index b746d135003..80b3ae786fb 100644 --- a/src/devices/bus/isa/mufdc.h +++ b/src/devices/bus/isa/mufdc.h @@ -54,8 +54,8 @@ private: static void floppy_formats(format_registration &fr); uint8_t fdc_input_r(); - DECLARE_WRITE_LINE_MEMBER( fdc_irq_w ); - DECLARE_WRITE_LINE_MEMBER( fdc_drq_w ); + void fdc_irq_w(int state); + void fdc_drq_w(int state); required_device m_fdc; required_ioport m_config; diff --git a/src/devices/bus/isa/myb3k_com.cpp b/src/devices/bus/isa/myb3k_com.cpp index b500d95b993..e4a8ce30ca8 100644 --- a/src/devices/bus/isa/myb3k_com.cpp +++ b/src/devices/bus/isa/myb3k_com.cpp @@ -123,7 +123,7 @@ void isa8_myb3k_com_device::device_reset() // pit_rxc - write receive clock if pit is selected source //----------------------------------------------------------- #define CLK_SEL 0x80 -WRITE_LINE_MEMBER(isa8_myb3k_com_device::pit_rxc) +void isa8_myb3k_com_device::pit_rxc(int state) { if ((m_control & CLK_SEL) != 0) { @@ -134,7 +134,7 @@ WRITE_LINE_MEMBER(isa8_myb3k_com_device::pit_rxc) //------------------------------------------------------------ // pit_txc - write transmit clock if pit is selected source //------------------------------------------------------------ -WRITE_LINE_MEMBER(isa8_myb3k_com_device::pit_txc) +void isa8_myb3k_com_device::pit_txc(int state) { if ((m_control & CLK_SEL) != 0) { @@ -146,7 +146,7 @@ WRITE_LINE_MEMBER(isa8_myb3k_com_device::pit_txc) // rem_rxc - write receive clock if remote clock is selected // source, eg for synchronous modes //----------------------------------------------------------- -WRITE_LINE_MEMBER(isa8_myb3k_com_device::rem_rxc) +void isa8_myb3k_com_device::rem_rxc(int state) { if ((m_control & CLK_SEL) == 0) { @@ -158,7 +158,7 @@ WRITE_LINE_MEMBER(isa8_myb3k_com_device::rem_rxc) // rem_txc - write transmit clock if remote cloc is selected // source, eg for synchronous modes //------------------------------------------------------------ -WRITE_LINE_MEMBER(isa8_myb3k_com_device::rem_txc) +void isa8_myb3k_com_device::rem_txc(int state) { if ((m_control & CLK_SEL) == 0) { @@ -169,7 +169,7 @@ WRITE_LINE_MEMBER(isa8_myb3k_com_device::rem_txc) //------------------------------------------------ // com_int_rx - signal selected interrup on ISA bus //------------------------------------------------ -WRITE_LINE_MEMBER(isa8_myb3k_com_device::com_int_rx) +void isa8_myb3k_com_device::com_int_rx(int state) { m_irq_rx = state; com_int(); @@ -178,7 +178,7 @@ WRITE_LINE_MEMBER(isa8_myb3k_com_device::com_int_rx) //------------------------------------------------ // com_int_tx - signal selected interrup on ISA bus //------------------------------------------------ -WRITE_LINE_MEMBER(isa8_myb3k_com_device::com_int_tx) +void isa8_myb3k_com_device::com_int_tx(int state) { m_irq_tx = state; com_int(); @@ -202,7 +202,7 @@ void isa8_myb3k_com_device::com_int() // dcd_w - DCD line value gated by a LS368 //------------------------------------------------ #define DCD_BIT 0x02 -WRITE_LINE_MEMBER(isa8_myb3k_com_device::dcd_w) +void isa8_myb3k_com_device::dcd_w(int state) { if (state == ASSERT_LINE) { @@ -218,7 +218,7 @@ WRITE_LINE_MEMBER(isa8_myb3k_com_device::dcd_w) // ri_w - RI line value gated by a LS368 //------------------------------------------------ #define RI_BIT 0x01 -WRITE_LINE_MEMBER(isa8_myb3k_com_device::ri_w) +void isa8_myb3k_com_device::ri_w(int state) { if (state == ASSERT_LINE) { diff --git a/src/devices/bus/isa/myb3k_com.h b/src/devices/bus/isa/myb3k_com.h index bdd591b5291..0dd75f0ec60 100644 --- a/src/devices/bus/isa/myb3k_com.h +++ b/src/devices/bus/isa/myb3k_com.h @@ -39,14 +39,14 @@ public: // construction/destruction isa8_myb3k_com_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - DECLARE_WRITE_LINE_MEMBER(pit_txc); - DECLARE_WRITE_LINE_MEMBER(pit_rxc); - DECLARE_WRITE_LINE_MEMBER(rem_txc); - DECLARE_WRITE_LINE_MEMBER(rem_rxc); - DECLARE_WRITE_LINE_MEMBER(com_int_rx); - DECLARE_WRITE_LINE_MEMBER(com_int_tx); - DECLARE_WRITE_LINE_MEMBER(dcd_w); - DECLARE_WRITE_LINE_MEMBER(ri_w); + void pit_txc(int state); + void pit_rxc(int state); + void rem_txc(int state); + void rem_rxc(int state); + void com_int_rx(int state); + void com_int_tx(int state); + void dcd_w(int state); + void ri_w(int state); void dce_control(uint8_t data); uint8_t dce_status(); diff --git a/src/devices/bus/isa/myb3k_fdc.cpp b/src/devices/bus/isa/myb3k_fdc.cpp index df803283459..d789850bce9 100644 --- a/src/devices/bus/isa/myb3k_fdc.cpp +++ b/src/devices/bus/isa/myb3k_fdc.cpp @@ -163,7 +163,7 @@ void isa8_myb3k_fdc471x_device_base::device_start() //------------------------------------------------- // irq_w - signal interrupt request to ISA bus //------------------------------------------------- -WRITE_LINE_MEMBER( isa8_myb3k_fdc471x_device_base::irq_w ) +void isa8_myb3k_fdc471x_device_base::irq_w(int state) { LOG("%s: %d\n", FUNCNAME, state); m_isa->irq6_w(state ? ASSERT_LINE : CLEAR_LINE); @@ -172,7 +172,7 @@ WRITE_LINE_MEMBER( isa8_myb3k_fdc471x_device_base::irq_w ) //------------------------------------------------- // drq_w - signal dma request to ISA bus //------------------------------------------------- -WRITE_LINE_MEMBER( isa8_myb3k_fdc471x_device_base::drq_w ) +void isa8_myb3k_fdc471x_device_base::drq_w(int state) { LOG("%s: %d\n", FUNCNAME, state); diff --git a/src/devices/bus/isa/myb3k_fdc.h b/src/devices/bus/isa/myb3k_fdc.h index b2a645423d6..be29847dc52 100644 --- a/src/devices/bus/isa/myb3k_fdc.h +++ b/src/devices/bus/isa/myb3k_fdc.h @@ -38,8 +38,8 @@ protected: virtual uint8_t myb3k_fdc_status(); virtual void myb3k_fdc_command(uint8_t data); - DECLARE_WRITE_LINE_MEMBER( irq_w ); - DECLARE_WRITE_LINE_MEMBER( drq_w ); + void irq_w(int state); + void drq_w(int state); required_device m_fdc; optional_device_array m_floppy_connectors; diff --git a/src/devices/bus/isa/ne1000.cpp b/src/devices/bus/isa/ne1000.cpp index d2234098c34..a290b076628 100644 --- a/src/devices/bus/isa/ne1000.cpp +++ b/src/devices/bus/isa/ne1000.cpp @@ -73,7 +73,7 @@ void ne1000_device::ne1000_port_w(offs_t offset, uint8_t data) { return; } -WRITE_LINE_MEMBER(ne1000_device::ne1000_irq_w) { +void ne1000_device::ne1000_irq_w(int state) { switch(m_irq) { case 0: m_isa->irq2_w(state); diff --git a/src/devices/bus/isa/ne2000.cpp b/src/devices/bus/isa/ne2000.cpp index 08c73b96dac..efd448fe3da 100644 --- a/src/devices/bus/isa/ne2000.cpp +++ b/src/devices/bus/isa/ne2000.cpp @@ -83,7 +83,7 @@ void ne2000_device::ne2000_port_w(offs_t offset, uint16_t data, uint16_t mem_mas return; } -WRITE_LINE_MEMBER(ne2000_device::ne2000_irq_w) { +void ne2000_device::ne2000_irq_w(int state) { switch(m_irq) { case 0: m_isa->irq2_w(state); diff --git a/src/devices/bus/isa/np600.cpp b/src/devices/bus/isa/np600.cpp index f40fcbf1ab5..b69b6a24327 100644 --- a/src/devices/bus/isa/np600.cpp +++ b/src/devices/bus/isa/np600.cpp @@ -38,7 +38,7 @@ void np600a3_device::int1_ack_w(u8 data) { } -WRITE_LINE_MEMBER(np600a3_device::host_int_w) +void np600a3_device::host_int_w(int state) { logerror("%s: Host interrupt %s\n", machine().describe_context(), state ? "asserted" : "cleared"); } diff --git a/src/devices/bus/isa/np600.h b/src/devices/bus/isa/np600.h index 5662ecd4335..889d77ef485 100644 --- a/src/devices/bus/isa/np600.h +++ b/src/devices/bus/isa/np600.h @@ -29,7 +29,7 @@ protected: private: void lcc_ca_w(u16 data); void int1_ack_w(u8 data); - DECLARE_WRITE_LINE_MEMBER(host_int_w); + void host_int_w(int state); u16 status_r(); u8 enetaddr_r(offs_t offset); diff --git a/src/devices/bus/isa/omti8621.cpp b/src/devices/bus/isa/omti8621.cpp index 02c117d493a..a6528105f98 100644 --- a/src/devices/bus/isa/omti8621.cpp +++ b/src/devices/bus/isa/omti8621.cpp @@ -1276,13 +1276,13 @@ void omti8621_device::set_jumper(uint16_t disk_type) } // FDC uses the standard IRQ 6 / DMA 2, doesn't appear to be configurable -WRITE_LINE_MEMBER( omti8621_device::fdc_irq_w ) +void omti8621_device::fdc_irq_w(int state) { if (BIT(m_moten, 3)) m_isa->irq6_w(state ? ASSERT_LINE : CLEAR_LINE); } -WRITE_LINE_MEMBER( omti8621_device::fdc_drq_w ) +void omti8621_device::fdc_drq_w(int state) { if (BIT(m_moten, 3)) m_isa->drq2_w(state ? ASSERT_LINE : CLEAR_LINE); diff --git a/src/devices/bus/isa/omti8621.h b/src/devices/bus/isa/omti8621.h index e5b39a9921b..0893dec9352 100644 --- a/src/devices/bus/isa/omti8621.h +++ b/src/devices/bus/isa/omti8621.h @@ -72,8 +72,8 @@ protected: std::string cpu_context() const; private: - DECLARE_WRITE_LINE_MEMBER( fdc_irq_w ); - DECLARE_WRITE_LINE_MEMBER( fdc_drq_w ); + void fdc_irq_w(int state); + void fdc_drq_w(int state); static void floppy_formats(format_registration &fr); void fd_moten_w(uint8_t data); diff --git a/src/devices/bus/isa/p1_fdc.cpp b/src/devices/bus/isa/p1_fdc.cpp index 390f98727b0..44369a37e41 100644 --- a/src/devices/bus/isa/p1_fdc.cpp +++ b/src/devices/bus/isa/p1_fdc.cpp @@ -115,7 +115,7 @@ void p1_fdc_device::p1_wd17xx_aux_w(int data) floppy1->mon_w(!(data & 8)); } -WRITE_LINE_MEMBER(p1_fdc_device::p1_fdc_irq_drq) +void p1_fdc_device::p1_fdc_irq_drq(int state) { if (state) m_isa->set_ready(CLEAR_LINE); // deassert I/O CH RDY diff --git a/src/devices/bus/isa/p1_fdc.h b/src/devices/bus/isa/p1_fdc.h index ceeb278f5c7..0c1ae3a492a 100644 --- a/src/devices/bus/isa/p1_fdc.h +++ b/src/devices/bus/isa/p1_fdc.h @@ -43,7 +43,7 @@ protected: virtual const tiny_rom_entry *device_rom_region() const override; private: - DECLARE_WRITE_LINE_MEMBER(p1_fdc_irq_drq); + void p1_fdc_irq_drq(int state); required_device m_fdc; required_device m_cpu; diff --git a/src/devices/bus/isa/p1_sound.cpp b/src/devices/bus/isa/p1_sound.cpp index f2e69debf95..11fe4c53c43 100644 --- a/src/devices/bus/isa/p1_sound.cpp +++ b/src/devices/bus/isa/p1_sound.cpp @@ -128,7 +128,7 @@ void p1_sound_device::dac_w(offs_t offset, uint8_t data) m_isa->irq7_w(CLEAR_LINE); } -WRITE_LINE_MEMBER(p1_sound_device::sampler_sync) +void p1_sound_device::sampler_sync(int state) { if (state) { diff --git a/src/devices/bus/isa/p1_sound.h b/src/devices/bus/isa/p1_sound.h index 3b7f1c40af9..519c58bfd6b 100644 --- a/src/devices/bus/isa/p1_sound.h +++ b/src/devices/bus/isa/p1_sound.h @@ -49,7 +49,7 @@ protected: virtual void device_add_mconfig(machine_config &config) override; private: - DECLARE_WRITE_LINE_MEMBER(sampler_sync); + void sampler_sync(int state); uint8_t m_dac_data[16]; int m_dac_ptr; diff --git a/src/devices/bus/isa/pgc.cpp b/src/devices/bus/isa/pgc.cpp index 21e4504bbe4..1a67e545378 100644 --- a/src/devices/bus/isa/pgc.cpp +++ b/src/devices/bus/isa/pgc.cpp @@ -252,7 +252,7 @@ void isa8_pgc_device::device_reset() // -WRITE_LINE_MEMBER(isa8_pgc_device::vblank_irq) +void isa8_pgc_device::vblank_irq(int state) { if (state) { diff --git a/src/devices/bus/isa/pgc.h b/src/devices/bus/isa/pgc.h index d560dbdda09..43bc42e2b85 100644 --- a/src/devices/bus/isa/pgc.h +++ b/src/devices/bus/isa/pgc.h @@ -41,7 +41,7 @@ protected: private: uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(vblank_irq); + void vblank_irq(int state); IRQ_CALLBACK_MEMBER(irq_callback); void vram_w(offs_t offset, uint8_t data); diff --git a/src/devices/bus/isa/sblaster.h b/src/devices/bus/isa/sblaster.h index f09f05957be..723998f9196 100644 --- a/src/devices/bus/isa/sblaster.h +++ b/src/devices/bus/isa/sblaster.h @@ -37,7 +37,7 @@ public: void dsp_rbuf_status_w(offs_t offset, uint8_t data); void dsp_cmd_w(offs_t offset, uint8_t data); - DECLARE_WRITE_LINE_MEMBER( midi_rx_w ) { device_serial_interface::rx_w((uint8_t)state); } + void midi_rx_w(int state) { device_serial_interface::rx_w((uint8_t)state); } protected: void common(machine_config &config); diff --git a/src/devices/bus/isa/side116.cpp b/src/devices/bus/isa/side116.cpp index bad6645bf5a..de47081b9fd 100644 --- a/src/devices/bus/isa/side116.cpp +++ b/src/devices/bus/isa/side116.cpp @@ -176,7 +176,7 @@ void side116_device::write(offs_t offset, uint8_t data) } } -WRITE_LINE_MEMBER( side116_device::ide_interrupt ) +void side116_device::ide_interrupt(int state) { uint8_t level = m_config->read() & 0x18; diff --git a/src/devices/bus/isa/side116.h b/src/devices/bus/isa/side116.h index 380e6206222..919785d86b7 100644 --- a/src/devices/bus/isa/side116.h +++ b/src/devices/bus/isa/side116.h @@ -43,7 +43,7 @@ protected: virtual const tiny_rom_entry *device_rom_region() const override; private: - DECLARE_WRITE_LINE_MEMBER( ide_interrupt ); + void ide_interrupt(int state); required_device m_ata; required_ioport m_config; diff --git a/src/devices/bus/isa/svga_s3.cpp b/src/devices/bus/isa/svga_s3.cpp index 58984396d86..1315c471679 100644 --- a/src/devices/bus/isa/svga_s3.cpp +++ b/src/devices/bus/isa/svga_s3.cpp @@ -174,7 +174,7 @@ void isa16_s3virge_device::device_add_mconfig(machine_config &config) // framebuffer configuration. //------------------------------------------------- -WRITE_LINE_MEMBER(isa16_s3virge_device::linear_config_changed_w) +void isa16_s3virge_device::linear_config_changed_w(int state) { } @@ -266,7 +266,7 @@ void isa16_s3virgedx_device::device_add_mconfig(machine_config &config) // framebuffer configuration. //------------------------------------------------- -WRITE_LINE_MEMBER(isa16_s3virgedx_device::linear_config_changed_w) +void isa16_s3virgedx_device::linear_config_changed_w(int state) { const bool old = m_lfb_enable; m_lfb_enable = state; @@ -382,7 +382,7 @@ void isa16_stealth3d2kpro_device::device_add_mconfig(machine_config &config) // framebuffer configuration. //------------------------------------------------- -WRITE_LINE_MEMBER(isa16_stealth3d2kpro_device::linear_config_changed_w) +void isa16_stealth3d2kpro_device::linear_config_changed_w(int state) { } diff --git a/src/devices/bus/isa/svga_s3.h b/src/devices/bus/isa/svga_s3.h index b5b650bd594..fa93264efb3 100644 --- a/src/devices/bus/isa/svga_s3.h +++ b/src/devices/bus/isa/svga_s3.h @@ -58,7 +58,7 @@ protected: virtual void device_add_mconfig(machine_config &config) override; virtual const tiny_rom_entry *device_rom_region() const override; - DECLARE_WRITE_LINE_MEMBER(linear_config_changed_w); + void linear_config_changed_w(int state); private: required_device m_vga; @@ -83,7 +83,7 @@ protected: virtual void device_add_mconfig(machine_config &config) override; virtual const tiny_rom_entry *device_rom_region() const override; - DECLARE_WRITE_LINE_MEMBER(linear_config_changed_w); + void linear_config_changed_w(int state); private: required_device m_vga; @@ -111,7 +111,7 @@ protected: virtual void device_add_mconfig(machine_config &config) override; virtual const tiny_rom_entry *device_rom_region() const override; - DECLARE_WRITE_LINE_MEMBER(linear_config_changed_w); + void linear_config_changed_w(int state); private: required_device m_vga; diff --git a/src/devices/bus/isa/wdxt_gen.cpp b/src/devices/bus/isa/wdxt_gen.cpp index fb2a8fd1965..1096e9a60d7 100644 --- a/src/devices/bus/isa/wdxt_gen.cpp +++ b/src/devices/bus/isa/wdxt_gen.cpp @@ -100,17 +100,17 @@ void wdxt_gen_device::wd1015_io(address_map &map) // WD11C00_17_INTERFACE( host_intf ) //------------------------------------------------- -WRITE_LINE_MEMBER( wdxt_gen_device::irq5_w ) +void wdxt_gen_device::irq5_w(int state) { m_isa->irq5_w(state); } -WRITE_LINE_MEMBER( wdxt_gen_device::drq3_w ) +void wdxt_gen_device::drq3_w(int state) { m_isa->drq3_w(state); } -WRITE_LINE_MEMBER( wdxt_gen_device::mr_w ) +void wdxt_gen_device::mr_w(int state) { if (state == ASSERT_LINE) { @@ -250,7 +250,7 @@ void wdxt_gen_device::dack_line_w(int line, int state) // wd1015_t1_r - //------------------------------------------------- -READ_LINE_MEMBER( wdxt_gen_device::wd1015_t1_r ) +int wdxt_gen_device::wd1015_t1_r() { return 0; // TODO } diff --git a/src/devices/bus/isa/wdxt_gen.h b/src/devices/bus/isa/wdxt_gen.h index f238f6750a1..39948ba6b5b 100644 --- a/src/devices/bus/isa/wdxt_gen.h +++ b/src/devices/bus/isa/wdxt_gen.h @@ -55,13 +55,13 @@ protected: virtual void dack_line_w(int line, int state) override; private: - DECLARE_WRITE_LINE_MEMBER( irq5_w ); - DECLARE_WRITE_LINE_MEMBER( drq3_w ); - DECLARE_WRITE_LINE_MEMBER( mr_w ); + void irq5_w(int state); + void drq3_w(int state); + void mr_w(int state); uint8_t rd322_r(); uint8_t ram_r(offs_t offset); void ram_w(offs_t offset, uint8_t data); - DECLARE_READ_LINE_MEMBER( wd1015_t1_r ); + int wd1015_t1_r(); uint8_t wd1015_p1_r(); void wd1015_p1_w(uint8_t data); uint8_t wd1015_p2_r(); diff --git a/src/devices/bus/isa/xtide.cpp b/src/devices/bus/isa/xtide.cpp index a22f69a9b13..4686edb6739 100644 --- a/src/devices/bus/isa/xtide.cpp +++ b/src/devices/bus/isa/xtide.cpp @@ -109,7 +109,7 @@ void xtide_device::write(offs_t offset, uint8_t data) } } -WRITE_LINE_MEMBER(xtide_device::ide_interrupt) +void xtide_device::ide_interrupt(int state) { switch (m_irq_number) { diff --git a/src/devices/bus/isa/xtide.h b/src/devices/bus/isa/xtide.h index b06d39d5dbb..494041e2acf 100644 --- a/src/devices/bus/isa/xtide.h +++ b/src/devices/bus/isa/xtide.h @@ -33,7 +33,7 @@ protected: virtual const tiny_rom_entry *device_rom_region() const override; private: - DECLARE_WRITE_LINE_MEMBER(ide_interrupt); + void ide_interrupt(int state); required_device m_ata; required_device m_eeprom; diff --git a/src/devices/bus/isbx/compis_fdc.cpp b/src/devices/bus/isbx/compis_fdc.cpp index b4f72b220ef..b7f48961e2e 100644 --- a/src/devices/bus/isbx/compis_fdc.cpp +++ b/src/devices/bus/isbx/compis_fdc.cpp @@ -29,12 +29,12 @@ DEFINE_DEVICE_TYPE(COMPIS_FDC, compis_fdc_device, "compis_fdc", "Compis FDC") // floppy_formats //------------------------------------------------- -WRITE_LINE_MEMBER( compis_fdc_device::fdc_irq ) +void compis_fdc_device::fdc_irq(int state) { m_slot->mintr1_w(state); } -WRITE_LINE_MEMBER( compis_fdc_device::fdc_drq ) +void compis_fdc_device::fdc_drq(int state) { m_slot->mdrqt_w(state); } diff --git a/src/devices/bus/isbx/compis_fdc.h b/src/devices/bus/isbx/compis_fdc.h index 5e50b3a3696..c3211c74e9a 100644 --- a/src/devices/bus/isbx/compis_fdc.h +++ b/src/devices/bus/isbx/compis_fdc.h @@ -48,8 +48,8 @@ protected: virtual void opt1_w(int state) override; private: - DECLARE_WRITE_LINE_MEMBER( fdc_irq ); - DECLARE_WRITE_LINE_MEMBER( fdc_drq ); + void fdc_irq(int state); + void fdc_drq(int state); static void floppy_formats(format_registration &fr); required_device m_fdc; diff --git a/src/devices/bus/isbx/isbc_218a.cpp b/src/devices/bus/isbx/isbc_218a.cpp index 3c1dd92b4fa..c0a6434fcd6 100644 --- a/src/devices/bus/isbx/isbc_218a.cpp +++ b/src/devices/bus/isbx/isbc_218a.cpp @@ -24,12 +24,12 @@ DEFINE_DEVICE_TYPE(ISBC_218A, isbc_218a_device, "isbc_218a", "ISBX 218a for ISBC") -WRITE_LINE_MEMBER( isbc_218a_device::fdc_irq ) +void isbc_218a_device::fdc_irq(int state) { m_slot->mintr1_w(state); } -WRITE_LINE_MEMBER( isbc_218a_device::fdc_drq ) +void isbc_218a_device::fdc_drq(int state) { m_slot->mdrqt_w(state); } diff --git a/src/devices/bus/isbx/isbc_218a.h b/src/devices/bus/isbx/isbc_218a.h index c654c74aae8..b5bb4947d3e 100644 --- a/src/devices/bus/isbx/isbc_218a.h +++ b/src/devices/bus/isbx/isbc_218a.h @@ -49,8 +49,8 @@ protected: virtual void opt0_w(int state) override; private: - DECLARE_WRITE_LINE_MEMBER( fdc_irq ); - DECLARE_WRITE_LINE_MEMBER( fdc_drq ); + void fdc_irq(int state); + void fdc_drq(int state); static void floppy_formats(format_registration &fr); required_device m_fdc; diff --git a/src/devices/bus/isbx/isbx.h b/src/devices/bus/isbx/isbx.h index af9c51aa842..7301f96dcc2 100644 --- a/src/devices/bus/isbx/isbx.h +++ b/src/devices/bus/isbx/isbx.h @@ -97,19 +97,19 @@ public: void mcs1_w(offs_t offset, uint8_t data) { if (m_card) m_card->mcs1_w(offset, data); } uint8_t mdack_r(offs_t offset) { return m_card ? m_card->mdack_r(offset) : 0xff; } void mdack_w(offs_t offset, uint8_t data) { if (m_card) m_card->mdack_w(offset, data); } - DECLARE_READ_LINE_MEMBER( mpst_r ) { return m_card == nullptr; } - DECLARE_READ_LINE_MEMBER( opt0_r ) { return m_card ? m_card->opt0_r() : 1; } - DECLARE_WRITE_LINE_MEMBER( opt0_w ) { if (m_card) m_card->opt0_w(state); } - DECLARE_READ_LINE_MEMBER( opt1_r ) { return m_card ? m_card->opt1_r() : 1; } - DECLARE_WRITE_LINE_MEMBER( opt1_w ) { if (m_card) m_card->opt1_w(state); } - DECLARE_WRITE_LINE_MEMBER( tdma_w ) { if (m_card) m_card->tdma_w(state); } - DECLARE_WRITE_LINE_MEMBER( mclk_w ) { if (m_card) m_card->mclk_w(state); } + int mpst_r() { return m_card == nullptr; } + int opt0_r() { return m_card ? m_card->opt0_r() : 1; } + void opt0_w(int state) { if (m_card) m_card->opt0_w(state); } + int opt1_r() { return m_card ? m_card->opt1_r() : 1; } + void opt1_w(int state) { if (m_card) m_card->opt1_w(state); } + void tdma_w(int state) { if (m_card) m_card->tdma_w(state); } + void mclk_w(int state) { if (m_card) m_card->mclk_w(state); } // card interface - DECLARE_WRITE_LINE_MEMBER( mintr0_w ) { m_write_mintr0(state); } - DECLARE_WRITE_LINE_MEMBER( mintr1_w ) { m_write_mintr1(state); } - DECLARE_WRITE_LINE_MEMBER( mdrqt_w ) { m_write_mdrqt(state); } - DECLARE_WRITE_LINE_MEMBER( mwait_w ) { m_write_mwait(state); } + void mintr0_w(int state) { m_write_mintr0(state); } + void mintr1_w(int state) { m_write_mintr1(state); } + void mdrqt_w(int state) { m_write_mdrqt(state); } + void mwait_w(int state) { m_write_mwait(state); } protected: // device-level overrides diff --git a/src/devices/bus/kc/d002.cpp b/src/devices/bus/kc/d002.cpp index 288d2278578..f11dfe327c5 100644 --- a/src/devices/bus/kc/d002.cpp +++ b/src/devices/bus/kc/d002.cpp @@ -52,17 +52,17 @@ INPUT_PORTS_END void kc85_cart(device_slot_interface &device); void kc85_exp(device_slot_interface &device); -WRITE_LINE_MEMBER(kc_d002_device::out_irq_w) +void kc_d002_device::out_irq_w(int state) { m_slot->m_out_irq_cb(state); } -WRITE_LINE_MEMBER(kc_d002_device::out_nmi_w) +void kc_d002_device::out_nmi_w(int state) { m_slot->m_out_nmi_cb(state); } -WRITE_LINE_MEMBER(kc_d002_device::out_halt_w) +void kc_d002_device::out_halt_w(int state) { m_slot->m_out_halt_cb(state); } @@ -226,7 +226,7 @@ void kc_d002_device::io_write(offs_t offset, uint8_t data) MEI line write -------------------------------------------------*/ -WRITE_LINE_MEMBER( kc_d002_device::mei_w ) +void kc_d002_device::mei_w(int state) { m_expansions[0]->mei_w(state); } diff --git a/src/devices/bus/kc/d002.h b/src/devices/bus/kc/d002.h index 7db1418bf5f..4c8d50108ac 100644 --- a/src/devices/bus/kc/d002.h +++ b/src/devices/bus/kc/d002.h @@ -35,13 +35,13 @@ protected: virtual void write(offs_t offset, uint8_t data) override; virtual void io_read(offs_t offset, uint8_t &data) override; virtual void io_write(offs_t offset, uint8_t data) override; - virtual DECLARE_WRITE_LINE_MEMBER( mei_w ) override; + virtual void mei_w(int state) override; private: // interface callbacks - DECLARE_WRITE_LINE_MEMBER( out_irq_w ); - DECLARE_WRITE_LINE_MEMBER( out_nmi_w ); - DECLARE_WRITE_LINE_MEMBER( out_halt_w ); + void out_irq_w(int state); + void out_nmi_w(int state); + void out_halt_w(int state); kcexp_slot_device *m_slot; diff --git a/src/devices/bus/kc/d004.cpp b/src/devices/bus/kc/d004.cpp index 45905b23b1d..3d129baaf3e 100644 --- a/src/devices/bus/kc/d004.cpp +++ b/src/devices/bus/kc/d004.cpp @@ -348,7 +348,7 @@ void kc_d004_device::hw_terminal_count_w(uint8_t data) m_fdc->tc_w(true); } -WRITE_LINE_MEMBER(kc_d004_device::fdc_irq) +void kc_d004_device::fdc_irq(int state) { if (state) m_fdc->tc_w(false); diff --git a/src/devices/bus/kc/d004.h b/src/devices/bus/kc/d004.h index 570f378b4fa..d4494632511 100644 --- a/src/devices/bus/kc/d004.h +++ b/src/devices/bus/kc/d004.h @@ -57,7 +57,7 @@ protected: private: static void floppy_formats(format_registration &fr); - DECLARE_WRITE_LINE_MEMBER( fdc_irq ); + void fdc_irq(int state); void kc_d004_io(address_map &map); void kc_d004_mem(address_map &map); diff --git a/src/devices/bus/kc/kc.cpp b/src/devices/bus/kc/kc.cpp index 8297ad7da7d..9f00129e6ac 100644 --- a/src/devices/bus/kc/kc.cpp +++ b/src/devices/bus/kc/kc.cpp @@ -270,7 +270,7 @@ void kcexp_slot_device::io_write(offs_t offset, uint8_t data) MEI line write -------------------------------------------------*/ -WRITE_LINE_MEMBER( kcexp_slot_device::mei_w ) +void kcexp_slot_device::mei_w(int state) { LOG("KCEXP: %s MEI line\n", state != CLEAR_LINE ? "ASSERT": "CLEAR"); @@ -282,7 +282,7 @@ WRITE_LINE_MEMBER( kcexp_slot_device::mei_w ) MEO line write -------------------------------------------------*/ -WRITE_LINE_MEMBER( kcexp_slot_device::meo_w ) +void kcexp_slot_device::meo_w(int state) { LOG("KCEXP: %s MEO line\n", state != CLEAR_LINE ? "ASSERT": "CLEAR"); diff --git a/src/devices/bus/kc/kc.h b/src/devices/bus/kc/kc.h index 20eca1b2d79..c7cd81287a4 100644 --- a/src/devices/bus/kc/kc.h +++ b/src/devices/bus/kc/kc.h @@ -35,7 +35,7 @@ public: virtual void io_read(offs_t offset, uint8_t &data) { } virtual void io_write(offs_t offset, uint8_t data) { } virtual uint8_t* get_cart_base() { return nullptr; } - virtual DECLARE_WRITE_LINE_MEMBER( mei_w ) { } + virtual void mei_w(int state) { } protected: device_kcexp_interface(const machine_config &mconfig, device_t &device); @@ -73,8 +73,8 @@ public: virtual void write(offs_t offset, uint8_t data); virtual void io_read(offs_t offset, uint8_t &data); virtual void io_write(offs_t offset, uint8_t data); - virtual DECLARE_WRITE_LINE_MEMBER( mei_w ); - virtual DECLARE_WRITE_LINE_MEMBER( meo_w ); + virtual void mei_w(int state); + virtual void meo_w(int state); devcb_write_line m_out_irq_cb; devcb_write_line m_out_nmi_cb; diff --git a/src/devices/bus/kc/ram.cpp b/src/devices/bus/kc/ram.cpp index 5e69b397508..347e386b397 100644 --- a/src/devices/bus/kc/ram.cpp +++ b/src/devices/bus/kc/ram.cpp @@ -131,7 +131,7 @@ void kc_m011_device::write(offs_t offset, uint8_t data) MEI line write -------------------------------------------------*/ -WRITE_LINE_MEMBER( kc_m011_device::mei_w ) +void kc_m011_device::mei_w(int state) { m_mei = state; diff --git a/src/devices/bus/kc/ram.h b/src/devices/bus/kc/ram.h index 823d32bdb31..bf30ce1a83f 100644 --- a/src/devices/bus/kc/ram.h +++ b/src/devices/bus/kc/ram.h @@ -33,7 +33,7 @@ protected: virtual void control_w(uint8_t data) override; virtual void read(offs_t offset, uint8_t &data) override; virtual void write(offs_t offset, uint8_t data) override; - virtual DECLARE_WRITE_LINE_MEMBER( mei_w ) override; + virtual void mei_w(int state) override; protected: kcexp_slot_device *m_slot; diff --git a/src/devices/bus/kc/rom.cpp b/src/devices/bus/kc/rom.cpp index eca6d6a1907..d0ae2d508ba 100644 --- a/src/devices/bus/kc/rom.cpp +++ b/src/devices/bus/kc/rom.cpp @@ -126,7 +126,7 @@ void kc_8k_device::read(offs_t offset, uint8_t &data) MEI line write -------------------------------------------------*/ -WRITE_LINE_MEMBER( kc_8k_device::mei_w ) +void kc_8k_device::mei_w(int state) { m_mei = state; diff --git a/src/devices/bus/kc/rom.h b/src/devices/bus/kc/rom.h index 024969d68b4..44556948a02 100644 --- a/src/devices/bus/kc/rom.h +++ b/src/devices/bus/kc/rom.h @@ -34,7 +34,7 @@ protected: virtual void control_w(uint8_t data) override; virtual void read(offs_t offset, uint8_t &data) override; virtual uint8_t* get_cart_base() override; - virtual DECLARE_WRITE_LINE_MEMBER( mei_w ) override; + virtual void mei_w(int state) override; protected: kcexp_slot_device *m_slot; diff --git a/src/devices/bus/lpci/i82439tx.cpp b/src/devices/bus/lpci/i82439tx.cpp index 0966456831a..1c36412eac1 100644 --- a/src/devices/bus/lpci/i82439tx.cpp +++ b/src/devices/bus/lpci/i82439tx.cpp @@ -426,7 +426,7 @@ void i82439tx_device::update_smram_mappings() } } -WRITE_LINE_MEMBER(i82439tx_device::smi_act_w) +void i82439tx_device::smi_act_w(int state) { // state is 0 when smm is not active // but smiact_n reflects the state of the SMIACT# pin diff --git a/src/devices/bus/lpci/i82439tx.h b/src/devices/bus/lpci/i82439tx.h index af5a0dcf757..b8dbc392e90 100644 --- a/src/devices/bus/lpci/i82439tx.h +++ b/src/devices/bus/lpci/i82439tx.h @@ -29,7 +29,7 @@ public: virtual uint32_t pci_read(pci_bus_device *pcibus, int function, int offset, uint32_t mem_mask) override; virtual void pci_write(pci_bus_device *pcibus, int function, int offset, uint32_t data, uint32_t mem_mask) override; - DECLARE_WRITE_LINE_MEMBER(smi_act_w); + void smi_act_w(int state); protected: // device-level overrides diff --git a/src/devices/bus/lpci/southbridge.cpp b/src/devices/bus/lpci/southbridge.cpp index 2f9faa4aab0..ebbb0c47ce4 100644 --- a/src/devices/bus/lpci/southbridge.cpp +++ b/src/devices/bus/lpci/southbridge.cpp @@ -282,19 +282,19 @@ void southbridge_device::at_speaker_set_spkrdata(uint8_t data) * *************************************************************/ -WRITE_LINE_MEMBER( southbridge_device::at_pit8254_out0_changed ) +void southbridge_device::at_pit8254_out0_changed(int state) { if (m_pic8259_master) m_pic8259_master->ir0_w(state); } -WRITE_LINE_MEMBER( southbridge_device::at_pit8254_out1_changed ) +void southbridge_device::at_pit8254_out1_changed(int state) { if(state) m_refresh = !m_refresh; } -WRITE_LINE_MEMBER( southbridge_device::at_pit8254_out2_changed ) +void southbridge_device::at_pit8254_out2_changed(int state) { m_pit_out2 = state ? 1 : 0; m_speaker->level_w(m_at_spkrdata & m_pit_out2); @@ -353,7 +353,7 @@ void southbridge_device::at_page8_w(offs_t offset, uint8_t data) } -WRITE_LINE_MEMBER( southbridge_device::pc_dma_hrq_changed ) +void southbridge_device::pc_dma_hrq_changed(int state) { m_maincpu->set_input_line(INPUT_LINE_HALT, state ? ASSERT_LINE : CLEAR_LINE); @@ -428,7 +428,7 @@ void southbridge_device::pc_dma8237_5_dack_w(uint8_t data) { m_isabus->dack_w(5, void southbridge_device::pc_dma8237_6_dack_w(uint8_t data) { m_isabus->dack_w(6, data); } void southbridge_device::pc_dma8237_7_dack_w(uint8_t data) { m_isabus->dack_w(7, data); } -WRITE_LINE_MEMBER( southbridge_device::at_dma8237_out_eop ) +void southbridge_device::at_dma8237_out_eop(int state) { m_cur_eop = state == ASSERT_LINE; if(m_dma_channel != -1) @@ -450,14 +450,14 @@ void southbridge_device::pc_select_dma_channel(int channel, bool state) } -WRITE_LINE_MEMBER( southbridge_device::pc_dack0_w ) { pc_select_dma_channel(0, state); } -WRITE_LINE_MEMBER( southbridge_device::pc_dack1_w ) { pc_select_dma_channel(1, state); } -WRITE_LINE_MEMBER( southbridge_device::pc_dack2_w ) { pc_select_dma_channel(2, state); } -WRITE_LINE_MEMBER( southbridge_device::pc_dack3_w ) { pc_select_dma_channel(3, state); } -WRITE_LINE_MEMBER( southbridge_device::pc_dack4_w ) { m_dma8237_1->hack_w( state ? 0 : 1); } // it's inverted -WRITE_LINE_MEMBER( southbridge_device::pc_dack5_w ) { pc_select_dma_channel(5, state); } -WRITE_LINE_MEMBER( southbridge_device::pc_dack6_w ) { pc_select_dma_channel(6, state); } -WRITE_LINE_MEMBER( southbridge_device::pc_dack7_w ) { pc_select_dma_channel(7, state); } +void southbridge_device::pc_dack0_w(int state) { pc_select_dma_channel(0, state); } +void southbridge_device::pc_dack1_w(int state) { pc_select_dma_channel(1, state); } +void southbridge_device::pc_dack2_w(int state) { pc_select_dma_channel(2, state); } +void southbridge_device::pc_dack3_w(int state) { pc_select_dma_channel(3, state); } +void southbridge_device::pc_dack4_w(int state) { m_dma8237_1->hack_w( state ? 0 : 1); } // it's inverted +void southbridge_device::pc_dack5_w(int state) { pc_select_dma_channel(5, state); } +void southbridge_device::pc_dack6_w(int state) { pc_select_dma_channel(6, state); } +void southbridge_device::pc_dack7_w(int state) { pc_select_dma_channel(7, state); } uint8_t southbridge_device::at_portb_r() { @@ -485,7 +485,7 @@ void southbridge_device::at_portb_w(uint8_t data) m_maincpu->set_input_line(INPUT_LINE_NMI, CLEAR_LINE); } -WRITE_LINE_MEMBER( southbridge_device::iochck_w ) +void southbridge_device::iochck_w(int state) { if (!state && !m_channel_check && m_nmi_enabled) m_maincpu->set_input_line(INPUT_LINE_NMI, ASSERT_LINE); diff --git a/src/devices/bus/lpci/southbridge.h b/src/devices/bus/lpci/southbridge.h index 92953a5df0f..b6f70dc590d 100644 --- a/src/devices/bus/lpci/southbridge.h +++ b/src/devices/bus/lpci/southbridge.h @@ -87,12 +87,12 @@ private: void at_page8_w(offs_t offset, uint8_t data); uint8_t at_portb_r(); void at_portb_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(iochck_w); + void iochck_w(int state); uint8_t get_slave_ack(offs_t offset); - DECLARE_WRITE_LINE_MEMBER(at_pit8254_out0_changed); - DECLARE_WRITE_LINE_MEMBER(at_pit8254_out1_changed); - DECLARE_WRITE_LINE_MEMBER(at_pit8254_out2_changed); - DECLARE_WRITE_LINE_MEMBER(pc_dma_hrq_changed); + void at_pit8254_out0_changed(int state); + void at_pit8254_out1_changed(int state); + void at_pit8254_out2_changed(int state); + void pc_dma_hrq_changed(int state); uint8_t pc_dma8237_0_dack_r(); uint8_t pc_dma8237_1_dack_r(); uint8_t pc_dma8237_2_dack_r(); @@ -107,15 +107,15 @@ private: void pc_dma8237_5_dack_w(uint8_t data); void pc_dma8237_6_dack_w(uint8_t data); void pc_dma8237_7_dack_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(at_dma8237_out_eop); - DECLARE_WRITE_LINE_MEMBER(pc_dack0_w); - DECLARE_WRITE_LINE_MEMBER(pc_dack1_w); - DECLARE_WRITE_LINE_MEMBER(pc_dack2_w); - DECLARE_WRITE_LINE_MEMBER(pc_dack3_w); - DECLARE_WRITE_LINE_MEMBER(pc_dack4_w); - DECLARE_WRITE_LINE_MEMBER(pc_dack5_w); - DECLARE_WRITE_LINE_MEMBER(pc_dack6_w); - DECLARE_WRITE_LINE_MEMBER(pc_dack7_w); + void at_dma8237_out_eop(int state); + void pc_dack0_w(int state); + void pc_dack1_w(int state); + void pc_dack2_w(int state); + void pc_dack3_w(int state); + void pc_dack4_w(int state); + void pc_dack5_w(int state); + void pc_dack6_w(int state); + void pc_dack7_w(int state); uint32_t ide1_read32_cs0_r(offs_t offset, uint32_t mem_mask = ~0); void ide1_write32_cs0_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0); diff --git a/src/devices/bus/mackbd/keyboard.cpp b/src/devices/bus/mackbd/keyboard.cpp index 46bc667429f..9d34ad83ee4 100644 --- a/src/devices/bus/mackbd/keyboard.cpp +++ b/src/devices/bus/mackbd/keyboard.cpp @@ -293,12 +293,12 @@ protected: save_item(NAME(m_watchdog_in)); } - virtual DECLARE_WRITE_LINE_MEMBER(data_w) override + virtual void data_w(int state) override { machine().scheduler().synchronize(timer_expired_delegate(FUNC(peripheral_base::update_host_data), this), state); } - DECLARE_WRITE_LINE_MEMBER(watchdog_w) + void watchdog_w(int state) { if (bool(state) != bool(m_watchdog_in)) { @@ -321,7 +321,7 @@ protected: required_device m_mpu; private: - DECLARE_WRITE_LINE_MEMBER(host_clock_w) + void host_clock_w(int state) { if (bool(state) != bool(m_host_clock_out)) { @@ -333,7 +333,7 @@ private: } } - DECLARE_WRITE_LINE_MEMBER(host_data_w) + void host_data_w(int state) { if (bool(state) != bool(m_host_data_out)) { @@ -454,7 +454,7 @@ protected: required_device m_keyboard_port; private: - DECLARE_WRITE_LINE_MEMBER(keyboard_data_out_w) + void keyboard_data_out_w(int state) { if (bool(state) != bool(m_keyboard_data_out)) { @@ -463,12 +463,12 @@ private: } } - DECLARE_WRITE_LINE_MEMBER(keyboard_clock_in_w) + void keyboard_clock_in_w(int state) { machine().scheduler().synchronize(timer_expired_delegate(FUNC(keypad_base::update_keyboard_clock), this), state); } - DECLARE_WRITE_LINE_MEMBER(keyboard_data_in_w) + void keyboard_data_in_w(int state) { machine().scheduler().synchronize(timer_expired_delegate(FUNC(keypad_base::update_keyboard_data), this), state); } diff --git a/src/devices/bus/mackbd/mackbd.cpp b/src/devices/bus/mackbd/mackbd.cpp index 0e13787c9cf..128f7b54725 100644 --- a/src/devices/bus/mackbd/mackbd.cpp +++ b/src/devices/bus/mackbd/mackbd.cpp @@ -112,7 +112,7 @@ mac_keyboard_port_device::~mac_keyboard_port_device() { } -WRITE_LINE_MEMBER(mac_keyboard_port_device::data_w) +void mac_keyboard_port_device::data_w(int state) { if (m_peripheral) m_peripheral->data_w(state); diff --git a/src/devices/bus/mackbd/mackbd.h b/src/devices/bus/mackbd/mackbd.h index 29be2d6e4ea..acb83df2e01 100644 --- a/src/devices/bus/mackbd/mackbd.h +++ b/src/devices/bus/mackbd/mackbd.h @@ -46,7 +46,7 @@ public: auto clock_cb() { return m_clock_cb.bind(); } auto data_cb() { return m_data_cb.bind(); } - DECLARE_WRITE_LINE_MEMBER(data_w); + void data_w(int state); protected: virtual void device_resolve_objects() override; @@ -76,10 +76,10 @@ protected: virtual void interface_validity_check(validity_checker &valid) const override; - DECLARE_WRITE_LINE_MEMBER(write_clock) { if (m_host) m_host->m_clock_cb(state); } - DECLARE_WRITE_LINE_MEMBER(write_data) { if (m_host) m_host->m_data_cb(state); } + void write_clock(int state) { if (m_host) m_host->m_clock_cb(state); } + void write_data(int state) { if (m_host) m_host->m_data_cb(state); } - virtual DECLARE_WRITE_LINE_MEMBER(data_w) = 0; + virtual void data_w(int state) = 0; private: mac_keyboard_port_device *const m_host; diff --git a/src/devices/bus/mackbd/pluskbd.cpp b/src/devices/bus/mackbd/pluskbd.cpp index b7b79ae66ab..c928b5faaca 100644 --- a/src/devices/bus/mackbd/pluskbd.cpp +++ b/src/devices/bus/mackbd/pluskbd.cpp @@ -149,7 +149,7 @@ protected: save_item(NAME(m_host_data_in)); } - virtual DECLARE_WRITE_LINE_MEMBER(data_w) override + virtual void data_w(int state) override { machine().scheduler().synchronize(timer_expired_delegate(FUNC(keyboard_base::update_host_data), this), state); } diff --git a/src/devices/bus/megadrive/jcart.cpp b/src/devices/bus/megadrive/jcart.cpp index c2869b397a5..d8cad677e52 100644 --- a/src/devices/bus/megadrive/jcart.cpp +++ b/src/devices/bus/megadrive/jcart.cpp @@ -173,7 +173,7 @@ void md_jcart_device::write(offs_t offset, uint16_t data, uint16_t mem_mask) } template -DECLARE_WRITE_LINE_MEMBER(md_jcart_device::th_in) +void md_jcart_device::th_in(int state) { m_th_in[N] = state ? 0x40 : 0x00; } diff --git a/src/devices/bus/megadrive/jcart.h b/src/devices/bus/megadrive/jcart.h index 360607a3bea..25916f5f4a5 100644 --- a/src/devices/bus/megadrive/jcart.h +++ b/src/devices/bus/megadrive/jcart.h @@ -33,7 +33,7 @@ protected: virtual void device_reset() override; private: - template DECLARE_WRITE_LINE_MEMBER(th_in); + template void th_in(int state); required_device_array m_ctrl_ports; uint8_t m_th_in[2]; diff --git a/src/devices/bus/midi/midi.cpp b/src/devices/bus/midi/midi.cpp index cff94bfe159..a225c81371e 100644 --- a/src/devices/bus/midi/midi.cpp +++ b/src/devices/bus/midi/midi.cpp @@ -28,7 +28,7 @@ void midi_port_device::device_start() m_rxd_handler.resolve_safe(); } -WRITE_LINE_MEMBER( midi_port_device::write_txd ) +void midi_port_device::write_txd(int state) { if(m_dev) m_dev->input_txd(state); diff --git a/src/devices/bus/midi/midi.h b/src/devices/bus/midi/midi.h index cdd89a84b6d..3479271a11f 100644 --- a/src/devices/bus/midi/midi.h +++ b/src/devices/bus/midi/midi.h @@ -28,9 +28,9 @@ public: // static configuration helpers auto rxd_handler() { return m_rxd_handler.bind(); } - DECLARE_WRITE_LINE_MEMBER( write_txd ); + void write_txd(int state); - DECLARE_READ_LINE_MEMBER( rx_r ) { return m_rxd; } + int rx_r() { return m_rxd; } protected: virtual void device_start() override; @@ -53,8 +53,8 @@ class device_midi_port_interface : public device_interface public: virtual ~device_midi_port_interface(); - virtual DECLARE_WRITE_LINE_MEMBER( input_txd ) { } - DECLARE_WRITE_LINE_MEMBER( output_rxd ) { m_port->m_rxd = state; m_port->m_rxd_handler(state); } + virtual void input_txd(int state) { } + void output_rxd(int state) { m_port->m_rxd = state; m_port->m_rxd_handler(state); } protected: device_midi_port_interface(const machine_config &mconfig, device_t &device); diff --git a/src/devices/bus/midi/midiinport.h b/src/devices/bus/midi/midiinport.h index 526af88bb2a..e373002f47f 100644 --- a/src/devices/bus/midi/midiinport.h +++ b/src/devices/bus/midi/midiinport.h @@ -28,7 +28,7 @@ protected: virtual void device_reset() override { } private: - DECLARE_WRITE_LINE_MEMBER( read ) { output_rxd(state); } + void read(int state) { output_rxd(state); } required_device m_midiin; }; diff --git a/src/devices/bus/midi/midioutport.h b/src/devices/bus/midi/midioutport.h index 2cc33ae922f..c675ecc086f 100644 --- a/src/devices/bus/midi/midioutport.h +++ b/src/devices/bus/midi/midioutport.h @@ -22,7 +22,7 @@ class midiout_port_device : public device_t, public: midiout_port_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - virtual DECLARE_WRITE_LINE_MEMBER( input_txd ) override { if (started()) m_midiout->tx(state); } + virtual void input_txd(int state) override { if (started()) m_midiout->tx(state); } protected: virtual void device_start() override { } diff --git a/src/devices/bus/mononcol/rom.h b/src/devices/bus/mononcol/rom.h index b9693b54adb..7184a8d8469 100644 --- a/src/devices/bus/mononcol/rom.h +++ b/src/devices/bus/mononcol/rom.h @@ -19,7 +19,7 @@ public: mononcol_rom_plain_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); uint8_t read() override { return m_spi->read(); } - DECLARE_WRITE_LINE_MEMBER(dir_w) override { m_spi->dir_w(state); } + void dir_w(int state) override { m_spi->dir_w(state); } void write(uint8_t data) override { m_spi->write(data); } void set_ready() override { m_spi->set_ready(); } diff --git a/src/devices/bus/mononcol/slot.h b/src/devices/bus/mononcol/slot.h index f5a9922f25b..5032044a8ca 100644 --- a/src/devices/bus/mononcol/slot.h +++ b/src/devices/bus/mononcol/slot.h @@ -22,7 +22,7 @@ public: // reading and writing virtual uint8_t read() = 0; - virtual DECLARE_WRITE_LINE_MEMBER(dir_w) = 0; + virtual void dir_w(int state) = 0; virtual void write(uint8_t data) = 0; virtual void set_ready() = 0; @@ -65,7 +65,7 @@ public: return m_cart->read(); } - DECLARE_WRITE_LINE_MEMBER(dir_w) + void dir_w(int state) { m_cart->dir_w(state); } diff --git a/src/devices/bus/msx/cart/bm_012.cpp b/src/devices/bus/msx/cart/bm_012.cpp index 7781b3c812f..1f9e3b43d9f 100644 --- a/src/devices/bus/msx/cart/bm_012.cpp +++ b/src/devices/bus/msx/cart/bm_012.cpp @@ -99,7 +99,7 @@ void msx_cart_bm_012_device::device_start() } -WRITE_LINE_MEMBER(msx_cart_bm_012_device::midi_in) +void msx_cart_bm_012_device::midi_in(int state) { m_mdthru->write_txd(state); m_tmpz84c015af->rxb_w(state); diff --git a/src/devices/bus/msx/cart/bm_012.h b/src/devices/bus/msx/cart/bm_012.h index 9adc5a78ceb..a48a0c82d25 100644 --- a/src/devices/bus/msx/cart/bm_012.h +++ b/src/devices/bus/msx/cart/bm_012.h @@ -26,7 +26,7 @@ protected: virtual const tiny_rom_entry *device_rom_region() const override; private: - DECLARE_WRITE_LINE_MEMBER(midi_in); + void midi_in(int state); void bm_012_memory_map(address_map &map); diff --git a/src/devices/bus/msx/cart/moonsound.cpp b/src/devices/bus/msx/cart/moonsound.cpp index 577b898d5f8..34299742c08 100644 --- a/src/devices/bus/msx/cart/moonsound.cpp +++ b/src/devices/bus/msx/cart/moonsound.cpp @@ -73,7 +73,7 @@ void msx_cart_moonsound_device::device_reset() { } -WRITE_LINE_MEMBER(msx_cart_moonsound_device::irq_w) +void msx_cart_moonsound_device::irq_w(int state) { LOG("moonsound: irq state %d\n", state); irq_out(state); diff --git a/src/devices/bus/msx/cart/moonsound.h b/src/devices/bus/msx/cart/moonsound.h index d84c7ea3adf..cd0c69b6a02 100644 --- a/src/devices/bus/msx/cart/moonsound.h +++ b/src/devices/bus/msx/cart/moonsound.h @@ -26,7 +26,7 @@ protected: virtual const tiny_rom_entry *device_rom_region() const override; private: - DECLARE_WRITE_LINE_MEMBER(irq_w); + void irq_w(int state); void write_ymf278b_pcm(offs_t offset, u8 data); u8 read_ymf278b_pcm(offs_t offset); u8 read_c0(); diff --git a/src/devices/bus/msx/cart/msx_audio.cpp b/src/devices/bus/msx/cart/msx_audio.cpp index bdcded61df9..dde3d149b17 100644 --- a/src/devices/bus/msx/cart/msx_audio.cpp +++ b/src/devices/bus/msx/cart/msx_audio.cpp @@ -170,7 +170,7 @@ const tiny_rom_entry *msx_cart_msx_audio_nms1205_device::device_rom_region() con return ROM_NAME(msx_nms1205); } -WRITE_LINE_MEMBER(msx_cart_msx_audio_nms1205_device::irq_write) +void msx_cart_msx_audio_nms1205_device::irq_write(int state) { // Trigger IRQ on the maincpu // The 8950 seems to trigger an irq on reset, this causes an infinite loop of continuously triggering @@ -179,7 +179,7 @@ WRITE_LINE_MEMBER(msx_cart_msx_audio_nms1205_device::irq_write) // m_out_irq_cb(state); } -WRITE_LINE_MEMBER(msx_cart_msx_audio_nms1205_device::midi_in) +void msx_cart_msx_audio_nms1205_device::midi_in(int state) { // MIDI in signals is sent to both the 6850 and the MIDI thru output port m_acia6850->write_rxd(state); diff --git a/src/devices/bus/msx/cart/msx_audio.h b/src/devices/bus/msx/cart/msx_audio.h index 43fdd5f3fd6..0d4b7ef1af8 100644 --- a/src/devices/bus/msx/cart/msx_audio.h +++ b/src/devices/bus/msx/cart/msx_audio.h @@ -50,8 +50,8 @@ protected: virtual const tiny_rom_entry *device_rom_region() const override; private: - DECLARE_WRITE_LINE_MEMBER(midi_in); - DECLARE_WRITE_LINE_MEMBER(irq_write); + void midi_in(int state); + void irq_write(int state); required_device m_y8950; required_device m_acia6850; diff --git a/src/devices/bus/msx/module/sfg.cpp b/src/devices/bus/msx/module/sfg.cpp index 23c089cc7df..96c899754ea 100644 --- a/src/devices/bus/msx/module/sfg.cpp +++ b/src/devices/bus/msx/module/sfg.cpp @@ -133,13 +133,13 @@ IRQ_CALLBACK_MEMBER(msx_cart_sfg_device::irq_callback) return m_ym2148->get_irq_vector(); } -WRITE_LINE_MEMBER(msx_cart_sfg_device::ym2151_irq_w) +void msx_cart_sfg_device::ym2151_irq_w(int state) { m_ym2151_irq_state = state ? ASSERT_LINE : CLEAR_LINE; check_irq(); } -WRITE_LINE_MEMBER(msx_cart_sfg_device::ym2148_irq_w) +void msx_cart_sfg_device::ym2148_irq_w(int state) { m_ym2148_irq_state = state ? ASSERT_LINE : CLEAR_LINE; check_irq(); diff --git a/src/devices/bus/msx/module/sfg.h b/src/devices/bus/msx/module/sfg.h index d40df66c677..81c3b098239 100644 --- a/src/devices/bus/msx/module/sfg.h +++ b/src/devices/bus/msx/module/sfg.h @@ -27,8 +27,8 @@ protected: IRQ_CALLBACK_MEMBER(irq_callback); - DECLARE_WRITE_LINE_MEMBER(ym2151_irq_w); - DECLARE_WRITE_LINE_MEMBER(ym2148_irq_w); + void ym2151_irq_w(int state); + void ym2148_irq_w(int state); required_memory_region m_region_sfg; required_device m_ym2151; diff --git a/src/devices/bus/msx/slot/cartridge.cpp b/src/devices/bus/msx/slot/cartridge.cpp index 5bc52c8886b..46c4505fcfb 100644 --- a/src/devices/bus/msx/slot/cartridge.cpp +++ b/src/devices/bus/msx/slot/cartridge.cpp @@ -83,7 +83,7 @@ void msx_slot_cartridge_base_device::call_unload() } } -WRITE_LINE_MEMBER(msx_slot_cartridge_base_device::irq_out) +void msx_slot_cartridge_base_device::irq_out(int state) { m_irq_handler(state); } @@ -97,7 +97,7 @@ msx_cart_interface::msx_cart_interface(const machine_config &mconfig, device_t & m_page[i] = nullptr; } -WRITE_LINE_MEMBER(msx_cart_interface::irq_out) +void msx_cart_interface::irq_out(int state) { m_exp->irq_out(state); } diff --git a/src/devices/bus/msx/slot/cartridge.h b/src/devices/bus/msx/slot/cartridge.h index e92091ecc20..67b822774f7 100644 --- a/src/devices/bus/msx/slot/cartridge.h +++ b/src/devices/bus/msx/slot/cartridge.h @@ -60,7 +60,7 @@ public: virtual std::string get_default_card_software(get_default_card_software_hook &hook) const override = 0; - DECLARE_WRITE_LINE_MEMBER(irq_out); + void irq_out(int state); protected: msx_slot_cartridge_base_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock); @@ -97,7 +97,7 @@ protected: memory_region *cart_sram_region() { return m_exp ? m_exp->memregion("sram") : nullptr; } const char *get_feature(std::string_view feature_name) { return m_exp ? m_exp->get_feature(feature_name) : nullptr; } bool is_loaded_through_softlist() { return m_exp ? m_exp->loaded_through_softlist() : false; } - DECLARE_WRITE_LINE_MEMBER(irq_out); + void irq_out(int state); msx_slot_cartridge_base_device *parent_slot() const { return m_exp; } address_space &memory_space() const; address_space &io_space() const; diff --git a/src/devices/bus/msx/slot/msx_rs232.cpp b/src/devices/bus/msx/slot/msx_rs232.cpp index 7d34e31edc5..aebae56a487 100644 --- a/src/devices/bus/msx/slot/msx_rs232.cpp +++ b/src/devices/bus/msx/slot/msx_rs232.cpp @@ -108,36 +108,36 @@ void msx_slot_rs232_base_device::irq_mask_w(offs_t offset, u8 data) m_irq_mask = data; } -WRITE_LINE_MEMBER(msx_slot_rs232_base_device::out2_w) +void msx_slot_rs232_base_device::out2_w(int state) { m_out2 = state; update_irq_state(); } -WRITE_LINE_MEMBER(msx_slot_rs232_base_device::cts_w) +void msx_slot_rs232_base_device::cts_w(int state) { m_cts = state; m_i8251->write_cts(state); } -WRITE_LINE_MEMBER(msx_slot_rs232_base_device::dcd_w) +void msx_slot_rs232_base_device::dcd_w(int state) { m_dcd = state; update_irq_state(); } -WRITE_LINE_MEMBER(msx_slot_rs232_base_device::ri_w) +void msx_slot_rs232_base_device::ri_w(int state) { m_ri = state; } -WRITE_LINE_MEMBER(msx_slot_rs232_base_device::rxrdy_w) +void msx_slot_rs232_base_device::rxrdy_w(int state) { m_rxrdy = state; update_irq_state(); } -WRITE_LINE_MEMBER(msx_slot_rs232_base_device::txrdy_w) +void msx_slot_rs232_base_device::txrdy_w(int state) { m_txrdy = state; update_irq_state(); diff --git a/src/devices/bus/msx/slot/msx_rs232.h b/src/devices/bus/msx/slot/msx_rs232.h index 2df9a653f38..6aa6ba52ffa 100644 --- a/src/devices/bus/msx/slot/msx_rs232.h +++ b/src/devices/bus/msx/slot/msx_rs232.h @@ -28,12 +28,12 @@ protected: virtual void irq_mask_w(offs_t offset, u8 data); virtual u8 status_r(offs_t offset) { return 0; } virtual void update_irq_state() { } - DECLARE_WRITE_LINE_MEMBER(out2_w); - DECLARE_WRITE_LINE_MEMBER(cts_w); - DECLARE_WRITE_LINE_MEMBER(dcd_w); - DECLARE_WRITE_LINE_MEMBER(ri_w); - DECLARE_WRITE_LINE_MEMBER(rxrdy_w); - DECLARE_WRITE_LINE_MEMBER(txrdy_w); + void out2_w(int state); + void cts_w(int state); + void dcd_w(int state); + void ri_w(int state); + void rxrdy_w(int state); + void txrdy_w(int state); required_device m_i8251; required_device m_i8253; diff --git a/src/devices/bus/mtx/exp.h b/src/devices/bus/mtx/exp.h index 86a939f3205..937db9431d3 100644 --- a/src/devices/bus/mtx/exp.h +++ b/src/devices/bus/mtx/exp.h @@ -49,9 +49,9 @@ public: auto nmi_handler() { return m_nmi_handler.bind(); } // for the card to use - DECLARE_WRITE_LINE_MEMBER( busreq_w ) { m_busreq_handler(state); } - DECLARE_WRITE_LINE_MEMBER( int_w ) { m_int_handler(state); } - DECLARE_WRITE_LINE_MEMBER( nmi_w ) { m_nmi_handler(state); } + void busreq_w(int state) { m_busreq_handler(state); } + void int_w(int state) { m_int_handler(state); } + void nmi_w(int state) { m_nmi_handler(state); } virtual void bankswitch(uint8_t data); diff --git a/src/devices/bus/mtx/sdx.cpp b/src/devices/bus/mtx/sdx.cpp index 0a27e48f309..f74e93cc53a 100644 --- a/src/devices/bus/mtx/sdx.cpp +++ b/src/devices/bus/mtx/sdx.cpp @@ -330,7 +330,7 @@ void mtx_sdx_device::sdx_control_w(uint8_t data) m_fdc->dden_w(!BIT(data, 4)); } -WRITE_LINE_MEMBER(mtx_sdx_device::motor_w) +void mtx_sdx_device::motor_w(int state) { if (m_floppy0->get_device()) m_floppy0->get_device()->mon_w(0); if (m_floppy1->get_device()) m_floppy1->get_device()->mon_w(0); diff --git a/src/devices/bus/mtx/sdx.h b/src/devices/bus/mtx/sdx.h index 5bed06258aa..2dc64d88f33 100644 --- a/src/devices/bus/mtx/sdx.h +++ b/src/devices/bus/mtx/sdx.h @@ -34,7 +34,7 @@ public: uint8_t sdx_status_r(); void sdx_control_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(motor_w); + void motor_w(int state); protected: // construction/destruction diff --git a/src/devices/bus/multibus/isbc202.cpp b/src/devices/bus/multibus/isbc202.cpp index 502737837d1..97b7bca71ae 100644 --- a/src/devices/bus/multibus/isbc202.cpp +++ b/src/devices/bus/multibus/isbc202.cpp @@ -316,7 +316,7 @@ void isbc202_device::io_w(address_space &space, offs_t offset, uint8_t data) } } -WRITE_LINE_MEMBER(isbc202_device::co_w) +void isbc202_device::co_w(int state) { m_inputs[ IN_SEL_CO ] = state; m_mcu->fi_w(state); diff --git a/src/devices/bus/multibus/isbc202.h b/src/devices/bus/multibus/isbc202.h index 6fc94179364..6f09512a9d1 100644 --- a/src/devices/bus/multibus/isbc202.h +++ b/src/devices/bus/multibus/isbc202.h @@ -31,7 +31,7 @@ public: uint8_t io_r(address_space &space, offs_t offset); void io_w(address_space &space, offs_t offset, uint8_t data); - DECLARE_WRITE_LINE_MEMBER(co_w); + void co_w(int state); uint8_t px_r(); diff --git a/src/devices/bus/nabupc/adapter.cpp b/src/devices/bus/nabupc/adapter.cpp index b1c499b4024..8afd3a51484 100644 --- a/src/devices/bus/nabupc/adapter.cpp +++ b/src/devices/bus/nabupc/adapter.cpp @@ -232,7 +232,7 @@ ioport_constructor network_adapter::device_input_ports() const // SERIAL PROTOCOL //************************************************************************** -WRITE_LINE_MEMBER(network_adapter::input_txd) +void network_adapter::input_txd(int state) { device_buffered_serial_interface::rx_w(state); } diff --git a/src/devices/bus/nabupc/adapter.h b/src/devices/bus/nabupc/adapter.h index 6405fe6525d..ad26c9d313f 100644 --- a/src/devices/bus/nabupc/adapter.h +++ b/src/devices/bus/nabupc/adapter.h @@ -45,7 +45,7 @@ public: virtual const char *image_brief_type_name() const noexcept override { return "hcca"; } virtual std::pair call_load() override; - virtual DECLARE_WRITE_LINE_MEMBER(input_txd) override; + virtual void input_txd(int state) override; protected: // device_t implementation diff --git a/src/devices/bus/nabupc/option.cpp b/src/devices/bus/nabupc/option.cpp index 40af4f53fe0..7e4421ff227 100644 --- a/src/devices/bus/nabupc/option.cpp +++ b/src/devices/bus/nabupc/option.cpp @@ -62,7 +62,7 @@ void option_slot_device::io_write(offs_t offset, uint8_t data) } } -WRITE_LINE_MEMBER(option_slot_device::int_w) { (*m_bus).set_int_line(state, m_slot); } +void option_slot_device::int_w(int state) { (*m_bus).set_int_line(state, m_slot); } //************************************************************************** diff --git a/src/devices/bus/nabupc/option.h b/src/devices/bus/nabupc/option.h index 62316b95365..94b47d642bf 100644 --- a/src/devices/bus/nabupc/option.h +++ b/src/devices/bus/nabupc/option.h @@ -78,7 +78,7 @@ public: uint8_t io_read(offs_t offset); void io_write(offs_t offset, uint8_t data); - DECLARE_WRITE_LINE_MEMBER(int_w); + void int_w(int state); protected: // device-level overrides virtual void device_start() override; diff --git a/src/devices/bus/nabupc/rs232.cpp b/src/devices/bus/nabupc/rs232.cpp index 1da633f9bfe..a57066984d3 100644 --- a/src/devices/bus/nabupc/rs232.cpp +++ b/src/devices/bus/nabupc/rs232.cpp @@ -37,7 +37,7 @@ protected: virtual void device_add_mconfig(machine_config &config) override; virtual void device_start() override; - DECLARE_WRITE_LINE_MEMBER(rxrdy_w); + void rxrdy_w(int state); private: required_device m_i8251; @@ -92,7 +92,7 @@ void rs232_device::device_start() { } -WRITE_LINE_MEMBER(rs232_device::rxrdy_w) +void rs232_device::rxrdy_w(int state) { get_slot()->int_w(!state); } diff --git a/src/devices/bus/nasbus/nasbus.cpp b/src/devices/bus/nasbus/nasbus.cpp index d72bd2c7d93..6cdc2669e2d 100644 --- a/src/devices/bus/nasbus/nasbus.cpp +++ b/src/devices/bus/nasbus/nasbus.cpp @@ -101,7 +101,7 @@ void nasbus_device::add_card(device_nasbus_card_interface &card) } // callbacks from slot device to the host -WRITE_LINE_MEMBER( nasbus_device::ram_disable_w ) { m_ram_disable_handler(state); } +void nasbus_device::ram_disable_w(int state) { m_ram_disable_handler(state); } //************************************************************************** diff --git a/src/devices/bus/nasbus/nasbus.h b/src/devices/bus/nasbus/nasbus.h index 550c9542faf..d1cd3a4fa77 100644 --- a/src/devices/bus/nasbus/nasbus.h +++ b/src/devices/bus/nasbus/nasbus.h @@ -156,7 +156,7 @@ public: template void set_io_space(T &&tag, int spacenum) { m_io.set_tag(std::forward(tag), spacenum); } // from cards - DECLARE_WRITE_LINE_MEMBER( ram_disable_w ); + void ram_disable_w(int state); protected: // device_t implementation @@ -192,7 +192,7 @@ protected: virtual void interface_pre_start() override; - DECLARE_WRITE_LINE_MEMBER( ram_disable_w ) { m_nasbus->ram_disable_w(state); } + void ram_disable_w(int state) { m_nasbus->ram_disable_w(state); } address_space &program_space() { return *m_nasbus->m_program; } address_space &io_space() { return *m_nasbus->m_io; } diff --git a/src/devices/bus/nes/nes_slot.cpp b/src/devices/bus/nes/nes_slot.cpp index 0bd4784d653..3d873e4902d 100644 --- a/src/devices/bus/nes/nes_slot.cpp +++ b/src/devices/bus/nes/nes_slot.cpp @@ -467,7 +467,7 @@ void device_nes_cart_interface::set_nt_mirroring(int mirroring) // Interrupt helpers //------------------------------------------------- -DECLARE_WRITE_LINE_MEMBER(device_nes_cart_interface::set_irq_line) +void device_nes_cart_interface::set_irq_line(int state) { assert(state == ASSERT_LINE || state == CLEAR_LINE); diff --git a/src/devices/bus/nes/nes_slot.h b/src/devices/bus/nes/nes_slot.h index c9a54e685b1..ca2d884c226 100644 --- a/src/devices/bus/nes/nes_slot.h +++ b/src/devices/bus/nes/nes_slot.h @@ -265,7 +265,7 @@ public: protected: device_nes_cart_interface(const machine_config &mconfig, device_t &device); - DECLARE_WRITE_LINE_MEMBER(set_irq_line); + void set_irq_line(int state); // internal state uint8_t *m_prg; diff --git a/src/devices/bus/newbrain/eim.cpp b/src/devices/bus/newbrain/eim.cpp index 7b3685eeea7..9b44f80b55f 100644 --- a/src/devices/bus/newbrain/eim.cpp +++ b/src/devices/bus/newbrain/eim.cpp @@ -223,7 +223,7 @@ void newbrain_eim_device::anio_w(uint8_t data) // adc_eoc_w - //------------------------------------------------- -WRITE_LINE_MEMBER( newbrain_eim_device::adc_eoc_w ) +void newbrain_eim_device::adc_eoc_w(int state) { m_anint = state; } @@ -233,7 +233,7 @@ WRITE_LINE_MEMBER( newbrain_eim_device::adc_eoc_w ) // acia_interrupt - //------------------------------------------------- -WRITE_LINE_MEMBER( newbrain_eim_device::acia_interrupt ) +void newbrain_eim_device::acia_interrupt(int state) { m_aciaint = state; } @@ -243,7 +243,7 @@ WRITE_LINE_MEMBER( newbrain_eim_device::acia_interrupt ) // ctc_z2_w - //------------------------------------------------- -WRITE_LINE_MEMBER( newbrain_eim_device::ctc_z2_w ) +void newbrain_eim_device::ctc_z2_w(int state) { // connected to CTC channel 0/1 clock inputs m_ctc->trg0(state); diff --git a/src/devices/bus/newbrain/eim.h b/src/devices/bus/newbrain/eim.h index 4241fd4b69a..89551a4bca4 100644 --- a/src/devices/bus/newbrain/eim.h +++ b/src/devices/bus/newbrain/eim.h @@ -54,9 +54,9 @@ protected: virtual void iorq_w(offs_t offset, uint8_t data, bool &prtov) override; private: - DECLARE_WRITE_LINE_MEMBER( acia_interrupt ); - DECLARE_WRITE_LINE_MEMBER( ctc_z2_w ); - DECLARE_WRITE_LINE_MEMBER( adc_eoc_w ); + void acia_interrupt(int state); + void ctc_z2_w(int state); + void adc_eoc_w(int state); TIMER_DEVICE_CALLBACK_MEMBER(ctc_c2_tick); diff --git a/src/devices/bus/newbrain/fdc.cpp b/src/devices/bus/newbrain/fdc.cpp index fa046e0d5a9..c726a36f020 100644 --- a/src/devices/bus/newbrain/fdc.cpp +++ b/src/devices/bus/newbrain/fdc.cpp @@ -231,7 +231,7 @@ void newbrain_fdc_device::moton(int state) // fdc_int_w - //------------------------------------------------- -WRITE_LINE_MEMBER( newbrain_fdc_device::fdc_int_w ) +void newbrain_fdc_device::fdc_int_w(int state) { m_fdc_int = state; } diff --git a/src/devices/bus/newbrain/fdc.h b/src/devices/bus/newbrain/fdc.h index 3ac24faffa6..a95d4679d2b 100644 --- a/src/devices/bus/newbrain/fdc.h +++ b/src/devices/bus/newbrain/fdc.h @@ -46,7 +46,7 @@ protected: virtual void iorq_w(offs_t offset, uint8_t data, bool &prtov) override; private: - DECLARE_WRITE_LINE_MEMBER( fdc_int_w ); + void fdc_int_w(int state); void fdc_auxiliary_w(uint8_t data); uint8_t fdc_control_r(); diff --git a/src/devices/bus/nubus/nubus.cpp b/src/devices/bus/nubus/nubus.cpp index 82e9b00f3c2..8ebe3cce2d2 100644 --- a/src/devices/bus/nubus/nubus.cpp +++ b/src/devices/bus/nubus/nubus.cpp @@ -246,12 +246,12 @@ void nubus_device::set_irq_line(int slot, int state) } // interrupt request from nubus card -WRITE_LINE_MEMBER( nubus_device::irq9_w ) { m_out_irq9_cb(state); } -WRITE_LINE_MEMBER( nubus_device::irqa_w ) { m_out_irqa_cb(state); } -WRITE_LINE_MEMBER( nubus_device::irqb_w ) { m_out_irqb_cb(state); } -WRITE_LINE_MEMBER( nubus_device::irqc_w ) { m_out_irqc_cb(state); } -WRITE_LINE_MEMBER( nubus_device::irqd_w ) { m_out_irqd_cb(state); } -WRITE_LINE_MEMBER( nubus_device::irqe_w ) { m_out_irqe_cb(state); } +void nubus_device::irq9_w(int state) { m_out_irq9_cb(state); } +void nubus_device::irqa_w(int state) { m_out_irqa_cb(state); } +void nubus_device::irqb_w(int state) { m_out_irqb_cb(state); } +void nubus_device::irqc_w(int state) { m_out_irqc_cb(state); } +void nubus_device::irqd_w(int state) { m_out_irqd_cb(state); } +void nubus_device::irqe_w(int state) { m_out_irqe_cb(state); } //************************************************************************** // DEVICE CONFIG NUBUS CARD INTERFACE diff --git a/src/devices/bus/nubus/nubus.h b/src/devices/bus/nubus/nubus.h index 99521ec619e..2d7ecc21033 100644 --- a/src/devices/bus/nubus/nubus.h +++ b/src/devices/bus/nubus/nubus.h @@ -130,12 +130,12 @@ public: void install_view(offs_t start, offs_t end, memory_view &view); void set_irq_line(int slot, int state); - DECLARE_WRITE_LINE_MEMBER( irq9_w ); - DECLARE_WRITE_LINE_MEMBER( irqa_w ); - DECLARE_WRITE_LINE_MEMBER( irqb_w ); - DECLARE_WRITE_LINE_MEMBER( irqc_w ); - DECLARE_WRITE_LINE_MEMBER( irqd_w ); - DECLARE_WRITE_LINE_MEMBER( irqe_w ); + void irq9_w(int state); + void irqa_w(int state); + void irqb_w(int state); + void irqc_w(int state); + void irqd_w(int state); + void irqe_w(int state); protected: nubus_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); diff --git a/src/devices/bus/nubus/nubus_asntmc3b.cpp b/src/devices/bus/nubus/nubus_asntmc3b.cpp index 2a45e2f2f3f..c7a846fe7b2 100644 --- a/src/devices/bus/nubus/nubus_asntmc3b.cpp +++ b/src/devices/bus/nubus/nubus_asntmc3b.cpp @@ -174,7 +174,7 @@ uint32_t nubus_mac8390_device::en_r(offs_t offset, uint32_t mem_mask) return 0; } -WRITE_LINE_MEMBER( nubus_mac8390_device::dp_irq_w ) +void nubus_mac8390_device::dp_irq_w(int state) { if (state) { diff --git a/src/devices/bus/odyssey2/homecomp.h b/src/devices/bus/odyssey2/homecomp.h index 7971afbff02..84b246ffc47 100644 --- a/src/devices/bus/odyssey2/homecomp.h +++ b/src/devices/bus/odyssey2/homecomp.h @@ -42,7 +42,7 @@ protected: virtual void write_p1(u8 data) override; virtual void io_write(offs_t offset, u8 data) override; virtual u8 io_read(offs_t offset) override; - virtual DECLARE_READ_LINE_MEMBER(t0_read) override { return m_latch[0]->pending_r(); } + virtual int t0_read() override { return m_latch[0]->pending_r(); } private: required_device m_maincpu; diff --git a/src/devices/bus/odyssey2/slot.cpp b/src/devices/bus/odyssey2/slot.cpp index af0d801a361..e3d0ae34168 100644 --- a/src/devices/bus/odyssey2/slot.cpp +++ b/src/devices/bus/odyssey2/slot.cpp @@ -241,7 +241,7 @@ u8 o2_cart_slot_device::bus_read() return (m_cart) ? m_cart->bus_read() : 0xff; } -READ_LINE_MEMBER(o2_cart_slot_device::t0_read) +int o2_cart_slot_device::t0_read() { return (m_cart) ? m_cart->t0_read() : 0; } diff --git a/src/devices/bus/odyssey2/slot.h b/src/devices/bus/odyssey2/slot.h index c8ed18523d7..386a6a3aeb5 100644 --- a/src/devices/bus/odyssey2/slot.h +++ b/src/devices/bus/odyssey2/slot.h @@ -68,7 +68,7 @@ public: virtual u8 io_read(offs_t offset) { return 0xff; } virtual void bus_write(u8 data) { } virtual u8 bus_read() { return 0xff; } - virtual DECLARE_READ_LINE_MEMBER(t0_read) { return 0; } + virtual int t0_read() { return 0; } virtual int b_read() { return -1; } virtual void cart_init() { } // called after loading ROM @@ -133,7 +133,7 @@ public: u8 io_read(offs_t offset); void bus_write(u8 data); u8 bus_read(); - DECLARE_READ_LINE_MEMBER(t0_read); + int t0_read(); int b_read(); void write_p1(u8 data) { if (m_cart) m_cart->write_p1(data); } diff --git a/src/devices/bus/odyssey2/voice.cpp b/src/devices/bus/odyssey2/voice.cpp index 831a02bcc1a..78507a92ab7 100644 --- a/src/devices/bus/odyssey2/voice.cpp +++ b/src/devices/bus/odyssey2/voice.cpp @@ -90,7 +90,7 @@ const tiny_rom_entry *o2_voice_device::device_rom_region() const // mapper specific handlers //------------------------------------------------- -READ_LINE_MEMBER(o2_voice_device::t0_read) +int o2_voice_device::t0_read() { return m_speech->lrq_r() ? 0 : 1; } diff --git a/src/devices/bus/odyssey2/voice.h b/src/devices/bus/odyssey2/voice.h index a8e3000032f..a125b282d66 100644 --- a/src/devices/bus/odyssey2/voice.h +++ b/src/devices/bus/odyssey2/voice.h @@ -36,7 +36,7 @@ public: virtual u8 bus_read() override { return (m_subslot->exists()) ? m_subslot->bus_read() : 0xff; } virtual void io_write(offs_t offset, u8 data) override; - virtual DECLARE_READ_LINE_MEMBER(t0_read) override; + virtual int t0_read() override; protected: // device-level overrides diff --git a/src/devices/bus/oricext/jasmin.cpp b/src/devices/bus/oricext/jasmin.cpp index 84144a010c1..25cd54b2f24 100644 --- a/src/devices/bus/oricext/jasmin.cpp +++ b/src/devices/bus/oricext/jasmin.cpp @@ -122,23 +122,23 @@ INPUT_CHANGED_MEMBER(oric_jasmin_device::boot_pressed) } } -WRITE_LINE_MEMBER(oric_jasmin_device::side_sel_w) +void oric_jasmin_device::side_sel_w(int state) { if(m_cur_floppy) m_cur_floppy->ss_w(state); } -WRITE_LINE_MEMBER(oric_jasmin_device::ram_access_w) +void oric_jasmin_device::ram_access_w(int state) { remap(); } -WRITE_LINE_MEMBER(oric_jasmin_device::rom_access_w) +void oric_jasmin_device::rom_access_w(int state) { remap(); } -WRITE_LINE_MEMBER(oric_jasmin_device::select_w) +void oric_jasmin_device::select_w(int state) { m_cur_floppy = nullptr; for(int i=0; i != 4; i++) diff --git a/src/devices/bus/oricext/jasmin.h b/src/devices/bus/oricext/jasmin.h index ec727c19769..fa4ffe7bf46 100644 --- a/src/devices/bus/oricext/jasmin.h +++ b/src/devices/bus/oricext/jasmin.h @@ -32,10 +32,10 @@ protected: private: void remap(); - DECLARE_WRITE_LINE_MEMBER(side_sel_w); - DECLARE_WRITE_LINE_MEMBER(ram_access_w); - DECLARE_WRITE_LINE_MEMBER(rom_access_w); - DECLARE_WRITE_LINE_MEMBER(select_w); + void side_sel_w(int state); + void ram_access_w(int state); + void rom_access_w(int state); + void select_w(int state); static void floppy_formats(format_registration &fr); diff --git a/src/devices/bus/oricext/microdisc.cpp b/src/devices/bus/oricext/microdisc.cpp index e6ff1e158ea..b85d56182f9 100644 --- a/src/devices/bus/oricext/microdisc.cpp +++ b/src/devices/bus/oricext/microdisc.cpp @@ -115,18 +115,18 @@ uint8_t oric_microdisc_device::port_318_r() return drq_state ? 0x7f : 0xff; } -WRITE_LINE_MEMBER(oric_microdisc_device::fdc_irq_w) +void oric_microdisc_device::fdc_irq_w(int state) { intrq_state = state; irq_w(intrq_state && (port_314 & P_IRQEN)); } -WRITE_LINE_MEMBER(oric_microdisc_device::fdc_drq_w) +void oric_microdisc_device::fdc_drq_w(int state) { drq_state = state; } -WRITE_LINE_MEMBER(oric_microdisc_device::fdc_hld_w) +void oric_microdisc_device::fdc_hld_w(int state) { hld_state = state; floppy_image_device *floppy = floppies[(port_314 >> 5) & 3]->get_device(); diff --git a/src/devices/bus/oricext/microdisc.h b/src/devices/bus/oricext/microdisc.h index 032b905da12..16696dd8fbf 100644 --- a/src/devices/bus/oricext/microdisc.h +++ b/src/devices/bus/oricext/microdisc.h @@ -42,9 +42,9 @@ private: uint8_t port_314; bool intrq_state, drq_state, hld_state; - DECLARE_WRITE_LINE_MEMBER(fdc_irq_w); - DECLARE_WRITE_LINE_MEMBER(fdc_drq_w); - DECLARE_WRITE_LINE_MEMBER(fdc_hld_w); + void fdc_irq_w(int state); + void fdc_drq_w(int state); + void fdc_hld_w(int state); void port_314_w(uint8_t data); uint8_t port_314_r(); diff --git a/src/devices/bus/oricext/oricext.cpp b/src/devices/bus/oricext/oricext.cpp index 6cb58f814bb..59bbb54aa55 100644 --- a/src/devices/bus/oricext/oricext.cpp +++ b/src/devices/bus/oricext/oricext.cpp @@ -68,12 +68,12 @@ void device_oricext_interface::interface_pre_start() connector = downcast(device().owner()); } -WRITE_LINE_MEMBER(device_oricext_interface::irq_w) +void device_oricext_interface::irq_w(int state) { connector->irq_w(state); } -WRITE_LINE_MEMBER(device_oricext_interface::reset_w) +void device_oricext_interface::reset_w(int state) { connector->reset_w(state); } diff --git a/src/devices/bus/oricext/oricext.h b/src/devices/bus/oricext/oricext.h index 7aba735aa06..3030888ec9d 100644 --- a/src/devices/bus/oricext/oricext.h +++ b/src/devices/bus/oricext/oricext.h @@ -53,8 +53,8 @@ protected: class device_oricext_interface : public device_interface { public: - DECLARE_WRITE_LINE_MEMBER(irq_w); - DECLARE_WRITE_LINE_MEMBER(reset_w); + void irq_w(int state); + void reset_w(int state); void set_view(memory_view &view); virtual void map_io(address_space_installer &space) = 0; diff --git a/src/devices/bus/pc8801/pc8801_23.cpp b/src/devices/bus/pc8801/pc8801_23.cpp index f0b11773d2c..507f4e49c7b 100644 --- a/src/devices/bus/pc8801/pc8801_23.cpp +++ b/src/devices/bus/pc8801/pc8801_23.cpp @@ -81,7 +81,7 @@ void pc8801_23_device::irq_mask_w(u8 data) int4_w(m_irq_pending); } -WRITE_LINE_MEMBER( pc8801_23_device::int4_w ) +void pc8801_23_device::int4_w(int state) { bool irq_state = (!m_irq_mask) & state; pc8801_exp_device::int4_w(irq_state); diff --git a/src/devices/bus/pc8801/pc8801_23.h b/src/devices/bus/pc8801/pc8801_23.h index b112274c7d0..ed36a171b10 100644 --- a/src/devices/bus/pc8801/pc8801_23.h +++ b/src/devices/bus/pc8801/pc8801_23.h @@ -21,7 +21,7 @@ public: protected: virtual void device_start() override; virtual void device_reset() override; - virtual DECLARE_WRITE_LINE_MEMBER( int4_w ) override; + virtual void int4_w(int state) override; private: virtual void device_add_mconfig(machine_config &config) override; diff --git a/src/devices/bus/pc8801/pc8801_exp.cpp b/src/devices/bus/pc8801/pc8801_exp.cpp index f3e8b23ee54..0317c72dfe3 100644 --- a/src/devices/bus/pc8801/pc8801_exp.cpp +++ b/src/devices/bus/pc8801/pc8801_exp.cpp @@ -65,9 +65,9 @@ void device_pc8801_exp_interface::interface_post_start() // generic passthroughs to INT* lines // NB: clients are responsible to handle irq masking just like base HW if available -WRITE_LINE_MEMBER( device_pc8801_exp_interface::int3_w ) { m_slot->m_int3_cb(state); } -WRITE_LINE_MEMBER( device_pc8801_exp_interface::int4_w ) { m_slot->m_int4_cb(state); } -WRITE_LINE_MEMBER( device_pc8801_exp_interface::int5_w ) { m_slot->m_int5_cb(state); } +void device_pc8801_exp_interface::int3_w(int state) { m_slot->m_int3_cb(state); } +void device_pc8801_exp_interface::int4_w(int state) { m_slot->m_int4_cb(state); } +void device_pc8801_exp_interface::int5_w(int state) { m_slot->m_int5_cb(state); } pc8801_exp_device::pc8801_exp_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, type, tag, owner, clock) diff --git a/src/devices/bus/pc8801/pc8801_exp.h b/src/devices/bus/pc8801/pc8801_exp.h index f3f540a1c9b..7d6286651af 100644 --- a/src/devices/bus/pc8801/pc8801_exp.h +++ b/src/devices/bus/pc8801/pc8801_exp.h @@ -68,9 +68,9 @@ protected: pc8801_exp_slot_device *m_slot; - DECLARE_WRITE_LINE_MEMBER( int3_w ); - virtual DECLARE_WRITE_LINE_MEMBER( int4_w ); - DECLARE_WRITE_LINE_MEMBER( int5_w ); + void int3_w(int state); + virtual void int4_w(int state); + void int5_w(int state); }; class pc8801_exp_device : public device_t, public device_pc8801_exp_interface diff --git a/src/devices/bus/pc_kbd/cherry_mx1500.cpp b/src/devices/bus/pc_kbd/cherry_mx1500.cpp index 4fc451d8354..e5636289abe 100644 --- a/src/devices/bus/pc_kbd/cherry_mx1500.cpp +++ b/src/devices/bus/pc_kbd/cherry_mx1500.cpp @@ -241,7 +241,7 @@ ioport_constructor cherry_g80_1500_device::device_input_ports() const } -WRITE_LINE_MEMBER(cherry_g80_1500_device::data_write) +void cherry_g80_1500_device::data_write(int state) { m_mcu->set_input_line(MCS51_INT1_LINE, state ? CLEAR_LINE : ASSERT_LINE); } diff --git a/src/devices/bus/pc_kbd/cherry_mx1500.h b/src/devices/bus/pc_kbd/cherry_mx1500.h index 902ee7a40f8..5bdabe34642 100644 --- a/src/devices/bus/pc_kbd/cherry_mx1500.h +++ b/src/devices/bus/pc_kbd/cherry_mx1500.h @@ -14,7 +14,7 @@ public: cherry_g80_1500_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); protected: - virtual DECLARE_WRITE_LINE_MEMBER(data_write) override; + virtual void data_write(int state) override; virtual ioport_constructor device_input_ports() const override; virtual void device_start() override; diff --git a/src/devices/bus/pc_kbd/ec1841.cpp b/src/devices/bus/pc_kbd/ec1841.cpp index cdd0b7c83d9..42350a4ecab 100644 --- a/src/devices/bus/pc_kbd/ec1841.cpp +++ b/src/devices/bus/pc_kbd/ec1841.cpp @@ -325,7 +325,7 @@ void ec_1841_keyboard_device::device_reset() // clock_write - //------------------------------------------------- -WRITE_LINE_MEMBER( ec_1841_keyboard_device::clock_write ) +void ec_1841_keyboard_device::clock_write(int state) { LOG("clock write %d\n", state); } @@ -335,7 +335,7 @@ WRITE_LINE_MEMBER( ec_1841_keyboard_device::clock_write ) // data_write - //------------------------------------------------- -WRITE_LINE_MEMBER( ec_1841_keyboard_device::data_write ) +void ec_1841_keyboard_device::data_write(int state) { LOG("data write %d\n", state); } @@ -440,7 +440,7 @@ void ec_1841_keyboard_device::p2_w(uint8_t data) // t1_r - //------------------------------------------------- -READ_LINE_MEMBER( ec_1841_keyboard_device::t1_r ) +int ec_1841_keyboard_device::t1_r() { if (BIT(m_p2,0)) { m_q = 1; diff --git a/src/devices/bus/pc_kbd/ec1841.h b/src/devices/bus/pc_kbd/ec1841.h index 08309b35d9e..cade4b56eee 100644 --- a/src/devices/bus/pc_kbd/ec1841.h +++ b/src/devices/bus/pc_kbd/ec1841.h @@ -39,15 +39,15 @@ protected: virtual ioport_constructor device_input_ports() const override; // device_pc_kbd_interface overrides - virtual DECLARE_WRITE_LINE_MEMBER( clock_write ) override; - virtual DECLARE_WRITE_LINE_MEMBER( data_write ) override; + virtual void clock_write(int state) override; + virtual void data_write(int state) override; private: void bus_w(uint8_t data); uint8_t p1_r(); void p1_w(uint8_t data); void p2_w(uint8_t data); - DECLARE_READ_LINE_MEMBER( t1_r ); + int t1_r(); required_device m_maincpu; required_ioport_array<16> m_kbd; diff --git a/src/devices/bus/pc_kbd/iskr1030.cpp b/src/devices/bus/pc_kbd/iskr1030.cpp index e9f986f21e0..78b2bfcd09c 100644 --- a/src/devices/bus/pc_kbd/iskr1030.cpp +++ b/src/devices/bus/pc_kbd/iskr1030.cpp @@ -316,7 +316,7 @@ void iskr_1030_keyboard_device::device_reset() // clock_write - //------------------------------------------------- -WRITE_LINE_MEMBER( iskr_1030_keyboard_device::clock_write ) +void iskr_1030_keyboard_device::clock_write(int state) { LOG("clock write %d\n", state); m_maincpu->set_input_line(MCS48_INPUT_IRQ, state ? CLEAR_LINE : ASSERT_LINE); @@ -327,7 +327,7 @@ WRITE_LINE_MEMBER( iskr_1030_keyboard_device::clock_write ) // data_write - //------------------------------------------------- -WRITE_LINE_MEMBER( iskr_1030_keyboard_device::data_write ) +void iskr_1030_keyboard_device::data_write(int state) { LOG("data write %d\n", state); } @@ -337,7 +337,7 @@ WRITE_LINE_MEMBER( iskr_1030_keyboard_device::data_write ) // t1_r - //------------------------------------------------- -READ_LINE_MEMBER( iskr_1030_keyboard_device::t1_r ) +int iskr_1030_keyboard_device::t1_r() { uint8_t data = data_signal(); uint8_t bias = m_p1 & 15; diff --git a/src/devices/bus/pc_kbd/iskr1030.h b/src/devices/bus/pc_kbd/iskr1030.h index 5c849a2b6b0..8d4224eb5f2 100644 --- a/src/devices/bus/pc_kbd/iskr1030.h +++ b/src/devices/bus/pc_kbd/iskr1030.h @@ -40,14 +40,14 @@ protected: virtual ioport_constructor device_input_ports() const override; // device_pc_kbd_interface overrides - virtual DECLARE_WRITE_LINE_MEMBER( clock_write ) override; - virtual DECLARE_WRITE_LINE_MEMBER( data_write ) override; + virtual void clock_write(int state) override; + virtual void data_write(int state) override; private: uint8_t p1_r(); void p1_w(uint8_t data); void p2_w(uint8_t data); - DECLARE_READ_LINE_MEMBER( t1_r ); + int t1_r(); uint8_t ram_r(offs_t offset); void ram_w(offs_t offset, uint8_t data); diff --git a/src/devices/bus/pc_kbd/keytro.cpp b/src/devices/bus/pc_kbd/keytro.cpp index d178bfceb6f..53a140894e7 100644 --- a/src/devices/bus/pc_kbd/keytro.cpp +++ b/src/devices/bus/pc_kbd/keytro.cpp @@ -456,13 +456,13 @@ const tiny_rom_entry *pc_kbd_keytronic_pc3270_device::device_rom_region() const } -WRITE_LINE_MEMBER( pc_kbd_keytronic_pc3270_device::clock_write ) +void pc_kbd_keytronic_pc3270_device::clock_write(int state) { m_cpu->set_input_line(MCS51_INT0_LINE, state ? CLEAR_LINE : ASSERT_LINE); } -WRITE_LINE_MEMBER( pc_kbd_keytronic_pc3270_device::data_write ) +void pc_kbd_keytronic_pc3270_device::data_write(int state) { m_cpu->set_input_line(MCS51_T0_LINE, state); } diff --git a/src/devices/bus/pc_kbd/keytro.h b/src/devices/bus/pc_kbd/keytro.h index 8fb6f021967..3ba6b6a583e 100644 --- a/src/devices/bus/pc_kbd/keytro.h +++ b/src/devices/bus/pc_kbd/keytro.h @@ -44,8 +44,8 @@ protected: virtual ioport_constructor device_input_ports() const override; virtual const tiny_rom_entry *device_rom_region() const override; - virtual DECLARE_WRITE_LINE_MEMBER(clock_write) override; - virtual DECLARE_WRITE_LINE_MEMBER(data_write) override; + virtual void clock_write(int state) override; + virtual void data_write(int state) override; uint8_t internal_data_read(offs_t offset); void internal_data_write(offs_t offset, uint8_t data); diff --git a/src/devices/bus/pc_kbd/msnat.cpp b/src/devices/bus/pc_kbd/msnat.cpp index 058a1ef39ff..bc6310c9465 100644 --- a/src/devices/bus/pc_kbd/msnat.cpp +++ b/src/devices/bus/pc_kbd/msnat.cpp @@ -272,12 +272,12 @@ const tiny_rom_entry *pc_kbd_microsoft_natural_device::device_rom_region() const } -WRITE_LINE_MEMBER( pc_kbd_microsoft_natural_device::clock_write ) +void pc_kbd_microsoft_natural_device::clock_write(int state) { } -WRITE_LINE_MEMBER( pc_kbd_microsoft_natural_device::data_write ) +void pc_kbd_microsoft_natural_device::data_write(int state) { } diff --git a/src/devices/bus/pc_kbd/msnat.h b/src/devices/bus/pc_kbd/msnat.h index 6ec5327675e..01a1d325a67 100644 --- a/src/devices/bus/pc_kbd/msnat.h +++ b/src/devices/bus/pc_kbd/msnat.h @@ -35,8 +35,8 @@ protected: virtual ioport_constructor device_input_ports() const override; virtual const tiny_rom_entry *device_rom_region() const override; - virtual DECLARE_WRITE_LINE_MEMBER(clock_write) override; - virtual DECLARE_WRITE_LINE_MEMBER(data_write) override; + virtual void clock_write(int state) override; + virtual void data_write(int state) override; private: required_device m_cpu; diff --git a/src/devices/bus/pc_kbd/pc83.cpp b/src/devices/bus/pc_kbd/pc83.cpp index 5e214660257..53c85c4d254 100644 --- a/src/devices/bus/pc_kbd/pc83.cpp +++ b/src/devices/bus/pc_kbd/pc83.cpp @@ -346,7 +346,7 @@ void ibm_pc_83_keyboard_device::p2_w(uint8_t data) // t0_r - //------------------------------------------------- -READ_LINE_MEMBER( ibm_pc_83_keyboard_device::t0_r ) +int ibm_pc_83_keyboard_device::t0_r() { uint8_t data = 0xff; diff --git a/src/devices/bus/pc_kbd/pc83.h b/src/devices/bus/pc_kbd/pc83.h index 44b58dfbc7f..ea1c762e6dd 100644 --- a/src/devices/bus/pc_kbd/pc83.h +++ b/src/devices/bus/pc_kbd/pc83.h @@ -41,14 +41,14 @@ protected: virtual ioport_constructor device_input_ports() const override; // device_pc_kbd_interface overrides - virtual DECLARE_WRITE_LINE_MEMBER( clock_write ) override { } - virtual DECLARE_WRITE_LINE_MEMBER( data_write ) override { } + virtual void clock_write(int state) override { } + virtual void data_write(int state) override { } private: void bus_w(uint8_t data); uint8_t p1_r(); void p2_w(uint8_t data); - DECLARE_READ_LINE_MEMBER( t0_r ); + int t0_r(); required_device m_maincpu; required_ioport_array<24> m_dr; diff --git a/src/devices/bus/pc_kbd/pc_kbdc.cpp b/src/devices/bus/pc_kbd/pc_kbdc.cpp index 4461648de7f..dc0063ace8a 100644 --- a/src/devices/bus/pc_kbd/pc_kbdc.cpp +++ b/src/devices/bus/pc_kbd/pc_kbdc.cpp @@ -126,28 +126,28 @@ void pc_kbdc_device::update_data_state(bool fromkb) } -WRITE_LINE_MEMBER(pc_kbdc_device::clock_write_from_mb) +void pc_kbdc_device::clock_write_from_mb(int state) { m_mb_clock_state = state; update_clock_state(false); } -WRITE_LINE_MEMBER(pc_kbdc_device::data_write_from_mb) +void pc_kbdc_device::data_write_from_mb(int state) { m_mb_data_state = state; update_data_state(false); } -WRITE_LINE_MEMBER(pc_kbdc_device::clock_write_from_kb) +void pc_kbdc_device::clock_write_from_kb(int state) { m_kb_clock_state = state; update_clock_state(true); } -WRITE_LINE_MEMBER(pc_kbdc_device::data_write_from_kb) +void pc_kbdc_device::data_write_from_kb(int state) { m_kb_data_state = state; update_data_state(true); @@ -179,12 +179,12 @@ device_pc_kbd_interface::~device_pc_kbd_interface() } -WRITE_LINE_MEMBER(device_pc_kbd_interface::clock_write) +void device_pc_kbd_interface::clock_write(int state) { } -WRITE_LINE_MEMBER(device_pc_kbd_interface::data_write) +void device_pc_kbd_interface::data_write(int state) { } diff --git a/src/devices/bus/pc_kbd/pc_kbdc.h b/src/devices/bus/pc_kbd/pc_kbdc.h index 4cbff6fc890..dbbf8024872 100644 --- a/src/devices/bus/pc_kbd/pc_kbdc.h +++ b/src/devices/bus/pc_kbd/pc_kbdc.h @@ -46,10 +46,10 @@ public: int clock_signal() { return m_clock_state; } int data_signal() { return m_data_state; } - DECLARE_WRITE_LINE_MEMBER( clock_write_from_mb ); - DECLARE_WRITE_LINE_MEMBER( data_write_from_mb ); - DECLARE_WRITE_LINE_MEMBER( clock_write_from_kb ); - DECLARE_WRITE_LINE_MEMBER( data_write_from_kb ); + void clock_write_from_mb(int state); + void data_write_from_mb(int state); + void clock_write_from_kb(int state); + void data_write_from_kb(int state); protected: // device-level overrides @@ -91,8 +91,8 @@ public: // // Override the clock_write and data_write methods in a keyboard implementation // - virtual DECLARE_WRITE_LINE_MEMBER( clock_write ); - virtual DECLARE_WRITE_LINE_MEMBER( data_write ); + virtual void clock_write(int state); + virtual void data_write(int state); // inline configuration void set_pc_kbdc(device_t *kbdc_device) { m_pc_kbdc = dynamic_cast(kbdc_device); } diff --git a/src/devices/bus/pc_kbd/pcat84.cpp b/src/devices/bus/pc_kbd/pcat84.cpp index d45588eea34..b7f84c4af55 100644 --- a/src/devices/bus/pc_kbd/pcat84.cpp +++ b/src/devices/bus/pc_kbd/pcat84.cpp @@ -545,7 +545,7 @@ void ibm_pc_at_84_keyboard_device::p2_w(uint8_t data) // t0_r - //------------------------------------------------- -READ_LINE_MEMBER( ibm_pc_at_84_keyboard_device::t0_r ) +int ibm_pc_at_84_keyboard_device::t0_r() { return !data_signal(); } @@ -555,7 +555,7 @@ READ_LINE_MEMBER( ibm_pc_at_84_keyboard_device::t0_r ) // t1_r - //------------------------------------------------- -READ_LINE_MEMBER( ibm_pc_at_84_keyboard_device::t1_r ) +int ibm_pc_at_84_keyboard_device::t1_r() { return key_depressed(); } diff --git a/src/devices/bus/pc_kbd/pcat84.h b/src/devices/bus/pc_kbd/pcat84.h index 3953786f900..b9f6374eaca 100644 --- a/src/devices/bus/pc_kbd/pcat84.h +++ b/src/devices/bus/pc_kbd/pcat84.h @@ -43,8 +43,8 @@ protected: virtual ioport_constructor device_input_ports() const override; // device_pc_kbd_interface overrides - virtual DECLARE_WRITE_LINE_MEMBER( clock_write ) override { m_maincpu->set_input_line(MCS48_INPUT_IRQ, state); } - virtual DECLARE_WRITE_LINE_MEMBER( data_write ) override { } + virtual void clock_write(int state) override { m_maincpu->set_input_line(MCS48_INPUT_IRQ, state); } + virtual void data_write(int state) override { } private: void bus_w(uint8_t data); @@ -52,8 +52,8 @@ private: void p1_w(uint8_t data); uint8_t p2_r(); void p2_w(uint8_t data); - DECLARE_READ_LINE_MEMBER( t0_r ); - DECLARE_READ_LINE_MEMBER( t1_r ); + int t0_r(); + int t1_r(); enum { diff --git a/src/devices/bus/pc_kbd/pcxt83.cpp b/src/devices/bus/pc_kbd/pcxt83.cpp index f155e9c853c..9baff0cedb8 100644 --- a/src/devices/bus/pc_kbd/pcxt83.cpp +++ b/src/devices/bus/pc_kbd/pcxt83.cpp @@ -276,7 +276,7 @@ void ibm_pc_xt_83_keyboard_device::device_reset() // clock_write - //------------------------------------------------- -WRITE_LINE_MEMBER( ibm_pc_xt_83_keyboard_device::clock_write ) +void ibm_pc_xt_83_keyboard_device::clock_write(int state) { } @@ -285,7 +285,7 @@ WRITE_LINE_MEMBER( ibm_pc_xt_83_keyboard_device::clock_write ) // data_write - //------------------------------------------------- -WRITE_LINE_MEMBER( ibm_pc_xt_83_keyboard_device::data_write ) +void ibm_pc_xt_83_keyboard_device::data_write(int state) { m_maincpu->set_input_line(MCS48_INPUT_IRQ, state ? CLEAR_LINE : ASSERT_LINE); } @@ -409,7 +409,7 @@ void ibm_pc_xt_83_keyboard_device::p2_w(uint8_t data) // t0_r - //------------------------------------------------- -READ_LINE_MEMBER( ibm_pc_xt_83_keyboard_device::t0_r ) +int ibm_pc_xt_83_keyboard_device::t0_r() { return clock_signal(); } @@ -419,7 +419,7 @@ READ_LINE_MEMBER( ibm_pc_xt_83_keyboard_device::t0_r ) // t1_r - //------------------------------------------------- -READ_LINE_MEMBER( ibm_pc_xt_83_keyboard_device::t1_r ) +int ibm_pc_xt_83_keyboard_device::t1_r() { return BIT(m_p2, 3) && m_q; } diff --git a/src/devices/bus/pc_kbd/pcxt83.h b/src/devices/bus/pc_kbd/pcxt83.h index 6044141610e..d12ceade4fc 100644 --- a/src/devices/bus/pc_kbd/pcxt83.h +++ b/src/devices/bus/pc_kbd/pcxt83.h @@ -40,16 +40,16 @@ protected: virtual ioport_constructor device_input_ports() const override; // device_pc_kbd_interface overrides - virtual DECLARE_WRITE_LINE_MEMBER( clock_write ) override; - virtual DECLARE_WRITE_LINE_MEMBER( data_write ) override; + virtual void clock_write(int state) override; + virtual void data_write(int state) override; private: uint8_t bus_r(); void bus_w(uint8_t data); void p1_w(uint8_t data); void p2_w(uint8_t data); - DECLARE_READ_LINE_MEMBER( t0_r ); - DECLARE_READ_LINE_MEMBER( t1_r ); + int t0_r(); + int t1_r(); required_device m_maincpu; required_ioport_array<12> m_md; diff --git a/src/devices/bus/pet/2joysnd.cpp b/src/devices/bus/pet/2joysnd.cpp index 6d65b70542a..89e9ac6f31d 100644 --- a/src/devices/bus/pet/2joysnd.cpp +++ b/src/devices/bus/pet/2joysnd.cpp @@ -152,7 +152,7 @@ void pet_userport_joystick_and_sound_device::update_port2() } -DECLARE_WRITE_LINE_MEMBER( pet_userport_joystick_and_sound_device::input_m ) +void pet_userport_joystick_and_sound_device::input_m(int state) { m_dac->write(state); } diff --git a/src/devices/bus/pet/2joysnd.h b/src/devices/bus/pet/2joysnd.h index 644d64fc564..22694f7d439 100644 --- a/src/devices/bus/pet/2joysnd.h +++ b/src/devices/bus/pet/2joysnd.h @@ -28,15 +28,15 @@ public: // construction/destruction pet_userport_joystick_and_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - virtual DECLARE_WRITE_LINE_MEMBER( input_m ) override; + virtual void input_m(int state) override; // device_pet_user_port_interface overrides - WRITE_LINE_MEMBER( write_up1 ) { m_up1 = state; update_port1(); } - WRITE_LINE_MEMBER( write_down1 ) { m_down1 = state; update_port1(); } - WRITE_LINE_MEMBER( write_fire1 ) { m_fire1 = state; update_port1(); } - WRITE_LINE_MEMBER( write_up2 ) { m_up2 = state; update_port2(); } - WRITE_LINE_MEMBER( write_down2 ) { m_down2 = state; update_port2(); } - WRITE_LINE_MEMBER( write_fire2 ) { m_fire2 = state; update_port2(); } + void write_up1(int state) { m_up1 = state; update_port1(); } + void write_down1(int state) { m_down1 = state; update_port1(); } + void write_fire1(int state) { m_fire1 = state; update_port1(); } + void write_up2(int state) { m_up2 = state; update_port2(); } + void write_down2(int state) { m_down2 = state; update_port2(); } + void write_fire2(int state) { m_fire2 = state; update_port2(); } protected: // device-level overrides diff --git a/src/devices/bus/pet/cass.cpp b/src/devices/bus/pet/cass.cpp index 301633e6d73..159cbbf82e0 100644 --- a/src/devices/bus/pet/cass.cpp +++ b/src/devices/bus/pet/cass.cpp @@ -82,12 +82,12 @@ void pet_datassette_port_device::device_start() } -READ_LINE_MEMBER( pet_datassette_port_device::read ) { int state = 1; if (m_cart != nullptr) state = m_cart->datassette_read(); return state; } -WRITE_LINE_MEMBER( pet_datassette_port_device::write ) { if (m_cart != nullptr) m_cart->datassette_write(state); } -READ_LINE_MEMBER( pet_datassette_port_device::sense_r ) { int state = 1; if (m_cart != nullptr) state = m_cart->datassette_sense(); return state; } -WRITE_LINE_MEMBER( pet_datassette_port_device::motor_w ) { if (m_cart != nullptr) m_cart->datassette_motor(state); } +int pet_datassette_port_device::read() { int state = 1; if (m_cart != nullptr) state = m_cart->datassette_read(); return state; } +void pet_datassette_port_device::write(int state) { if (m_cart != nullptr) m_cart->datassette_write(state); } +int pet_datassette_port_device::sense_r() { int state = 1; if (m_cart != nullptr) state = m_cart->datassette_sense(); return state; } +void pet_datassette_port_device::motor_w(int state) { if (m_cart != nullptr) m_cart->datassette_motor(state); } -WRITE_LINE_MEMBER( pet_datassette_port_device::read_w ) { m_read_handler(state); } +void pet_datassette_port_device::read_w(int state) { m_read_handler(state); } // slot devices diff --git a/src/devices/bus/pet/cass.h b/src/devices/bus/pet/cass.h index a6a6eac11f9..51c2e5dfa42 100644 --- a/src/devices/bus/pet/cass.h +++ b/src/devices/bus/pet/cass.h @@ -59,13 +59,13 @@ public: auto read_handler() { return m_read_handler.bind(); } // computer interface - DECLARE_READ_LINE_MEMBER( read ); - DECLARE_WRITE_LINE_MEMBER( write ); - DECLARE_READ_LINE_MEMBER( sense_r ); - DECLARE_WRITE_LINE_MEMBER( motor_w ); + int read(); + void write(int state); + int sense_r(); + void motor_w(int state); // device interface - DECLARE_WRITE_LINE_MEMBER( read_w ); + void read_w(int state); protected: // device-level overrides diff --git a/src/devices/bus/pet/cb2snd.cpp b/src/devices/bus/pet/cb2snd.cpp index b80d2efcce8..17dfc72b30b 100644 --- a/src/devices/bus/pet/cb2snd.cpp +++ b/src/devices/bus/pet/cb2snd.cpp @@ -55,7 +55,7 @@ void pet_userport_cb2_sound_device::device_start() { } -DECLARE_WRITE_LINE_MEMBER( pet_userport_cb2_sound_device::input_m ) +void pet_userport_cb2_sound_device::input_m(int state) { m_dac->write(state); } diff --git a/src/devices/bus/pet/cb2snd.h b/src/devices/bus/pet/cb2snd.h index cd39cc5bbb8..719e0db7c9f 100644 --- a/src/devices/bus/pet/cb2snd.h +++ b/src/devices/bus/pet/cb2snd.h @@ -25,7 +25,7 @@ public: // construction/destruction pet_userport_cb2_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - virtual DECLARE_WRITE_LINE_MEMBER( input_m ) override; + virtual void input_m(int state) override; protected: // device-level overrides diff --git a/src/devices/bus/pet/diag.h b/src/devices/bus/pet/diag.h index 8bcf1bfd415..400c3df6a1c 100644 --- a/src/devices/bus/pet/diag.h +++ b/src/devices/bus/pet/diag.h @@ -28,19 +28,19 @@ public: pet_userport_diagnostic_connector_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); // device_pet_user_port_interface overrides - virtual DECLARE_WRITE_LINE_MEMBER( input_2 ) override { output_b(state); } - virtual DECLARE_WRITE_LINE_MEMBER( input_3 ) override { output_c(state); } - virtual DECLARE_WRITE_LINE_MEMBER( input_4 ) override { output_d(state); } - virtual DECLARE_WRITE_LINE_MEMBER( input_6 ) override { output_7(state); output_8(state); } - virtual DECLARE_WRITE_LINE_MEMBER( input_7 ) override { output_6(state); output_8(state); } - virtual DECLARE_WRITE_LINE_MEMBER( input_8 ) override { output_6(state); output_7(state); } - virtual DECLARE_WRITE_LINE_MEMBER( input_9 ) override { output_k(state); } - virtual DECLARE_WRITE_LINE_MEMBER( input_10 ) override { output_l(state); } - virtual DECLARE_WRITE_LINE_MEMBER( input_b ) override { output_2(state); } - virtual DECLARE_WRITE_LINE_MEMBER( input_c ) override { output_3(state); } - virtual DECLARE_WRITE_LINE_MEMBER( input_d ) override { output_4(state); } - virtual DECLARE_WRITE_LINE_MEMBER( input_k ) override { output_9(state); } - virtual DECLARE_WRITE_LINE_MEMBER( input_l ) override { output_10(state); } + virtual void input_2(int state) override { output_b(state); } + virtual void input_3(int state) override { output_c(state); } + virtual void input_4(int state) override { output_d(state); } + virtual void input_6(int state) override { output_7(state); output_8(state); } + virtual void input_7(int state) override { output_6(state); output_8(state); } + virtual void input_8(int state) override { output_6(state); output_7(state); } + virtual void input_9(int state) override { output_k(state); } + virtual void input_10(int state) override { output_l(state); } + virtual void input_b(int state) override { output_2(state); } + virtual void input_c(int state) override { output_3(state); } + virtual void input_d(int state) override { output_4(state); } + virtual void input_k(int state) override { output_9(state); } + virtual void input_l(int state) override { output_10(state); } protected: // device-level overrides diff --git a/src/devices/bus/pet/exp.cpp b/src/devices/bus/pet/exp.cpp index aef8c5dfbf4..33a6041a0ca 100644 --- a/src/devices/bus/pet/exp.cpp +++ b/src/devices/bus/pet/exp.cpp @@ -128,7 +128,7 @@ void pet_expansion_slot_device::write(offs_t offset, uint8_t data, int &sel) // diag_r - DIAG read //------------------------------------------------- -READ_LINE_MEMBER( pet_expansion_slot_device::diag_r ) +int pet_expansion_slot_device::diag_r() { return m_card ? m_card->pet_diag_r() : 1; } @@ -138,7 +138,7 @@ READ_LINE_MEMBER( pet_expansion_slot_device::diag_r ) // irq_w - IRQ write //------------------------------------------------- -WRITE_LINE_MEMBER( pet_expansion_slot_device::irq_w ) +void pet_expansion_slot_device::irq_w(int state) { if (m_card) m_card->pet_irq_w(state); } diff --git a/src/devices/bus/pet/exp.h b/src/devices/bus/pet/exp.h index e8018bdd732..b8b53701a79 100644 --- a/src/devices/bus/pet/exp.h +++ b/src/devices/bus/pet/exp.h @@ -48,8 +48,8 @@ public: int norom_r(offs_t offset, int sel); uint8_t read(offs_t offset, uint8_t data, int &sel); void write(offs_t offset, uint8_t data, int &sel); - DECLARE_READ_LINE_MEMBER( diag_r ); - DECLARE_WRITE_LINE_MEMBER( irq_w ); + int diag_r(); + void irq_w(int state); // cartridge interface uint8_t dma_bd_r(offs_t offset); diff --git a/src/devices/bus/pet/petuja.h b/src/devices/bus/pet/petuja.h index b268c0d1519..9d5c9693743 100644 --- a/src/devices/bus/pet/petuja.h +++ b/src/devices/bus/pet/petuja.h @@ -33,12 +33,12 @@ public: virtual ioport_constructor device_input_ports() const override; // device_pet_user_port_interface overrides - WRITE_LINE_MEMBER( write_up1 ) { m_up1 = state; update_port1(); } - WRITE_LINE_MEMBER( write_down1 ) { m_down1 = state; update_port1(); } - WRITE_LINE_MEMBER( write_fire1 ) { m_fire1 = state; update_port1(); } - WRITE_LINE_MEMBER( write_up2 ) { m_up2 = state; update_port2(); } - WRITE_LINE_MEMBER( write_down2 ) { m_down2 = state; update_port2(); } - WRITE_LINE_MEMBER( write_fire2 ) { m_fire2 = state; update_port2(); } + void write_up1(int state) { m_up1 = state; update_port1(); } + void write_down1(int state) { m_down1 = state; update_port1(); } + void write_fire1(int state) { m_fire1 = state; update_port1(); } + void write_up2(int state) { m_up2 = state; update_port2(); } + void write_down2(int state) { m_down2 = state; update_port2(); } + void write_fire2(int state) { m_fire2 = state; update_port2(); } protected: // device-level overrides diff --git a/src/devices/bus/pet/superpet.cpp b/src/devices/bus/pet/superpet.cpp index df5c0071600..1b6bb9e80df 100644 --- a/src/devices/bus/pet/superpet.cpp +++ b/src/devices/bus/pet/superpet.cpp @@ -417,7 +417,7 @@ void superpet_device::write(offs_t offset, uint8_t data) // acia_irq_w - //------------------------------------------------- -WRITE_LINE_MEMBER( superpet_device::acia_irq_w ) +void superpet_device::acia_irq_w(int state) { m_acia_irq = state; diff --git a/src/devices/bus/pet/superpet.h b/src/devices/bus/pet/superpet.h index 56c07df525f..8dff4cd00b6 100644 --- a/src/devices/bus/pet/superpet.h +++ b/src/devices/bus/pet/superpet.h @@ -48,7 +48,7 @@ protected: virtual void pet_irq_w(int state) override; private: - DECLARE_WRITE_LINE_MEMBER( acia_irq_w ); + void acia_irq_w(int state); uint8_t read(offs_t offset); void write(offs_t offset, uint8_t data); diff --git a/src/devices/bus/pet/user.cpp b/src/devices/bus/pet/user.cpp index 574c6c9afe9..0c2cd7b40b3 100644 --- a/src/devices/bus/pet/user.cpp +++ b/src/devices/bus/pet/user.cpp @@ -86,25 +86,25 @@ void pet_user_port_device::device_start() m_m_handler(1); } -WRITE_LINE_MEMBER( pet_user_port_device::write_2 ) { if (m_card != nullptr) m_card->input_2(state); } -WRITE_LINE_MEMBER( pet_user_port_device::write_3 ) { if (m_card != nullptr) m_card->input_3(state); } -WRITE_LINE_MEMBER( pet_user_port_device::write_4 ) { if (m_card != nullptr) m_card->input_4(state); } -WRITE_LINE_MEMBER( pet_user_port_device::write_5 ) { if (m_card != nullptr) m_card->input_5(state); } -WRITE_LINE_MEMBER( pet_user_port_device::write_6 ) { if (m_card != nullptr) m_card->input_6(state); } -WRITE_LINE_MEMBER( pet_user_port_device::write_7 ) { if (m_card != nullptr) m_card->input_7(state); } -WRITE_LINE_MEMBER( pet_user_port_device::write_8 ) { if (m_card != nullptr) m_card->input_8(state); } -WRITE_LINE_MEMBER( pet_user_port_device::write_9 ) { if (m_card != nullptr) m_card->input_9(state); } -WRITE_LINE_MEMBER( pet_user_port_device::write_10 ) { if (m_card != nullptr) m_card->input_10(state); } -WRITE_LINE_MEMBER( pet_user_port_device::write_b ) { if (m_card != nullptr) m_card->input_b(state); } -WRITE_LINE_MEMBER( pet_user_port_device::write_c ) { if (m_card != nullptr) m_card->input_c(state); } -WRITE_LINE_MEMBER( pet_user_port_device::write_d ) { if (m_card != nullptr) m_card->input_d(state); } -WRITE_LINE_MEMBER( pet_user_port_device::write_e ) { if (m_card != nullptr) m_card->input_e(state); } -WRITE_LINE_MEMBER( pet_user_port_device::write_f ) { if (m_card != nullptr) m_card->input_f(state); } -WRITE_LINE_MEMBER( pet_user_port_device::write_h ) { if (m_card != nullptr) m_card->input_h(state); } -WRITE_LINE_MEMBER( pet_user_port_device::write_j ) { if (m_card != nullptr) m_card->input_j(state); } -WRITE_LINE_MEMBER( pet_user_port_device::write_k ) { if (m_card != nullptr) m_card->input_k(state); } -WRITE_LINE_MEMBER( pet_user_port_device::write_l ) { if (m_card != nullptr) m_card->input_l(state); } -WRITE_LINE_MEMBER( pet_user_port_device::write_m ) { if (m_card != nullptr) m_card->input_m(state); } +void pet_user_port_device::write_2(int state) { if (m_card != nullptr) m_card->input_2(state); } +void pet_user_port_device::write_3(int state) { if (m_card != nullptr) m_card->input_3(state); } +void pet_user_port_device::write_4(int state) { if (m_card != nullptr) m_card->input_4(state); } +void pet_user_port_device::write_5(int state) { if (m_card != nullptr) m_card->input_5(state); } +void pet_user_port_device::write_6(int state) { if (m_card != nullptr) m_card->input_6(state); } +void pet_user_port_device::write_7(int state) { if (m_card != nullptr) m_card->input_7(state); } +void pet_user_port_device::write_8(int state) { if (m_card != nullptr) m_card->input_8(state); } +void pet_user_port_device::write_9(int state) { if (m_card != nullptr) m_card->input_9(state); } +void pet_user_port_device::write_10(int state) { if (m_card != nullptr) m_card->input_10(state); } +void pet_user_port_device::write_b(int state) { if (m_card != nullptr) m_card->input_b(state); } +void pet_user_port_device::write_c(int state) { if (m_card != nullptr) m_card->input_c(state); } +void pet_user_port_device::write_d(int state) { if (m_card != nullptr) m_card->input_d(state); } +void pet_user_port_device::write_e(int state) { if (m_card != nullptr) m_card->input_e(state); } +void pet_user_port_device::write_f(int state) { if (m_card != nullptr) m_card->input_f(state); } +void pet_user_port_device::write_h(int state) { if (m_card != nullptr) m_card->input_h(state); } +void pet_user_port_device::write_j(int state) { if (m_card != nullptr) m_card->input_j(state); } +void pet_user_port_device::write_k(int state) { if (m_card != nullptr) m_card->input_k(state); } +void pet_user_port_device::write_l(int state) { if (m_card != nullptr) m_card->input_l(state); } +void pet_user_port_device::write_m(int state) { if (m_card != nullptr) m_card->input_m(state); } // class device_pet_user_port_interface diff --git a/src/devices/bus/pet/user.h b/src/devices/bus/pet/user.h index 4a6a64c3081..52e334d40d0 100644 --- a/src/devices/bus/pet/user.h +++ b/src/devices/bus/pet/user.h @@ -67,25 +67,25 @@ public: auto pl_handler() { return m_l_handler.bind(); } auto pm_handler() { return m_m_handler.bind(); } - DECLARE_WRITE_LINE_MEMBER( write_2 ); - DECLARE_WRITE_LINE_MEMBER( write_3 ); - DECLARE_WRITE_LINE_MEMBER( write_4 ); - DECLARE_WRITE_LINE_MEMBER( write_5 ); - DECLARE_WRITE_LINE_MEMBER( write_6 ); - DECLARE_WRITE_LINE_MEMBER( write_7 ); - DECLARE_WRITE_LINE_MEMBER( write_8 ); - DECLARE_WRITE_LINE_MEMBER( write_9 ); - DECLARE_WRITE_LINE_MEMBER( write_10 ); - DECLARE_WRITE_LINE_MEMBER( write_b ); - DECLARE_WRITE_LINE_MEMBER( write_c ); - DECLARE_WRITE_LINE_MEMBER( write_d ); - DECLARE_WRITE_LINE_MEMBER( write_e ); - DECLARE_WRITE_LINE_MEMBER( write_f ); - DECLARE_WRITE_LINE_MEMBER( write_h ); - DECLARE_WRITE_LINE_MEMBER( write_j ); - DECLARE_WRITE_LINE_MEMBER( write_k ); - DECLARE_WRITE_LINE_MEMBER( write_l ); - DECLARE_WRITE_LINE_MEMBER( write_m ); + void write_2(int state); + void write_3(int state); + void write_4(int state); + void write_5(int state); + void write_6(int state); + void write_7(int state); + void write_8(int state); + void write_9(int state); + void write_10(int state); + void write_b(int state); + void write_c(int state); + void write_d(int state); + void write_e(int state); + void write_f(int state); + void write_h(int state); + void write_j(int state); + void write_k(int state); + void write_l(int state); + void write_m(int state); protected: // device-level overrides @@ -124,48 +124,48 @@ class device_pet_user_port_interface : public device_interface public: virtual ~device_pet_user_port_interface(); - DECLARE_WRITE_LINE_MEMBER( output_2 ) { m_slot->m_2_handler(state); } - DECLARE_WRITE_LINE_MEMBER( output_3 ) { m_slot->m_3_handler(state); } - DECLARE_WRITE_LINE_MEMBER( output_4 ) { m_slot->m_4_handler(state); } - DECLARE_WRITE_LINE_MEMBER( output_5 ) { m_slot->m_5_handler(state); } - DECLARE_WRITE_LINE_MEMBER( output_6 ) { m_slot->m_6_handler(state); } - DECLARE_WRITE_LINE_MEMBER( output_7 ) { m_slot->m_7_handler(state); } - DECLARE_WRITE_LINE_MEMBER( output_8 ) { m_slot->m_8_handler(state); } - DECLARE_WRITE_LINE_MEMBER( output_9 ) { m_slot->m_9_handler(state); } - DECLARE_WRITE_LINE_MEMBER( output_10 ) { m_slot->m_10_handler(state); } - DECLARE_WRITE_LINE_MEMBER( output_b ) { m_slot->m_b_handler(state); } - DECLARE_WRITE_LINE_MEMBER( output_c ) { m_slot->m_c_handler(state); } - DECLARE_WRITE_LINE_MEMBER( output_d ) { m_slot->m_d_handler(state); } - DECLARE_WRITE_LINE_MEMBER( output_e ) { m_slot->m_e_handler(state); } - DECLARE_WRITE_LINE_MEMBER( output_f ) { m_slot->m_f_handler(state); } - DECLARE_WRITE_LINE_MEMBER( output_h ) { m_slot->m_h_handler(state); } - DECLARE_WRITE_LINE_MEMBER( output_j ) { m_slot->m_j_handler(state); } - DECLARE_WRITE_LINE_MEMBER( output_k ) { m_slot->m_k_handler(state); } - DECLARE_WRITE_LINE_MEMBER( output_l ) { m_slot->m_l_handler(state); } - DECLARE_WRITE_LINE_MEMBER( output_m ) { m_slot->m_m_handler(state); } + void output_2(int state) { m_slot->m_2_handler(state); } + void output_3(int state) { m_slot->m_3_handler(state); } + void output_4(int state) { m_slot->m_4_handler(state); } + void output_5(int state) { m_slot->m_5_handler(state); } + void output_6(int state) { m_slot->m_6_handler(state); } + void output_7(int state) { m_slot->m_7_handler(state); } + void output_8(int state) { m_slot->m_8_handler(state); } + void output_9(int state) { m_slot->m_9_handler(state); } + void output_10(int state) { m_slot->m_10_handler(state); } + void output_b(int state) { m_slot->m_b_handler(state); } + void output_c(int state) { m_slot->m_c_handler(state); } + void output_d(int state) { m_slot->m_d_handler(state); } + void output_e(int state) { m_slot->m_e_handler(state); } + void output_f(int state) { m_slot->m_f_handler(state); } + void output_h(int state) { m_slot->m_h_handler(state); } + void output_j(int state) { m_slot->m_j_handler(state); } + void output_k(int state) { m_slot->m_k_handler(state); } + void output_l(int state) { m_slot->m_l_handler(state); } + void output_m(int state) { m_slot->m_m_handler(state); } protected: device_pet_user_port_interface(const machine_config &mconfig, device_t &device); - virtual DECLARE_WRITE_LINE_MEMBER( input_2 ) {} - virtual DECLARE_WRITE_LINE_MEMBER( input_3 ) {} - virtual DECLARE_WRITE_LINE_MEMBER( input_4 ) {} - virtual DECLARE_WRITE_LINE_MEMBER( input_5 ) {} - virtual DECLARE_WRITE_LINE_MEMBER( input_6 ) {} - virtual DECLARE_WRITE_LINE_MEMBER( input_7 ) {} - virtual DECLARE_WRITE_LINE_MEMBER( input_8 ) {} - virtual DECLARE_WRITE_LINE_MEMBER( input_9 ) {} - virtual DECLARE_WRITE_LINE_MEMBER( input_10 ) {} - virtual DECLARE_WRITE_LINE_MEMBER( input_b ) {} - virtual DECLARE_WRITE_LINE_MEMBER( input_c ) {} - virtual DECLARE_WRITE_LINE_MEMBER( input_d ) {} - virtual DECLARE_WRITE_LINE_MEMBER( input_e ) {} - virtual DECLARE_WRITE_LINE_MEMBER( input_f ) {} - virtual DECLARE_WRITE_LINE_MEMBER( input_h ) {} - virtual DECLARE_WRITE_LINE_MEMBER( input_j ) {} - virtual DECLARE_WRITE_LINE_MEMBER( input_k ) {} - virtual DECLARE_WRITE_LINE_MEMBER( input_l ) {} - virtual DECLARE_WRITE_LINE_MEMBER( input_m ) {} + virtual void input_2(int state) {} + virtual void input_3(int state) {} + virtual void input_4(int state) {} + virtual void input_5(int state) {} + virtual void input_6(int state) {} + virtual void input_7(int state) {} + virtual void input_8(int state) {} + virtual void input_9(int state) {} + virtual void input_10(int state) {} + virtual void input_b(int state) {} + virtual void input_c(int state) {} + virtual void input_d(int state) {} + virtual void input_e(int state) {} + virtual void input_f(int state) {} + virtual void input_h(int state) {} + virtual void input_j(int state) {} + virtual void input_k(int state) {} + virtual void input_l(int state) {} + virtual void input_m(int state) {} pet_user_port_device *m_slot; }; diff --git a/src/devices/bus/plus4/diag264_lb_user.h b/src/devices/bus/plus4/diag264_lb_user.h index dd45e469106..932868f81a3 100644 --- a/src/devices/bus/plus4/diag264_lb_user.h +++ b/src/devices/bus/plus4/diag264_lb_user.h @@ -32,23 +32,23 @@ protected: virtual void device_start() override; // device_pet_user_port_interface overrides - virtual DECLARE_WRITE_LINE_MEMBER(input_b) override { output_6(state); } - virtual DECLARE_WRITE_LINE_MEMBER(input_k) override { output_7(state); } - virtual DECLARE_WRITE_LINE_MEMBER(input_4) override { output_j(state); } - virtual DECLARE_WRITE_LINE_MEMBER(input_5) override { output_f(state); } - - virtual DECLARE_WRITE_LINE_MEMBER(input_6) override { output_b(state); } - virtual DECLARE_WRITE_LINE_MEMBER(input_7) override { output_k(state); } - virtual DECLARE_WRITE_LINE_MEMBER(input_j) override { output_4(state); } - virtual DECLARE_WRITE_LINE_MEMBER(input_f) override { output_5(state); } - - virtual DECLARE_WRITE_LINE_MEMBER(input_c) override { output_m(state); } - virtual DECLARE_WRITE_LINE_MEMBER(input_d) override { output_l(state); } - virtual DECLARE_WRITE_LINE_MEMBER(input_e) override { output_h(state); } - - virtual DECLARE_WRITE_LINE_MEMBER(input_m) override { output_c(state); } - virtual DECLARE_WRITE_LINE_MEMBER(input_l) override { output_d(state); } - virtual DECLARE_WRITE_LINE_MEMBER(input_h) override { output_e(state); } + virtual void input_b(int state) override { output_6(state); } + virtual void input_k(int state) override { output_7(state); } + virtual void input_4(int state) override { output_j(state); } + virtual void input_5(int state) override { output_f(state); } + + virtual void input_6(int state) override { output_b(state); } + virtual void input_7(int state) override { output_k(state); } + virtual void input_j(int state) override { output_4(state); } + virtual void input_f(int state) override { output_5(state); } + + virtual void input_c(int state) override { output_m(state); } + virtual void input_d(int state) override { output_l(state); } + virtual void input_e(int state) override { output_h(state); } + + virtual void input_m(int state) override { output_c(state); } + virtual void input_l(int state) override { output_d(state); } + virtual void input_h(int state) override { output_e(state); } }; // device type definition diff --git a/src/devices/bus/plus4/exp.h b/src/devices/bus/plus4/exp.h index 93202068651..8dbd43106cf 100644 --- a/src/devices/bus/plus4/exp.h +++ b/src/devices/bus/plus4/exp.h @@ -79,8 +79,8 @@ public: // cartridge interface uint8_t dma_cd_r(offs_t offset) { return m_read_dma_cd(offset); } void dma_cd_w(offs_t offset, uint8_t data) { m_write_dma_cd(offset, data); } - DECLARE_WRITE_LINE_MEMBER( irq_w ) { m_write_irq(state); } - DECLARE_WRITE_LINE_MEMBER( aec_w ) { m_write_aec(state); } + void irq_w(int state) { m_write_irq(state); } + void aec_w(int state) { m_write_aec(state); } int phi2() { return clock(); } protected: diff --git a/src/devices/bus/pofo/exp.cpp b/src/devices/bus/pofo/exp.cpp index 8dc14ecfd03..c0edb7ee263 100644 --- a/src/devices/bus/pofo/exp.cpp +++ b/src/devices/bus/pofo/exp.cpp @@ -33,9 +33,9 @@ device_portfolio_expansion_slot_interface::device_portfolio_expansion_slot_inter m_slot = dynamic_cast(device.owner()); } -WRITE_LINE_MEMBER( device_portfolio_expansion_slot_interface::eint_w ) { m_slot->eint_w(state); } -WRITE_LINE_MEMBER( device_portfolio_expansion_slot_interface::nmio_w ) { m_slot->nmio_w(state); } -WRITE_LINE_MEMBER( device_portfolio_expansion_slot_interface::wake_w ) { m_slot->wake_w(state); } +void device_portfolio_expansion_slot_interface::eint_w(int state) { m_slot->eint_w(state); } +void device_portfolio_expansion_slot_interface::nmio_w(int state) { m_slot->nmio_w(state); } +void device_portfolio_expansion_slot_interface::wake_w(int state) { m_slot->wake_w(state); } diff --git a/src/devices/bus/pofo/exp.h b/src/devices/bus/pofo/exp.h index 0790aa04123..9f37bcf444c 100644 --- a/src/devices/bus/pofo/exp.h +++ b/src/devices/bus/pofo/exp.h @@ -68,11 +68,11 @@ public: virtual uint8_t nrdi_r(offs_t offset, uint8_t data, bool iom, bool bcom, bool ncc1) { return data; } virtual void nwri_w(offs_t offset, uint8_t data, bool iom, bool bcom, bool ncc1) { } - virtual WRITE_LINE_MEMBER( iint_w ) { } + virtual void iint_w(int state) { } - DECLARE_WRITE_LINE_MEMBER( eint_w ); - DECLARE_WRITE_LINE_MEMBER( nmio_w ); - DECLARE_WRITE_LINE_MEMBER( wake_w ); + void eint_w(int state); + void nmio_w(int state); + void wake_w(int state); protected: // construction/destruction @@ -115,12 +115,12 @@ public: uint8_t nrdi_r(offs_t offset, uint8_t data, bool iom, bool bcom, bool ncc1) { return (m_card != nullptr) ? m_card->nrdi_r(offset, data, iom, bcom, ncc1) : data; } void nwri_w(offs_t offset, uint8_t data, bool iom, bool bcom, bool ncc1) { if (m_card != nullptr) m_card->nwri_w(offset, data, iom, bcom, ncc1); } - WRITE_LINE_MEMBER( iint_w ) { if (m_card != nullptr) m_card->iint_w(state); } + void iint_w(int state) { if (m_card != nullptr) m_card->iint_w(state); } // peripheral interface - WRITE_LINE_MEMBER( eint_w ) { m_write_eint(state); } - WRITE_LINE_MEMBER( nmio_w ) { m_write_nmio(state); } - WRITE_LINE_MEMBER( wake_w ) { m_write_wake(state); } + void eint_w(int state) { m_write_eint(state); } + void nmio_w(int state) { m_write_nmio(state); } + void wake_w(int state) { m_write_wake(state); } protected: // device-level overrides diff --git a/src/devices/bus/pofo/hpc104.h b/src/devices/bus/pofo/hpc104.h index d5d1c36c3d3..7c9148d59e1 100644 --- a/src/devices/bus/pofo/hpc104.h +++ b/src/devices/bus/pofo/hpc104.h @@ -52,7 +52,7 @@ protected: virtual uint8_t nrdi_r(offs_t offset, uint8_t data, bool iom, bool bcom, bool ncc1) override; virtual void nwri_w(offs_t offset, uint8_t data, bool iom, bool bcom, bool ncc1) override; - virtual WRITE_LINE_MEMBER( iint_w ) override { m_exp->iint_w(state); } + virtual void iint_w(int state) override { m_exp->iint_w(state); } private: required_device m_ccm; diff --git a/src/devices/bus/psi_kbd/psi_kbd.cpp b/src/devices/bus/psi_kbd/psi_kbd.cpp index 1ba3a0e2620..5046036f3d5 100644 --- a/src/devices/bus/psi_kbd/psi_kbd.cpp +++ b/src/devices/bus/psi_kbd/psi_kbd.cpp @@ -72,7 +72,7 @@ void psi_keyboard_bus_device::device_reset() // host to module interface //------------------------------------------------- -WRITE_LINE_MEMBER( psi_keyboard_bus_device::tx_w ) +void psi_keyboard_bus_device::tx_w(int state) { if (m_kbd) m_kbd->tx_w(state); diff --git a/src/devices/bus/psi_kbd/psi_kbd.h b/src/devices/bus/psi_kbd/psi_kbd.h index 364ef98586a..37e9f1f327e 100644 --- a/src/devices/bus/psi_kbd/psi_kbd.h +++ b/src/devices/bus/psi_kbd/psi_kbd.h @@ -61,12 +61,12 @@ public: auto key_strobe() { return m_key_strobe_handler.bind(); } // called from keyboard - DECLARE_WRITE_LINE_MEMBER( rx_w ) { m_rx_handler(state); } - DECLARE_WRITE_LINE_MEMBER( key_strobe_w ) { m_key_strobe_handler(state); } + void rx_w(int state) { m_rx_handler(state); } + void key_strobe_w(int state) { m_key_strobe_handler(state); } void key_data_w(uint8_t data) { m_key_data = data; } // called from host - DECLARE_WRITE_LINE_MEMBER( tx_w ); + void tx_w(int state); uint8_t key_data_r() { return m_key_data; } protected: diff --git a/src/devices/bus/psion/honda/slot.h b/src/devices/bus/psion/honda/slot.h index f0283f17139..f4acf9094a9 100644 --- a/src/devices/bus/psion/honda/slot.h +++ b/src/devices/bus/psion/honda/slot.h @@ -62,7 +62,7 @@ public: uint8_t data_r(); void data_w(uint16_t data); - DECLARE_WRITE_LINE_MEMBER( int_w ) { m_int_cb(state); } + void int_w(int state) { m_int_cb(state); } protected: // device-level overrides diff --git a/src/devices/bus/psion/module/slot.h b/src/devices/bus/psion/module/slot.h index 6ba31dff0f6..8919277627b 100644 --- a/src/devices/bus/psion/module/slot.h +++ b/src/devices/bus/psion/module/slot.h @@ -75,7 +75,7 @@ public: uint8_t data_r(); void data_w(uint16_t data); - DECLARE_WRITE_LINE_MEMBER( intr_w ) { m_intr_cb(state); } + void intr_w(int state) { m_intr_cb(state); } protected: // device-level overrides diff --git a/src/devices/bus/psion/sibo/slot.h b/src/devices/bus/psion/sibo/slot.h index 5ea3af924a7..3bfc6289b0f 100644 --- a/src/devices/bus/psion/sibo/slot.h +++ b/src/devices/bus/psion/sibo/slot.h @@ -53,7 +53,7 @@ public: uint8_t data_r(); void data_w(uint16_t data); - DECLARE_WRITE_LINE_MEMBER( int_w ) { m_int_cb(state); } + void int_w(int state) { m_int_cb(state); } protected: // device-level overrides diff --git a/src/devices/bus/psx/ctlrport.cpp b/src/devices/bus/psx/ctlrport.cpp index 1e6158ff614..dc9a6ae392a 100644 --- a/src/devices/bus/psx/ctlrport.cpp +++ b/src/devices/bus/psx/ctlrport.cpp @@ -73,20 +73,20 @@ void psx_controllers_nomulti(device_slot_interface &device) PSX_CONTROLLERS } -WRITE_LINE_MEMBER(psxcontrollerports_device::write_dtr) +void psxcontrollerports_device::write_dtr(int state) { m_port0->sel_w(!state); m_port1->sel_w(state); } -WRITE_LINE_MEMBER(psxcontrollerports_device::write_sck) +void psxcontrollerports_device::write_sck(int state) { m_port0->clock_w(state); m_port1->clock_w(state); m_rxd_handler(m_port0->rx_r() && m_port1->rx_r()); } -WRITE_LINE_MEMBER(psxcontrollerports_device::write_txd) +void psxcontrollerports_device::write_txd(int state) { m_port0->tx_w(state); m_port1->tx_w(state); diff --git a/src/devices/bus/psx/ctlrport.h b/src/devices/bus/psx/ctlrport.h index 5c8fc82dd22..ff6859b1d72 100644 --- a/src/devices/bus/psx/ctlrport.h +++ b/src/devices/bus/psx/ctlrport.h @@ -89,9 +89,9 @@ public: auto dsr() { return m_dsr_handler.bind(); } auto rxd() { return m_rxd_handler.bind(); } - DECLARE_WRITE_LINE_MEMBER(write_sck); - DECLARE_WRITE_LINE_MEMBER(write_dtr); - DECLARE_WRITE_LINE_MEMBER(write_txd); + void write_sck(int state); + void write_dtr(int state); + void write_txd(int state); protected: virtual void device_start() override; @@ -123,13 +123,13 @@ public: void ack() { if(!ack_cb.isnull()) ack_cb(); } void setup_ack_cb(void_cb cb) { ack_cb = cb; } - DECLARE_WRITE_LINE_MEMBER(tx_w) { m_tx = state; } - DECLARE_WRITE_LINE_MEMBER(sel_w) { if(m_dev) m_dev->sel_w(state); m_card->sel_w(state); } - DECLARE_WRITE_LINE_MEMBER(clock_w) { if(m_dev) m_dev->clock_w(state); m_card->clock_w(state); } + void tx_w(int state) { m_tx = state; } + void sel_w(int state) { if(m_dev) m_dev->sel_w(state); m_card->sel_w(state); } + void clock_w(int state) { if(m_dev) m_dev->clock_w(state); m_card->clock_w(state); } - DECLARE_READ_LINE_MEMBER(rx_r) { return (m_dev?m_dev->rx_r():true) && m_card->rx_r(); } - DECLARE_READ_LINE_MEMBER(ack_r) { return (m_dev?m_dev->ack_r():true) && m_card->ack_r(); } - DECLARE_READ_LINE_MEMBER(tx_r) { return m_tx; } + int rx_r() { return (m_dev?m_dev->rx_r():true) && m_card->rx_r(); } + int ack_r() { return (m_dev?m_dev->ack_r():true) && m_card->ack_r(); } + int tx_r() { return m_tx; } void disable_card(bool status); diff --git a/src/devices/bus/qbus/qbus.h b/src/devices/bus/qbus/qbus.h index c0773aa6b81..ae6248c6a40 100644 --- a/src/devices/bus/qbus/qbus.h +++ b/src/devices/bus/qbus/qbus.h @@ -79,12 +79,12 @@ public: void add_card(device_qbus_card_interface &card); void install_device(offs_t start, offs_t end, read16sm_delegate rhandler, write16sm_delegate whandler, uint32_t mask=0xffffffff); - DECLARE_WRITE_LINE_MEMBER(birq4_w) { m_out_birq4_cb(state); } - DECLARE_WRITE_LINE_MEMBER(birq5_w) { m_out_birq5_cb(state); } - DECLARE_WRITE_LINE_MEMBER(birq6_w) { m_out_birq6_cb(state); } - DECLARE_WRITE_LINE_MEMBER(birq7_w) { m_out_birq7_cb(state); } + void birq4_w(int state) { m_out_birq4_cb(state); } + void birq5_w(int state) { m_out_birq5_cb(state); } + void birq6_w(int state) { m_out_birq6_cb(state); } + void birq7_w(int state) { m_out_birq7_cb(state); } - DECLARE_WRITE_LINE_MEMBER(bdmr_w) { m_out_bdmr_cb(state); } + void bdmr_w(int state) { m_out_bdmr_cb(state); } const address_space_config m_program_config; @@ -132,8 +132,8 @@ public: qbus_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); // computer interface - DECLARE_WRITE_LINE_MEMBER( biaki_w ) { if (m_card) m_card->biaki_w(state); } - DECLARE_WRITE_LINE_MEMBER( bdmgi_w ) { if (m_card) m_card->bdmgi_w(state); } + void biaki_w(int state) { if (m_card) m_card->biaki_w(state); } + void bdmgi_w(int state) { if (m_card) m_card->bdmgi_w(state); } protected: // device_t implementation diff --git a/src/devices/bus/ql/cst_q_plus4.h b/src/devices/bus/ql/cst_q_plus4.h index 4c8ea616f51..799829bce99 100644 --- a/src/devices/bus/ql/cst_q_plus4.h +++ b/src/devices/bus/ql/cst_q_plus4.h @@ -41,10 +41,10 @@ protected: virtual void write(offs_t offset, uint8_t data) override; private: - DECLARE_WRITE_LINE_MEMBER( exp1_extintl_w ) { m_exp1_extinl = state; update_extintl(); } - DECLARE_WRITE_LINE_MEMBER( exp2_extintl_w ) { m_exp2_extinl = state; update_extintl(); } - DECLARE_WRITE_LINE_MEMBER( exp3_extintl_w ) { m_exp3_extinl = state; update_extintl(); } - DECLARE_WRITE_LINE_MEMBER( exp4_extintl_w ) { m_exp4_extinl = state; update_extintl(); } + void exp1_extintl_w(int state) { m_exp1_extinl = state; update_extintl(); } + void exp2_extintl_w(int state) { m_exp2_extinl = state; update_extintl(); } + void exp3_extintl_w(int state) { m_exp3_extinl = state; update_extintl(); } + void exp4_extintl_w(int state) { m_exp4_extinl = state; update_extintl(); } void update_extintl() { m_slot->extintl_w(m_exp1_extinl || m_exp2_extinl || m_exp3_extinl || m_exp4_extinl); } diff --git a/src/devices/bus/ql/exp.h b/src/devices/bus/ql/exp.h index 31948566bfd..767f98cf4ef 100644 --- a/src/devices/bus/ql/exp.h +++ b/src/devices/bus/ql/exp.h @@ -102,13 +102,13 @@ public: // computer interface uint8_t read(offs_t offset, uint8_t data) { if (m_card) data = m_card->read(offset, data); return data; } void write(offs_t offset, uint8_t data) { if (m_card) m_card->write(offset, data); } - DECLARE_WRITE_LINE_MEMBER( romoeh_w ) { if (m_card) m_card->romoeh_w(state); } + void romoeh_w(int state) { if (m_card) m_card->romoeh_w(state); } // card interface - DECLARE_WRITE_LINE_MEMBER( ipl0l_w ) { m_write_ipl0l(state); } - DECLARE_WRITE_LINE_MEMBER( ipl1l_w ) { m_write_ipl1l(state); } - DECLARE_WRITE_LINE_MEMBER( berrl_w ) { m_write_berrl(state); } - DECLARE_WRITE_LINE_MEMBER( extintl_w ) { m_write_extintl(state); } + void ipl0l_w(int state) { m_write_ipl0l(state); } + void ipl1l_w(int state) { m_write_ipl1l(state); } + void berrl_w(int state) { m_write_berrl(state); } + void extintl_w(int state) { m_write_extintl(state); } protected: // device-level overrides diff --git a/src/devices/bus/ql/rom.h b/src/devices/bus/ql/rom.h index bb70e2f3969..fe32cdcf828 100644 --- a/src/devices/bus/ql/rom.h +++ b/src/devices/bus/ql/rom.h @@ -88,7 +88,7 @@ public: // computer interface uint8_t read(offs_t offset, uint8_t data) { if (m_card) data = m_card->read(offset, data); return data; } void write(offs_t offset, uint8_t data) { if (m_card) m_card->write(offset, data); } - DECLARE_WRITE_LINE_MEMBER( romoeh_w ) { if (m_card) m_card->romoeh_w(state); } + void romoeh_w(int state) { if (m_card) m_card->romoeh_w(state); } protected: // device_t implementation diff --git a/src/devices/bus/ql/sandy_superdisk.cpp b/src/devices/bus/ql/sandy_superdisk.cpp index 45b0f3035a4..7b4221d83e4 100644 --- a/src/devices/bus/ql/sandy_superdisk.cpp +++ b/src/devices/bus/ql/sandy_superdisk.cpp @@ -73,7 +73,7 @@ void sandy_super_disk_device::floppy_formats(format_registration &fr) // centronics //------------------------------------------------- -WRITE_LINE_MEMBER( sandy_super_disk_device::busy_w ) +void sandy_super_disk_device::busy_w(int state) { m_busy = state; check_interrupt(); diff --git a/src/devices/bus/ql/sandy_superdisk.h b/src/devices/bus/ql/sandy_superdisk.h index 8f821e953ad..191b578cd7e 100644 --- a/src/devices/bus/ql/sandy_superdisk.h +++ b/src/devices/bus/ql/sandy_superdisk.h @@ -45,7 +45,7 @@ protected: virtual void write(offs_t offset, uint8_t data) override; private: - WRITE_LINE_MEMBER( busy_w ); + void busy_w(int state); static void floppy_formats(format_registration &fr); diff --git a/src/devices/bus/ql/sandy_superqboard.cpp b/src/devices/bus/ql/sandy_superqboard.cpp index ad1ce340524..c9e1ab7b72c 100644 --- a/src/devices/bus/ql/sandy_superqboard.cpp +++ b/src/devices/bus/ql/sandy_superqboard.cpp @@ -86,7 +86,7 @@ void sandy_superqboard_device::floppy_formats(format_registration &fr) // centronics //------------------------------------------------- -WRITE_LINE_MEMBER( sandy_superqboard_device::busy_w ) +void sandy_superqboard_device::busy_w(int state) { if (state) { diff --git a/src/devices/bus/ql/sandy_superqboard.h b/src/devices/bus/ql/sandy_superqboard.h index 244d0e8a54f..6865df33fd5 100644 --- a/src/devices/bus/ql/sandy_superqboard.h +++ b/src/devices/bus/ql/sandy_superqboard.h @@ -50,7 +50,7 @@ protected: virtual void write(offs_t offset, uint8_t data) override; private: - WRITE_LINE_MEMBER( busy_w ); + void busy_w(int state); static void floppy_formats(format_registration &fr); diff --git a/src/devices/bus/rc2014/cf.cpp b/src/devices/bus/rc2014/cf.cpp index 9640853da86..3ba614f2cdb 100644 --- a/src/devices/bus/rc2014/cf.cpp +++ b/src/devices/bus/rc2014/cf.cpp @@ -29,7 +29,7 @@ protected: virtual void device_reset() override; virtual void device_add_mconfig(machine_config &config) override; - DECLARE_WRITE_LINE_MEMBER( tx_w ) { m_bus->tx_w(state); } + void tx_w(int state) { m_bus->tx_w(state); } uint8_t ide_cs0_r(offs_t offset) { return m_ata->cs0_r(offset); } void ide_cs0_w(offs_t offset, uint8_t data) { m_ata->cs0_w(offset, data); } diff --git a/src/devices/bus/rc2014/clock.cpp b/src/devices/bus/rc2014/clock.cpp index bb73143edc2..00a5e88d358 100644 --- a/src/devices/bus/rc2014/clock.cpp +++ b/src/devices/bus/rc2014/clock.cpp @@ -28,7 +28,7 @@ protected: virtual void device_start() override; virtual void device_add_mconfig(machine_config &config) override; - DECLARE_WRITE_LINE_MEMBER( clk_w ) { m_bus->clk_w(state); } + void clk_w(int state) { m_bus->clk_w(state); } }; single_clock_device::single_clock_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) @@ -69,8 +69,8 @@ protected: virtual void device_add_mconfig(machine_config &config) override; virtual ioport_constructor device_input_ports() const override; - virtual DECLARE_WRITE_LINE_MEMBER( clk_w ) = 0; - virtual DECLARE_WRITE_LINE_MEMBER( clk2_w ) = 0; + virtual void clk_w(int state) = 0; + virtual void clk2_w(int state) = 0; // base-class members required_device m_clock_1; @@ -173,8 +173,8 @@ protected: virtual void device_reset() override; // base-class overrides - DECLARE_WRITE_LINE_MEMBER( clk_w ) override { m_bus->clk_w(state); } - DECLARE_WRITE_LINE_MEMBER( clk2_w ) override { m_bus->clk2_w(state); } + void clk_w(int state) override { m_bus->clk_w(state); } + void clk2_w(int state) override { m_bus->clk2_w(state); } }; dual_clock_device::dual_clock_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) @@ -204,8 +204,8 @@ protected: virtual void device_reset() override; // base-class overrides - DECLARE_WRITE_LINE_MEMBER( clk_w ) override { m_bus->clk_w(state); } - DECLARE_WRITE_LINE_MEMBER( clk2_w ) override { } + void clk_w(int state) override { m_bus->clk_w(state); } + void clk2_w(int state) override { } }; dual_clock_device_40pin::dual_clock_device_40pin(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) diff --git a/src/devices/bus/rc2014/micro.cpp b/src/devices/bus/rc2014/micro.cpp index f818dcd8c7f..1c61b97f725 100644 --- a/src/devices/bus/rc2014/micro.cpp +++ b/src/devices/bus/rc2014/micro.cpp @@ -38,8 +38,8 @@ private: virtual ioport_constructor device_input_ports() const override; virtual const tiny_rom_entry *device_rom_region() const override; - DECLARE_WRITE_LINE_MEMBER( clk_w ) { m_bus->clk_w(state); } - DECLARE_WRITE_LINE_MEMBER( tx_w ) { m_bus->tx_w(state); } + void clk_w(int state) { m_bus->clk_w(state); } + void tx_w(int state) { m_bus->tx_w(state); } void addrmap_mem(address_map &map) { map.unmap_value_high(); } void addrmap_io(address_map &map) { map.unmap_value_high(); } @@ -186,7 +186,7 @@ protected: virtual ioport_constructor device_input_ports() const override; virtual const tiny_rom_entry *device_rom_region() const override; - DECLARE_WRITE_LINE_MEMBER( tx_w ) { m_bus->tx_w(state); } + void tx_w(int state) { m_bus->tx_w(state); } uint8_t ide_cs0_r(offs_t offset) { return m_ata->cs0_r(offset); } void ide_cs0_w(offs_t offset, uint8_t data) { m_ata->cs0_w(offset, data); } diff --git a/src/devices/bus/rc2014/ram.cpp b/src/devices/bus/rc2014/ram.cpp index dc7c89ae170..b71184cf45a 100644 --- a/src/devices/bus/rc2014/ram.cpp +++ b/src/devices/bus/rc2014/ram.cpp @@ -68,7 +68,7 @@ protected: virtual ioport_constructor device_input_ports() const override; - DECLARE_WRITE_LINE_MEMBER( page_w ) { m_bank = state; update_banks(); } + void page_w(int state) { m_bank = state; update_banks(); } virtual void update_banks() = 0; diff --git a/src/devices/bus/rc2014/rc2014.h b/src/devices/bus/rc2014/rc2014.h index a40355af389..cbdff7ec847 100644 --- a/src/devices/bus/rc2014/rc2014.h +++ b/src/devices/bus/rc2014/rc2014.h @@ -86,14 +86,14 @@ public: auto user3_callback() { return m_user3.bind(); } auto user4_callback() { return m_user4.bind(); } - DECLARE_WRITE_LINE_MEMBER( clk_w ) { m_clk(state); } - DECLARE_WRITE_LINE_MEMBER( int_w ) { m_int(state); } - DECLARE_WRITE_LINE_MEMBER( tx_w ) { m_tx(state); } - DECLARE_WRITE_LINE_MEMBER( rx_w ) { m_rx(state); } - DECLARE_WRITE_LINE_MEMBER( user1_w ) { m_user1(state); } - DECLARE_WRITE_LINE_MEMBER( user2_w ) { m_user2(state); } - DECLARE_WRITE_LINE_MEMBER( user3_w ) { m_user3(state); } - DECLARE_WRITE_LINE_MEMBER( user4_w ) { m_user4(state); } + void clk_w(int state) { m_clk(state); } + void int_w(int state) { m_int(state); } + void tx_w(int state) { m_tx(state); } + void rx_w(int state) { m_rx(state); } + void user1_w(int state) { m_user1(state); } + void user2_w(int state) { m_user2(state); } + void user3_w(int state) { m_user3(state); } + void user4_w(int state) { m_user4(state); } void set_bus_clock(u32 clock); void set_bus_clock(const XTAL &xtal) { set_bus_clock(xtal.value()); } @@ -188,15 +188,15 @@ public: auto user7_callback() { return m_user7.bind(); } auto user8_callback() { return m_user8.bind(); } - DECLARE_WRITE_LINE_MEMBER( clk2_w ) { m_clk2(state); } - DECLARE_WRITE_LINE_MEMBER( page_w ) { m_page(state); } - DECLARE_WRITE_LINE_MEMBER( nmi_w ) { m_nmi(state); } - DECLARE_WRITE_LINE_MEMBER( tx2_w ) { m_tx2(state); } - DECLARE_WRITE_LINE_MEMBER( rx2_w ) { m_rx2(state); } - DECLARE_WRITE_LINE_MEMBER( user5_w ) { m_user5(state); } - DECLARE_WRITE_LINE_MEMBER( user6_w ) { m_user6(state); } - DECLARE_WRITE_LINE_MEMBER( user7_w ) { m_user7(state); } - DECLARE_WRITE_LINE_MEMBER( user8_w ) { m_user8(state); } + void clk2_w(int state) { m_clk2(state); } + void page_w(int state) { m_page(state); } + void nmi_w(int state) { m_nmi(state); } + void tx2_w(int state) { m_tx2(state); } + void rx2_w(int state) { m_rx2(state); } + void user5_w(int state) { m_user5(state); } + void user6_w(int state) { m_user6(state); } + void user7_w(int state) { m_user7(state); } + void user8_w(int state) { m_user8(state); } protected: rc2014_ext_bus_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); diff --git a/src/devices/bus/rc2014/serial.cpp b/src/devices/bus/rc2014/serial.cpp index 9453055f2ce..faf8a831714 100644 --- a/src/devices/bus/rc2014/serial.cpp +++ b/src/devices/bus/rc2014/serial.cpp @@ -32,8 +32,8 @@ protected: virtual void device_resolve_objects() override; virtual void device_add_mconfig(machine_config &config) override; - DECLARE_WRITE_LINE_MEMBER( irq_w ) { m_bus->int_w(state); } - DECLARE_WRITE_LINE_MEMBER( tx_w ) { m_bus->tx_w(state); } + void irq_w(int state) { m_bus->int_w(state); } + void tx_w(int state) { m_bus->tx_w(state); } private: required_device m_acia; }; @@ -108,11 +108,11 @@ protected: virtual void device_add_mconfig(machine_config &config) override; virtual ioport_constructor device_input_ports() const override; - virtual DECLARE_WRITE_LINE_MEMBER( irq_w ) = 0; - virtual DECLARE_WRITE_LINE_MEMBER( tx_w ) = 0; - virtual DECLARE_WRITE_LINE_MEMBER( tx2_w ) = 0; - DECLARE_WRITE_LINE_MEMBER( clk1_w ) { if (m_clk_portb == 1) { m_sio->txcb_w(state); m_sio->rxcb_w(state); } } - DECLARE_WRITE_LINE_MEMBER( clk2_w ) { if (m_clk_portb == 0) { m_sio->txcb_w(state); m_sio->rxcb_w(state); } } + virtual void irq_w(int state) = 0; + virtual void tx_w(int state) = 0; + virtual void tx2_w(int state) = 0; + void clk1_w(int state) { if (m_clk_portb == 1) { m_sio->txcb_w(state); m_sio->rxcb_w(state); } } + void clk2_w(int state) { if (m_clk_portb == 0) { m_sio->txcb_w(state); m_sio->rxcb_w(state); } } // base-class members u8 m_clk_portb; @@ -188,9 +188,9 @@ protected: virtual void device_resolve_objects() override; // base-class overrides - DECLARE_WRITE_LINE_MEMBER( irq_w ) override { m_bus->int_w(state); } - DECLARE_WRITE_LINE_MEMBER( tx_w ) override { m_bus->tx_w(state); } - DECLARE_WRITE_LINE_MEMBER( tx2_w ) override { m_bus->tx2_w(state); } + void irq_w(int state) override { m_bus->int_w(state); } + void tx_w(int state) override { m_bus->tx_w(state); } + void tx2_w(int state) override { m_bus->tx2_w(state); } }; dual_serial_device::dual_serial_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) @@ -238,9 +238,9 @@ protected: virtual void device_resolve_objects() override; // base-class overrides - DECLARE_WRITE_LINE_MEMBER( irq_w ) override { m_bus->int_w(state); } - DECLARE_WRITE_LINE_MEMBER( tx_w ) override { m_bus->tx_w(state); } - DECLARE_WRITE_LINE_MEMBER( tx2_w ) override { } + void irq_w(int state) override { m_bus->int_w(state); } + void tx_w(int state) override { m_bus->tx_w(state); } + void tx2_w(int state) override { } }; dual_serial_device_40pin::dual_serial_device_40pin(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) diff --git a/src/devices/bus/rc2014/z180cpu.cpp b/src/devices/bus/rc2014/z180cpu.cpp index c715970b299..64f0eb27318 100644 --- a/src/devices/bus/rc2014/z180cpu.cpp +++ b/src/devices/bus/rc2014/z180cpu.cpp @@ -33,9 +33,9 @@ protected: void addrmap_mem(address_map &map) { map.unmap_value_high(); } void addrmap_io(address_map &map) { map.unmap_value_high(); } - DECLARE_WRITE_LINE_MEMBER( clk_w ) { m_bus->clk_w(state); } - DECLARE_WRITE_LINE_MEMBER( tx_w ) { m_bus->tx_w(state); } - DECLARE_WRITE_LINE_MEMBER( tx2_w ) { m_bus->tx2_w(state); } + void clk_w(int state) { m_bus->clk_w(state); } + void tx_w(int state) { m_bus->tx_w(state); } + void tx2_w(int state) { m_bus->tx2_w(state); } // object finders required_device m_maincpu; diff --git a/src/devices/bus/rs232/exorterm.cpp b/src/devices/bus/rs232/exorterm.cpp index a4980d53538..130173ce569 100644 --- a/src/devices/bus/rs232/exorterm.cpp +++ b/src/devices/bus/rs232/exorterm.cpp @@ -34,19 +34,19 @@ ioport_constructor exorterm155_terminal_device::device_input_ports() const return INPUT_PORTS_NAME(exorterm155_terminal); } -WRITE_LINE_MEMBER(exorterm155_terminal_device::input_txd) +void exorterm155_terminal_device::input_txd(int state) { m_exorterm155->rs232_conn_rxd_w(state); } -WRITE_LINE_MEMBER(exorterm155_terminal_device::route_term_rts) +void exorterm155_terminal_device::route_term_rts(int state) { // Loop the terminal RTS output to the terminal CTS input. m_exorterm155->rs232_conn_cts_w(state); } // This terminal uses DTR for hardware flow control. -WRITE_LINE_MEMBER(exorterm155_terminal_device::route_term_dtr) +void exorterm155_terminal_device::route_term_dtr(int state) { if (m_flow_control->read()) { diff --git a/src/devices/bus/rs232/exorterm.h b/src/devices/bus/rs232/exorterm.h index c8ae8298b13..c658b4bbe8e 100644 --- a/src/devices/bus/rs232/exorterm.h +++ b/src/devices/bus/rs232/exorterm.h @@ -15,7 +15,7 @@ class exorterm155_terminal_device : public device_t, public device_rs232_port_in public: exorterm155_terminal_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - virtual DECLARE_WRITE_LINE_MEMBER(input_txd) override; + virtual void input_txd(int state) override; DECLARE_INPUT_CHANGED_MEMBER(flow_control); @@ -29,8 +29,8 @@ private: required_device m_exorterm155; required_ioport m_flow_control; - DECLARE_WRITE_LINE_MEMBER(route_term_rts); - DECLARE_WRITE_LINE_MEMBER(route_term_dtr); + void route_term_rts(int state); + void route_term_dtr(int state); int m_dtr; }; diff --git a/src/devices/bus/rs232/hlemouse.cpp b/src/devices/bus/rs232/hlemouse.cpp index 49d7a720606..02577316448 100644 --- a/src/devices/bus/rs232/hlemouse.cpp +++ b/src/devices/bus/rs232/hlemouse.cpp @@ -239,13 +239,13 @@ void hle_msmouse_device_base::device_start() machine().scheduler().synchronize(timer_expired_delegate(FUNC(hle_msmouse_device_base::start_mouse), this)); } -WRITE_LINE_MEMBER(hle_msmouse_device_base::input_dtr) +void hle_msmouse_device_base::input_dtr(int state) { m_dtr = state ? 1U : 0U; check_enable(); } -WRITE_LINE_MEMBER(hle_msmouse_device_base::input_rts) +void hle_msmouse_device_base::input_rts(int state) { m_rts = state ? 1U : 0U; check_enable(); diff --git a/src/devices/bus/rs232/hlemouse.h b/src/devices/bus/rs232/hlemouse.h index d2fae5bd4d1..183822c9dc5 100644 --- a/src/devices/bus/rs232/hlemouse.h +++ b/src/devices/bus/rs232/hlemouse.h @@ -33,8 +33,8 @@ protected: virtual void device_resolve_objects() override; virtual void device_start() override; - virtual DECLARE_WRITE_LINE_MEMBER(input_dtr) override; - virtual DECLARE_WRITE_LINE_MEMBER(input_rts) override; + virtual void input_dtr(int state) override; + virtual void input_rts(int state) override; virtual void tra_complete() override; diff --git a/src/devices/bus/rs232/ie15.cpp b/src/devices/bus/rs232/ie15.cpp index 904d65f246c..7f11557fa10 100644 --- a/src/devices/bus/rs232/ie15.cpp +++ b/src/devices/bus/rs232/ie15.cpp @@ -18,7 +18,7 @@ public: { } - virtual DECLARE_WRITE_LINE_MEMBER( input_txd ) override { m_ie15->rs232_conn_rxd_w(state); } + virtual void input_txd(int state) override { m_ie15->rs232_conn_rxd_w(state); } protected: virtual void device_start() override { } diff --git a/src/devices/bus/rs232/keyboard.cpp b/src/devices/bus/rs232/keyboard.cpp index 64beb75d6f2..50ea6a1a95f 100644 --- a/src/devices/bus/rs232/keyboard.cpp +++ b/src/devices/bus/rs232/keyboard.cpp @@ -35,12 +35,12 @@ ioport_constructor serial_keyboard_device::device_input_ports() const return INPUT_PORTS_NAME(serial_keyboard); } -WRITE_LINE_MEMBER( serial_keyboard_device::input_txd ) +void serial_keyboard_device::input_txd(int state) { device_buffered_serial_interface::rx_w(state); } -WRITE_LINE_MEMBER( serial_keyboard_device::update_serial ) +void serial_keyboard_device::update_serial(int state) { reset(); } diff --git a/src/devices/bus/rs232/keyboard.h b/src/devices/bus/rs232/keyboard.h index 190a33a49e4..04552216079 100644 --- a/src/devices/bus/rs232/keyboard.h +++ b/src/devices/bus/rs232/keyboard.h @@ -18,9 +18,9 @@ public: virtual ioport_constructor device_input_ports() const override; - virtual DECLARE_WRITE_LINE_MEMBER( input_txd ) override; + virtual void input_txd(int state) override; - DECLARE_WRITE_LINE_MEMBER(update_serial); + void update_serial(int state); protected: serial_keyboard_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); diff --git a/src/devices/bus/rs232/loopback.cpp b/src/devices/bus/rs232/loopback.cpp index de1f07f3cd7..fcfc858ce62 100644 --- a/src/devices/bus/rs232/loopback.cpp +++ b/src/devices/bus/rs232/loopback.cpp @@ -16,7 +16,7 @@ void rs232_loopback_device::device_start() { } -WRITE_LINE_MEMBER( rs232_loopback_device::input_txd ) +void rs232_loopback_device::input_txd(int state) { if (started()) { @@ -24,7 +24,7 @@ WRITE_LINE_MEMBER( rs232_loopback_device::input_txd ) } } -WRITE_LINE_MEMBER( rs232_loopback_device::input_rts ) +void rs232_loopback_device::input_rts(int state) { if (started()) { @@ -34,7 +34,7 @@ WRITE_LINE_MEMBER( rs232_loopback_device::input_rts ) } } -WRITE_LINE_MEMBER( rs232_loopback_device::input_dtr ) +void rs232_loopback_device::input_dtr(int state) { if (started()) { @@ -55,7 +55,7 @@ void dec_rs232_loopback_device::device_start() { } -WRITE_LINE_MEMBER( dec_rs232_loopback_device::input_txd ) +void dec_rs232_loopback_device::input_txd(int state) { // Pin 2 (Transmitted Data) connected to Pin 3 (Received Data) and Pin 15 (Transmission Clock) if (started()) @@ -65,7 +65,7 @@ WRITE_LINE_MEMBER( dec_rs232_loopback_device::input_txd ) } } -WRITE_LINE_MEMBER( dec_rs232_loopback_device::input_rts ) +void dec_rs232_loopback_device::input_rts(int state) { // Pin 4 (Request to Send) connected to Pin 5 (Clear to Send) and Pin 8 (Carrier Detect) if (started()) @@ -75,7 +75,7 @@ WRITE_LINE_MEMBER( dec_rs232_loopback_device::input_rts ) } } -WRITE_LINE_MEMBER( dec_rs232_loopback_device::input_dtr ) +void dec_rs232_loopback_device::input_dtr(int state) { // Pin 20 (Data Terminal Ready) connected to Pin 6 (Data Set Ready) and 22 (Ring Indicator) if (started()) @@ -85,7 +85,7 @@ WRITE_LINE_MEMBER( dec_rs232_loopback_device::input_dtr ) } } -WRITE_LINE_MEMBER( dec_rs232_loopback_device::input_spds ) +void dec_rs232_loopback_device::input_spds(int state) { // Pin 19 (Speed Select) connected to Pin 12 (Speed Indicator) and 17 (Receive Clock) if (started()) diff --git a/src/devices/bus/rs232/loopback.h b/src/devices/bus/rs232/loopback.h index b7f499d08d0..bfd167e451d 100644 --- a/src/devices/bus/rs232/loopback.h +++ b/src/devices/bus/rs232/loopback.h @@ -13,9 +13,9 @@ class rs232_loopback_device : public device_t, public device_rs232_port_interfac public: rs232_loopback_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - virtual WRITE_LINE_MEMBER( input_txd ) override; - virtual WRITE_LINE_MEMBER( input_rts ) override; - virtual WRITE_LINE_MEMBER( input_dtr ) override; + virtual void input_txd(int state) override; + virtual void input_rts(int state) override; + virtual void input_dtr(int state) override; protected: virtual void device_start() override; @@ -26,10 +26,10 @@ class dec_rs232_loopback_device : public device_t, public device_rs232_port_inte public: dec_rs232_loopback_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - virtual WRITE_LINE_MEMBER( input_txd ) override; - virtual WRITE_LINE_MEMBER( input_rts ) override; - virtual WRITE_LINE_MEMBER( input_dtr ) override; - virtual WRITE_LINE_MEMBER( input_spds ) override; + virtual void input_txd(int state) override; + virtual void input_rts(int state) override; + virtual void input_dtr(int state) override; + virtual void input_spds(int state) override; protected: virtual void device_start() override; diff --git a/src/devices/bus/rs232/mboardd.cpp b/src/devices/bus/rs232/mboardd.cpp index b2b44a6db70..05649283a89 100644 --- a/src/devices/bus/rs232/mboardd.cpp +++ b/src/devices/bus/rs232/mboardd.cpp @@ -36,7 +36,7 @@ class mockingboard_d_device : public device_t, public device_rs232_port_interfac public: mockingboard_d_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - virtual DECLARE_WRITE_LINE_MEMBER( input_txd ) override; + virtual void input_txd(int state) override; required_device m_cpu; required_device m_ay1; @@ -110,7 +110,7 @@ void mockingboard_d_device::m6803_mem(address_map &map) map(0xf800, 0xffff).rom().region("mbcpu", 0); } -WRITE_LINE_MEMBER(mockingboard_d_device::input_txd) +void mockingboard_d_device::input_txd(int state) { m_rx_state = (state & 1); } diff --git a/src/devices/bus/rs232/null_modem.cpp b/src/devices/bus/rs232/null_modem.cpp index 5e79c37bb37..e27542d0306 100644 --- a/src/devices/bus/rs232/null_modem.cpp +++ b/src/devices/bus/rs232/null_modem.cpp @@ -53,7 +53,7 @@ void null_modem_device::device_start() m_timer_poll = timer_alloc(FUNC(null_modem_device::update_queue), this); } -WRITE_LINE_MEMBER(null_modem_device::update_serial) +void null_modem_device::update_serial(int state) { int startbits = 1; int databits = convert_databits(m_rs232_databits->read()); diff --git a/src/devices/bus/rs232/null_modem.h b/src/devices/bus/rs232/null_modem.h index bd9b2520fc4..c59973dc39b 100644 --- a/src/devices/bus/rs232/null_modem.h +++ b/src/devices/bus/rs232/null_modem.h @@ -16,11 +16,11 @@ class null_modem_device : public device_t, public: null_modem_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - virtual WRITE_LINE_MEMBER( input_txd ) override { device_serial_interface::rx_w(state); } - virtual WRITE_LINE_MEMBER( input_rts ) override { m_rts = state; } - virtual WRITE_LINE_MEMBER( input_dtr ) override { m_dtr = state; } + virtual void input_txd(int state) override { device_serial_interface::rx_w(state); } + virtual void input_rts(int state) override { m_rts = state; } + virtual void input_dtr(int state) override { m_dtr = state; } - DECLARE_WRITE_LINE_MEMBER(update_serial); + void update_serial(int state); protected: virtual ioport_constructor device_input_ports() const override; diff --git a/src/devices/bus/rs232/patchbox.cpp b/src/devices/bus/rs232/patchbox.cpp index ccd16f2867e..8d6ed0c9153 100644 --- a/src/devices/bus/rs232/patchbox.cpp +++ b/src/devices/bus/rs232/patchbox.cpp @@ -127,15 +127,15 @@ protected: m_dce_port->write_spds(m_signals[m_sources[SPDS]] ^ m_invert[SPDS]); } - virtual DECLARE_WRITE_LINE_MEMBER( input_txd ) override { signal_in(state); } - virtual DECLARE_WRITE_LINE_MEMBER( input_dtr ) override { signal_in(state); } - virtual DECLARE_WRITE_LINE_MEMBER( input_rts ) override { signal_in(state); } - virtual DECLARE_WRITE_LINE_MEMBER( input_etc ) override { signal_in(state); } - virtual DECLARE_WRITE_LINE_MEMBER( input_spds ) override { signal_in(state); } + virtual void input_txd(int state) override { signal_in(state); } + virtual void input_dtr(int state) override { signal_in(state); } + virtual void input_rts(int state) override { signal_in(state); } + virtual void input_etc(int state) override { signal_in(state); } + virtual void input_spds(int state) override { signal_in(state); } private: template - DECLARE_WRITE_LINE_MEMBER( signal_in ) + void signal_in(int state) { state = state ? 1 : 0; if (m_signals[Signal] != state) diff --git a/src/devices/bus/rs232/printer.cpp b/src/devices/bus/rs232/printer.cpp index 19347b84002..0112edc8715 100644 --- a/src/devices/bus/rs232/printer.cpp +++ b/src/devices/bus/rs232/printer.cpp @@ -55,7 +55,7 @@ void serial_printer_device::device_start() { } -WRITE_LINE_MEMBER(serial_printer_device::update_serial) +void serial_printer_device::update_serial(int state) { int startbits = 1; int databits = convert_databits(m_rs232_databits->read()); @@ -79,7 +79,7 @@ void serial_printer_device::device_reset() update_serial(0); } -WRITE_LINE_MEMBER(serial_printer_device::printer_online) +void serial_printer_device::printer_online(int state) { /// TODO: ? } diff --git a/src/devices/bus/rs232/printer.h b/src/devices/bus/rs232/printer.h index cdc0fbbbbf7..795c1128896 100644 --- a/src/devices/bus/rs232/printer.h +++ b/src/devices/bus/rs232/printer.h @@ -16,9 +16,9 @@ class serial_printer_device : public device_t, public: serial_printer_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - virtual DECLARE_WRITE_LINE_MEMBER( input_txd ) override { device_serial_interface::rx_w(state); } + virtual void input_txd(int state) override { device_serial_interface::rx_w(state); } - DECLARE_WRITE_LINE_MEMBER(update_serial); + void update_serial(int state); protected: serial_printer_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); @@ -31,7 +31,7 @@ protected: int m_initial_rx_state; private: - DECLARE_WRITE_LINE_MEMBER(printer_online); + void printer_online(int state); required_device m_printer; diff --git a/src/devices/bus/rs232/pty.cpp b/src/devices/bus/rs232/pty.cpp index 2e233107afd..d59133c44f4 100644 --- a/src/devices/bus/rs232/pty.cpp +++ b/src/devices/bus/rs232/pty.cpp @@ -29,7 +29,7 @@ pseudo_terminal_device::pseudo_terminal_device(const machine_config &mconfig, co { } -WRITE_LINE_MEMBER(pseudo_terminal_device::update_serial) +void pseudo_terminal_device::update_serial(int state) { int startbits = 1; int databits = convert_databits(m_rs232_databits->read()); diff --git a/src/devices/bus/rs232/pty.h b/src/devices/bus/rs232/pty.h index 52be89732da..32a1cd6b9a1 100644 --- a/src/devices/bus/rs232/pty.h +++ b/src/devices/bus/rs232/pty.h @@ -17,9 +17,9 @@ class pseudo_terminal_device : public device_t, public: pseudo_terminal_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - virtual DECLARE_WRITE_LINE_MEMBER( input_txd ) override { device_serial_interface::rx_w(state); } + virtual void input_txd(int state) override { device_serial_interface::rx_w(state); } - DECLARE_WRITE_LINE_MEMBER(update_serial); + void update_serial(int state); protected: virtual ioport_constructor device_input_ports() const override; diff --git a/src/devices/bus/rs232/rs232.cpp b/src/devices/bus/rs232/rs232.cpp index 805d295c4de..7ce61331f23 100644 --- a/src/devices/bus/rs232/rs232.cpp +++ b/src/devices/bus/rs232/rs232.cpp @@ -122,31 +122,31 @@ void rs232_port_device::device_start() save_item(NAME(m_dce_txc)); } -WRITE_LINE_MEMBER( rs232_port_device::write_txd ) +void rs232_port_device::write_txd(int state) { if (m_dev) m_dev->input_txd(state); } -WRITE_LINE_MEMBER( rs232_port_device::write_dtr ) +void rs232_port_device::write_dtr(int state) { if (m_dev) m_dev->input_dtr(state); } -WRITE_LINE_MEMBER( rs232_port_device::write_rts ) +void rs232_port_device::write_rts(int state) { if (m_dev) m_dev->input_rts(state); } -WRITE_LINE_MEMBER( rs232_port_device::write_etc ) +void rs232_port_device::write_etc(int state) { if (m_dev) m_dev->input_etc(state); } -WRITE_LINE_MEMBER( rs232_port_device::write_spds ) +void rs232_port_device::write_spds(int state) { if (m_dev) m_dev->input_spds(state); diff --git a/src/devices/bus/rs232/rs232.h b/src/devices/bus/rs232/rs232.h index ff903f30fce..cfbd9206265 100644 --- a/src/devices/bus/rs232/rs232.h +++ b/src/devices/bus/rs232/rs232.h @@ -130,20 +130,20 @@ public: auto rxc_handler() { return m_rxc_handler.bind(); } auto txc_handler() { return m_txc_handler.bind(); } - DECLARE_WRITE_LINE_MEMBER( write_txd ); // DB25 pin 2 V.24 circuit 103 Transmitted data - DECLARE_WRITE_LINE_MEMBER( write_dtr ); // DB25 pin 20 V.24 circuit 108/2 Data terminal ready - DECLARE_WRITE_LINE_MEMBER( write_rts ); // DB25 pin 4 V.24 circuit 105 Request to send - DECLARE_WRITE_LINE_MEMBER( write_etc ); // DB25 pin 24 V.24 circuit 113 Transmitter signal element timing (DTE) - DECLARE_WRITE_LINE_MEMBER( write_spds ); // DB25 pin 23 V.24 circuit 111 Data signal rate selector (DTE) - - DECLARE_READ_LINE_MEMBER( rxd_r ) { return m_rxd; } // DB25 pin 3 V.24 circuit 104 Received data - DECLARE_READ_LINE_MEMBER( dcd_r ) { return m_dcd; } // DB25 pin 8 V.24 circuit 109 Data channel received line signal detector - DECLARE_READ_LINE_MEMBER( dsr_r ) { return m_dsr; } // DB25 pin 6 V.24 circuit 107 Data set ready - DECLARE_READ_LINE_MEMBER( ri_r ) { return m_ri; } // DB25 pin 22 V.24 circuit 125 Calling indicator - DECLARE_READ_LINE_MEMBER( si_r ) { return m_si; } // V.24 circuit 112 Data signal rate selector (DCE) - DECLARE_READ_LINE_MEMBER( cts_r ) { return m_cts; } // DB25 pin 5 V.24 circuit 106 Ready for sending - DECLARE_READ_LINE_MEMBER( rxc_r ) { return m_dce_rxc; } // DB25 pin 17 V.24 circuit 115 Receiver signal element timing (DCE) - DECLARE_READ_LINE_MEMBER( txc_r ) { return m_dce_txc; } // DB25 pin 15 V.24 circuit 114 Transmitter signal element timing (DCE) + void write_txd(int state); // DB25 pin 2 V.24 circuit 103 Transmitted data + void write_dtr(int state); // DB25 pin 20 V.24 circuit 108/2 Data terminal ready + void write_rts(int state); // DB25 pin 4 V.24 circuit 105 Request to send + void write_etc(int state); // DB25 pin 24 V.24 circuit 113 Transmitter signal element timing (DTE) + void write_spds(int state); // DB25 pin 23 V.24 circuit 111 Data signal rate selector (DTE) + + int rxd_r() { return m_rxd; } // DB25 pin 3 V.24 circuit 104 Received data + int dcd_r() { return m_dcd; } // DB25 pin 8 V.24 circuit 109 Data channel received line signal detector + int dsr_r() { return m_dsr; } // DB25 pin 6 V.24 circuit 107 Data set ready + int ri_r() { return m_ri; } // DB25 pin 22 V.24 circuit 125 Calling indicator + int si_r() { return m_si; } // V.24 circuit 112 Data signal rate selector (DCE) + int cts_r() { return m_cts; } // DB25 pin 5 V.24 circuit 106 Ready for sending + int rxc_r() { return m_dce_rxc; } // DB25 pin 17 V.24 circuit 115 Receiver signal element timing (DCE) + int txc_r() { return m_dce_txc; } // DB25 pin 15 V.24 circuit 114 Transmitter signal element timing (DCE) protected: rs232_port_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); @@ -182,20 +182,20 @@ class device_rs232_port_interface : public device_interface public: virtual ~device_rs232_port_interface(); - virtual DECLARE_WRITE_LINE_MEMBER( input_txd ) { } - virtual DECLARE_WRITE_LINE_MEMBER( input_dtr ) { } - virtual DECLARE_WRITE_LINE_MEMBER( input_rts ) { } - virtual DECLARE_WRITE_LINE_MEMBER( input_etc ) { } - virtual DECLARE_WRITE_LINE_MEMBER( input_spds ) { } - - DECLARE_WRITE_LINE_MEMBER( output_rxd ) { m_port->m_rxd = state; m_port->m_rxd_handler(state); } - DECLARE_WRITE_LINE_MEMBER( output_dcd ) { m_port->m_dcd = state; m_port->m_dcd_handler(state); } - DECLARE_WRITE_LINE_MEMBER( output_dsr ) { m_port->m_dsr = state; m_port->m_dsr_handler(state); } - DECLARE_WRITE_LINE_MEMBER( output_ri ) { m_port->m_ri = state; m_port->m_ri_handler(state); } - DECLARE_WRITE_LINE_MEMBER( output_si ) { m_port->m_si = state; m_port->m_si_handler(state); } - DECLARE_WRITE_LINE_MEMBER( output_cts ) { m_port->m_cts = state; m_port->m_cts_handler(state); } - DECLARE_WRITE_LINE_MEMBER( output_rxc ) { m_port->m_dce_rxc = state; m_port->m_rxc_handler(state); } - DECLARE_WRITE_LINE_MEMBER( output_txc ) { m_port->m_dce_txc = state; m_port->m_txc_handler(state); } + virtual void input_txd(int state) { } + virtual void input_dtr(int state) { } + virtual void input_rts(int state) { } + virtual void input_etc(int state) { } + virtual void input_spds(int state) { } + + void output_rxd(int state) { m_port->m_rxd = state; m_port->m_rxd_handler(state); } + void output_dcd(int state) { m_port->m_dcd = state; m_port->m_dcd_handler(state); } + void output_dsr(int state) { m_port->m_dsr = state; m_port->m_dsr_handler(state); } + void output_ri(int state) { m_port->m_ri = state; m_port->m_ri_handler(state); } + void output_si(int state) { m_port->m_si = state; m_port->m_si_handler(state); } + void output_cts(int state) { m_port->m_cts = state; m_port->m_cts_handler(state); } + void output_rxc(int state) { m_port->m_dce_rxc = state; m_port->m_rxc_handler(state); } + void output_txc(int state) { m_port->m_dce_txc = state; m_port->m_txc_handler(state); } protected: device_rs232_port_interface(const machine_config &mconfig, device_t &device); @@ -280,7 +280,7 @@ template class buffered_rs232_device : public device_t, public device_buffered_serial_interface, public device_rs232_port_interface { public: - virtual DECLARE_WRITE_LINE_MEMBER( input_txd ) override + virtual void input_txd(int state) override { device_buffered_serial_interface::rx_w(state); } diff --git a/src/devices/bus/rs232/rs232_sync_io.cpp b/src/devices/bus/rs232/rs232_sync_io.cpp index 8403c41e2cf..56baf776da4 100644 --- a/src/devices/bus/rs232/rs232_sync_io.cpp +++ b/src/devices/bus/rs232/rs232_sync_io.cpp @@ -70,13 +70,13 @@ rs232_sync_io_device:: ~rs232_sync_io_device() { } -WRITE_LINE_MEMBER(rs232_sync_io_device::input_txd) +void rs232_sync_io_device::input_txd(int state) { m_txd = state; LOG("TxD %d %u\n" , state , m_tx_counter); } -WRITE_LINE_MEMBER(rs232_sync_io_device::input_rts) +void rs232_sync_io_device::input_rts(int state) { m_rts = state; } @@ -191,7 +191,7 @@ TIMER_CALLBACK_MEMBER(rs232_sync_io_device::clock_tick) } } -WRITE_LINE_MEMBER(rs232_sync_io_device::update_serial) +void rs232_sync_io_device::update_serial(int state) { auto baud_rate = convert_baud(m_rs232_baud->read()); auto period = attotime::from_hz(baud_rate * 2); diff --git a/src/devices/bus/rs232/rs232_sync_io.h b/src/devices/bus/rs232/rs232_sync_io.h index a5b6818de48..3b821b31a18 100644 --- a/src/devices/bus/rs232/rs232_sync_io.h +++ b/src/devices/bus/rs232/rs232_sync_io.h @@ -23,10 +23,10 @@ public: rs232_sync_io_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); virtual ~rs232_sync_io_device(); - virtual DECLARE_WRITE_LINE_MEMBER(input_txd) override; - virtual DECLARE_WRITE_LINE_MEMBER(input_rts) override; + virtual void input_txd(int state) override; + virtual void input_rts(int state) override; - DECLARE_WRITE_LINE_MEMBER(update_serial); + void update_serial(int state); protected: // device-level overrides diff --git a/src/devices/bus/rs232/sun_kbd.cpp b/src/devices/bus/rs232/sun_kbd.cpp index 32ed5d42c80..316a2012b82 100644 --- a/src/devices/bus/rs232/sun_kbd.cpp +++ b/src/devices/bus/rs232/sun_kbd.cpp @@ -20,7 +20,7 @@ public: { } - virtual DECLARE_WRITE_LINE_MEMBER( input_txd ) override { m_keyboard_port->write_txd(state); } + virtual void input_txd(int state) override { m_keyboard_port->write_txd(state); } protected: virtual void device_add_mconfig(machine_config &config) override diff --git a/src/devices/bus/rs232/swtpc8212.cpp b/src/devices/bus/rs232/swtpc8212.cpp index b7265aea5d5..aa331c66a93 100644 --- a/src/devices/bus/rs232/swtpc8212.cpp +++ b/src/devices/bus/rs232/swtpc8212.cpp @@ -34,19 +34,19 @@ ioport_constructor swtpc8212_terminal_device::device_input_ports() const return INPUT_PORTS_NAME(swtpc8212_terminal); } -WRITE_LINE_MEMBER(swtpc8212_terminal_device::input_txd) +void swtpc8212_terminal_device::input_txd(int state) { m_swtpc8212->rs232_conn_rxd_w(state); } -WRITE_LINE_MEMBER(swtpc8212_terminal_device::route_term_rts) +void swtpc8212_terminal_device::route_term_rts(int state) { // Loop the terminal RTS output to the terminal CTS input. m_swtpc8212->rs232_conn_cts_w(state); } // This terminal uses DTR for hardware flow control. -WRITE_LINE_MEMBER(swtpc8212_terminal_device::route_term_dtr) +void swtpc8212_terminal_device::route_term_dtr(int state) { if (m_flow_control->read()) { diff --git a/src/devices/bus/rs232/swtpc8212.h b/src/devices/bus/rs232/swtpc8212.h index 2af82fa3215..6105faa7058 100644 --- a/src/devices/bus/rs232/swtpc8212.h +++ b/src/devices/bus/rs232/swtpc8212.h @@ -15,7 +15,7 @@ class swtpc8212_terminal_device : public device_t, public device_rs232_port_inte public: swtpc8212_terminal_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - virtual DECLARE_WRITE_LINE_MEMBER(input_txd) override; + virtual void input_txd(int state) override; DECLARE_INPUT_CHANGED_MEMBER(flow_control); @@ -29,8 +29,8 @@ private: required_device m_swtpc8212; required_ioport m_flow_control; - DECLARE_WRITE_LINE_MEMBER(route_term_rts); - DECLARE_WRITE_LINE_MEMBER(route_term_dtr); + void route_term_rts(int state); + void route_term_dtr(int state); int m_dtr; }; diff --git a/src/devices/bus/rs232/terminal.cpp b/src/devices/bus/rs232/terminal.cpp index 24c37f5a0e2..a1ae0612694 100644 --- a/src/devices/bus/rs232/terminal.cpp +++ b/src/devices/bus/rs232/terminal.cpp @@ -15,9 +15,9 @@ class serial_terminal_device : public generic_terminal_device, public: serial_terminal_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - virtual DECLARE_WRITE_LINE_MEMBER( input_txd ) override { device_buffered_serial_interface::rx_w(state); } + virtual void input_txd(int state) override { device_buffered_serial_interface::rx_w(state); } - DECLARE_WRITE_LINE_MEMBER(update_serial); + void update_serial(int state); protected: virtual ioport_constructor device_input_ports() const override; @@ -63,7 +63,7 @@ ioport_constructor serial_terminal_device::device_input_ports() const return INPUT_PORTS_NAME(serial_terminal); } -WRITE_LINE_MEMBER(serial_terminal_device::update_serial) +void serial_terminal_device::update_serial(int state) { clear_fifo(); diff --git a/src/devices/bus/rs232/xvd701.h b/src/devices/bus/rs232/xvd701.h index 8e85e377f76..2d1419d307f 100644 --- a/src/devices/bus/rs232/xvd701.h +++ b/src/devices/bus/rs232/xvd701.h @@ -13,7 +13,7 @@ class jvc_xvd701_device : public device_t, public: jvc_xvd701_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - virtual WRITE_LINE_MEMBER( input_txd ) override { device_serial_interface::rx_w(state); } + virtual void input_txd(int state) override { device_serial_interface::rx_w(state); } protected: virtual ioport_constructor device_input_ports() const override; virtual void device_start() override; diff --git a/src/devices/bus/s100/ascsasi.cpp b/src/devices/bus/s100/ascsasi.cpp index 73cacf9680a..1733b2caf3e 100644 --- a/src/devices/bus/s100/ascsasi.cpp +++ b/src/devices/bus/s100/ascsasi.cpp @@ -46,8 +46,8 @@ protected: virtual void s100_sout_w(offs_t offset, u8 data) override; private: - DECLARE_WRITE_LINE_MEMBER(iio_w); - DECLARE_WRITE_LINE_MEMBER(req_w); + void iio_w(int state); + void req_w(int state); void sasi_sel_pulse(); void sasi_rst_pulse(); TIMER_CALLBACK_MEMBER(sel_off); @@ -106,7 +106,7 @@ void asc_sasi_device::device_reset() m_boot = true; } -WRITE_LINE_MEMBER(asc_sasi_device::iio_w) +void asc_sasi_device::iio_w(int state) { // Release data bus when I/O is asserted if (state) @@ -115,7 +115,7 @@ WRITE_LINE_MEMBER(asc_sasi_device::iio_w) m_sasi->data_w(7, m_data_latch); } -WRITE_LINE_MEMBER(asc_sasi_device::req_w) +void asc_sasi_device::req_w(int state) { // Clear ACK when REQ is negated if (!state) diff --git a/src/devices/bus/s100/dj2db.cpp b/src/devices/bus/s100/dj2db.cpp index 6ee50a89840..cd160593425 100644 --- a/src/devices/bus/s100/dj2db.cpp +++ b/src/devices/bus/s100/dj2db.cpp @@ -71,7 +71,7 @@ static void s100_dj2db_floppies(device_slot_interface &device) device.option_add("8dsdd", FLOPPY_8_DSDD); } -WRITE_LINE_MEMBER( s100_dj2db_device::fdc_intrq_w ) +void s100_dj2db_device::fdc_intrq_w(int state) { if (state) m_bus->rdy_w(CLEAR_LINE); @@ -89,7 +89,7 @@ WRITE_LINE_MEMBER( s100_dj2db_device::fdc_intrq_w ) } } -WRITE_LINE_MEMBER( s100_dj2db_device::fdc_drq_w ) +void s100_dj2db_device::fdc_drq_w(int state) { if (state) m_bus->rdy_w(CLEAR_LINE); } diff --git a/src/devices/bus/s100/dj2db.h b/src/devices/bus/s100/dj2db.h index e285ab43f42..6be3d63c117 100644 --- a/src/devices/bus/s100/dj2db.h +++ b/src/devices/bus/s100/dj2db.h @@ -50,8 +50,8 @@ protected: virtual void s100_phantom_w(int state) override; private: - DECLARE_WRITE_LINE_MEMBER( fdc_intrq_w ); - DECLARE_WRITE_LINE_MEMBER( fdc_drq_w ); + void fdc_intrq_w(int state); + void fdc_drq_w(int state); // internal state required_device m_fdc; diff --git a/src/devices/bus/s100/polyvti.cpp b/src/devices/bus/s100/polyvti.cpp index 242d13a8fe2..e84ea2e7ded 100644 --- a/src/devices/bus/s100/polyvti.cpp +++ b/src/devices/bus/s100/polyvti.cpp @@ -54,7 +54,7 @@ private: u32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void kbd_put(u8 data); - DECLARE_WRITE_LINE_MEMBER(kbd_int_w); + void kbd_int_w(int state); // object finders required_device m_kbdlatch; @@ -206,7 +206,7 @@ void poly_vti_device::kbd_put(u8 data) } } -WRITE_LINE_MEMBER(poly_vti_device::kbd_int_w) +void poly_vti_device::kbd_int_w(int state) { m_kbd_int = !state; diff --git a/src/devices/bus/s100/s100.h b/src/devices/bus/s100/s100.h index 0a32b83f73b..337cb4264c3 100644 --- a/src/devices/bus/s100/s100.h +++ b/src/devices/bus/s100/s100.h @@ -163,23 +163,23 @@ public: uint8_t sinp_r(offs_t offset); void sout_w(offs_t offset, uint8_t data); - DECLARE_WRITE_LINE_MEMBER( irq_w ) { m_write_irq(state); } - DECLARE_WRITE_LINE_MEMBER( nmi_w ) { m_write_nmi(state); } - DECLARE_WRITE_LINE_MEMBER( vi0_w ) { m_write_vi0(state); } - DECLARE_WRITE_LINE_MEMBER( vi1_w ) { m_write_vi1(state); } - DECLARE_WRITE_LINE_MEMBER( vi2_w ) { m_write_vi2(state); } - DECLARE_WRITE_LINE_MEMBER( vi3_w ) { m_write_vi3(state); } - DECLARE_WRITE_LINE_MEMBER( vi4_w ) { m_write_vi4(state); } - DECLARE_WRITE_LINE_MEMBER( vi5_w ) { m_write_vi5(state); } - DECLARE_WRITE_LINE_MEMBER( vi6_w ) { m_write_vi6(state); } - DECLARE_WRITE_LINE_MEMBER( vi7_w ) { m_write_vi7(state); } - DECLARE_WRITE_LINE_MEMBER( dma0_w ) { m_write_dma0(state); } - DECLARE_WRITE_LINE_MEMBER( dma1_w ) { m_write_dma1(state); } - DECLARE_WRITE_LINE_MEMBER( dma2_w ) { m_write_dma2(state); } - DECLARE_WRITE_LINE_MEMBER( dma3_w ) { m_write_dma3(state); } - DECLARE_WRITE_LINE_MEMBER( rdy_w ) { m_write_rdy(state); } - DECLARE_WRITE_LINE_MEMBER( hold_w ) { m_write_hold(state); } - DECLARE_WRITE_LINE_MEMBER( error_w ) { m_write_error(state); } + void irq_w(int state) { m_write_irq(state); } + void nmi_w(int state) { m_write_nmi(state); } + void vi0_w(int state) { m_write_vi0(state); } + void vi1_w(int state) { m_write_vi1(state); } + void vi2_w(int state) { m_write_vi2(state); } + void vi3_w(int state) { m_write_vi3(state); } + void vi4_w(int state) { m_write_vi4(state); } + void vi5_w(int state) { m_write_vi5(state); } + void vi6_w(int state) { m_write_vi6(state); } + void vi7_w(int state) { m_write_vi7(state); } + void dma0_w(int state) { m_write_dma0(state); } + void dma1_w(int state) { m_write_dma1(state); } + void dma2_w(int state) { m_write_dma2(state); } + void dma3_w(int state) { m_write_dma3(state); } + void rdy_w(int state) { m_write_rdy(state); } + void hold_w(int state) { m_write_hold(state); } + void error_w(int state) { m_write_error(state); } protected: // device_t implementation diff --git a/src/devices/bus/s100/wunderbus.cpp b/src/devices/bus/s100/wunderbus.cpp index 29efc80b185..a331d026506 100644 --- a/src/devices/bus/s100/wunderbus.cpp +++ b/src/devices/bus/s100/wunderbus.cpp @@ -53,7 +53,7 @@ DEFINE_DEVICE_TYPE(S100_WUNDERBUS, s100_wunderbus_device, "s100_wunderbus", "Mor */ -WRITE_LINE_MEMBER( s100_wunderbus_device::pic_int_w ) +void s100_wunderbus_device::pic_int_w(int state) { m_bus->irq_w(state); } @@ -71,7 +71,7 @@ DEVICE_INPUT_DEFAULTS_END // UPD1990A_INTERFACE( rtc_intf ) //------------------------------------------------- -WRITE_LINE_MEMBER( s100_wunderbus_device::rtc_tp_w ) +void s100_wunderbus_device::rtc_tp_w(int state) { if (state) { diff --git a/src/devices/bus/s100/wunderbus.h b/src/devices/bus/s100/wunderbus.h index ca9a6d0e641..a50fbea2d70 100644 --- a/src/devices/bus/s100/wunderbus.h +++ b/src/devices/bus/s100/wunderbus.h @@ -48,8 +48,8 @@ protected: virtual void s100_sout_w(offs_t offset, uint8_t data) override; private: - DECLARE_WRITE_LINE_MEMBER( pic_int_w ); - DECLARE_WRITE_LINE_MEMBER( rtc_tp_w ); + void pic_int_w(int state); + void rtc_tp_w(int state); required_device m_pic; required_device m_ace1; diff --git a/src/devices/bus/samcoupe/drive/drive.h b/src/devices/bus/samcoupe/drive/drive.h index 83f7ce0f069..f02b8a8d743 100644 --- a/src/devices/bus/samcoupe/drive/drive.h +++ b/src/devices/bus/samcoupe/drive/drive.h @@ -60,7 +60,7 @@ public: uint8_t read(offs_t offset); void write(offs_t offset, uint8_t data); - DECLARE_WRITE_LINE_MEMBER( disk1_w ); + void disk1_w(int state); protected: // device-level overrides diff --git a/src/devices/bus/samcoupe/expansion/expansion.cpp b/src/devices/bus/samcoupe/expansion/expansion.cpp index b52792eb43d..49c2409cf9f 100644 --- a/src/devices/bus/samcoupe/expansion/expansion.cpp +++ b/src/devices/bus/samcoupe/expansion/expansion.cpp @@ -88,13 +88,13 @@ void samcoupe_expansion_device::iorq_w(offs_t offset, uint8_t data) m_module->iorq_w(offset, data); } -WRITE_LINE_MEMBER( samcoupe_expansion_device::xmem_w ) +void samcoupe_expansion_device::xmem_w(int state) { if (m_module) m_module->xmem_w(state); } -WRITE_LINE_MEMBER( samcoupe_expansion_device::print_w ) +void samcoupe_expansion_device::print_w(int state) { if (m_module) m_module->print_w(state); diff --git a/src/devices/bus/samcoupe/expansion/expansion.h b/src/devices/bus/samcoupe/expansion/expansion.h index 90390286ac2..2bd8d199866 100644 --- a/src/devices/bus/samcoupe/expansion/expansion.h +++ b/src/devices/bus/samcoupe/expansion/expansion.h @@ -76,7 +76,7 @@ public: auto int_handler() { return m_int_handler.bind(); } // called from cart device - DECLARE_WRITE_LINE_MEMBER( int_w ) { m_int_handler(state); } + void int_w(int state) { m_int_handler(state); } // called from host uint8_t mreq_r(offs_t offset); @@ -84,8 +84,8 @@ public: uint8_t iorq_r(offs_t offset); void iorq_w(offs_t offset, uint8_t data); - DECLARE_WRITE_LINE_MEMBER( xmem_w ); - DECLARE_WRITE_LINE_MEMBER( print_w ); + void xmem_w(int state); + void print_w(int state); protected: // device-level overrides diff --git a/src/devices/bus/samcoupe/expansion/spi.cpp b/src/devices/bus/samcoupe/expansion/spi.cpp index 47343f32dc1..e005a39ba70 100644 --- a/src/devices/bus/samcoupe/expansion/spi.cpp +++ b/src/devices/bus/samcoupe/expansion/spi.cpp @@ -66,7 +66,7 @@ void sam_spi_device::device_start() // IMPLEMENTATION //************************************************************************** -WRITE_LINE_MEMBER( sam_spi_device::centronics_busy_w ) +void sam_spi_device::centronics_busy_w(int state) { m_busy = state; } diff --git a/src/devices/bus/samcoupe/expansion/spi.h b/src/devices/bus/samcoupe/expansion/spi.h index 38e813bd6ee..674ecf3880e 100644 --- a/src/devices/bus/samcoupe/expansion/spi.h +++ b/src/devices/bus/samcoupe/expansion/spi.h @@ -41,7 +41,7 @@ private: required_device m_data_out; required_device m_centronics; - DECLARE_WRITE_LINE_MEMBER(centronics_busy_w); + void centronics_busy_w(int state); int m_print; int m_busy; diff --git a/src/devices/bus/samcoupe/mouse/mouseport.h b/src/devices/bus/samcoupe/mouse/mouseport.h index 92943f39a7c..89233101758 100644 --- a/src/devices/bus/samcoupe/mouse/mouseport.h +++ b/src/devices/bus/samcoupe/mouse/mouseport.h @@ -52,7 +52,7 @@ public: auto mseint_handler() { return m_mseint_handler.bind(); } // called from cart device - DECLARE_WRITE_LINE_MEMBER( mseint_w ) { m_mseint_handler(state); } + void mseint_w(int state) { m_mseint_handler(state); } // called from host uint8_t read(); diff --git a/src/devices/bus/sbus/cgsix.cpp b/src/devices/bus/sbus/cgsix.cpp index 4ae3301c285..46685deb58a 100644 --- a/src/devices/bus/sbus/cgsix.cpp +++ b/src/devices/bus/sbus/cgsix.cpp @@ -1274,7 +1274,7 @@ void sbus_cgsix_device::thc_misc_w(offs_t offset, uint32_t data, uint32_t mem_ma m_thc_misc &= THC_MISC_WRITE_MASK; } -WRITE_LINE_MEMBER(sbus_cgsix_device::vblank_w) +void sbus_cgsix_device::vblank_w(int state) { int old_state = BIT(m_thc_misc, THC_MISC_VSYNC_BIT); if (old_state != state) diff --git a/src/devices/bus/sbus/cgsix.h b/src/devices/bus/sbus/cgsix.h index b6f3fe7520d..40392f250df 100644 --- a/src/devices/bus/sbus/cgsix.h +++ b/src/devices/bus/sbus/cgsix.h @@ -50,7 +50,7 @@ protected: void cursor_address_w(uint32_t data); uint32_t cursor_ram_r(offs_t offset); void cursor_ram_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0); - DECLARE_WRITE_LINE_MEMBER(vblank_w); + void vblank_w(int state); uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); uint8_t perform_rasterop(uint8_t src, uint8_t dst, uint8_t mask = 0xff); diff --git a/src/devices/bus/scsi/scsi.cpp b/src/devices/bus/scsi/scsi.cpp index a4477483766..1530679230e 100644 --- a/src/devices/bus/scsi/scsi.cpp +++ b/src/devices/bus/scsi/scsi.cpp @@ -491,7 +491,7 @@ void scsi_port_device::update_data7() } } -WRITE_LINE_MEMBER( scsi_port_device::write_bsy ) +void scsi_port_device::write_bsy(int state) { if (m_bsy_in != state) { @@ -500,7 +500,7 @@ WRITE_LINE_MEMBER( scsi_port_device::write_bsy ) } } -WRITE_LINE_MEMBER( scsi_port_device::write_sel ) +void scsi_port_device::write_sel(int state) { if (m_sel_in != state) { @@ -509,7 +509,7 @@ WRITE_LINE_MEMBER( scsi_port_device::write_sel ) } } -WRITE_LINE_MEMBER( scsi_port_device::write_cd ) +void scsi_port_device::write_cd(int state) { if (m_cd_in != state) { @@ -518,7 +518,7 @@ WRITE_LINE_MEMBER( scsi_port_device::write_cd ) } } -WRITE_LINE_MEMBER( scsi_port_device::write_io ) +void scsi_port_device::write_io(int state) { if (m_io_in != state) { @@ -527,7 +527,7 @@ WRITE_LINE_MEMBER( scsi_port_device::write_io ) } } -WRITE_LINE_MEMBER( scsi_port_device::write_msg ) +void scsi_port_device::write_msg(int state) { if (m_msg_in != state) { @@ -536,7 +536,7 @@ WRITE_LINE_MEMBER( scsi_port_device::write_msg ) } } -WRITE_LINE_MEMBER( scsi_port_device::write_req ) +void scsi_port_device::write_req(int state) { if (m_req_in != state) { @@ -545,7 +545,7 @@ WRITE_LINE_MEMBER( scsi_port_device::write_req ) } } -WRITE_LINE_MEMBER( scsi_port_device::write_ack ) +void scsi_port_device::write_ack(int state) { if (m_ack_in != state) { @@ -554,7 +554,7 @@ WRITE_LINE_MEMBER( scsi_port_device::write_ack ) } } -WRITE_LINE_MEMBER( scsi_port_device::write_atn ) +void scsi_port_device::write_atn(int state) { if (m_atn_in != state) { @@ -563,7 +563,7 @@ WRITE_LINE_MEMBER( scsi_port_device::write_atn ) } } -WRITE_LINE_MEMBER( scsi_port_device::write_rst ) +void scsi_port_device::write_rst(int state) { if (m_rst_in != state) { @@ -572,7 +572,7 @@ WRITE_LINE_MEMBER( scsi_port_device::write_rst ) } } -WRITE_LINE_MEMBER( scsi_port_device::write_data0 ) +void scsi_port_device::write_data0(int state) { if (m_data0_in != state) { @@ -581,7 +581,7 @@ WRITE_LINE_MEMBER( scsi_port_device::write_data0 ) } } -WRITE_LINE_MEMBER( scsi_port_device::write_data1 ) +void scsi_port_device::write_data1(int state) { if (m_data1_in != state) { @@ -590,7 +590,7 @@ WRITE_LINE_MEMBER( scsi_port_device::write_data1 ) } } -WRITE_LINE_MEMBER( scsi_port_device::write_data2 ) +void scsi_port_device::write_data2(int state) { if (m_data2_in != state) { @@ -599,7 +599,7 @@ WRITE_LINE_MEMBER( scsi_port_device::write_data2 ) } } -WRITE_LINE_MEMBER( scsi_port_device::write_data3 ) +void scsi_port_device::write_data3(int state) { if (m_data3_in != state) { @@ -608,7 +608,7 @@ WRITE_LINE_MEMBER( scsi_port_device::write_data3 ) } } -WRITE_LINE_MEMBER( scsi_port_device::write_data4 ) +void scsi_port_device::write_data4(int state) { if (m_data4_in != state) { @@ -617,7 +617,7 @@ WRITE_LINE_MEMBER( scsi_port_device::write_data4 ) } } -WRITE_LINE_MEMBER( scsi_port_device::write_data5 ) +void scsi_port_device::write_data5(int state) { if (m_data5_in != state) { @@ -626,7 +626,7 @@ WRITE_LINE_MEMBER( scsi_port_device::write_data5 ) } } -WRITE_LINE_MEMBER( scsi_port_device::write_data6 ) +void scsi_port_device::write_data6(int state) { if (m_data6_in != state) { @@ -635,7 +635,7 @@ WRITE_LINE_MEMBER( scsi_port_device::write_data6 ) } } -WRITE_LINE_MEMBER( scsi_port_device::write_data7 ) +void scsi_port_device::write_data7(int state) { if (m_data7_in != state) { diff --git a/src/devices/bus/scsi/scsi.h b/src/devices/bus/scsi/scsi.h index 07e64d5f102..4906125cf56 100644 --- a/src/devices/bus/scsi/scsi.h +++ b/src/devices/bus/scsi/scsi.h @@ -62,23 +62,23 @@ public: void set_output_latch(output_latch_device &latch); - DECLARE_WRITE_LINE_MEMBER( write_bsy ); - DECLARE_WRITE_LINE_MEMBER( write_sel ); - DECLARE_WRITE_LINE_MEMBER( write_cd ); - DECLARE_WRITE_LINE_MEMBER( write_io ); - DECLARE_WRITE_LINE_MEMBER( write_msg ); - DECLARE_WRITE_LINE_MEMBER( write_req ); - DECLARE_WRITE_LINE_MEMBER( write_ack ); - DECLARE_WRITE_LINE_MEMBER( write_atn ); - DECLARE_WRITE_LINE_MEMBER( write_rst ); - DECLARE_WRITE_LINE_MEMBER( write_data0 ); - DECLARE_WRITE_LINE_MEMBER( write_data1 ); - DECLARE_WRITE_LINE_MEMBER( write_data2 ); - DECLARE_WRITE_LINE_MEMBER( write_data3 ); - DECLARE_WRITE_LINE_MEMBER( write_data4 ); - DECLARE_WRITE_LINE_MEMBER( write_data5 ); - DECLARE_WRITE_LINE_MEMBER( write_data6 ); - DECLARE_WRITE_LINE_MEMBER( write_data7 ); + void write_bsy(int state); + void write_sel(int state); + void write_cd(int state); + void write_io(int state); + void write_msg(int state); + void write_req(int state); + void write_ack(int state); + void write_atn(int state); + void write_rst(int state); + void write_data0(int state); + void write_data1(int state); + void write_data2(int state); + void write_data3(int state); + void write_data4(int state); + void write_data5(int state); + void write_data6(int state); + void write_data7(int state); scsi_port_slot_device &slot(int index); void set_slot_device(int index, const char *option, const device_type &type, const input_device_default *id); @@ -214,41 +214,41 @@ class scsi_port_interface : public device_interface public: virtual ~scsi_port_interface(); - virtual DECLARE_WRITE_LINE_MEMBER( input_bsy ) { } - virtual DECLARE_WRITE_LINE_MEMBER( input_sel ) { } - virtual DECLARE_WRITE_LINE_MEMBER( input_cd ) { } - virtual DECLARE_WRITE_LINE_MEMBER( input_io ) { } - virtual DECLARE_WRITE_LINE_MEMBER( input_msg ) { } - virtual DECLARE_WRITE_LINE_MEMBER( input_req ) { } - virtual DECLARE_WRITE_LINE_MEMBER( input_ack ) { } - virtual DECLARE_WRITE_LINE_MEMBER( input_atn ) { } - virtual DECLARE_WRITE_LINE_MEMBER( input_rst ) { } - virtual DECLARE_WRITE_LINE_MEMBER( input_data0 ) { } - virtual DECLARE_WRITE_LINE_MEMBER( input_data1 ) { } - virtual DECLARE_WRITE_LINE_MEMBER( input_data2 ) { } - virtual DECLARE_WRITE_LINE_MEMBER( input_data3 ) { } - virtual DECLARE_WRITE_LINE_MEMBER( input_data4 ) { } - virtual DECLARE_WRITE_LINE_MEMBER( input_data5 ) { } - virtual DECLARE_WRITE_LINE_MEMBER( input_data6 ) { } - virtual DECLARE_WRITE_LINE_MEMBER( input_data7 ) { } - - DECLARE_WRITE_LINE_MEMBER( output_bsy ) { if (m_slot->m_bsy != state) { m_slot->m_bsy = state; m_slot->port()->update_bsy(); } } - DECLARE_WRITE_LINE_MEMBER( output_sel ) { if (m_slot->m_sel != state) { m_slot->m_sel = state; m_slot->port()->update_sel(); } } - DECLARE_WRITE_LINE_MEMBER( output_cd ) { if (m_slot->m_cd != state) { m_slot->m_cd = state; m_slot->port()->update_cd(); } } - DECLARE_WRITE_LINE_MEMBER( output_io ) { if (m_slot->m_io != state) { m_slot->m_io = state; m_slot->port()->update_io(); } } - DECLARE_WRITE_LINE_MEMBER( output_msg ) { if (m_slot->m_msg != state) { m_slot->m_msg = state; m_slot->port()->update_msg(); } } - DECLARE_WRITE_LINE_MEMBER( output_req ) { if (m_slot->m_req != state) { m_slot->m_req = state; m_slot->port()->update_req(); } } - DECLARE_WRITE_LINE_MEMBER( output_ack ) { if (m_slot->m_ack != state) { m_slot->m_ack = state; m_slot->port()->update_ack(); } } - DECLARE_WRITE_LINE_MEMBER( output_atn ) { if (m_slot->m_atn != state) { m_slot->m_atn = state; m_slot->port()->update_atn(); } } - DECLARE_WRITE_LINE_MEMBER( output_rst ) { if (m_slot->m_rst != state) { m_slot->m_rst = state; m_slot->port()->update_rst(); } } - DECLARE_WRITE_LINE_MEMBER( output_data0 ) { if (m_slot->m_data0 != state) { m_slot->m_data0 = state; m_slot->port()->update_data0(); } } - DECLARE_WRITE_LINE_MEMBER( output_data1 ) { if (m_slot->m_data1 != state) { m_slot->m_data1 = state; m_slot->port()->update_data1(); } } - DECLARE_WRITE_LINE_MEMBER( output_data2 ) { if (m_slot->m_data2 != state) { m_slot->m_data2 = state; m_slot->port()->update_data2(); } } - DECLARE_WRITE_LINE_MEMBER( output_data3 ) { if (m_slot->m_data3 != state) { m_slot->m_data3 = state; m_slot->port()->update_data3(); } } - DECLARE_WRITE_LINE_MEMBER( output_data4 ) { if (m_slot->m_data4 != state) { m_slot->m_data4 = state; m_slot->port()->update_data4(); } } - DECLARE_WRITE_LINE_MEMBER( output_data5 ) { if (m_slot->m_data5 != state) { m_slot->m_data5 = state; m_slot->port()->update_data5(); } } - DECLARE_WRITE_LINE_MEMBER( output_data6 ) { if (m_slot->m_data6 != state) { m_slot->m_data6 = state; m_slot->port()->update_data6(); } } - DECLARE_WRITE_LINE_MEMBER( output_data7 ) { if (m_slot->m_data7 != state) { m_slot->m_data7 = state; m_slot->port()->update_data7(); } } + virtual void input_bsy(int state) { } + virtual void input_sel(int state) { } + virtual void input_cd(int state) { } + virtual void input_io(int state) { } + virtual void input_msg(int state) { } + virtual void input_req(int state) { } + virtual void input_ack(int state) { } + virtual void input_atn(int state) { } + virtual void input_rst(int state) { } + virtual void input_data0(int state) { } + virtual void input_data1(int state) { } + virtual void input_data2(int state) { } + virtual void input_data3(int state) { } + virtual void input_data4(int state) { } + virtual void input_data5(int state) { } + virtual void input_data6(int state) { } + virtual void input_data7(int state) { } + + void output_bsy(int state) { if (m_slot->m_bsy != state) { m_slot->m_bsy = state; m_slot->port()->update_bsy(); } } + void output_sel(int state) { if (m_slot->m_sel != state) { m_slot->m_sel = state; m_slot->port()->update_sel(); } } + void output_cd(int state) { if (m_slot->m_cd != state) { m_slot->m_cd = state; m_slot->port()->update_cd(); } } + void output_io(int state) { if (m_slot->m_io != state) { m_slot->m_io = state; m_slot->port()->update_io(); } } + void output_msg(int state) { if (m_slot->m_msg != state) { m_slot->m_msg = state; m_slot->port()->update_msg(); } } + void output_req(int state) { if (m_slot->m_req != state) { m_slot->m_req = state; m_slot->port()->update_req(); } } + void output_ack(int state) { if (m_slot->m_ack != state) { m_slot->m_ack = state; m_slot->port()->update_ack(); } } + void output_atn(int state) { if (m_slot->m_atn != state) { m_slot->m_atn = state; m_slot->port()->update_atn(); } } + void output_rst(int state) { if (m_slot->m_rst != state) { m_slot->m_rst = state; m_slot->port()->update_rst(); } } + void output_data0(int state) { if (m_slot->m_data0 != state) { m_slot->m_data0 = state; m_slot->port()->update_data0(); } } + void output_data1(int state) { if (m_slot->m_data1 != state) { m_slot->m_data1 = state; m_slot->port()->update_data1(); } } + void output_data2(int state) { if (m_slot->m_data2 != state) { m_slot->m_data2 = state; m_slot->port()->update_data2(); } } + void output_data3(int state) { if (m_slot->m_data3 != state) { m_slot->m_data3 = state; m_slot->port()->update_data3(); } } + void output_data4(int state) { if (m_slot->m_data4 != state) { m_slot->m_data4 = state; m_slot->port()->update_data4(); } } + void output_data5(int state) { if (m_slot->m_data5 != state) { m_slot->m_data5 = state; m_slot->port()->update_data5(); } } + void output_data6(int state) { if (m_slot->m_data6 != state) { m_slot->m_data6 = state; m_slot->port()->update_data6(); } } + void output_data7(int state) { if (m_slot->m_data7 != state) { m_slot->m_data7 = state; m_slot->port()->update_data7(); } } protected: scsi_port_interface(const machine_config &mconfig, device_t &device); diff --git a/src/devices/bus/scsi/scsihle.cpp b/src/devices/bus/scsi/scsihle.cpp index 59f2b3a0c03..da0d6c45817 100644 --- a/src/devices/bus/scsi/scsihle.cpp +++ b/src/devices/bus/scsi/scsihle.cpp @@ -405,7 +405,7 @@ void scsihle_device::scsi_change_phase(uint8_t newphase) } } -WRITE_LINE_MEMBER( scsihle_device::input_sel ) +void scsihle_device::input_sel(int state) { // printf( "sel %d %d %02x\n", state, m_phase, m_input_data ); switch (m_phase) @@ -433,7 +433,7 @@ WRITE_LINE_MEMBER( scsihle_device::input_sel ) } } -WRITE_LINE_MEMBER( scsihle_device::input_ack ) +void scsihle_device::input_ack(int state) { switch (m_phase) { @@ -571,7 +571,7 @@ WRITE_LINE_MEMBER( scsihle_device::input_ack ) } } -WRITE_LINE_MEMBER( scsihle_device::input_rst ) +void scsihle_device::input_rst(int state) { if (state) { diff --git a/src/devices/bus/scsi/scsihle.h b/src/devices/bus/scsi/scsihle.h index 6c8312177ee..95849f34332 100644 --- a/src/devices/bus/scsi/scsihle.h +++ b/src/devices/bus/scsi/scsihle.h @@ -23,17 +23,17 @@ class scsihle_device : public device_t, public: virtual int GetDeviceID(); // hack for legacy_scsi_host_adapter::get_device - virtual DECLARE_WRITE_LINE_MEMBER( input_sel ) override; - virtual DECLARE_WRITE_LINE_MEMBER( input_ack ) override; - virtual DECLARE_WRITE_LINE_MEMBER( input_rst ) override; - virtual DECLARE_WRITE_LINE_MEMBER( input_data0 ) override { if (state) m_input_data |= 0x01; else m_input_data &= ~0x01; } - virtual DECLARE_WRITE_LINE_MEMBER( input_data1 ) override { if (state) m_input_data |= 0x02; else m_input_data &= ~0x02; } - virtual DECLARE_WRITE_LINE_MEMBER( input_data2 ) override { if (state) m_input_data |= 0x04; else m_input_data &= ~0x04; } - virtual DECLARE_WRITE_LINE_MEMBER( input_data3 ) override { if (state) m_input_data |= 0x08; else m_input_data &= ~0x08; } - virtual DECLARE_WRITE_LINE_MEMBER( input_data4 ) override { if (state) m_input_data |= 0x10; else m_input_data &= ~0x10; } - virtual DECLARE_WRITE_LINE_MEMBER( input_data5 ) override { if (state) m_input_data |= 0x20; else m_input_data &= ~0x20; } - virtual DECLARE_WRITE_LINE_MEMBER( input_data6 ) override { if (state) m_input_data |= 0x40; else m_input_data &= ~0x40; } - virtual DECLARE_WRITE_LINE_MEMBER( input_data7 ) override { if (state) m_input_data |= 0x80; else m_input_data &= ~0x80; } + virtual void input_sel(int state) override; + virtual void input_ack(int state) override; + virtual void input_rst(int state) override; + virtual void input_data0(int state) override { if (state) m_input_data |= 0x01; else m_input_data &= ~0x01; } + virtual void input_data1(int state) override { if (state) m_input_data |= 0x02; else m_input_data &= ~0x02; } + virtual void input_data2(int state) override { if (state) m_input_data |= 0x04; else m_input_data &= ~0x04; } + virtual void input_data3(int state) override { if (state) m_input_data |= 0x08; else m_input_data &= ~0x08; } + virtual void input_data4(int state) override { if (state) m_input_data |= 0x10; else m_input_data &= ~0x10; } + virtual void input_data5(int state) override { if (state) m_input_data |= 0x20; else m_input_data &= ~0x20; } + virtual void input_data6(int state) override { if (state) m_input_data |= 0x40; else m_input_data &= ~0x40; } + virtual void input_data7(int state) override { if (state) m_input_data |= 0x80; else m_input_data &= ~0x80; } virtual bool exists() const = 0; diff --git a/src/devices/bus/sg1000_exp/kblink.h b/src/devices/bus/sg1000_exp/kblink.h index 561c1b79455..ee0aec9315d 100644 --- a/src/devices/bus/sg1000_exp/kblink.h +++ b/src/devices/bus/sg1000_exp/kblink.h @@ -40,12 +40,12 @@ protected: virtual void device_add_mconfig(machine_config &config) override; // device_sk1100_link_cable_interface overrides - virtual DECLARE_WRITE_LINE_MEMBER( input_data ) override { m_data = state; set_data_transfer(); } - virtual DECLARE_WRITE_LINE_MEMBER( input_reset ) override { m_reset = state; set_data_transfer(); } - virtual DECLARE_WRITE_LINE_MEMBER( input_feed ) override { m_feed = state; set_data_transfer(); } + virtual void input_data(int state) override { m_data = state; set_data_transfer(); } + virtual void input_reset(int state) override { m_reset = state; set_data_transfer(); } + virtual void input_feed(int state) override { m_feed = state; set_data_transfer(); } - virtual DECLARE_READ_LINE_MEMBER( output_fault ) override { set_data_read(); return m_fault; } - virtual DECLARE_READ_LINE_MEMBER( output_busy ) override { set_data_read(); return m_busy; } + virtual int output_fault() override { set_data_read(); return m_fault; } + virtual int output_busy() override { set_data_read(); return m_busy; } TIMER_CALLBACK_MEMBER(update_queue); TIMER_CALLBACK_MEMBER(send_tick); diff --git a/src/devices/bus/sg1000_exp/sk1100prn.cpp b/src/devices/bus/sg1000_exp/sk1100prn.cpp index 8f80306588b..2b24864d75b 100644 --- a/src/devices/bus/sg1000_exp/sk1100prn.cpp +++ b/src/devices/bus/sg1000_exp/sk1100prn.cpp @@ -80,25 +80,25 @@ void sk1100_printer_port_device::device_start() m_device = get_card_device(); } -WRITE_LINE_MEMBER(sk1100_printer_port_device::data_w) +void sk1100_printer_port_device::data_w(int state) { if (m_device) m_device->input_data(state); } -WRITE_LINE_MEMBER(sk1100_printer_port_device::reset_w) +void sk1100_printer_port_device::reset_w(int state) { if (m_device) m_device->input_reset(state); } -WRITE_LINE_MEMBER(sk1100_printer_port_device::feed_w) +void sk1100_printer_port_device::feed_w(int state) { if (m_device) m_device->input_feed(state); } -READ_LINE_MEMBER(sk1100_printer_port_device::fault_r) +int sk1100_printer_port_device::fault_r() { if (m_device) return m_device->output_fault(); @@ -106,7 +106,7 @@ READ_LINE_MEMBER(sk1100_printer_port_device::fault_r) return 1; } -READ_LINE_MEMBER(sk1100_printer_port_device::busy_r) +int sk1100_printer_port_device::busy_r() { if (m_device) return m_device->output_busy(); diff --git a/src/devices/bus/sg1000_exp/sk1100prn.h b/src/devices/bus/sg1000_exp/sk1100prn.h index 8e1988102c8..56771a774b7 100644 --- a/src/devices/bus/sg1000_exp/sk1100prn.h +++ b/src/devices/bus/sg1000_exp/sk1100prn.h @@ -40,12 +40,12 @@ public: sk1100_printer_port_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock = 0); virtual ~sk1100_printer_port_device(); - DECLARE_READ_LINE_MEMBER(fault_r); - DECLARE_READ_LINE_MEMBER(busy_r); + int fault_r(); + int busy_r(); - DECLARE_WRITE_LINE_MEMBER(data_w); - DECLARE_WRITE_LINE_MEMBER(reset_w); - DECLARE_WRITE_LINE_MEMBER(feed_w); + void data_w(int state); + void reset_w(int state); + void feed_w(int state); protected: // device-level overrides @@ -69,12 +69,12 @@ public: protected: device_sk1100_printer_port_interface(const machine_config &mconfig, device_t &device); - virtual DECLARE_WRITE_LINE_MEMBER( input_data ) { } - virtual DECLARE_WRITE_LINE_MEMBER( input_reset ) { } - virtual DECLARE_WRITE_LINE_MEMBER( input_feed ) { } + virtual void input_data(int state) { } + virtual void input_reset(int state) { } + virtual void input_feed(int state) { } - virtual DECLARE_READ_LINE_MEMBER( output_fault ) { return 1; } - virtual DECLARE_READ_LINE_MEMBER( output_busy ) { return 1; } + virtual int output_fault() { return 1; } + virtual int output_busy() { return 1; } }; diff --git a/src/devices/bus/sms_ctrl/rfu.cpp b/src/devices/bus/sms_ctrl/rfu.cpp index d116b803db2..4f3307759ca 100644 --- a/src/devices/bus/sms_ctrl/rfu.cpp +++ b/src/devices/bus/sms_ctrl/rfu.cpp @@ -52,7 +52,7 @@ public: virtual uint8_t in_r() override; virtual void out_w(uint8_t data, uint8_t mem_mask) override; - DECLARE_WRITE_LINE_MEMBER(rapid_changed); + void rapid_changed(int state); protected: // device_t implementation @@ -102,7 +102,7 @@ sms_rapid_fire_device::sms_rapid_fire_device(const machine_config &mconfig, cons } -WRITE_LINE_MEMBER(sms_rapid_fire_device::rapid_changed) +void sms_rapid_fire_device::rapid_changed(int state) { m_rapid = m_rfire_sw->read(); m_subctrl_port->out_w(m_in | m_rapid, m_drive & ~m_rapid); diff --git a/src/devices/bus/sms_ctrl/smsctrl.h b/src/devices/bus/sms_ctrl/smsctrl.h index a4c1e25f09e..5a0cac7de42 100644 --- a/src/devices/bus/sms_ctrl/smsctrl.h +++ b/src/devices/bus/sms_ctrl/smsctrl.h @@ -118,7 +118,7 @@ protected: template void configure_screen(T &&act) { if (m_port) act(std::as_const(m_port->m_screen)); } screen_device *screen() const { return m_port ? m_port->m_screen.target() : nullptr; } - DECLARE_WRITE_LINE_MEMBER(th_w) { if (m_port) m_port->m_th_handler(state); } + void th_w(int state) { if (m_port) m_port->m_th_handler(state); } private: sms_control_port_device *const m_port; diff --git a/src/devices/bus/sms_ctrl/teamplayer.cpp b/src/devices/bus/sms_ctrl/teamplayer.cpp index 6741c530db6..c73af605e60 100644 --- a/src/devices/bus/sms_ctrl/teamplayer.cpp +++ b/src/devices/bus/sms_ctrl/teamplayer.cpp @@ -65,7 +65,7 @@ private: PHASE_FINAL }; - template DECLARE_WRITE_LINE_MEMBER(th_up_w); + template void th_up_w(int state); TIMER_CALLBACK_MEMBER(probe_step); @@ -286,7 +286,7 @@ void sms_teamplayer_device::device_start() template -DECLARE_WRITE_LINE_MEMBER(sms_teamplayer_device::th_up_w) +void sms_teamplayer_device::th_up_w(int state) { if (bool(state) != bool(m_th_up[N])) { diff --git a/src/devices/bus/snes/sfx.cpp b/src/devices/bus/snes/sfx.cpp index 8051fe9c8f8..88405e67feb 100644 --- a/src/devices/bus/snes/sfx.cpp +++ b/src/devices/bus/snes/sfx.cpp @@ -90,7 +90,7 @@ void sns_rom_superfx_device::sfx_map(address_map &map) } -WRITE_LINE_MEMBER(sns_rom_superfx_device::snes_extern_irq_w) +void sns_rom_superfx_device::snes_extern_irq_w(int state) { write_irq(state); } diff --git a/src/devices/bus/snes/sfx.h b/src/devices/bus/snes/sfx.h index 54df5a8018b..b46ca0c639d 100644 --- a/src/devices/bus/snes/sfx.h +++ b/src/devices/bus/snes/sfx.h @@ -20,7 +20,7 @@ protected: virtual void device_start() override; virtual void device_reset() override; - virtual DECLARE_WRITE_LINE_MEMBER(snes_extern_irq_w); + virtual void snes_extern_irq_w(int state); // additional reading and writing virtual uint8_t read_l(offs_t offset) override; diff --git a/src/devices/bus/snes/snes_slot.cpp b/src/devices/bus/snes/snes_slot.cpp index 050581aadcb..04b9b6a1c89 100644 --- a/src/devices/bus/snes/snes_slot.cpp +++ b/src/devices/bus/snes/snes_slot.cpp @@ -170,7 +170,7 @@ void device_sns_cart_interface::rom_map_setup(uint32_t size) // write_irq - set the cart IRQ output //------------------------------------------------- -WRITE_LINE_MEMBER(device_sns_cart_interface::write_irq) +void device_sns_cart_interface::write_irq(int state) { if (m_slot != nullptr) m_slot->write_irq(state); diff --git a/src/devices/bus/snes/snes_slot.h b/src/devices/bus/snes/snes_slot.h index 477259343ef..43ea1aeab8e 100644 --- a/src/devices/bus/snes/snes_slot.h +++ b/src/devices/bus/snes/snes_slot.h @@ -143,7 +143,7 @@ public: protected: device_sns_cart_interface(const machine_config &mconfig, device_t &device); - DECLARE_WRITE_LINE_MEMBER(write_irq); + void write_irq(int state); uint8_t read_open_bus(); int scanlines_r(); offs_t address_r(); @@ -212,7 +212,7 @@ public: uint8_t chip_read(offs_t offset); void chip_write(offs_t offset, uint8_t data); - DECLARE_WRITE_LINE_MEMBER(write_irq) { m_irq_callback(state); } + void write_irq(int state) { m_irq_callback(state); } uint8_t read_open_bus() { return m_open_bus_callback(); } int scanlines_r() { return m_scanlines; } offs_t address_r() { return m_address; } diff --git a/src/devices/bus/spc1000/vdp.cpp b/src/devices/bus/spc1000/vdp.cpp index f85a64f59b9..5380ac9c061 100644 --- a/src/devices/bus/spc1000/vdp.cpp +++ b/src/devices/bus/spc1000/vdp.cpp @@ -14,7 +14,7 @@ IMPLEMENTATION ***************************************************************************/ -WRITE_LINE_MEMBER(spc1000_vdp_exp_device::vdp_interrupt) +void spc1000_vdp_exp_device::vdp_interrupt(int state) { // nothing here? } diff --git a/src/devices/bus/spc1000/vdp.h b/src/devices/bus/spc1000/vdp.h index 989b25d5a90..3f7bdf31dfe 100644 --- a/src/devices/bus/spc1000/vdp.h +++ b/src/devices/bus/spc1000/vdp.h @@ -30,7 +30,7 @@ protected: virtual uint8_t read(offs_t offset) override; virtual void write(offs_t offset, uint8_t data) override; - DECLARE_WRITE_LINE_MEMBER(vdp_interrupt); + void vdp_interrupt(int state); private: // internal state diff --git a/src/devices/bus/spectrum/beta.cpp b/src/devices/bus/spectrum/beta.cpp index 8578cf46b3d..00ac6921429 100644 --- a/src/devices/bus/spectrum/beta.cpp +++ b/src/devices/bus/spectrum/beta.cpp @@ -475,7 +475,7 @@ void spectrum_betav2_device::device_reset() // IMPLEMENTATION //************************************************************************** -READ_LINE_MEMBER(spectrum_betav2_device::romcs) +int spectrum_betav2_device::romcs() { return m_romcs | m_exp->romcs(); } diff --git a/src/devices/bus/spectrum/beta.h b/src/devices/bus/spectrum/beta.h index 1827c741355..3f2b21e6c58 100644 --- a/src/devices/bus/spectrum/beta.h +++ b/src/devices/bus/spectrum/beta.h @@ -48,7 +48,7 @@ protected: virtual uint8_t mreq_r(offs_t offset) override; virtual uint8_t iorq_r(offs_t offset) override; virtual void iorq_w(offs_t offset, uint8_t data) override; - virtual DECLARE_READ_LINE_MEMBER(romcs) override; + virtual int romcs() override; // passthru virtual void post_opcode_fetch(offs_t offset) override { m_exp->post_opcode_fetch(offset); } @@ -154,7 +154,7 @@ protected: virtual const tiny_rom_entry *device_rom_region() const override; virtual uint8_t iorq_r(offs_t offset) override; virtual void iorq_w(offs_t offset, uint8_t data) override; - virtual DECLARE_READ_LINE_MEMBER(romcs) override { return 1; } + virtual int romcs() override { return 1; } required_device m_ppi; required_device m_acia; diff --git a/src/devices/bus/spectrum/beta128.cpp b/src/devices/bus/spectrum/beta128.cpp index 09b95763a27..5494b2a2fb1 100644 --- a/src/devices/bus/spectrum/beta128.cpp +++ b/src/devices/bus/spectrum/beta128.cpp @@ -175,7 +175,7 @@ void spectrum_beta128_device::device_reset() // IMPLEMENTATION //************************************************************************** -READ_LINE_MEMBER(spectrum_beta128_device::romcs) +int spectrum_beta128_device::romcs() { return m_romcs | m_exp->romcs(); } diff --git a/src/devices/bus/spectrum/beta128.h b/src/devices/bus/spectrum/beta128.h index bcbc889c94d..72fa4160d06 100644 --- a/src/devices/bus/spectrum/beta128.h +++ b/src/devices/bus/spectrum/beta128.h @@ -44,7 +44,7 @@ protected: virtual uint8_t mreq_r(offs_t offset) override; virtual uint8_t iorq_r(offs_t offset) override; virtual void iorq_w(offs_t offset, uint8_t data) override; - virtual DECLARE_READ_LINE_MEMBER(romcs) override; + virtual int romcs() override; // passthru virtual void post_opcode_fetch(offs_t offset) override { m_exp->post_opcode_fetch(offset); } diff --git a/src/devices/bus/spectrum/d40.cpp b/src/devices/bus/spectrum/d40.cpp index 9a7811b7936..89f0417c681 100644 --- a/src/devices/bus/spectrum/d40.cpp +++ b/src/devices/bus/spectrum/d40.cpp @@ -211,7 +211,7 @@ void spectrum_d40base_device::device_reset() // IMPLEMENTATION spectrum_d40base_device //************************************************************************** -READ_LINE_MEMBER(spectrum_d40base_device::romcs) +int spectrum_d40base_device::romcs() { return m_romcs; } diff --git a/src/devices/bus/spectrum/d40.h b/src/devices/bus/spectrum/d40.h index 250b2feccd8..d2f83b88cce 100644 --- a/src/devices/bus/spectrum/d40.h +++ b/src/devices/bus/spectrum/d40.h @@ -43,7 +43,7 @@ protected: virtual void mreq_w(offs_t offset, uint8_t data) override; virtual uint8_t iorq_r(offs_t offset) override; virtual void iorq_w(offs_t offset, uint8_t data) override; - virtual DECLARE_READ_LINE_MEMBER(romcs) override; + virtual int romcs() override; virtual uint8_t fdc0_r(offs_t offset) { return 0xff; } virtual uint8_t fdc1_r(offs_t offset) { return 0xff; } diff --git a/src/devices/bus/spectrum/exp.cpp b/src/devices/bus/spectrum/exp.cpp index a0c79eeaec8..88912901418 100644 --- a/src/devices/bus/spectrum/exp.cpp +++ b/src/devices/bus/spectrum/exp.cpp @@ -69,7 +69,7 @@ void spectrum_expansion_slot_device::device_start() // romcs //------------------------------------------------- -READ_LINE_MEMBER(spectrum_expansion_slot_device::romcs) +int spectrum_expansion_slot_device::romcs() { if (m_card) return m_card->romcs(); diff --git a/src/devices/bus/spectrum/exp.h b/src/devices/bus/spectrum/exp.h index 04e3e942889..c2fade96fe8 100644 --- a/src/devices/bus/spectrum/exp.h +++ b/src/devices/bus/spectrum/exp.h @@ -87,10 +87,10 @@ public: void mreq_w(offs_t offset, uint8_t data); uint8_t iorq_r(offs_t offset); void iorq_w(offs_t offset, uint8_t data); - DECLARE_READ_LINE_MEMBER( romcs ); + int romcs(); - DECLARE_WRITE_LINE_MEMBER( irq_w ) { m_irq_handler(state); } - DECLARE_WRITE_LINE_MEMBER( nmi_w ) { m_nmi_handler(state); } + void irq_w(int state) { m_irq_handler(state); } + void nmi_w(int state) { m_nmi_handler(state); } uint8_t fb_r() { return m_fb_r_handler(); } protected: @@ -120,7 +120,7 @@ public: virtual void mreq_w(offs_t offset, uint8_t data) { } virtual uint8_t iorq_r(offs_t offset) { return offset & 1 ? m_slot->fb_r() : 0xff; } virtual void iorq_w(offs_t offset, uint8_t data) { } - virtual DECLARE_READ_LINE_MEMBER(romcs) { return 0; } + virtual int romcs() { return 0; } protected: // construction/destruction diff --git a/src/devices/bus/spectrum/floppyone.cpp b/src/devices/bus/spectrum/floppyone.cpp index 4291199501d..ee3b49a4e05 100644 --- a/src/devices/bus/spectrum/floppyone.cpp +++ b/src/devices/bus/spectrum/floppyone.cpp @@ -193,7 +193,7 @@ void spectrum_flpone_device::device_reset() // IMPLEMENTATION //************************************************************************** -READ_LINE_MEMBER(spectrum_flpone_device::romcs) +int spectrum_flpone_device::romcs() { return m_romcs | m_exp->romcs(); } diff --git a/src/devices/bus/spectrum/floppyone.h b/src/devices/bus/spectrum/floppyone.h index 8eeea6bad0f..c0817a2c457 100644 --- a/src/devices/bus/spectrum/floppyone.h +++ b/src/devices/bus/spectrum/floppyone.h @@ -47,7 +47,7 @@ protected: virtual void post_opcode_fetch(offs_t offset) override; virtual uint8_t mreq_r(offs_t offset) override; virtual void mreq_w(offs_t offset, uint8_t data) override; - virtual DECLARE_READ_LINE_MEMBER(romcs) override; + virtual int romcs() override; // passthru virtual void pre_opcode_fetch(offs_t offset) override { m_exp->pre_opcode_fetch(offset); } @@ -56,7 +56,7 @@ protected: virtual uint8_t iorq_r(offs_t offset) override { return m_exp->iorq_r(offset); } virtual void iorq_w(offs_t offset, uint8_t data) override { m_exp->iorq_w(offset, data); } - DECLARE_WRITE_LINE_MEMBER(busy_w) { m_busy = state; } + void busy_w(int state) { m_busy = state; } required_memory_region m_rom; required_memory_region m_prom; diff --git a/src/devices/bus/spectrum/fuller.h b/src/devices/bus/spectrum/fuller.h index fa16ec01579..9c39738380a 100644 --- a/src/devices/bus/spectrum/fuller.h +++ b/src/devices/bus/spectrum/fuller.h @@ -47,7 +47,7 @@ protected: virtual void post_data_fetch(offs_t offset) override { m_exp->post_data_fetch(offset); } virtual uint8_t mreq_r(offs_t offset) override { return m_exp->romcs() ? m_exp->mreq_r(offset) : 0xff; } virtual void mreq_w(offs_t offset, uint8_t data) override { if (m_exp->romcs()) m_exp->mreq_w(offset, data); } - virtual DECLARE_READ_LINE_MEMBER(romcs) override { return m_exp->romcs(); } + virtual int romcs() override { return m_exp->romcs(); } private: required_device m_exp; diff --git a/src/devices/bus/spectrum/intf1.cpp b/src/devices/bus/spectrum/intf1.cpp index df40de1f9d6..9e6328eac86 100644 --- a/src/devices/bus/spectrum/intf1.cpp +++ b/src/devices/bus/spectrum/intf1.cpp @@ -105,7 +105,7 @@ void spectrum_intf1_device::device_reset() // IMPLEMENTATION //************************************************************************** -READ_LINE_MEMBER(spectrum_intf1_device::romcs) +int spectrum_intf1_device::romcs() { return m_romcs | m_exp->romcs(); } diff --git a/src/devices/bus/spectrum/intf1.h b/src/devices/bus/spectrum/intf1.h index 787c64b843d..eac6fd8ab87 100644 --- a/src/devices/bus/spectrum/intf1.h +++ b/src/devices/bus/spectrum/intf1.h @@ -42,7 +42,7 @@ protected: virtual uint8_t mreq_r(offs_t offset) override; virtual uint8_t iorq_r(offs_t offset) override; virtual void iorq_w(offs_t offset, uint8_t data) override; - virtual DECLARE_READ_LINE_MEMBER(romcs) override; + virtual int romcs() override; // passthru virtual void pre_data_fetch(offs_t offset) override { m_exp->pre_data_fetch(offset); } diff --git a/src/devices/bus/spectrum/intf2.cpp b/src/devices/bus/spectrum/intf2.cpp index d17bbd49c8d..c5bf565af97 100644 --- a/src/devices/bus/spectrum/intf2.cpp +++ b/src/devices/bus/spectrum/intf2.cpp @@ -107,7 +107,7 @@ DEVICE_IMAGE_LOAD_MEMBER(spectrum_intf2_device::cart_load) return std::make_pair(std::error_condition(), std::string()); } -READ_LINE_MEMBER(spectrum_intf2_device::romcs) +int spectrum_intf2_device::romcs() { if (m_cart && m_cart->exists()) return 1; diff --git a/src/devices/bus/spectrum/intf2.h b/src/devices/bus/spectrum/intf2.h index af34e4fd7f9..268e74e9573 100644 --- a/src/devices/bus/spectrum/intf2.h +++ b/src/devices/bus/spectrum/intf2.h @@ -34,7 +34,7 @@ protected: virtual void device_add_mconfig(machine_config &config) override; virtual ioport_constructor device_input_ports() const override; - virtual DECLARE_READ_LINE_MEMBER(romcs) override; + virtual int romcs() override; virtual uint8_t mreq_r(offs_t offset) override; virtual uint8_t iorq_r(offs_t offset) override; diff --git a/src/devices/bus/spectrum/kempdisc.cpp b/src/devices/bus/spectrum/kempdisc.cpp index 32573ebf969..2533863664f 100644 --- a/src/devices/bus/spectrum/kempdisc.cpp +++ b/src/devices/bus/spectrum/kempdisc.cpp @@ -162,7 +162,7 @@ void spectrum_kempdisc_device::device_reset() // IMPLEMENTATION //************************************************************************** -READ_LINE_MEMBER(spectrum_kempdisc_device::romcs) +int spectrum_kempdisc_device::romcs() { return m_romcs | m_exp->romcs(); } diff --git a/src/devices/bus/spectrum/kempdisc.h b/src/devices/bus/spectrum/kempdisc.h index 3a3b5118402..1df722828dd 100644 --- a/src/devices/bus/spectrum/kempdisc.h +++ b/src/devices/bus/spectrum/kempdisc.h @@ -42,7 +42,7 @@ protected: virtual uint8_t mreq_r(offs_t offset) override; virtual uint8_t iorq_r(offs_t offset) override; virtual void iorq_w(offs_t offset, uint8_t data) override; - virtual DECLARE_READ_LINE_MEMBER(romcs) override; + virtual int romcs() override; // passthru virtual void pre_opcode_fetch(offs_t offset) override { m_exp->pre_opcode_fetch(offset); } diff --git a/src/devices/bus/spectrum/logitek.cpp b/src/devices/bus/spectrum/logitek.cpp index 6406231ce47..3d8a9b457f3 100644 --- a/src/devices/bus/spectrum/logitek.cpp +++ b/src/devices/bus/spectrum/logitek.cpp @@ -127,7 +127,7 @@ void spectrum_proceed_device::device_reset() // IMPLEMENTATION //************************************************************************** -READ_LINE_MEMBER(spectrum_proceed_device::romcs) +int spectrum_proceed_device::romcs() { return m_romcs; } diff --git a/src/devices/bus/spectrum/logitek.h b/src/devices/bus/spectrum/logitek.h index a6d807d7236..a395c10230c 100644 --- a/src/devices/bus/spectrum/logitek.h +++ b/src/devices/bus/spectrum/logitek.h @@ -50,7 +50,7 @@ protected: virtual uint8_t mreq_r(offs_t offset) override; virtual uint8_t iorq_r(offs_t offset) override; virtual void iorq_w(offs_t offset, uint8_t data) override; - virtual DECLARE_READ_LINE_MEMBER(romcs) override; + virtual int romcs() override; required_memory_region m_rom; required_device m_z80pio; diff --git a/src/devices/bus/spectrum/lprint.cpp b/src/devices/bus/spectrum/lprint.cpp index 912c26d6c74..74f93cd5322 100644 --- a/src/devices/bus/spectrum/lprint.cpp +++ b/src/devices/bus/spectrum/lprint.cpp @@ -251,7 +251,7 @@ void spectrum_kempcentre_device::device_reset() // IMPLEMENTATION (lprint) //************************************************************************** -READ_LINE_MEMBER(spectrum_lprint_device::romcs) +int spectrum_lprint_device::romcs() { return m_romcs; } @@ -315,7 +315,7 @@ void spectrum_lprint_device::iorq_w(offs_t offset, uint8_t data) // IMPLEMENTATION (lprint3) //************************************************************************** -READ_LINE_MEMBER(spectrum_lprint3_device::romcs) +int spectrum_lprint3_device::romcs() { return m_romcs | m_exp->romcs(); } @@ -414,7 +414,7 @@ void spectrum_kempcentrs_device::iorq_w(offs_t offset, uint8_t data) // IMPLEMENTATION (kempcentre) //************************************************************************** -READ_LINE_MEMBER(spectrum_kempcentre_device::romcs) +int spectrum_kempcentre_device::romcs() { return m_romcs; } diff --git a/src/devices/bus/spectrum/lprint.h b/src/devices/bus/spectrum/lprint.h index d58793607c6..448ba9830e8 100644 --- a/src/devices/bus/spectrum/lprint.h +++ b/src/devices/bus/spectrum/lprint.h @@ -39,9 +39,9 @@ protected: virtual uint8_t mreq_r(offs_t offset) override; virtual uint8_t iorq_r(offs_t offset) override; virtual void iorq_w(offs_t offset, uint8_t data) override; - virtual DECLARE_READ_LINE_MEMBER(romcs) override; + virtual int romcs() override; - DECLARE_WRITE_LINE_MEMBER(busy_w) { m_busy = state; } + void busy_w(int state) { m_busy = state; } required_memory_region m_rom; required_device m_centronics; @@ -71,7 +71,7 @@ protected: virtual uint8_t mreq_r(offs_t offset) override; virtual uint8_t iorq_r(offs_t offset) override; virtual void iorq_w(offs_t offset, uint8_t data) override; - virtual DECLARE_READ_LINE_MEMBER(romcs) override; + virtual int romcs() override; // passthru virtual void pre_opcode_fetch(offs_t offset) override { m_exp->pre_opcode_fetch(offset); } @@ -80,7 +80,7 @@ protected: virtual void post_data_fetch(offs_t offset) override { m_exp->post_data_fetch(offset); } virtual void mreq_w(offs_t offset, uint8_t data) override { if (m_exp->romcs()) m_exp->mreq_w(offset, data); } - DECLARE_WRITE_LINE_MEMBER(busy_w) { m_busy = state; } + void busy_w(int state) { m_busy = state; } required_memory_region m_rom; required_device m_centronics; @@ -111,7 +111,7 @@ protected: virtual uint8_t iorq_r(offs_t offset) override; virtual void iorq_w(offs_t offset, uint8_t data) override; - DECLARE_WRITE_LINE_MEMBER(busy_w) { m_busy = state; } + void busy_w(int state) { m_busy = state; } required_device m_centronics; @@ -143,9 +143,9 @@ protected: virtual uint8_t mreq_r(offs_t offset) override; virtual uint8_t iorq_r(offs_t offset) override; virtual void iorq_w(offs_t offset, uint8_t data) override; - virtual DECLARE_READ_LINE_MEMBER(romcs) override; + virtual int romcs() override; - DECLARE_WRITE_LINE_MEMBER(busy_w) { m_busy = state; } + void busy_w(int state) { m_busy = state; } required_memory_region m_rom; required_device m_centronics; diff --git a/src/devices/bus/spectrum/melodik.h b/src/devices/bus/spectrum/melodik.h index 6c0d4f6b3fd..ce1bc0110be 100644 --- a/src/devices/bus/spectrum/melodik.h +++ b/src/devices/bus/spectrum/melodik.h @@ -46,7 +46,7 @@ protected: virtual void post_data_fetch(offs_t offset) override { m_exp->post_data_fetch(offset); } virtual uint8_t mreq_r(offs_t offset) override { return m_exp->romcs() ? m_exp->mreq_r(offset) : 0xff; } virtual void mreq_w(offs_t offset, uint8_t data) override { if (m_exp->romcs()) m_exp->mreq_w(offset, data); } - virtual DECLARE_READ_LINE_MEMBER(romcs) override { return m_exp->romcs(); } + virtual int romcs() override { return m_exp->romcs(); } private: required_device m_exp; diff --git a/src/devices/bus/spectrum/mface.cpp b/src/devices/bus/spectrum/mface.cpp index 693b3eb4fcf..68ba08ac5b0 100644 --- a/src/devices/bus/spectrum/mface.cpp +++ b/src/devices/bus/spectrum/mface.cpp @@ -509,7 +509,7 @@ void spectrum_mprint_device::device_reset() // IMPLEMENTATION //************************************************************************** -READ_LINE_MEMBER(spectrum_mface_base_device::romcs) +int spectrum_mface_base_device::romcs() { return m_romcs | m_exp->romcs(); } diff --git a/src/devices/bus/spectrum/mface.h b/src/devices/bus/spectrum/mface.h index 7b3fbf03e72..c76f981c284 100644 --- a/src/devices/bus/spectrum/mface.h +++ b/src/devices/bus/spectrum/mface.h @@ -39,7 +39,7 @@ protected: virtual void pre_opcode_fetch(offs_t offset) override; virtual uint8_t mreq_r(offs_t offset) override; virtual void mreq_w(offs_t offset, uint8_t data) override; - virtual DECLARE_READ_LINE_MEMBER(romcs) override; + virtual int romcs() override; // passthru virtual void post_opcode_fetch(offs_t offset) override { m_exp->post_opcode_fetch(offset); } @@ -223,7 +223,7 @@ protected: virtual void iorq_w(offs_t offset, uint8_t data) override; private: - DECLARE_WRITE_LINE_MEMBER(busy_w) { m_busy = state; } + void busy_w(int state) { m_busy = state; } required_device m_centronics; diff --git a/src/devices/bus/spectrum/mgt.cpp b/src/devices/bus/spectrum/mgt.cpp index 581a748dcea..854f711e440 100644 --- a/src/devices/bus/spectrum/mgt.cpp +++ b/src/devices/bus/spectrum/mgt.cpp @@ -403,7 +403,7 @@ void spectrum_disciple_device::device_reset() // IMPLEMENTATION spectrum_plusd_device //************************************************************************** -READ_LINE_MEMBER(spectrum_plusd_device::romcs) +int spectrum_plusd_device::romcs() { return m_romcs; } @@ -530,7 +530,7 @@ INPUT_CHANGED_MEMBER(spectrum_plusd_device::snapshot_button) } } -WRITE_LINE_MEMBER(spectrum_plusd_device::busy_w) +void spectrum_plusd_device::busy_w(int state) { m_centronics_busy = state; } @@ -539,7 +539,7 @@ WRITE_LINE_MEMBER(spectrum_plusd_device::busy_w) // IMPLEMENTATION spectrum_disciple_device //************************************************************************** -READ_LINE_MEMBER(spectrum_disciple_device::romcs) +int spectrum_disciple_device::romcs() { return m_romcs | m_exp->romcs(); } diff --git a/src/devices/bus/spectrum/mgt.h b/src/devices/bus/spectrum/mgt.h index 35d168b10ae..1bcb3bb8ff9 100644 --- a/src/devices/bus/spectrum/mgt.h +++ b/src/devices/bus/spectrum/mgt.h @@ -51,9 +51,9 @@ protected: virtual void mreq_w(offs_t offset, uint8_t data) override; virtual uint8_t iorq_r(offs_t offset) override; virtual void iorq_w(offs_t offset, uint8_t data) override; - virtual DECLARE_READ_LINE_MEMBER(romcs) override; + virtual int romcs() override; - DECLARE_WRITE_LINE_MEMBER(busy_w); + void busy_w(int state); required_memory_region m_rom; required_device m_fdc; @@ -88,7 +88,7 @@ protected: virtual void mreq_w(offs_t offset, uint8_t data) override; virtual uint8_t iorq_r(offs_t offset) override; virtual void iorq_w(offs_t offset, uint8_t data) override; - virtual DECLARE_READ_LINE_MEMBER(romcs) override; + virtual int romcs() override; TIMER_CALLBACK_MEMBER(reset_tick); diff --git a/src/devices/bus/spectrum/mikroplus.cpp b/src/devices/bus/spectrum/mikroplus.cpp index 9f46bc1b7db..d9c34e89660 100644 --- a/src/devices/bus/spectrum/mikroplus.cpp +++ b/src/devices/bus/spectrum/mikroplus.cpp @@ -100,7 +100,7 @@ uint8_t spectrum_mikroplus_device::iorq_r(offs_t offset) return data; } -READ_LINE_MEMBER(spectrum_mikroplus_device::romcs) +int spectrum_mikroplus_device::romcs() { return 1; } diff --git a/src/devices/bus/spectrum/mikroplus.h b/src/devices/bus/spectrum/mikroplus.h index e06cb38bb2c..9f6a683ee9d 100644 --- a/src/devices/bus/spectrum/mikroplus.h +++ b/src/devices/bus/spectrum/mikroplus.h @@ -36,7 +36,7 @@ protected: virtual const tiny_rom_entry *device_rom_region() const override; virtual ioport_constructor device_input_ports() const override; - virtual DECLARE_READ_LINE_MEMBER(romcs) override; + virtual int romcs() override; virtual uint8_t mreq_r(offs_t offset) override; virtual uint8_t iorq_r(offs_t offset) override; diff --git a/src/devices/bus/spectrum/mpoker.cpp b/src/devices/bus/spectrum/mpoker.cpp index c2d84d13c1b..9dc2c69c18d 100644 --- a/src/devices/bus/spectrum/mpoker.cpp +++ b/src/devices/bus/spectrum/mpoker.cpp @@ -129,7 +129,7 @@ void spectrum_mpoker_device::device_reset() // IMPLEMENTATION //************************************************************************** -READ_LINE_MEMBER(spectrum_mpoker_device::romcs) +int spectrum_mpoker_device::romcs() { return m_romcs; } diff --git a/src/devices/bus/spectrum/mpoker.h b/src/devices/bus/spectrum/mpoker.h index 27f7cef19b0..003effe3998 100644 --- a/src/devices/bus/spectrum/mpoker.h +++ b/src/devices/bus/spectrum/mpoker.h @@ -36,7 +36,7 @@ protected: virtual uint8_t mreq_r(offs_t offset) override; virtual void iorq_w(offs_t offset, uint8_t data) override; - virtual DECLARE_READ_LINE_MEMBER(romcs) override; + virtual int romcs() override; required_memory_region m_rom; diff --git a/src/devices/bus/spectrum/opus.cpp b/src/devices/bus/spectrum/opus.cpp index 37eff23bce6..571ed7601c6 100644 --- a/src/devices/bus/spectrum/opus.cpp +++ b/src/devices/bus/spectrum/opus.cpp @@ -159,7 +159,7 @@ void spectrum_opus_device::device_reset() // IMPLEMENTATION //************************************************************************** -READ_LINE_MEMBER(spectrum_opus_device::romcs) +int spectrum_opus_device::romcs() { return m_romcs | m_exp->romcs(); } @@ -280,7 +280,7 @@ void spectrum_opus_device::pia_out_b(uint8_t data) m_centronics->write_data7(BIT(data, 7)); } -WRITE_LINE_MEMBER(spectrum_opus_device::busy_w) +void spectrum_opus_device::busy_w(int state) { m_pia->set_a_input(state << 6); } diff --git a/src/devices/bus/spectrum/opus.h b/src/devices/bus/spectrum/opus.h index 2c175621820..6578371ca1d 100644 --- a/src/devices/bus/spectrum/opus.h +++ b/src/devices/bus/spectrum/opus.h @@ -46,7 +46,7 @@ protected: virtual uint8_t mreq_r(offs_t offset) override; virtual void mreq_w(offs_t offset, uint8_t data) override; virtual uint8_t iorq_r(offs_t offset) override; - virtual DECLARE_READ_LINE_MEMBER(romcs) override; + virtual int romcs() override; // passthru virtual void pre_opcode_fetch(offs_t offset) override { m_exp->pre_opcode_fetch(offset); } @@ -57,7 +57,7 @@ protected: private: void pia_out_a(uint8_t data); void pia_out_b(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(busy_w); + void busy_w(int state); required_ioport m_joy; required_memory_region m_rom; diff --git a/src/devices/bus/spectrum/plus2test.cpp b/src/devices/bus/spectrum/plus2test.cpp index 3d90ed4dee3..f11bda87fe2 100644 --- a/src/devices/bus/spectrum/plus2test.cpp +++ b/src/devices/bus/spectrum/plus2test.cpp @@ -63,7 +63,7 @@ void spectrum_plus2test_device::device_start() // IMPLEMENTATION //************************************************************************** -READ_LINE_MEMBER(spectrum_plus2test_device::romcs) +int spectrum_plus2test_device::romcs() { return 1; } diff --git a/src/devices/bus/spectrum/plus2test.h b/src/devices/bus/spectrum/plus2test.h index f8caad2fa26..42f6c5b4aea 100644 --- a/src/devices/bus/spectrum/plus2test.h +++ b/src/devices/bus/spectrum/plus2test.h @@ -35,7 +35,7 @@ protected: // optional information overrides virtual const tiny_rom_entry *device_rom_region() const override; - virtual DECLARE_READ_LINE_MEMBER(romcs) override; + virtual int romcs() override; virtual uint8_t mreq_r(offs_t offset) override; private: diff --git a/src/devices/bus/spectrum/sdi.cpp b/src/devices/bus/spectrum/sdi.cpp index ab8becb80f8..3722f80bdec 100644 --- a/src/devices/bus/spectrum/sdi.cpp +++ b/src/devices/bus/spectrum/sdi.cpp @@ -98,7 +98,7 @@ void spectrum_sdi_device::device_reset() // IMPLEMENTATION //************************************************************************** -READ_LINE_MEMBER(spectrum_sdi_device::romcs) +int spectrum_sdi_device::romcs() { return m_romcs; } diff --git a/src/devices/bus/spectrum/sdi.h b/src/devices/bus/spectrum/sdi.h index 619ec52f44f..b85f7eb40dc 100644 --- a/src/devices/bus/spectrum/sdi.h +++ b/src/devices/bus/spectrum/sdi.h @@ -41,7 +41,7 @@ protected: virtual uint8_t mreq_r(offs_t offset) override; virtual uint8_t iorq_r(offs_t offset) override; virtual void iorq_w(offs_t offset, uint8_t data) override; - virtual DECLARE_READ_LINE_MEMBER(romcs) override; + virtual int romcs() override; required_memory_region m_rom; required_device m_ppi; diff --git a/src/devices/bus/spectrum/sixword.cpp b/src/devices/bus/spectrum/sixword.cpp index c85a9347dc9..5c59d666181 100644 --- a/src/devices/bus/spectrum/sixword.cpp +++ b/src/devices/bus/spectrum/sixword.cpp @@ -266,7 +266,7 @@ void spectrum_swiftdisc2_device::device_reset() // IMPLEMENTATION (swiftdisc) //************************************************************************** -READ_LINE_MEMBER(spectrum_swiftdisc_device::romcs) +int spectrum_swiftdisc_device::romcs() { return m_romcs | m_exp->romcs(); } diff --git a/src/devices/bus/spectrum/sixword.h b/src/devices/bus/spectrum/sixword.h index c11108454f6..e842ec25704 100644 --- a/src/devices/bus/spectrum/sixword.h +++ b/src/devices/bus/spectrum/sixword.h @@ -49,7 +49,7 @@ protected: virtual uint8_t mreq_r(offs_t offset) override; virtual void mreq_w(offs_t offset, uint8_t data) override; virtual uint8_t iorq_r(offs_t offset) override; - virtual DECLARE_READ_LINE_MEMBER(romcs) override; + virtual int romcs() override; // passthru virtual void pre_opcode_fetch(offs_t offset) override { m_exp->pre_opcode_fetch(offset); } @@ -92,7 +92,7 @@ protected: virtual void mreq_w(offs_t offset, uint8_t data) override; virtual uint8_t iorq_r(offs_t offset) override; virtual void iorq_w(offs_t offset, uint8_t data) override; - DECLARE_WRITE_LINE_MEMBER(busy_w) { m_busy = state; } + void busy_w(int state) { m_busy = state; } required_device m_centronics; required_ioport m_conf; diff --git a/src/devices/bus/spectrum/speccydos.cpp b/src/devices/bus/spectrum/speccydos.cpp index 1afbb52da26..b1ca7d17b40 100644 --- a/src/devices/bus/spectrum/speccydos.cpp +++ b/src/devices/bus/spectrum/speccydos.cpp @@ -168,7 +168,7 @@ void spectrum_speccydos_device::device_reset() // IMPLEMENTATION //************************************************************************** -READ_LINE_MEMBER(spectrum_speccydos_device::romcs) +int spectrum_speccydos_device::romcs() { return m_romcs | m_exp->romcs(); } diff --git a/src/devices/bus/spectrum/speccydos.h b/src/devices/bus/spectrum/speccydos.h index 3cdb29b7b38..907c5d776bf 100644 --- a/src/devices/bus/spectrum/speccydos.h +++ b/src/devices/bus/spectrum/speccydos.h @@ -44,7 +44,7 @@ protected: virtual void pre_opcode_fetch(offs_t offset) override; virtual uint8_t mreq_r(offs_t offset) override; virtual void mreq_w(offs_t offset, uint8_t data) override; - virtual DECLARE_READ_LINE_MEMBER(romcs) override; + virtual int romcs() override; // passthru virtual void post_opcode_fetch(offs_t offset) override { m_exp->post_opcode_fetch(offset); } diff --git a/src/devices/bus/spectrum/specmate.cpp b/src/devices/bus/spectrum/specmate.cpp index 4177a74f814..c8cab185d71 100644 --- a/src/devices/bus/spectrum/specmate.cpp +++ b/src/devices/bus/spectrum/specmate.cpp @@ -151,7 +151,7 @@ void spectrum_specmate_device::device_reset() // IMPLEMENTATION //************************************************************************** -READ_LINE_MEMBER(spectrum_specmate_device::romcs) +int spectrum_specmate_device::romcs() { return m_romcs | m_exp->romcs(); } diff --git a/src/devices/bus/spectrum/specmate.h b/src/devices/bus/spectrum/specmate.h index cc361b49171..bdf5faa9b46 100644 --- a/src/devices/bus/spectrum/specmate.h +++ b/src/devices/bus/spectrum/specmate.h @@ -37,7 +37,7 @@ protected: virtual void pre_opcode_fetch(offs_t offset) override; virtual uint8_t mreq_r(offs_t offset) override; - virtual DECLARE_READ_LINE_MEMBER(romcs) override; + virtual int romcs() override; // passthru virtual void post_opcode_fetch(offs_t offset) override { m_exp->post_opcode_fetch(offset); } diff --git a/src/devices/bus/spectrum/uslot.cpp b/src/devices/bus/spectrum/uslot.cpp index eeef849a8fe..7c078599b18 100644 --- a/src/devices/bus/spectrum/uslot.cpp +++ b/src/devices/bus/spectrum/uslot.cpp @@ -71,7 +71,7 @@ void spectrum_uslot_device::device_reset() // IMPLEMENTATION //************************************************************************** -READ_LINE_MEMBER(spectrum_uslot_device::romcs) +int spectrum_uslot_device::romcs() { return m_exp1->romcs() | m_exp2->romcs(); } diff --git a/src/devices/bus/spectrum/uslot.h b/src/devices/bus/spectrum/uslot.h index 0764d014147..bff4679cb43 100644 --- a/src/devices/bus/spectrum/uslot.h +++ b/src/devices/bus/spectrum/uslot.h @@ -44,7 +44,7 @@ protected: virtual void mreq_w(offs_t offset, uint8_t data) override; virtual uint8_t iorq_r(offs_t offset) override; virtual void iorq_w(offs_t offset, uint8_t data) override; - virtual DECLARE_READ_LINE_MEMBER(romcs) override; + virtual int romcs() override; private: required_device m_exp1; diff --git a/src/devices/bus/spectrum/usource.cpp b/src/devices/bus/spectrum/usource.cpp index 3c368297fef..d5561ac873c 100644 --- a/src/devices/bus/spectrum/usource.cpp +++ b/src/devices/bus/spectrum/usource.cpp @@ -78,7 +78,7 @@ void spectrum_usource_device::device_reset() // IMPLEMENTATION //************************************************************************** -READ_LINE_MEMBER(spectrum_usource_device::romcs) +int spectrum_usource_device::romcs() { return m_romcs; } diff --git a/src/devices/bus/spectrum/usource.h b/src/devices/bus/spectrum/usource.h index 1f0d7d44e58..22230be0a85 100644 --- a/src/devices/bus/spectrum/usource.h +++ b/src/devices/bus/spectrum/usource.h @@ -39,7 +39,7 @@ protected: virtual const tiny_rom_entry *device_rom_region() const override; virtual void pre_opcode_fetch(offs_t offset) override; - virtual DECLARE_READ_LINE_MEMBER(romcs) override; + virtual int romcs() override; virtual uint8_t mreq_r(offs_t offset) override; private: diff --git a/src/devices/bus/spectrum/uspeech.cpp b/src/devices/bus/spectrum/uspeech.cpp index 06e48dca0fd..586feaf8bbd 100644 --- a/src/devices/bus/spectrum/uspeech.cpp +++ b/src/devices/bus/spectrum/uspeech.cpp @@ -94,7 +94,7 @@ void spectrum_uspeech_device::device_reset() // IMPLEMENTATION //************************************************************************** -READ_LINE_MEMBER(spectrum_uspeech_device::romcs) +int spectrum_uspeech_device::romcs() { return m_romcs; } diff --git a/src/devices/bus/spectrum/uspeech.h b/src/devices/bus/spectrum/uspeech.h index 078e33599af..ff6948fadb3 100644 --- a/src/devices/bus/spectrum/uspeech.h +++ b/src/devices/bus/spectrum/uspeech.h @@ -41,7 +41,7 @@ protected: virtual void device_add_mconfig(machine_config &config) override; virtual void pre_opcode_fetch(offs_t offset) override; - virtual DECLARE_READ_LINE_MEMBER(romcs) override; + virtual int romcs() override; virtual uint8_t mreq_r(offs_t offset) override; virtual void mreq_w(offs_t offset, uint8_t data) override; virtual uint8_t iorq_r(offs_t offset) override; diff --git a/src/devices/bus/spectrum/wafa.cpp b/src/devices/bus/spectrum/wafa.cpp index c5af195289c..a085ba639d1 100644 --- a/src/devices/bus/spectrum/wafa.cpp +++ b/src/devices/bus/spectrum/wafa.cpp @@ -103,7 +103,7 @@ void spectrum_wafa_device::device_reset() // IMPLEMENTATION //************************************************************************** -READ_LINE_MEMBER(spectrum_wafa_device::romcs) +int spectrum_wafa_device::romcs() { return m_romcs | m_exp->romcs(); } diff --git a/src/devices/bus/spectrum/wafa.h b/src/devices/bus/spectrum/wafa.h index 6ca1f4d256a..cbf885bff90 100644 --- a/src/devices/bus/spectrum/wafa.h +++ b/src/devices/bus/spectrum/wafa.h @@ -44,7 +44,7 @@ protected: virtual uint8_t mreq_r(offs_t offset) override; virtual uint8_t iorq_r(offs_t offset) override; virtual void iorq_w(offs_t offset, uint8_t data) override; - virtual DECLARE_READ_LINE_MEMBER(romcs) override; + virtual int romcs() override; // passthru virtual void pre_data_fetch(offs_t offset) override { m_exp->pre_data_fetch(offset); } diff --git a/src/devices/bus/ss50/dc5.cpp b/src/devices/bus/ss50/dc5.cpp index d3c105bc2a8..62982d98c38 100644 --- a/src/devices/bus/ss50/dc5.cpp +++ b/src/devices/bus/ss50/dc5.cpp @@ -74,9 +74,9 @@ protected: virtual void register_write(offs_t offset, uint8_t data) override; private: - DECLARE_WRITE_LINE_MEMBER( fdc_intrq_w ); - DECLARE_WRITE_LINE_MEMBER( fdc_drq_w ); - DECLARE_WRITE_LINE_MEMBER( fdc_sso_w ); + void fdc_intrq_w(int state); + void fdc_drq_w(int state); + void fdc_sso_w(int state); static void floppy_formats(format_registration &fr); uint8_t m_fdc_status; // for floppy controller @@ -503,7 +503,7 @@ uint8_t ss50_dc5_device::validate_fdc_sector_size(uint8_t cmd) return cmd; } -WRITE_LINE_MEMBER( ss50_dc5_device::fdc_intrq_w ) +void ss50_dc5_device::fdc_intrq_w(int state) { if (state) m_fdc_status |= 0x40; @@ -518,7 +518,7 @@ WRITE_LINE_MEMBER( ss50_dc5_device::fdc_intrq_w ) write_firq(state); } -WRITE_LINE_MEMBER( ss50_dc5_device::fdc_drq_w ) +void ss50_dc5_device::fdc_drq_w(int state) { if (state) m_fdc_status |= 0x80; @@ -526,7 +526,7 @@ WRITE_LINE_MEMBER( ss50_dc5_device::fdc_drq_w ) m_fdc_status &= 0x7f; } -WRITE_LINE_MEMBER( ss50_dc5_device::fdc_sso_w ) +void ss50_dc5_device::fdc_sso_w(int state) { // The DC4 and DC5 invert the SSO output and wire it to the DDEN input // to allow selection of single or double density. diff --git a/src/devices/bus/ss50/interface.cpp b/src/devices/bus/ss50/interface.cpp index a3100585a76..6db293bfec8 100644 --- a/src/devices/bus/ss50/interface.cpp +++ b/src/devices/bus/ss50/interface.cpp @@ -171,31 +171,31 @@ void ss50_interface_port_device::write(offs_t offset, u8 data) // fN_w - baud rate clocks for serial interfaces //------------------------------------------------- -WRITE_LINE_MEMBER(ss50_interface_port_device::f110_w) +void ss50_interface_port_device::f110_w(int state) { if (m_card != nullptr) m_card->f110_w(state); } -WRITE_LINE_MEMBER(ss50_interface_port_device::f150_9600_w) +void ss50_interface_port_device::f150_9600_w(int state) { if (m_card != nullptr) m_card->f150_9600_w(state); } -WRITE_LINE_MEMBER(ss50_interface_port_device::f300_w) +void ss50_interface_port_device::f300_w(int state) { if (m_card != nullptr) m_card->f300_w(state); } -WRITE_LINE_MEMBER(ss50_interface_port_device::f600_4800_w) +void ss50_interface_port_device::f600_4800_w(int state) { if (m_card != nullptr) m_card->f600_4800_w(state); } -WRITE_LINE_MEMBER(ss50_interface_port_device::f600_1200_w) +void ss50_interface_port_device::f600_1200_w(int state) { if (m_card != nullptr) m_card->f600_1200_w(state); diff --git a/src/devices/bus/ss50/interface.h b/src/devices/bus/ss50/interface.h index 28e8f82c8c9..ead1754ba00 100644 --- a/src/devices/bus/ss50/interface.h +++ b/src/devices/bus/ss50/interface.h @@ -48,11 +48,11 @@ public: void write(offs_t offset, u8 data); // baud rates - DECLARE_WRITE_LINE_MEMBER(f110_w); - DECLARE_WRITE_LINE_MEMBER(f150_9600_w); - DECLARE_WRITE_LINE_MEMBER(f300_w); - DECLARE_WRITE_LINE_MEMBER(f600_4800_w); - DECLARE_WRITE_LINE_MEMBER(f600_1200_w); + void f110_w(int state); + void f150_9600_w(int state); + void f300_w(int state); + void f600_4800_w(int state); + void f600_1200_w(int state); protected: // device-specific overrides @@ -83,15 +83,15 @@ protected: virtual void register_write(offs_t offset, u8 data) = 0; // optional overrides - virtual DECLARE_WRITE_LINE_MEMBER(f110_w) { } - virtual DECLARE_WRITE_LINE_MEMBER(f150_9600_w) { } - virtual DECLARE_WRITE_LINE_MEMBER(f300_w) { } - virtual DECLARE_WRITE_LINE_MEMBER(f600_4800_w) { } - virtual DECLARE_WRITE_LINE_MEMBER(f600_1200_w) { } + virtual void f110_w(int state) { } + virtual void f150_9600_w(int state) { } + virtual void f300_w(int state) { } + virtual void f600_4800_w(int state) { } + virtual void f600_1200_w(int state) { } // IRQ/FIRQ/NMI outputs - DECLARE_WRITE_LINE_MEMBER(write_irq) { m_slot->m_irq_cb(state); } - DECLARE_WRITE_LINE_MEMBER(write_firq) { m_slot->m_firq_cb(state); } + void write_irq(int state) { m_slot->m_irq_cb(state); } + void write_firq(int state) { m_slot->m_firq_cb(state); } private: virtual void interface_pre_start() override; diff --git a/src/devices/bus/ss50/mpc.cpp b/src/devices/bus/ss50/mpc.cpp index 99c476684b3..fb8f1918354 100644 --- a/src/devices/bus/ss50/mpc.cpp +++ b/src/devices/bus/ss50/mpc.cpp @@ -44,14 +44,14 @@ protected: // interface-specific overrides virtual u8 register_read(offs_t offset) override; virtual void register_write(offs_t offset, u8 data) override; - virtual DECLARE_WRITE_LINE_MEMBER(f110_w) override; - virtual DECLARE_WRITE_LINE_MEMBER(f300_w) override; + virtual void f110_w(int state) override; + virtual void f300_w(int state) override; private: - DECLARE_WRITE_LINE_MEMBER(serial_input_w); - DECLARE_WRITE_LINE_MEMBER(reader_control_w); - DECLARE_READ_LINE_MEMBER(count_r); - DECLARE_WRITE_LINE_MEMBER(count_select_w); + void serial_input_w(int state); + void reader_control_w(int state); + int count_r(); + void count_select_w(int state); required_device m_pia; required_device m_loopback; @@ -133,24 +133,24 @@ void ss50_mpc_device::device_start() save_item(NAME(m_count_select)); } -WRITE_LINE_MEMBER(ss50_mpc_device::serial_input_w) +void ss50_mpc_device::serial_input_w(int state) { m_pia->write_porta_line(7, state); m_loopback->in_w<0>(state); } -WRITE_LINE_MEMBER(ss50_mpc_device::reader_control_w) +void ss50_mpc_device::reader_control_w(int state) { m_loopback->in_w<1>(state); } -READ_LINE_MEMBER(ss50_mpc_device::count_r) +int ss50_mpc_device::count_r() { return BIT(m_counter->count(), m_count_select ? 4 : 3); } -WRITE_LINE_MEMBER(ss50_mpc_device::count_select_w) +void ss50_mpc_device::count_select_w(int state) { m_count_select = bool(state); } @@ -174,13 +174,13 @@ void ss50_mpc_device::register_write(offs_t offset, u8 data) m_pia->write(offset & 3, data); } -WRITE_LINE_MEMBER(ss50_mpc_device::f110_w) +void ss50_mpc_device::f110_w(int state) { if (m_baud_jumper->read()) m_counter->clock_w(state); } -WRITE_LINE_MEMBER(ss50_mpc_device::f300_w) +void ss50_mpc_device::f300_w(int state) { if (!m_baud_jumper->read()) m_counter->clock_w(state); diff --git a/src/devices/bus/ss50/mps.cpp b/src/devices/bus/ss50/mps.cpp index b79d1dddbc0..5275c84350d 100644 --- a/src/devices/bus/ss50/mps.cpp +++ b/src/devices/bus/ss50/mps.cpp @@ -43,15 +43,15 @@ protected: // interface-specific overrides virtual u8 register_read(offs_t offset) override; virtual void register_write(offs_t offset, u8 data) override; - virtual DECLARE_WRITE_LINE_MEMBER(f110_w) override; - virtual DECLARE_WRITE_LINE_MEMBER(f150_9600_w) override; - virtual DECLARE_WRITE_LINE_MEMBER(f300_w) override; - virtual DECLARE_WRITE_LINE_MEMBER(f600_4800_w) override; - virtual DECLARE_WRITE_LINE_MEMBER(f600_1200_w) override; + virtual void f110_w(int state) override; + virtual void f150_9600_w(int state) override; + virtual void f300_w(int state) override; + virtual void f600_4800_w(int state) override; + virtual void f600_1200_w(int state) override; private: - DECLARE_WRITE_LINE_MEMBER(acia_irq_w); - DECLARE_WRITE_LINE_MEMBER(route_cts); + void acia_irq_w(int state); + void route_cts(int state); required_device m_acia; required_ioport m_irq_jumper; @@ -143,7 +143,7 @@ void ss50_mps_device::register_write(offs_t offset, u8 data) m_acia->write(offset & 1, data); } -WRITE_LINE_MEMBER(ss50_mps_device::f110_w) +void ss50_mps_device::f110_w(int state) { if (!BIT(m_rate_jumper->read(), 0)) { @@ -152,7 +152,7 @@ WRITE_LINE_MEMBER(ss50_mps_device::f110_w) } } -WRITE_LINE_MEMBER(ss50_mps_device::f150_9600_w) +void ss50_mps_device::f150_9600_w(int state) { if (!BIT(m_rate_jumper->read(), 1)) { @@ -161,7 +161,7 @@ WRITE_LINE_MEMBER(ss50_mps_device::f150_9600_w) } } -WRITE_LINE_MEMBER(ss50_mps_device::f300_w) +void ss50_mps_device::f300_w(int state) { if (!BIT(m_rate_jumper->read(), 2)) { @@ -170,7 +170,7 @@ WRITE_LINE_MEMBER(ss50_mps_device::f300_w) } } -WRITE_LINE_MEMBER(ss50_mps_device::f600_4800_w) +void ss50_mps_device::f600_4800_w(int state) { if (!BIT(m_rate_jumper->read(), 3)) { @@ -179,7 +179,7 @@ WRITE_LINE_MEMBER(ss50_mps_device::f600_4800_w) } } -WRITE_LINE_MEMBER(ss50_mps_device::f600_1200_w) +void ss50_mps_device::f600_1200_w(int state) { if (!BIT(m_rate_jumper->read(), 4)) { @@ -188,13 +188,13 @@ WRITE_LINE_MEMBER(ss50_mps_device::f600_1200_w) } } -WRITE_LINE_MEMBER(ss50_mps_device::acia_irq_w) +void ss50_mps_device::acia_irq_w(int state) { if (!m_irq_jumper->read()) write_irq(state); } -WRITE_LINE_MEMBER(ss50_mps_device::route_cts) +void ss50_mps_device::route_cts(int state) { if (m_cts_route->read()) m_acia->write_cts(state); diff --git a/src/devices/bus/ss50/mps2.cpp b/src/devices/bus/ss50/mps2.cpp index f0d9350bfb8..9d8b8990ac1 100644 --- a/src/devices/bus/ss50/mps2.cpp +++ b/src/devices/bus/ss50/mps2.cpp @@ -45,11 +45,11 @@ protected: // interface-specific overrides virtual u8 register_read(offs_t offset) override; virtual void register_write(offs_t offset, u8 data) override; - virtual DECLARE_WRITE_LINE_MEMBER(f110_w) override; - virtual DECLARE_WRITE_LINE_MEMBER(f150_9600_w) override; - virtual DECLARE_WRITE_LINE_MEMBER(f300_w) override; - virtual DECLARE_WRITE_LINE_MEMBER(f600_4800_w) override; - virtual DECLARE_WRITE_LINE_MEMBER(f600_1200_w) override; + virtual void f110_w(int state) override; + virtual void f150_9600_w(int state) override; + virtual void f300_w(int state) override; + virtual void f600_4800_w(int state) override; + virtual void f600_1200_w(int state) override; private: required_device m_acia_upper; @@ -195,7 +195,7 @@ void ss50_mps2_device::register_write(offs_t offset, u8 data) m_acia_lower->write((offset - 4) & 1, data); } -WRITE_LINE_MEMBER(ss50_mps2_device::f110_w) +void ss50_mps2_device::f110_w(int state) { if (!BIT(m_tx_rate_upper_jumper->read(), 0)) m_acia_upper->write_txc(state); @@ -207,7 +207,7 @@ WRITE_LINE_MEMBER(ss50_mps2_device::f110_w) m_acia_lower->write_rxc(state); } -WRITE_LINE_MEMBER(ss50_mps2_device::f150_9600_w) +void ss50_mps2_device::f150_9600_w(int state) { if (!BIT(m_tx_rate_upper_jumper->read(), 1)) m_acia_upper->write_txc(state); @@ -219,7 +219,7 @@ WRITE_LINE_MEMBER(ss50_mps2_device::f150_9600_w) m_acia_lower->write_rxc(state); } -WRITE_LINE_MEMBER(ss50_mps2_device::f300_w) +void ss50_mps2_device::f300_w(int state) { if (!BIT(m_tx_rate_upper_jumper->read(), 2)) m_acia_upper->write_txc(state); @@ -231,7 +231,7 @@ WRITE_LINE_MEMBER(ss50_mps2_device::f300_w) m_acia_lower->write_rxc(state); } -WRITE_LINE_MEMBER(ss50_mps2_device::f600_4800_w) +void ss50_mps2_device::f600_4800_w(int state) { if (!BIT(m_tx_rate_upper_jumper->read(), 3)) m_acia_upper->write_txc(state); @@ -243,7 +243,7 @@ WRITE_LINE_MEMBER(ss50_mps2_device::f600_4800_w) m_acia_lower->write_rxc(state); } -WRITE_LINE_MEMBER(ss50_mps2_device::f600_1200_w) +void ss50_mps2_device::f600_1200_w(int state) { if (!BIT(m_tx_rate_upper_jumper->read(), 4)) m_acia_upper->write_txc(state); diff --git a/src/devices/bus/ss50/mpt.cpp b/src/devices/bus/ss50/mpt.cpp index f9078aee4ac..9898c28971a 100644 --- a/src/devices/bus/ss50/mpt.cpp +++ b/src/devices/bus/ss50/mpt.cpp @@ -36,10 +36,10 @@ protected: private: void pia_b_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(pia_irq_b); + void pia_irq_b(int state); TIMER_CALLBACK_MEMBER(mpt_timer_callback); - DECLARE_WRITE_LINE_MEMBER(pia_irqa_w); - DECLARE_WRITE_LINE_MEMBER(pia_irqb_w); + void pia_irqa_w(int state); + void pia_irqb_w(int state); required_device m_pia; required_ioport m_irqa_jumper; @@ -178,13 +178,13 @@ TIMER_CALLBACK_MEMBER(ss50_mpt_device::mpt_timer_callback) m_mpt_timer->enable(true); } -WRITE_LINE_MEMBER(ss50_mpt_device::pia_irqa_w) +void ss50_mpt_device::pia_irqa_w(int state) { if (m_irqa_jumper->read()) write_irq(state); } -WRITE_LINE_MEMBER(ss50_mpt_device::pia_irqb_w) +void ss50_mpt_device::pia_irqb_w(int state) { if (m_irqb_jumper->read()) write_irq(state); diff --git a/src/devices/bus/sunkbd/hlekbd.cpp b/src/devices/bus/sunkbd/hlekbd.cpp index db798a716fb..3a45c85569a 100644 --- a/src/devices/bus/sunkbd/hlekbd.cpp +++ b/src/devices/bus/sunkbd/hlekbd.cpp @@ -971,7 +971,7 @@ hle_device_base::~hle_device_base() handle serial input line changes --------------------------------------------------*/ -WRITE_LINE_MEMBER( hle_device_base::input_txd ) +void hle_device_base::input_txd(int state) { device_buffered_serial_interface::rx_w(state); } diff --git a/src/devices/bus/sunkbd/hlekbd.h b/src/devices/bus/sunkbd/hlekbd.h index 3ed680b24c6..775117eb790 100644 --- a/src/devices/bus/sunkbd/hlekbd.h +++ b/src/devices/bus/sunkbd/hlekbd.h @@ -23,7 +23,7 @@ class hle_device_base public: virtual ~hle_device_base() override; - virtual DECLARE_WRITE_LINE_MEMBER( input_txd ) override; + virtual void input_txd(int state) override; protected: // constructor/destructor diff --git a/src/devices/bus/sunkbd/sunkbd.cpp b/src/devices/bus/sunkbd/sunkbd.cpp index ee166b8b39f..cdc8c89b4cf 100644 --- a/src/devices/bus/sunkbd/sunkbd.cpp +++ b/src/devices/bus/sunkbd/sunkbd.cpp @@ -148,7 +148,7 @@ void sun_keyboard_port_device::device_start() } -WRITE_LINE_MEMBER( sun_keyboard_port_device::write_txd ) +void sun_keyboard_port_device::write_txd(int state) { if (m_dev) m_dev->input_txd(state); diff --git a/src/devices/bus/sunkbd/sunkbd.h b/src/devices/bus/sunkbd/sunkbd.h index 8a210025912..ee70ce937f2 100644 --- a/src/devices/bus/sunkbd/sunkbd.h +++ b/src/devices/bus/sunkbd/sunkbd.h @@ -31,9 +31,9 @@ public: // configuration helpers auto rxd_handler() { return m_rxd_handler.bind(); } - DECLARE_WRITE_LINE_MEMBER( write_txd ); + void write_txd(int state); - DECLARE_READ_LINE_MEMBER( rxd_r ) { return m_rxd; } + int rxd_r() { return m_rxd; } protected: sun_keyboard_port_device(machine_config const &mconfig, device_type type, char const *tag, device_t *owner, uint32_t clock); @@ -61,9 +61,9 @@ public: protected: device_sun_keyboard_port_interface(machine_config const &mconfig, device_t &device); - virtual DECLARE_WRITE_LINE_MEMBER( input_txd ) { } + virtual void input_txd(int state) { } - DECLARE_WRITE_LINE_MEMBER( output_rxd ) { m_port->m_rxd = state; m_port->m_rxd_handler(state); } + void output_rxd(int state) { m_port->m_rxd = state; m_port->m_rxd_handler(state); } sun_keyboard_port_device *m_port; diff --git a/src/devices/bus/sunmouse/sunmouse.cpp b/src/devices/bus/sunmouse/sunmouse.cpp index 4bd80279149..5c37d3b0774 100644 --- a/src/devices/bus/sunmouse/sunmouse.cpp +++ b/src/devices/bus/sunmouse/sunmouse.cpp @@ -126,7 +126,7 @@ void sun_mouse_port_device::device_start() } -WRITE_LINE_MEMBER( sun_mouse_port_device::write_txd ) +void sun_mouse_port_device::write_txd(int state) { if (m_dev) m_dev->input_txd(state ? 0 : 1); diff --git a/src/devices/bus/sunmouse/sunmouse.h b/src/devices/bus/sunmouse/sunmouse.h index e665529bdfe..4c91aac522e 100644 --- a/src/devices/bus/sunmouse/sunmouse.h +++ b/src/devices/bus/sunmouse/sunmouse.h @@ -31,9 +31,9 @@ public: // configuration helpers auto rxd_handler() { return m_rxd_handler.bind(); } - DECLARE_WRITE_LINE_MEMBER( write_txd ); + void write_txd(int state); - DECLARE_READ_LINE_MEMBER( rxd_r ) { return m_rxd; } + int rxd_r() { return m_rxd; } protected: sun_mouse_port_device(machine_config const &mconfig, device_type type, char const *tag, device_t *owner, uint32_t clock); @@ -61,9 +61,9 @@ public: protected: device_sun_mouse_port_interface(machine_config const &mconfig, device_t &device); - virtual DECLARE_WRITE_LINE_MEMBER( input_txd ) { } + virtual void input_txd(int state) { } - DECLARE_WRITE_LINE_MEMBER( output_rxd ) { m_port->m_rxd_handler(m_port->m_rxd = state ? 0 : 1); } + void output_rxd(int state) { m_port->m_rxd_handler(m_port->m_rxd = state ? 0 : 1); } sun_mouse_port_device *m_port; diff --git a/src/devices/bus/svi3x8/expander/expander.cpp b/src/devices/bus/svi3x8/expander/expander.cpp index ea1fab43f93..c7906b99261 100644 --- a/src/devices/bus/svi3x8/expander/expander.cpp +++ b/src/devices/bus/svi3x8/expander/expander.cpp @@ -106,28 +106,28 @@ void svi_expander_device::iorq_w(offs_t offset, uint8_t data) m_module->iorq_w(offset, data); } -WRITE_LINE_MEMBER( svi_expander_device::bk21_w ) +void svi_expander_device::bk21_w(int state) { - if (m_module) - m_module->bk21_w(state); + if (m_module) + m_module->bk21_w(state); } -WRITE_LINE_MEMBER( svi_expander_device::bk22_w ) +void svi_expander_device::bk22_w(int state) { - if (m_module) - m_module->bk22_w(state); + if (m_module) + m_module->bk22_w(state); } -WRITE_LINE_MEMBER( svi_expander_device::bk31_w ) +void svi_expander_device::bk31_w(int state) { - if (m_module) - m_module->bk31_w(state); + if (m_module) + m_module->bk31_w(state); } -WRITE_LINE_MEMBER( svi_expander_device::bk32_w ) +void svi_expander_device::bk32_w(int state) { - if (m_module) - m_module->bk32_w(state); + if (m_module) + m_module->bk32_w(state); } diff --git a/src/devices/bus/svi3x8/expander/expander.h b/src/devices/bus/svi3x8/expander/expander.h index f7bba16eba3..5e63daaadbb 100644 --- a/src/devices/bus/svi3x8/expander/expander.h +++ b/src/devices/bus/svi3x8/expander/expander.h @@ -75,11 +75,11 @@ public: auto excsw_handler() { return m_excsw_handler.bind(); } // called from cart device - DECLARE_WRITE_LINE_MEMBER( int_w ) { m_int_handler(state); } - DECLARE_WRITE_LINE_MEMBER( romdis_w ) { m_romdis_handler(state); } - DECLARE_WRITE_LINE_MEMBER( ramdis_w ) { m_ramdis_handler(state); } - DECLARE_WRITE_LINE_MEMBER( ctrl1_w ) { m_ctrl1_handler(state); } - DECLARE_WRITE_LINE_MEMBER( ctrl2_w ) { m_ctrl2_handler(state); } + void int_w(int state) { m_int_handler(state); } + void romdis_w(int state) { m_romdis_handler(state); } + void ramdis_w(int state) { m_ramdis_handler(state); } + void ctrl1_w(int state) { m_ctrl1_handler(state); } + void ctrl2_w(int state) { m_ctrl2_handler(state); } uint8_t excs_r(offs_t offset) { return m_excsr_handler(offset); } void excs_w(offs_t offset, uint8_t data) { m_excsw_handler(offset, data); } @@ -90,10 +90,10 @@ public: uint8_t iorq_r(offs_t offset); void iorq_w(offs_t offset, uint8_t data); - DECLARE_WRITE_LINE_MEMBER( bk21_w ); - DECLARE_WRITE_LINE_MEMBER( bk22_w ); - DECLARE_WRITE_LINE_MEMBER( bk31_w ); - DECLARE_WRITE_LINE_MEMBER( bk32_w ); + void bk21_w(int state); + void bk22_w(int state); + void bk31_w(int state); + void bk32_w(int state); protected: // device-level overrides diff --git a/src/devices/bus/svi3x8/expander/sv601.cpp b/src/devices/bus/svi3x8/expander/sv601.cpp index 662f3cb0c2e..f37c844d5ab 100644 --- a/src/devices/bus/svi3x8/expander/sv601.cpp +++ b/src/devices/bus/svi3x8/expander/sv601.cpp @@ -64,9 +64,9 @@ void sv601_device::device_start() // IMPLEMENTATION //************************************************************************** -WRITE_LINE_MEMBER( sv601_device::int_w ) { m_expander->int_w(state); } -WRITE_LINE_MEMBER( sv601_device::romdis_w ) { m_expander->romdis_w(state); } -WRITE_LINE_MEMBER( sv601_device::ramdis_w ) { m_expander->ramdis_w(state); } +void sv601_device::int_w(int state) { m_expander->int_w(state); } +void sv601_device::romdis_w(int state) { m_expander->romdis_w(state); } +void sv601_device::ramdis_w(int state) { m_expander->ramdis_w(state); } uint8_t sv601_device::mreq_r(offs_t offset) { return m_slotbus->mreq_r(offset); } void sv601_device::mreq_w(offs_t offset, uint8_t data) { m_slotbus->mreq_w(offset, data); } diff --git a/src/devices/bus/svi3x8/expander/sv601.h b/src/devices/bus/svi3x8/expander/sv601.h index 692191a7ea9..cd08e785aa6 100644 --- a/src/devices/bus/svi3x8/expander/sv601.h +++ b/src/devices/bus/svi3x8/expander/sv601.h @@ -28,9 +28,9 @@ public: sv601_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); // from slots - WRITE_LINE_MEMBER( int_w ); - WRITE_LINE_MEMBER( romdis_w ); - WRITE_LINE_MEMBER( ramdis_w ); + void int_w(int state); + void romdis_w(int state); + void ramdis_w(int state); // from host virtual uint8_t mreq_r(offs_t offset) override; diff --git a/src/devices/bus/svi3x8/expander/sv602.cpp b/src/devices/bus/svi3x8/expander/sv602.cpp index 1f5d0c0d352..3143d9239f1 100644 --- a/src/devices/bus/svi3x8/expander/sv602.cpp +++ b/src/devices/bus/svi3x8/expander/sv602.cpp @@ -58,9 +58,9 @@ void sv602_device::device_start() // IMPLEMENTATION //************************************************************************** -WRITE_LINE_MEMBER( sv602_device::int_w ) { m_expander->int_w(state); } -WRITE_LINE_MEMBER( sv602_device::romdis_w ) { m_expander->romdis_w(state); } -WRITE_LINE_MEMBER( sv602_device::ramdis_w ) { m_expander->ramdis_w(state); } +void sv602_device::int_w(int state) { m_expander->int_w(state); } +void sv602_device::romdis_w(int state) { m_expander->romdis_w(state); } +void sv602_device::ramdis_w(int state) { m_expander->ramdis_w(state); } uint8_t sv602_device::mreq_r(offs_t offset) { return m_slotbus->mreq_r(offset); } void sv602_device::mreq_w(offs_t offset, uint8_t data) { m_slotbus->mreq_w(offset, data); } diff --git a/src/devices/bus/svi3x8/expander/sv602.h b/src/devices/bus/svi3x8/expander/sv602.h index 607d1cf6c17..d90a0c0ae8e 100644 --- a/src/devices/bus/svi3x8/expander/sv602.h +++ b/src/devices/bus/svi3x8/expander/sv602.h @@ -44,9 +44,9 @@ protected: private: // from slots - WRITE_LINE_MEMBER( int_w ); - WRITE_LINE_MEMBER( romdis_w ); - WRITE_LINE_MEMBER( ramdis_w ); + void int_w(int state); + void romdis_w(int state); + void ramdis_w(int state); required_device m_slotbus; }; diff --git a/src/devices/bus/svi3x8/expander/sv603.cpp b/src/devices/bus/svi3x8/expander/sv603.cpp index fb0fd3428f9..fb488f902ea 100644 --- a/src/devices/bus/svi3x8/expander/sv603.cpp +++ b/src/devices/bus/svi3x8/expander/sv603.cpp @@ -94,7 +94,7 @@ void sv603_device::device_reset() //************************************************************************** template -WRITE_LINE_MEMBER( sv603_device::joy_irq_w ) +void sv603_device::joy_irq_w(int state) { m_expander->int_w(state); } diff --git a/src/devices/bus/svi3x8/expander/sv603.h b/src/devices/bus/svi3x8/expander/sv603.h index a6b3fde21b8..2cde9ebf3b7 100644 --- a/src/devices/bus/svi3x8/expander/sv603.h +++ b/src/devices/bus/svi3x8/expander/sv603.h @@ -35,7 +35,7 @@ public: virtual uint8_t iorq_r(offs_t offset) override; virtual void iorq_w(offs_t offset, uint8_t data) override; - template DECLARE_WRITE_LINE_MEMBER( joy_irq_w ); + template void joy_irq_w(int state); protected: virtual const tiny_rom_entry *device_rom_region() const override; diff --git a/src/devices/bus/svi3x8/slot/slot.cpp b/src/devices/bus/svi3x8/slot/slot.cpp index f486094ade2..a514d0e9da4 100644 --- a/src/devices/bus/svi3x8/slot/slot.cpp +++ b/src/devices/bus/svi3x8/slot/slot.cpp @@ -110,7 +110,7 @@ void svi_slot_bus_device::iorq_w(offs_t offset, uint8_t data) // bk21_w - signal from host to slots //------------------------------------------------- -WRITE_LINE_MEMBER( svi_slot_bus_device::bk21_w ) +void svi_slot_bus_device::bk21_w(int state) { for (device_svi_slot_interface &entry : m_dev) entry.bk21_w(state); @@ -120,7 +120,7 @@ WRITE_LINE_MEMBER( svi_slot_bus_device::bk21_w ) // bk22_w - signal from host to slots //------------------------------------------------- -WRITE_LINE_MEMBER( svi_slot_bus_device::bk22_w ) +void svi_slot_bus_device::bk22_w(int state) { for (device_svi_slot_interface &entry : m_dev) entry.bk22_w(state); @@ -130,7 +130,7 @@ WRITE_LINE_MEMBER( svi_slot_bus_device::bk22_w ) // bk31_w - signal from host to slots //------------------------------------------------- -WRITE_LINE_MEMBER( svi_slot_bus_device::bk31_w ) +void svi_slot_bus_device::bk31_w(int state) { for (device_svi_slot_interface &entry : m_dev) entry.bk31_w(state); @@ -140,7 +140,7 @@ WRITE_LINE_MEMBER( svi_slot_bus_device::bk31_w ) // bk32_w - signal from host to slots //------------------------------------------------- -WRITE_LINE_MEMBER( svi_slot_bus_device::bk32_w ) +void svi_slot_bus_device::bk32_w(int state) { for (device_svi_slot_interface &entry : m_dev) entry.bk32_w(state); diff --git a/src/devices/bus/svi3x8/slot/slot.h b/src/devices/bus/svi3x8/slot/slot.h index da676e7ec84..ca69257b99c 100644 --- a/src/devices/bus/svi3x8/slot/slot.h +++ b/src/devices/bus/svi3x8/slot/slot.h @@ -67,9 +67,9 @@ public: void add_card(device_svi_slot_interface &card); // from slot - DECLARE_WRITE_LINE_MEMBER( int_w ) { m_int_handler(state); } - DECLARE_WRITE_LINE_MEMBER( romdis_w ) { m_romdis_handler(state); } - DECLARE_WRITE_LINE_MEMBER( ramdis_w ) { m_ramdis_handler(state); } + void int_w(int state) { m_int_handler(state); } + void romdis_w(int state) { m_romdis_handler(state); } + void ramdis_w(int state) { m_ramdis_handler(state); } // from host uint8_t mreq_r(offs_t offset); @@ -77,10 +77,10 @@ public: uint8_t iorq_r(offs_t offset); void iorq_w(offs_t offset, uint8_t data); - DECLARE_WRITE_LINE_MEMBER( bk21_w ); - DECLARE_WRITE_LINE_MEMBER( bk22_w ); - DECLARE_WRITE_LINE_MEMBER( bk31_w ); - DECLARE_WRITE_LINE_MEMBER( bk32_w ); + void bk21_w(int state); + void bk22_w(int state); + void bk31_w(int state); + void bk32_w(int state); private: using card_vector = std::vector >; @@ -145,10 +145,10 @@ public: virtual uint8_t iorq_r(offs_t offset) { return 0xff; } virtual void iorq_w(offs_t offset, uint8_t data) { } - virtual DECLARE_WRITE_LINE_MEMBER( bk21_w ) { } - virtual DECLARE_WRITE_LINE_MEMBER( bk22_w ) { } - virtual DECLARE_WRITE_LINE_MEMBER( bk31_w ) { } - virtual DECLARE_WRITE_LINE_MEMBER( bk32_w ) { } + virtual void bk21_w(int state) { } + virtual void bk22_w(int state) { } + virtual void bk31_w(int state) { } + virtual void bk32_w(int state) { } protected: device_svi_slot_interface(const machine_config &mconfig, device_t &device); diff --git a/src/devices/bus/svi3x8/slot/sv801.cpp b/src/devices/bus/svi3x8/slot/sv801.cpp index 5695cfd5957..514a844e3a0 100644 --- a/src/devices/bus/svi3x8/slot/sv801.cpp +++ b/src/devices/bus/svi3x8/slot/sv801.cpp @@ -89,12 +89,12 @@ void sv801_device::device_reset() // IMPLEMENTATION //************************************************************************** -WRITE_LINE_MEMBER( sv801_device::intrq_w ) +void sv801_device::intrq_w(int state) { m_irq = state; } -WRITE_LINE_MEMBER( sv801_device::drq_w ) +void sv801_device::drq_w(int state) { m_drq = state; } diff --git a/src/devices/bus/svi3x8/slot/sv801.h b/src/devices/bus/svi3x8/slot/sv801.h index 5651e519fb7..1369dc27972 100644 --- a/src/devices/bus/svi3x8/slot/sv801.h +++ b/src/devices/bus/svi3x8/slot/sv801.h @@ -39,8 +39,8 @@ protected: private: void motor_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER( intrq_w ); - DECLARE_WRITE_LINE_MEMBER( drq_w ); + void intrq_w(int state); + void drq_w(int state); static void floppy_formats(format_registration &fr); diff --git a/src/devices/bus/svi3x8/slot/sv802.cpp b/src/devices/bus/svi3x8/slot/sv802.cpp index 909ed2fa712..cf407084a49 100644 --- a/src/devices/bus/svi3x8/slot/sv802.cpp +++ b/src/devices/bus/svi3x8/slot/sv802.cpp @@ -79,7 +79,7 @@ void sv802_device::iorq_w(offs_t offset, uint8_t data) } } -WRITE_LINE_MEMBER( sv802_device::busy_w ) +void sv802_device::busy_w(int state) { m_busy = state; } diff --git a/src/devices/bus/svi3x8/slot/sv802.h b/src/devices/bus/svi3x8/slot/sv802.h index aabea33bbaf..f70440fc9fd 100644 --- a/src/devices/bus/svi3x8/slot/sv802.h +++ b/src/devices/bus/svi3x8/slot/sv802.h @@ -36,7 +36,7 @@ protected: virtual void device_start() override; private: - DECLARE_WRITE_LINE_MEMBER( busy_w ); + void busy_w(int state); required_device m_centronics; required_device m_cent_data_out; diff --git a/src/devices/bus/svi3x8/slot/sv805.cpp b/src/devices/bus/svi3x8/slot/sv805.cpp index a5ceadf3577..0e41f8b5f89 100644 --- a/src/devices/bus/svi3x8/slot/sv805.cpp +++ b/src/devices/bus/svi3x8/slot/sv805.cpp @@ -99,7 +99,7 @@ void sv805_device::iorq_w(offs_t offset, uint8_t data) } } -WRITE_LINE_MEMBER( sv805_device::uart_intr_w ) +void sv805_device::uart_intr_w(int state) { m_bus->int_w(state); } diff --git a/src/devices/bus/svi3x8/slot/sv805.h b/src/devices/bus/svi3x8/slot/sv805.h index 892dc23b432..317fa0fe47c 100644 --- a/src/devices/bus/svi3x8/slot/sv805.h +++ b/src/devices/bus/svi3x8/slot/sv805.h @@ -36,7 +36,7 @@ protected: virtual void device_start() override; private: - DECLARE_WRITE_LINE_MEMBER( uart_intr_w ); + void uart_intr_w(int state); required_device m_uart; required_device m_rs232; diff --git a/src/devices/bus/tanbus/keyboard/keyboard.h b/src/devices/bus/tanbus/keyboard/keyboard.h index 3c57807faa5..a9b0c5300b1 100644 --- a/src/devices/bus/tanbus/keyboard/keyboard.h +++ b/src/devices/bus/tanbus/keyboard/keyboard.h @@ -43,8 +43,8 @@ public: virtual uint8_t read(); virtual void write(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(strobe_w) { m_strobe_handler(state); } - DECLARE_WRITE_LINE_MEMBER(reset_w) { m_reset_handler(state); } + void strobe_w(int state) { m_strobe_handler(state); } + void reset_w(int state) { m_reset_handler(state); } protected: // device-level overrides diff --git a/src/devices/bus/tanbus/mpvdu.cpp b/src/devices/bus/tanbus/mpvdu.cpp index 43c303dff4b..a74bdddedaf 100644 --- a/src/devices/bus/tanbus/mpvdu.cpp +++ b/src/devices/bus/tanbus/mpvdu.cpp @@ -180,7 +180,7 @@ MC6845_UPDATE_ROW(tanbus_mpvdu_device::crtc_update_row) } } -WRITE_LINE_MEMBER(tanbus_mpvdu_device::vsync_changed) +void tanbus_mpvdu_device::vsync_changed(int state) { m_trom->dew_w(state); } diff --git a/src/devices/bus/tanbus/mpvdu.h b/src/devices/bus/tanbus/mpvdu.h index ddde01e0611..37db354574e 100644 --- a/src/devices/bus/tanbus/mpvdu.h +++ b/src/devices/bus/tanbus/mpvdu.h @@ -45,7 +45,7 @@ protected: private: uint8_t videoram_r(offs_t offset); MC6845_UPDATE_ROW(crtc_update_row); - DECLARE_WRITE_LINE_MEMBER(vsync_changed); + void vsync_changed(int state); required_device m_screen; required_device m_crtc; diff --git a/src/devices/bus/tanbus/radisc.cpp b/src/devices/bus/tanbus/radisc.cpp index 36266d15c65..4b0d14fb4f9 100644 --- a/src/devices/bus/tanbus/radisc.cpp +++ b/src/devices/bus/tanbus/radisc.cpp @@ -194,17 +194,17 @@ uint8_t tanbus_radisc_device::status_r() return m_status | (m_fdc->drq_r() << 7) | (m_fdc->hld_r() << 6) | (m_fdc->intrq_r() << 0); } -WRITE_LINE_MEMBER(tanbus_radisc_device::fdc_drq_w) +void tanbus_radisc_device::fdc_drq_w(int state) { m_tanbus->so_w((m_drq_enable && state) ? ASSERT_LINE : CLEAR_LINE); } -WRITE_LINE_MEMBER(tanbus_radisc_device::fdc_irq_w) +void tanbus_radisc_device::fdc_irq_w(int state) { m_irq_line->in_w((m_irq_enable && state) ? ASSERT_LINE : CLEAR_LINE); } -WRITE_LINE_MEMBER(tanbus_radisc_device::irq_w) +void tanbus_radisc_device::irq_w(int state) { m_tanbus->irq_w(state ? ASSERT_LINE : CLEAR_LINE); } diff --git a/src/devices/bus/tanbus/radisc.h b/src/devices/bus/tanbus/radisc.h index 8e9445eac19..86654897c8a 100644 --- a/src/devices/bus/tanbus/radisc.h +++ b/src/devices/bus/tanbus/radisc.h @@ -49,9 +49,9 @@ private: void control_w(uint8_t data); uint8_t status_r(); - DECLARE_WRITE_LINE_MEMBER(fdc_irq_w); - DECLARE_WRITE_LINE_MEMBER(fdc_drq_w); - DECLARE_WRITE_LINE_MEMBER(irq_w); + void fdc_irq_w(int state); + void fdc_drq_w(int state); + void irq_w(int state); required_device m_fdc; required_device_array m_floppies; diff --git a/src/devices/bus/tanbus/ravdu.cpp b/src/devices/bus/tanbus/ravdu.cpp index 43cd6ff45ab..2a20e14cbe5 100644 --- a/src/devices/bus/tanbus/ravdu.cpp +++ b/src/devices/bus/tanbus/ravdu.cpp @@ -193,7 +193,7 @@ MC6845_UPDATE_ROW(tanbus_ravdu_device::crtc_update_row) } } -WRITE_LINE_MEMBER(tanbus_ravdu_device::vsync_changed) +void tanbus_ravdu_device::vsync_changed(int state) { m_trom->dew_w(state); } diff --git a/src/devices/bus/tanbus/ravdu.h b/src/devices/bus/tanbus/ravdu.h index f21dc73c4f5..e98fe034d4f 100644 --- a/src/devices/bus/tanbus/ravdu.h +++ b/src/devices/bus/tanbus/ravdu.h @@ -46,7 +46,7 @@ protected: private: uint8_t videoram_r(offs_t offset); MC6845_UPDATE_ROW(crtc_update_row); - DECLARE_WRITE_LINE_MEMBER(vsync_changed); + void vsync_changed(int state); required_device m_screen; required_device m_crtc; diff --git a/src/devices/bus/tanbus/tanbus.h b/src/devices/bus/tanbus/tanbus.h index d433513c69d..86636e834dd 100644 --- a/src/devices/bus/tanbus/tanbus.h +++ b/src/devices/bus/tanbus/tanbus.h @@ -83,9 +83,9 @@ public: void set_inhibit_lines(offs_t offset); - DECLARE_WRITE_LINE_MEMBER(irq_w) { m_out_irq_cb(state); } - DECLARE_WRITE_LINE_MEMBER(nmi_w) { m_out_nmi_cb(state); } - DECLARE_WRITE_LINE_MEMBER(so_w) { m_out_so_cb(state); } + void irq_w(int state) { m_out_irq_cb(state); } + void nmi_w(int state) { m_out_nmi_cb(state); } + void so_w(int state) { m_out_so_cb(state); } // pgm board has additional cable to fully decode the character generator void pgm_w(offs_t offset, uint8_t data) { m_out_pgm_cb(offset, data); } diff --git a/src/devices/bus/tanbus/tandos.cpp b/src/devices/bus/tanbus/tandos.cpp index 4ac5eaed684..cefecca7cc6 100644 --- a/src/devices/bus/tanbus/tandos.cpp +++ b/src/devices/bus/tanbus/tandos.cpp @@ -253,17 +253,17 @@ uint8_t tanbus_tandos_device::status_r() } -WRITE_LINE_MEMBER(tanbus_tandos_device::fdc_drq_w) +void tanbus_tandos_device::fdc_drq_w(int state) { m_tanbus->so_w((m_drq_enable && state) ? ASSERT_LINE : CLEAR_LINE); } -WRITE_LINE_MEMBER(tanbus_tandos_device::fdc_irq_w) +void tanbus_tandos_device::fdc_irq_w(int state) { m_tanbus->irq_w((m_irq_enable && state) ? ASSERT_LINE : CLEAR_LINE); } -WRITE_LINE_MEMBER(tanbus_tandos_device::fdc_hld_w) +void tanbus_tandos_device::fdc_hld_w(int state) { if (m_floppy) m_floppy->mon_w(state); diff --git a/src/devices/bus/tanbus/tandos.h b/src/devices/bus/tanbus/tandos.h index a95a87f6215..449ea65df72 100644 --- a/src/devices/bus/tanbus/tandos.h +++ b/src/devices/bus/tanbus/tandos.h @@ -48,9 +48,9 @@ protected: private: void control_w(uint8_t data); uint8_t status_r(); - DECLARE_WRITE_LINE_MEMBER(fdc_irq_w); - DECLARE_WRITE_LINE_MEMBER(fdc_drq_w); - DECLARE_WRITE_LINE_MEMBER(fdc_hld_w); + void fdc_irq_w(int state); + void fdc_drq_w(int state); + void fdc_hld_w(int state); required_memory_region m_dos_rom; required_device m_ieee; diff --git a/src/devices/bus/tanbus/tanex.cpp b/src/devices/bus/tanbus/tanex.cpp index f99a9d6cdf4..2af60e172e5 100644 --- a/src/devices/bus/tanbus/tanex.cpp +++ b/src/devices/bus/tanbus/tanex.cpp @@ -366,12 +366,12 @@ TIMER_DEVICE_CALLBACK_MEMBER(tanbus_tanex_device::read_cassette) m_via6522[0]->write_cb2(1); } -WRITE_LINE_MEMBER(tanbus_tanex_device::bus_so_w) +void tanbus_tanex_device::bus_so_w(int state) { m_tanbus->so_w(state); } -WRITE_LINE_MEMBER(tanbus_tanex_device::bus_irq_w) +void tanbus_tanex_device::bus_irq_w(int state) { m_tanbus->irq_w(state); } @@ -401,12 +401,12 @@ void tanbus_tanex_device::via_0_out_b(uint8_t data) m_cassette->output(data & 0x80 ? +1.0 : -1.0); } -WRITE_LINE_MEMBER(tanbus_tanex_device::via_0_out_ca2) +void tanbus_tanex_device::via_0_out_ca2(int state) { LOG("via_0_out_ca2 %d\n", state); } -WRITE_LINE_MEMBER(tanbus_tanex_device::via_0_out_cb2) +void tanbus_tanex_device::via_0_out_cb2(int state) { LOG("via_0_out_cb2 %d\n", state); } @@ -425,12 +425,12 @@ void tanbus_tanex_device::via_1_out_b(uint8_t data) LOG("via_1_out_b %02X\n", data); } -WRITE_LINE_MEMBER(tanbus_tanex_device::via_1_out_ca2) +void tanbus_tanex_device::via_1_out_ca2(int state) { LOG("via_1_out_ca2 %d\n", state); } -WRITE_LINE_MEMBER(tanbus_tanex_device::via_1_out_cb2) +void tanbus_tanex_device::via_1_out_cb2(int state) { LOG("via_1_out_cb2 %d\n", state); } diff --git a/src/devices/bus/tanbus/tanex.h b/src/devices/bus/tanbus/tanex.h index ec3f75fb344..96afff46e2c 100644 --- a/src/devices/bus/tanbus/tanex.h +++ b/src/devices/bus/tanbus/tanex.h @@ -50,18 +50,18 @@ protected: private: enum { IRQ_VIA_0, IRQ_VIA_1, IRQ_ACIA }; - DECLARE_WRITE_LINE_MEMBER(bus_irq_w); - DECLARE_WRITE_LINE_MEMBER(bus_so_w); + void bus_irq_w(int state); + void bus_so_w(int state); TIMER_DEVICE_CALLBACK_MEMBER(read_cassette); uint8_t via_0_in_a(); void via_0_out_a(uint8_t data); void via_0_out_b(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(via_0_out_ca2); - DECLARE_WRITE_LINE_MEMBER(via_0_out_cb2); + void via_0_out_ca2(int state); + void via_0_out_cb2(int state); void via_1_out_a(uint8_t data); void via_1_out_b(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(via_1_out_ca2); - DECLARE_WRITE_LINE_MEMBER(via_1_out_cb2); + void via_1_out_ca2(int state); + void via_1_out_cb2(int state); required_memory_region m_rom_tanex; required_memory_region m_rom_h2; diff --git a/src/devices/bus/tanbus/tug8082.cpp b/src/devices/bus/tanbus/tug8082.cpp index 582ab726c8e..86eac77b5d8 100644 --- a/src/devices/bus/tanbus/tug8082.cpp +++ b/src/devices/bus/tanbus/tug8082.cpp @@ -208,7 +208,7 @@ void tanbus_tug8082_device::write(offs_t offset, uint8_t data, int inhrom, int i // IMPLEMENTATION //************************************************************************** -WRITE_LINE_MEMBER(tanbus_tug8082_device::bus_irq_w) +void tanbus_tug8082_device::bus_irq_w(int state) { /* Manual says these DIPs are not used but schematic suggests they are */ //switch (m_dips[0]->read() >> 2) @@ -222,7 +222,7 @@ WRITE_LINE_MEMBER(tanbus_tug8082_device::bus_irq_w) //} } -WRITE_LINE_MEMBER(tanbus_tug8082_device::vdu_irq_w) +void tanbus_tug8082_device::vdu_irq_w(int state) { switch (m_dips[0]->read() & 0x03) { diff --git a/src/devices/bus/tanbus/tug8082.h b/src/devices/bus/tanbus/tug8082.h index 979e47180e5..aae8887a6d8 100644 --- a/src/devices/bus/tanbus/tug8082.h +++ b/src/devices/bus/tanbus/tug8082.h @@ -46,8 +46,8 @@ protected: virtual void write(offs_t offset, uint8_t data, int inhrom, int inhram, int be) override; private: - DECLARE_WRITE_LINE_MEMBER(bus_irq_w); - DECLARE_WRITE_LINE_MEMBER(vdu_irq_w); + void bus_irq_w(int state); + void vdu_irq_w(int state); uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); diff --git a/src/devices/bus/thomson/cc90_232.cpp b/src/devices/bus/thomson/cc90_232.cpp index 6ec74ceba11..7b5a80e47b3 100644 --- a/src/devices/bus/thomson/cc90_232.cpp +++ b/src/devices/bus/thomson/cc90_232.cpp @@ -93,25 +93,25 @@ void cc90_232_device::porta_out(uint8_t data) -WRITE_LINE_MEMBER(cc90_232_device::write_rxd ) +void cc90_232_device::write_rxd(int state) { m_rxd = state; } -WRITE_LINE_MEMBER(cc90_232_device::write_dsr ) +void cc90_232_device::write_dsr(int state) { if (!state) m_last_low = 0; m_dsr = state; } -WRITE_LINE_MEMBER(cc90_232_device::write_cts ) +void cc90_232_device::write_cts(int state) { m_pia_io->ca1_w(state); m_cts = state; } -WRITE_LINE_MEMBER(cc90_232_device::write_centronics_busy ) +void cc90_232_device::write_centronics_busy(int state) { if (!state) m_last_low = 1; diff --git a/src/devices/bus/thomson/cc90_232.h b/src/devices/bus/thomson/cc90_232.h index c17981bedb4..910f8a3bacc 100644 --- a/src/devices/bus/thomson/cc90_232.h +++ b/src/devices/bus/thomson/cc90_232.h @@ -27,10 +27,10 @@ private: // write data register void porta_out(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(write_rxd); - DECLARE_WRITE_LINE_MEMBER(write_cts); - DECLARE_WRITE_LINE_MEMBER(write_dsr); - DECLARE_WRITE_LINE_MEMBER(write_centronics_busy); + void write_rxd(int state); + void write_cts(int state); + void write_dsr(int state); + void write_centronics_busy(int state); required_device m_pia_io; required_device m_rs232; diff --git a/src/devices/bus/thomson/extension.cpp b/src/devices/bus/thomson/extension.cpp index 57c0729faec..205d8a24a88 100644 --- a/src/devices/bus/thomson/extension.cpp +++ b/src/devices/bus/thomson/extension.cpp @@ -47,13 +47,13 @@ thomson_extension_interface::thomson_extension_interface(const machine_config &m { } -WRITE_LINE_MEMBER(thomson_extension_interface::firq_w) +void thomson_extension_interface::firq_w(int state) { if(m_ext) m_ext->m_firq_callback(state); } -WRITE_LINE_MEMBER(thomson_extension_interface::irq_w) +void thomson_extension_interface::irq_w(int state) { if(m_ext) m_ext->m_irq_callback(state); diff --git a/src/devices/bus/thomson/extension.h b/src/devices/bus/thomson/extension.h index 6fed74af0c6..4fe83a8a007 100644 --- a/src/devices/bus/thomson/extension.h +++ b/src/devices/bus/thomson/extension.h @@ -21,8 +21,8 @@ public: virtual void io_map(address_map &map) = 0; protected: - DECLARE_WRITE_LINE_MEMBER(firq_w); - DECLARE_WRITE_LINE_MEMBER(irq_w); + void firq_w(int state); + void irq_w(int state); private: thomson_extension_device *const m_ext; diff --git a/src/devices/bus/thomson/md90_120.cpp b/src/devices/bus/thomson/md90_120.cpp index 2c185342620..d59767a0322 100644 --- a/src/devices/bus/thomson/md90_120.cpp +++ b/src/devices/bus/thomson/md90_120.cpp @@ -57,20 +57,20 @@ void md90_120_device::device_add_mconfig(machine_config &config) } -WRITE_LINE_MEMBER( md90_120_device::modem_cb ) +void md90_120_device::modem_cb(int state) { LOG( "modem_cb: called %i\n", state ); } -WRITE_LINE_MEMBER( md90_120_device::modem_tx_w ) +void md90_120_device::modem_tx_w(int state) { m_modem_tx = state; } -WRITE_LINE_MEMBER( md90_120_device::write_acia_clock ) +void md90_120_device::write_acia_clock(int state) { m_acia->write_txc(state); m_acia->write_rxc(state); diff --git a/src/devices/bus/thomson/md90_120.h b/src/devices/bus/thomson/md90_120.h index 5d022faf7ff..e8d13ff1292 100644 --- a/src/devices/bus/thomson/md90_120.h +++ b/src/devices/bus/thomson/md90_120.h @@ -23,9 +23,9 @@ protected: virtual void device_reset() override; private: - DECLARE_WRITE_LINE_MEMBER( modem_cb ); - DECLARE_WRITE_LINE_MEMBER( modem_tx_w); - DECLARE_WRITE_LINE_MEMBER( write_acia_clock ); + void modem_cb(int state); + void modem_tx_w(int state); + void write_acia_clock(int state); required_device m_acia; diff --git a/src/devices/bus/ti8x/bitsocket.cpp b/src/devices/bus/ti8x/bitsocket.cpp index 1c4feb4ed4f..df14d58292d 100644 --- a/src/devices/bus/ti8x/bitsocket.cpp +++ b/src/devices/bus/ti8x/bitsocket.cpp @@ -29,8 +29,8 @@ protected: virtual void device_add_mconfig(machine_config &config) override; virtual void device_start() override; - virtual DECLARE_WRITE_LINE_MEMBER(input_tip) override; - virtual DECLARE_WRITE_LINE_MEMBER(input_ring) override; + virtual void input_tip(int state) override; + virtual void input_ring(int state) override; TIMER_CALLBACK_MEMBER(poll_tick); @@ -86,14 +86,14 @@ TIMER_CALLBACK_MEMBER(bit_socket_device::poll_tick) } -WRITE_LINE_MEMBER(bit_socket_device::input_tip) +void bit_socket_device::input_tip(int state) { m_tip_in = bool(state); m_stream->output((m_tip_in ? 0x01 : 0x00) | 0x02); } -WRITE_LINE_MEMBER(bit_socket_device::input_ring) +void bit_socket_device::input_ring(int state) { m_ring_in = bool(state); m_stream->output((m_ring_in ? 0x01 : 0x00) | 0x04); diff --git a/src/devices/bus/ti8x/teeconn.cpp b/src/devices/bus/ti8x/teeconn.cpp index b0774684dc7..8a873c4c72d 100644 --- a/src/devices/bus/ti8x/teeconn.cpp +++ b/src/devices/bus/ti8x/teeconn.cpp @@ -19,13 +19,13 @@ protected: virtual void device_add_mconfig(machine_config &config) override; virtual void device_start() override; - virtual DECLARE_WRITE_LINE_MEMBER(input_tip) override; - virtual DECLARE_WRITE_LINE_MEMBER(input_ring) override; + virtual void input_tip(int state) override; + virtual void input_ring(int state) override; - DECLARE_WRITE_LINE_MEMBER(tip_a_w); - DECLARE_WRITE_LINE_MEMBER(ring_a_w); - DECLARE_WRITE_LINE_MEMBER(tip_b_w); - DECLARE_WRITE_LINE_MEMBER(ring_b_w); + void tip_a_w(int state); + void ring_a_w(int state); + void tip_b_w(int state); + void ring_b_w(int state); required_device m_port_a; required_device m_port_b; @@ -54,7 +54,7 @@ tee_connector_device::tee_connector_device( } -WRITE_LINE_MEMBER(tee_connector_device::tip_a_w) +void tee_connector_device::tip_a_w(int state) { m_tip_a = bool(state); output_tip((m_tip_a && m_tip_b) ? 1 : 0); @@ -62,7 +62,7 @@ WRITE_LINE_MEMBER(tee_connector_device::tip_a_w) } -WRITE_LINE_MEMBER(tee_connector_device::ring_a_w) +void tee_connector_device::ring_a_w(int state) { m_ring_a = bool(state); output_ring((m_ring_a && m_ring_b) ? 1 : 0); @@ -70,7 +70,7 @@ WRITE_LINE_MEMBER(tee_connector_device::ring_a_w) } -WRITE_LINE_MEMBER(tee_connector_device::tip_b_w) +void tee_connector_device::tip_b_w(int state) { m_tip_b = bool(state); output_tip((m_tip_a && m_tip_b) ? 1 : 0); @@ -78,7 +78,7 @@ WRITE_LINE_MEMBER(tee_connector_device::tip_b_w) } -WRITE_LINE_MEMBER(tee_connector_device::ring_b_w) +void tee_connector_device::ring_b_w(int state) { m_ring_b = bool(state); output_ring((m_ring_a && m_ring_b) ? 1 : 0); @@ -112,7 +112,7 @@ void tee_connector_device::device_start() } -WRITE_LINE_MEMBER(tee_connector_device::input_tip) +void tee_connector_device::input_tip(int state) { m_tip_host = bool(state); m_port_a->tip_w((m_tip_host && m_tip_b) ? 1 : 0); @@ -120,7 +120,7 @@ WRITE_LINE_MEMBER(tee_connector_device::input_tip) } -WRITE_LINE_MEMBER(tee_connector_device::input_ring) +void tee_connector_device::input_ring(int state) { m_ring_host = bool(state); m_port_a->ring_w((m_ring_host && m_ring_b) ? 1 : 0); diff --git a/src/devices/bus/ti8x/ti8x.cpp b/src/devices/bus/ti8x/ti8x.cpp index 87399276d41..ecc0f58e031 100644 --- a/src/devices/bus/ti8x/ti8x.cpp +++ b/src/devices/bus/ti8x/ti8x.cpp @@ -48,7 +48,7 @@ ti8x_link_port_device::ti8x_link_port_device( } -WRITE_LINE_MEMBER(ti8x_link_port_device::tip_w) +void ti8x_link_port_device::tip_w(int state) { if (bool(state) != m_tip_out) { @@ -59,7 +59,7 @@ WRITE_LINE_MEMBER(ti8x_link_port_device::tip_w) } -WRITE_LINE_MEMBER(ti8x_link_port_device::ring_w) +void ti8x_link_port_device::ring_w(int state) { if (bool(state) != m_ring_out) { @@ -228,7 +228,7 @@ void device_ti8x_link_port_bit_interface::accept_bit() } -WRITE_LINE_MEMBER(device_ti8x_link_port_bit_interface::input_tip) +void device_ti8x_link_port_bit_interface::input_tip(int state) { m_tip_in = bool(state); switch (m_bit_phase) @@ -313,7 +313,7 @@ WRITE_LINE_MEMBER(device_ti8x_link_port_bit_interface::input_tip) } -WRITE_LINE_MEMBER(device_ti8x_link_port_bit_interface::input_ring) +void device_ti8x_link_port_bit_interface::input_ring(int state) { m_ring_in = bool(state); switch (m_bit_phase) diff --git a/src/devices/bus/ti8x/ti8x.h b/src/devices/bus/ti8x/ti8x.h index 759b3523eb1..a757a999ba0 100644 --- a/src/devices/bus/ti8x/ti8x.h +++ b/src/devices/bus/ti8x/ti8x.h @@ -63,11 +63,11 @@ public: auto tip_handler() { return m_tip_handler.bind(); } auto ring_handler() { return m_ring_handler.bind(); } - DECLARE_WRITE_LINE_MEMBER(tip_w); - DECLARE_WRITE_LINE_MEMBER(ring_w); + void tip_w(int state); + void ring_w(int state); - DECLARE_READ_LINE_MEMBER(tip_r) { return m_tip_in ? 1 : 0; } - DECLARE_READ_LINE_MEMBER(ring_r) { return m_ring_in ? 1 : 0; } + int tip_r() { return m_tip_in ? 1 : 0; } + int ring_r() { return m_ring_in ? 1 : 0; } protected: ti8x_link_port_device( @@ -95,9 +95,9 @@ private: class device_ti8x_link_port_interface : public device_interface { public: - DECLARE_WRITE_LINE_MEMBER(output_tip) + void output_tip(int state) { if (bool(state) != m_port->m_tip_in) m_port->m_tip_handler((m_port->m_tip_in = bool(state)) ? 1 : 0); } - DECLARE_WRITE_LINE_MEMBER(output_ring) + void output_ring(int state) { if (bool(state) != m_port->m_ring_in) m_port->m_ring_handler((m_port->m_ring_in = bool(state)) ? 1 : 0); } protected: @@ -106,8 +106,8 @@ protected: ti8x_link_port_device &port() { return *m_port; } private: - virtual DECLARE_WRITE_LINE_MEMBER(input_tip) = 0; - virtual DECLARE_WRITE_LINE_MEMBER(input_ring) = 0; + virtual void input_tip(int state) = 0; + virtual void input_ring(int state) = 0; friend class ti8x_link_port_device; @@ -149,8 +149,8 @@ private: PENDING_1 }; - virtual DECLARE_WRITE_LINE_MEMBER(input_tip) override; - virtual DECLARE_WRITE_LINE_MEMBER(input_ring) override; + virtual void input_tip(int state) override; + virtual void input_ring(int state) override; virtual void bit_collision() = 0; virtual void bit_send_timeout() = 0; diff --git a/src/devices/bus/ti8x/tispeaker.cpp b/src/devices/bus/ti8x/tispeaker.cpp index 2aa5afdcf7d..36ab34caae9 100644 --- a/src/devices/bus/ti8x/tispeaker.cpp +++ b/src/devices/bus/ti8x/tispeaker.cpp @@ -42,12 +42,12 @@ protected: } - virtual DECLARE_WRITE_LINE_MEMBER(input_tip) override + virtual void input_tip(int state) override { m_left_speaker->level_w(state); } - virtual DECLARE_WRITE_LINE_MEMBER(input_ring) override + virtual void input_ring(int state) override { m_right_speaker->level_w(state); } @@ -91,13 +91,13 @@ protected: } - virtual DECLARE_WRITE_LINE_MEMBER(input_tip) override + virtual void input_tip(int state) override { m_tip_state = bool(state); m_speaker->level_w((m_tip_state || m_ring_state) ? 1 : 0); } - virtual DECLARE_WRITE_LINE_MEMBER(input_ring) override + virtual void input_ring(int state) override { m_ring_state = bool(state); m_speaker->level_w((m_tip_state || m_ring_state) ? 1 : 0); diff --git a/src/devices/bus/ti99/gromport/cartridges.cpp b/src/devices/bus/ti99/gromport/cartridges.cpp index b3d4fc4fb15..832d3ca2950 100644 --- a/src/devices/bus/ti99/gromport/cartridges.cpp +++ b/src/devices/bus/ti99/gromport/cartridges.cpp @@ -418,12 +418,12 @@ void ti99_cartridge_device::cruwrite(offs_t offset, uint8_t data) if (m_pcb != nullptr) m_pcb->cruwrite(offset, data); } -WRITE_LINE_MEMBER( ti99_cartridge_device::ready_line ) +void ti99_cartridge_device::ready_line(int state) { m_connector->ready_line(state); } -WRITE_LINE_MEMBER( ti99_cartridge_device::romgq_line ) +void ti99_cartridge_device::romgq_line(int state) { if (m_pcb != nullptr) { @@ -440,7 +440,7 @@ void ti99_cartridge_device::set_gromlines(line_state mline, line_state moline, l if (m_pcb != nullptr) m_pcb->set_gromlines(mline, moline, gsq); } -WRITE_LINE_MEMBER(ti99_cartridge_device::gclock_in) +void ti99_cartridge_device::gclock_in(int state) { if (m_pcb != nullptr) m_pcb->gclock_in(state); } @@ -609,7 +609,7 @@ void ti99_cartridge_pcb::set_grom_pointer(int number, device_t *dev) } -WRITE_LINE_MEMBER( ti99_cartridge_pcb::romgq_line ) +void ti99_cartridge_pcb::romgq_line(int state) { m_romspace_selected = (state==ASSERT_LINE); } @@ -631,7 +631,7 @@ void ti99_cartridge_pcb::set_gromlines(line_state mline, line_state moline, line } } -WRITE_LINE_MEMBER(ti99_cartridge_pcb::gclock_in) +void ti99_cartridge_pcb::gclock_in(int state) { for (auto& elem : m_grom) { diff --git a/src/devices/bus/ti99/gromport/cartridges.h b/src/devices/bus/ti99/gromport/cartridges.h index 2c93b7281b7..4b5de4c0be1 100644 --- a/src/devices/bus/ti99/gromport/cartridges.h +++ b/src/devices/bus/ti99/gromport/cartridges.h @@ -33,12 +33,12 @@ public: void crureadz(offs_t offset, uint8_t *value); void cruwrite(offs_t offset, uint8_t data); - DECLARE_WRITE_LINE_MEMBER(ready_line); - DECLARE_WRITE_LINE_MEMBER(romgq_line); + void ready_line(int state); + void romgq_line(int state); void set_gromlines(line_state mline, line_state moline, line_state gsq); - DECLARE_WRITE_LINE_MEMBER(gclock_in); + void gclock_in(int state); bool is_available() { return m_pcb != nullptr; } void set_slot(int i); @@ -144,9 +144,9 @@ protected: virtual void crureadz(offs_t offset, uint8_t *value); virtual void cruwrite(offs_t offset, uint8_t data); - DECLARE_WRITE_LINE_MEMBER(romgq_line); + void romgq_line(int state); virtual void set_gromlines(line_state mline, line_state moline, line_state gsq); - DECLARE_WRITE_LINE_MEMBER(gclock_in); + void gclock_in(int state); void gromreadz(uint8_t* value); void gromwrite(uint8_t data); diff --git a/src/devices/bus/ti99/gromport/gkracker.cpp b/src/devices/bus/ti99/gromport/gkracker.cpp index 6db175774da..2228a84e25e 100644 --- a/src/devices/bus/ti99/gromport/gkracker.cpp +++ b/src/devices/bus/ti99/gromport/gkracker.cpp @@ -145,7 +145,7 @@ ti99_gkracker_device::ti99_gkracker_device(const machine_config &mconfig, const { } -WRITE_LINE_MEMBER(ti99_gkracker_device::romgq_line) +void ti99_gkracker_device::romgq_line(int state) { m_romspace_selected = (state==ASSERT_LINE); // Propagate to the guest @@ -161,7 +161,7 @@ void ti99_gkracker_device::set_gromlines(line_state mline, line_state moline, li if (m_cartridge != nullptr) m_cartridge->set_gromlines(mline, moline, gsq); } -WRITE_LINE_MEMBER(ti99_gkracker_device::gclock_in) +void ti99_gkracker_device::gclock_in(int state) { if (m_cartridge != nullptr) m_cartridge->gclock_in(state); } diff --git a/src/devices/bus/ti99/gromport/gkracker.h b/src/devices/bus/ti99/gromport/gkracker.h index 76bc457a11e..a163baffd8a 100644 --- a/src/devices/bus/ti99/gromport/gkracker.h +++ b/src/devices/bus/ti99/gromport/gkracker.h @@ -21,10 +21,10 @@ public: void write(offs_t offset, uint8_t data) override; void crureadz(offs_t offset, uint8_t *value) override; void cruwrite(offs_t offset, uint8_t data) override; - DECLARE_WRITE_LINE_MEMBER(romgq_line) override; + void romgq_line(int state) override; void set_gromlines(line_state mline, line_state moline, line_state gsq) override; - DECLARE_WRITE_LINE_MEMBER(gclock_in) override; + void gclock_in(int state) override; void insert(int index, ti99_cartridge_device* cart) override; void remove(int index) override; diff --git a/src/devices/bus/ti99/gromport/gromport.cpp b/src/devices/bus/ti99/gromport/gromport.cpp index 6db2931b017..9afb4161309 100644 --- a/src/devices/bus/ti99/gromport/gromport.cpp +++ b/src/devices/bus/ti99/gromport/gromport.cpp @@ -173,7 +173,7 @@ void gromport_device::cruwrite(offs_t offset, uint8_t data) m_connector->cruwrite(offset, data); } -WRITE_LINE_MEMBER(gromport_device::ready_line) +void gromport_device::ready_line(int state) { m_console_ready(state); } @@ -181,14 +181,14 @@ WRITE_LINE_MEMBER(gromport_device::ready_line) /* Asserted when the console addresses cartridge rom. */ -WRITE_LINE_MEMBER(gromport_device::romgq_line) +void gromport_device::romgq_line(int state) { m_romgq = state; if (m_connector != nullptr) m_connector->romgq_line(state); } -WRITE_LINE_MEMBER(gromport_device::gclock_in) +void gromport_device::gclock_in(int state) { if (m_connector != nullptr) m_connector->gclock_in(state); @@ -278,7 +278,7 @@ cartridge_connector_device::cartridge_connector_device(const machine_config &mco { } -WRITE_LINE_MEMBER( cartridge_connector_device::ready_line ) +void cartridge_connector_device::ready_line(int state) { m_gromport->ready_line(state); } diff --git a/src/devices/bus/ti99/gromport/gromport.h b/src/devices/bus/ti99/gromport/gromport.h index 74c844d7ed7..655046b7cc4 100644 --- a/src/devices/bus/ti99/gromport/gromport.h +++ b/src/devices/bus/ti99/gromport/gromport.h @@ -44,10 +44,10 @@ public: void write(offs_t offset, uint8_t data); void crureadz(offs_t offset, uint8_t *value); void cruwrite(offs_t offset, uint8_t data); - DECLARE_WRITE_LINE_MEMBER(ready_line); - DECLARE_WRITE_LINE_MEMBER(romgq_line); + void ready_line(int state); + void romgq_line(int state); void set_gromlines(line_state mline, line_state moline, line_state gsq); - DECLARE_WRITE_LINE_MEMBER(gclock_in); + void gclock_in(int state); void cartridge_inserted(); bool is_grom_idle(); @@ -83,12 +83,12 @@ public: virtual void crureadz(offs_t offset, uint8_t *value) = 0; virtual void cruwrite(offs_t offset, uint8_t data) = 0; - virtual DECLARE_WRITE_LINE_MEMBER(romgq_line) = 0; + virtual void romgq_line(int state) = 0; virtual void set_gromlines(line_state mline, line_state moline, line_state gsq) =0; - virtual DECLARE_WRITE_LINE_MEMBER(gclock_in) = 0; + virtual void gclock_in(int state) = 0; - DECLARE_WRITE_LINE_MEMBER(ready_line); + void ready_line(int state); virtual void insert(int index, bus::ti99::gromport::ti99_cartridge_device* cart) { m_gromport->cartridge_inserted(); } virtual void remove(int index) { } diff --git a/src/devices/bus/ti99/gromport/multiconn.cpp b/src/devices/bus/ti99/gromport/multiconn.cpp index 4e51f876ab6..22963d1caf0 100644 --- a/src/devices/bus/ti99/gromport/multiconn.cpp +++ b/src/devices/bus/ti99/gromport/multiconn.cpp @@ -137,7 +137,7 @@ void ti99_multi_cart_conn_device::remove(int index) m_cartridge[index] = nullptr; } -WRITE_LINE_MEMBER(ti99_multi_cart_conn_device::romgq_line) +void ti99_multi_cart_conn_device::romgq_line(int state) { m_readrom = state; @@ -169,7 +169,7 @@ void ti99_multi_cart_conn_device::set_gromlines(line_state mline, line_state mol } } -WRITE_LINE_MEMBER(ti99_multi_cart_conn_device::gclock_in) +void ti99_multi_cart_conn_device::gclock_in(int state) { // Propagate to all slots for (int i=0; i < NUMBER_OF_CARTRIDGE_SLOTS; i++) diff --git a/src/devices/bus/ti99/gromport/multiconn.h b/src/devices/bus/ti99/gromport/multiconn.h index 517224eff14..fd4af556f8f 100644 --- a/src/devices/bus/ti99/gromport/multiconn.h +++ b/src/devices/bus/ti99/gromport/multiconn.h @@ -26,9 +26,9 @@ public: void write(offs_t offset, uint8_t data) override; void crureadz(offs_t offset, uint8_t *value) override; void cruwrite(offs_t offset, uint8_t data) override; - DECLARE_WRITE_LINE_MEMBER(romgq_line) override; + void romgq_line(int state) override; void set_gromlines(line_state mline, line_state moline, line_state gsq) override; - DECLARE_WRITE_LINE_MEMBER(gclock_in) override; + void gclock_in(int state) override; void insert(int index, ti99_cartridge_device* cart) override; void remove(int index) override; diff --git a/src/devices/bus/ti99/gromport/singleconn.cpp b/src/devices/bus/ti99/gromport/singleconn.cpp index e24a3ba416a..35469762a65 100644 --- a/src/devices/bus/ti99/gromport/singleconn.cpp +++ b/src/devices/bus/ti99/gromport/singleconn.cpp @@ -43,7 +43,7 @@ void ti99_single_cart_conn_device::cruwrite(offs_t offset, uint8_t data) m_cartridge->cruwrite(offset, data); } -WRITE_LINE_MEMBER(ti99_single_cart_conn_device::romgq_line) +void ti99_single_cart_conn_device::romgq_line(int state) { // Pass through m_cartridge->romgq_line(state); @@ -59,7 +59,7 @@ void ti99_single_cart_conn_device::set_gromlines(line_state mline, line_state mo } -WRITE_LINE_MEMBER(ti99_single_cart_conn_device::gclock_in) +void ti99_single_cart_conn_device::gclock_in(int state) { // Pass through m_cartridge->gclock_in(state); diff --git a/src/devices/bus/ti99/gromport/singleconn.h b/src/devices/bus/ti99/gromport/singleconn.h index 40627a07867..6cf9d09240c 100644 --- a/src/devices/bus/ti99/gromport/singleconn.h +++ b/src/devices/bus/ti99/gromport/singleconn.h @@ -22,9 +22,9 @@ public: void write(offs_t offset, uint8_t data) override; void crureadz(offs_t offset, uint8_t *value) override; void cruwrite(offs_t offset, uint8_t data) override; - DECLARE_WRITE_LINE_MEMBER(romgq_line) override; + void romgq_line(int state) override; void set_gromlines(line_state mline, line_state moline, line_state gsq) override; - DECLARE_WRITE_LINE_MEMBER(gclock_in) override; + void gclock_in(int state) override; bool is_grom_idle() override; diff --git a/src/devices/bus/ti99/internal/992board.cpp b/src/devices/bus/ti99/internal/992board.cpp index 2132bab43d5..99a52a26d6e 100644 --- a/src/devices/bus/ti99/internal/992board.cpp +++ b/src/devices/bus/ti99/internal/992board.cpp @@ -278,7 +278,7 @@ uint32_t video992_device::screen_update(screen_device &screen, bitmap_rgb32 &bit /* VIDENA pin, positive logic */ -WRITE_LINE_MEMBER(video992_device::videna) +void video992_device::videna(int state) { m_videna = state; } diff --git a/src/devices/bus/ti99/internal/992board.h b/src/devices/bus/ti99/internal/992board.h index 573ab319bdf..ec345ebce0a 100644 --- a/src/devices/bus/ti99/internal/992board.h +++ b/src/devices/bus/ti99/internal/992board.h @@ -46,7 +46,7 @@ public: uint32_t screen_update( screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect ); // Video enable - DECLARE_WRITE_LINE_MEMBER( videna ); + void videna(int state); // Callbacks auto readmem_cb() { return m_mem_read_cb.bind(); } diff --git a/src/devices/bus/ti99/internal/998board.cpp b/src/devices/bus/ti99/internal/998board.cpp index fafd71c1bcd..f435687554d 100644 --- a/src/devices/bus/ti99/internal/998board.cpp +++ b/src/devices/bus/ti99/internal/998board.cpp @@ -414,12 +414,12 @@ void mainboard8_device::setaddress(offs_t offset, uint8_t busctrl) m_ready(m_amigo->cpury_out()); } -WRITE_LINE_MEMBER( mainboard8_device::reset_console ) +void mainboard8_device::reset_console(int state) { m_console_reset(state); } -WRITE_LINE_MEMBER( mainboard8_device::hold_cpu ) +void mainboard8_device::hold_cpu(int state) { m_hold_line(state); } @@ -427,7 +427,7 @@ WRITE_LINE_MEMBER( mainboard8_device::hold_cpu ) /* HOLD Acknowledge from the CPU */ -WRITE_LINE_MEMBER( mainboard8_device::holda_line ) +void mainboard8_device::holda_line(int state) { m_amigo->holda_in(state); } @@ -435,7 +435,7 @@ WRITE_LINE_MEMBER( mainboard8_device::holda_line ) /* Clock line from the CPU. Forward to the custom chips. */ -WRITE_LINE_MEMBER( mainboard8_device::clock_in ) +void mainboard8_device::clock_in(int state) { LOGMASKED(LOG_CLOCK, "CLKOUT = %d\n", state); @@ -686,7 +686,7 @@ void mainboard8_device::set_paddress(int address) m_ioport->setaddress_dbin(address, m_dbin_level); } -WRITE_LINE_MEMBER( mainboard8_device::msast_in ) +void mainboard8_device::msast_in(int state) { LOGMASKED(LOG_DETAIL, "msast = %d\n", state); @@ -960,7 +960,7 @@ void mainboard8_device::write(offs_t offset, uint8_t data) /* Set 99/4A compatibility mode (CRUS=1) */ -WRITE_LINE_MEMBER( mainboard8_device::crus_in ) +void mainboard8_device::crus_in(int state) { LOGMASKED(LOG_CRU, "%s CRUS\n", (state==1)? "Assert" : "Clear"); m_vaquerro->crus_in(state); @@ -972,7 +972,7 @@ WRITE_LINE_MEMBER( mainboard8_device::crus_in ) Set mapper /PTGEN line ("Pascal and Text-to-speech GROMs enable"). Note that PTGEN is negative logic. */ -WRITE_LINE_MEMBER( mainboard8_device::ptgen_in ) +void mainboard8_device::ptgen_in(int state) { LOGMASKED(LOG_CRU, "%s PTGEN*\n", (state==0)? "Assert" : "Clear"); m_vaquerro->crusgl_in((state==0)? ASSERT_LINE : CLEAR_LINE); @@ -982,43 +982,43 @@ WRITE_LINE_MEMBER( mainboard8_device::ptgen_in ) /* READY lines, to be combined */ -WRITE_LINE_MEMBER( mainboard8_device::system_grom_ready ) +void mainboard8_device::system_grom_ready(int state) { m_vaquerro->sgmry(state); } -WRITE_LINE_MEMBER( mainboard8_device::ptts_grom_ready ) +void mainboard8_device::ptts_grom_ready(int state) { m_vaquerro->tsgry(state); } -WRITE_LINE_MEMBER( mainboard8_device::p8_grom_ready ) +void mainboard8_device::p8_grom_ready(int state) { m_vaquerro->p8gry(state); } -WRITE_LINE_MEMBER( mainboard8_device::p3_grom_ready ) +void mainboard8_device::p3_grom_ready(int state) { m_vaquerro->p3gry(state); } -WRITE_LINE_MEMBER( mainboard8_device::sound_ready ) +void mainboard8_device::sound_ready(int state) { m_sound_ready = state; } -WRITE_LINE_MEMBER( mainboard8_device::speech_ready ) +void mainboard8_device::speech_ready(int state) { // The TMS5200 implementation uses true/false, not ASSERT/CLEAR semantics m_speech_ready = (state==false)? ASSERT_LINE : CLEAR_LINE; } -WRITE_LINE_MEMBER( mainboard8_device::pbox_ready ) +void mainboard8_device::pbox_ready(int state) { m_pbox_ready = state; } -WRITE_LINE_MEMBER( mainboard8_device::ggrdy_in ) +void mainboard8_device::ggrdy_in(int state) { m_amigo->srdy_in((state==ASSERT_LINE && m_speech_ready && m_sound_ready && m_pbox_ready)? ASSERT_LINE : CLEAR_LINE); } @@ -1254,17 +1254,17 @@ void vaquerro_device::set_address(offs_t offset, int state) } } -WRITE_LINE_MEMBER( vaquerro_device::crusgl_in ) +void vaquerro_device::crusgl_in(int state) { m_crugl = (state==ASSERT_LINE); } -WRITE_LINE_MEMBER( vaquerro_device::crus_in ) +void vaquerro_device::crus_in(int state) { m_crus = (line_state)state; } -WRITE_LINE_MEMBER( vaquerro_device::memen_in ) +void vaquerro_device::memen_in(int state) { m_memen = (state==ASSERT_LINE); } @@ -1272,7 +1272,7 @@ WRITE_LINE_MEMBER( vaquerro_device::memen_in ) /* Called by Mofetta */ -READ_LINE_MEMBER( vaquerro_device::lascsq_out ) +int vaquerro_device::lascsq_out() { return (m_lasreq && m_memen)? ASSERT_LINE : CLEAR_LINE; } @@ -1280,25 +1280,25 @@ READ_LINE_MEMBER( vaquerro_device::lascsq_out ) /* Incoming ready lines from the GROM library */ -WRITE_LINE_MEMBER( vaquerro_device::sgmry ) +void vaquerro_device::sgmry(int state) { LOGMASKED(LOG_READY, "Incoming SGMRY = %d\n", state); m_sgmws.ready_in((line_state)state); } -WRITE_LINE_MEMBER( vaquerro_device::tsgry ) +void vaquerro_device::tsgry(int state) { LOGMASKED(LOG_READY, "Incoming TSGRY = %d\n", state); m_tsgws.ready_in((line_state)state); } -WRITE_LINE_MEMBER( vaquerro_device::p8gry ) +void vaquerro_device::p8gry(int state) { LOGMASKED(LOG_READY, "Incoming 8GRY = %d\n", state); m_p8gws.ready_in((line_state)state); } -WRITE_LINE_MEMBER( vaquerro_device::p3gry ) +void vaquerro_device::p3gry(int state) { LOGMASKED(LOG_READY, "Incoming P3GRY = %d\n", state); m_p3gws.ready_in((line_state)state); @@ -1307,7 +1307,7 @@ WRITE_LINE_MEMBER( vaquerro_device::p3gry ) /* Outgoing READY */ -READ_LINE_MEMBER( vaquerro_device::ggrdy_out ) +int vaquerro_device::ggrdy_out() { LOGMASKED(LOG_READY, "GGRDY out = %d\n", m_ggrdy); return m_ggrdy; @@ -1326,32 +1326,32 @@ int vaquerro_device::gromcs_out() // ========================= -READ_LINE_MEMBER( vaquerro_device::vdprd_out ) +int vaquerro_device::vdprd_out() { return (m_vdprd && m_memen)? ASSERT_LINE : CLEAR_LINE; } -READ_LINE_MEMBER( vaquerro_device::vdpwt_out ) +int vaquerro_device::vdpwt_out() { return (m_vdpwt && m_memen)? ASSERT_LINE : CLEAR_LINE; } -READ_LINE_MEMBER( vaquerro_device::sprd_out ) +int vaquerro_device::sprd_out() { return (m_sprd && m_memen)? ASSERT_LINE : CLEAR_LINE; } -READ_LINE_MEMBER( vaquerro_device::spwt_out ) +int vaquerro_device::spwt_out() { return (m_spwt && m_memen)? ASSERT_LINE : CLEAR_LINE; } -READ_LINE_MEMBER( vaquerro_device::sromcs_out ) +int vaquerro_device::sromcs_out() { return (m_sromcs && m_memen)? ASSERT_LINE : CLEAR_LINE; } -READ_LINE_MEMBER( vaquerro_device::sccs_out ) +int vaquerro_device::sccs_out() { return (m_sccs && m_memen)? ASSERT_LINE : CLEAR_LINE; } @@ -1366,7 +1366,7 @@ READ_LINE_MEMBER( vaquerro_device::sccs_out ) access occurs, the system READY line will be cleared, triggering wait states in the CPU. */ -WRITE_LINE_MEMBER( vaquerro_device::clock_in ) +void vaquerro_device::clock_in(int state) { line_state level = (line_state)state; @@ -1662,7 +1662,7 @@ void mofetta_device::set_address(offs_t offset, int state) Mofetta delivers the GROMCLK. In the 99/4A, this clock is produced by the VDP. Apart from that, Mofetta does not need the CLKOUT. */ -WRITE_LINE_MEMBER( mofetta_device::clock_in ) +void mofetta_device::clock_in(int state) { if (state == CLEAR_LINE) // TODO: Correct edge? { @@ -1675,37 +1675,37 @@ WRITE_LINE_MEMBER( mofetta_device::clock_in ) } } -READ_LINE_MEMBER( mofetta_device::alccs_out ) +int mofetta_device::alccs_out() { return (m_alccs && m_pmemen)? ASSERT_LINE : CLEAR_LINE; } -READ_LINE_MEMBER( mofetta_device::gromclk_out ) +int mofetta_device::gromclk_out() { return m_gromclk_up? ASSERT_LINE : CLEAR_LINE; } -READ_LINE_MEMBER( mofetta_device::rom1cs_out ) +int mofetta_device::rom1cs_out() { return (m_rom1cs && m_pmemen)? ASSERT_LINE : CLEAR_LINE; } -READ_LINE_MEMBER( mofetta_device::rom1am_out ) +int mofetta_device::rom1am_out() { return (m_rom1am && m_pmemen)? ASSERT_LINE : CLEAR_LINE; } -READ_LINE_MEMBER( mofetta_device::rom1al_out ) +int mofetta_device::rom1al_out() { return (m_rom1al && m_pmemen)? ASSERT_LINE : CLEAR_LINE; } -READ_LINE_MEMBER( mofetta_device::prcs_out ) +int mofetta_device::prcs_out() { return (m_prcs && m_pmemen)? ASSERT_LINE : CLEAR_LINE; } -READ_LINE_MEMBER( mofetta_device::cmas_out ) +int mofetta_device::cmas_out() { return (m_cmas && m_pmemen)? ASSERT_LINE : CLEAR_LINE; } @@ -1713,7 +1713,7 @@ READ_LINE_MEMBER( mofetta_device::cmas_out ) /* Asserted when a PEB access occurs */ -READ_LINE_MEMBER( mofetta_device::dbc_out ) +int mofetta_device::dbc_out() { return (m_lasreq || m_cmas || m_rom1cs || m_skdrcs || !m_pmemen)? CLEAR_LINE : ASSERT_LINE; } @@ -1762,7 +1762,7 @@ void mofetta_device::cruwrite(offs_t offset, uint8_t data) /* Setting or clearing the MSAST line. */ -WRITE_LINE_MEMBER( mofetta_device::msast_in ) +void mofetta_device::msast_in(int state) { if (state == ASSERT_LINE) { @@ -1777,17 +1777,17 @@ WRITE_LINE_MEMBER( mofetta_device::msast_in ) m_msast = (line_state)state; } -WRITE_LINE_MEMBER( mofetta_device::pmemen_in ) +void mofetta_device::pmemen_in(int state) { m_pmemen = (state==ASSERT_LINE); } -WRITE_LINE_MEMBER( mofetta_device::lascs_in ) +void mofetta_device::lascs_in(int state) { m_lasreq = (state==ASSERT_LINE); } -WRITE_LINE_MEMBER( mofetta_device::skdrcs_in ) +void mofetta_device::skdrcs_in(int state) { m_skdrcs = (state==ASSERT_LINE); } @@ -1924,7 +1924,7 @@ int amigo_device::get_physical_address_debug(offs_t offset) /* Incoming READY line (SRDY) */ -WRITE_LINE_MEMBER( amigo_device::srdy_in ) +void amigo_device::srdy_in(int state) { LOGMASKED(LOG_READY, "Incoming SRDY = %d\n", state); m_srdy = (line_state)state; @@ -1937,7 +1937,7 @@ WRITE_LINE_MEMBER( amigo_device::srdy_in ) } } -WRITE_LINE_MEMBER( amigo_device::memen_in ) +void amigo_device::memen_in(int state) { m_memen = (state==ASSERT_LINE); } @@ -1945,7 +1945,7 @@ WRITE_LINE_MEMBER( amigo_device::memen_in ) /* Polled from the mainboard */ -READ_LINE_MEMBER( amigo_device::cpury_out ) +int amigo_device::cpury_out() { return m_ready_out; } @@ -1953,7 +1953,7 @@ READ_LINE_MEMBER( amigo_device::cpury_out ) /* Polled from the mainboard */ -READ_LINE_MEMBER( amigo_device::sramcs_out ) +int amigo_device::sramcs_out() { return m_sram_accessed && m_memen? ASSERT_LINE : CLEAR_LINE; } @@ -1964,7 +1964,7 @@ READ_LINE_MEMBER( amigo_device::sramcs_out ) This is actually more than needed because we only have 64K DRAM (which would only need a 16 bit address), and Amigo itself selects it. */ -READ_LINE_MEMBER( amigo_device::skdrcs_out ) +int amigo_device::skdrcs_out() { return m_dram_accessed && (m_amstate == IDLE) && m_memen? ASSERT_LINE : CLEAR_LINE; } @@ -1972,7 +1972,7 @@ READ_LINE_MEMBER( amigo_device::skdrcs_out ) /* Incoming CRUS line. Needed to set the mapper config addresses. */ -WRITE_LINE_MEMBER( amigo_device::crus_in ) +void amigo_device::crus_in(int state) { m_crus = (line_state)state; } @@ -1980,7 +1980,7 @@ WRITE_LINE_MEMBER( amigo_device::crus_in ) /* Incoming LASCS line. */ -WRITE_LINE_MEMBER( amigo_device::lascs_in ) +void amigo_device::lascs_in(int state) { m_logical_space = (state==ASSERT_LINE); } @@ -2076,7 +2076,7 @@ void amigo_device::write(uint8_t data) else LOGMASKED(LOG_WARN, "Invalid value written to Amigo: %02x\n", data); } -WRITE_LINE_MEMBER( amigo_device::clock_in ) +void amigo_device::clock_in(int state) { if (state==CLEAR_LINE) { @@ -2184,7 +2184,7 @@ void amigo_device::mapper_access_debug(int data) } } -WRITE_LINE_MEMBER( amigo_device::holda_in ) +void amigo_device::holda_in(int state) { LOGMASKED(LOG_MAP, "HOLD acknowledged = %d\n", state); m_hold_acknowledged = (state==ASSERT_LINE); @@ -2383,7 +2383,7 @@ void oso_device::clear_int_status() /* Phi3 incoming clock pulse */ -WRITE_LINE_MEMBER( oso_device::clock_in ) +void oso_device::clock_in(int state) { m_phi3 = state; if (state==ASSERT_LINE) diff --git a/src/devices/bus/ti99/internal/998board.h b/src/devices/bus/ti99/internal/998board.h index f699b8d02cf..fea5f18e412 100644 --- a/src/devices/bus/ti99/internal/998board.h +++ b/src/devices/bus/ti99/internal/998board.h @@ -107,29 +107,29 @@ public: void set_address(offs_t offset, int state); - DECLARE_READ_LINE_MEMBER( sprd_out ); - DECLARE_READ_LINE_MEMBER( spwt_out ); - DECLARE_READ_LINE_MEMBER( sccs_out ); - DECLARE_READ_LINE_MEMBER( sromcs_out ); + int sprd_out(); + int spwt_out(); + int sccs_out(); + int sromcs_out(); // Collective select line query int gromcs_out(); - DECLARE_READ_LINE_MEMBER( vdprd_out ); - DECLARE_READ_LINE_MEMBER( vdpwt_out ); - DECLARE_READ_LINE_MEMBER( lascsq_out ); - DECLARE_READ_LINE_MEMBER( ggrdy_out ); - DECLARE_WRITE_LINE_MEMBER( hold_cpu ); + int vdprd_out(); + int vdpwt_out(); + int lascsq_out(); + int ggrdy_out(); + void hold_cpu(int state); - DECLARE_WRITE_LINE_MEMBER( crus_in ); - DECLARE_WRITE_LINE_MEMBER( crusgl_in ); - DECLARE_WRITE_LINE_MEMBER( clock_in ); - DECLARE_WRITE_LINE_MEMBER( memen_in ); + void crus_in(int state); + void crusgl_in(int state); + void clock_in(int state); + void memen_in(int state); - DECLARE_WRITE_LINE_MEMBER( sgmry ); - DECLARE_WRITE_LINE_MEMBER( tsgry ); - DECLARE_WRITE_LINE_MEMBER( p8gry ); - DECLARE_WRITE_LINE_MEMBER( p3gry ); + void sgmry(int state); + void tsgry(int state); + void p8gry(int state); + void p3gry(int state); private: /* @@ -258,22 +258,22 @@ public: bool hexbus_access_debug(); bool intdsr_access_debug(); - DECLARE_WRITE_LINE_MEMBER( clock_in ); - DECLARE_WRITE_LINE_MEMBER( msast_in ); - DECLARE_WRITE_LINE_MEMBER( lascs_in ); - DECLARE_WRITE_LINE_MEMBER( pmemen_in ); - DECLARE_WRITE_LINE_MEMBER( skdrcs_in ); + void clock_in(int state); + void msast_in(int state); + void lascs_in(int state); + void pmemen_in(int state); + void skdrcs_in(int state); - DECLARE_READ_LINE_MEMBER( gromclk_out ); + int gromclk_out(); - DECLARE_READ_LINE_MEMBER( alccs_out ); - DECLARE_READ_LINE_MEMBER( prcs_out ); - DECLARE_READ_LINE_MEMBER( cmas_out ); - DECLARE_READ_LINE_MEMBER( dbc_out ); + int alccs_out(); + int prcs_out(); + int cmas_out(); + int dbc_out(); - DECLARE_READ_LINE_MEMBER( rom1cs_out ); - DECLARE_READ_LINE_MEMBER( rom1am_out ); - DECLARE_READ_LINE_MEMBER( rom1al_out ); + int rom1cs_out(); + int rom1am_out(); + int rom1al_out(); private: // Memory cycle state @@ -345,17 +345,17 @@ public: int get_physical_address_debug(offs_t offset); void mapper_access_debug(int data); - DECLARE_WRITE_LINE_MEMBER( srdy_in ); - DECLARE_WRITE_LINE_MEMBER( clock_in ); - DECLARE_WRITE_LINE_MEMBER( crus_in ); - DECLARE_WRITE_LINE_MEMBER( lascs_in ); - DECLARE_WRITE_LINE_MEMBER( memen_in ); + void srdy_in(int state); + void clock_in(int state); + void crus_in(int state); + void lascs_in(int state); + void memen_in(int state); - DECLARE_WRITE_LINE_MEMBER( holda_in ); + void holda_in(int state); - DECLARE_READ_LINE_MEMBER( cpury_out ); - DECLARE_READ_LINE_MEMBER( sramcs_out ); - DECLARE_READ_LINE_MEMBER( skdrcs_out ); + int cpury_out(); + int sramcs_out(); + int skdrcs_out(); void connect_sram(uint8_t* sram) { m_sram = sram; } bool mapper_accessed() { return m_mapper_accessed; } @@ -460,7 +460,7 @@ public: void device_start() override; void hexbus_value_changed(uint8_t data) override; - WRITE_LINE_MEMBER( clock_in ); + void clock_in(int state); // INT line devcb_write_line m_int; @@ -556,16 +556,16 @@ public: void cruwrite(offs_t offset, uint8_t data); // Control lines - DECLARE_WRITE_LINE_MEMBER( clock_in ); - DECLARE_WRITE_LINE_MEMBER( dbin_in ); - DECLARE_WRITE_LINE_MEMBER( msast_in ); - DECLARE_WRITE_LINE_MEMBER( crus_in ); - DECLARE_WRITE_LINE_MEMBER( ptgen_in ); - DECLARE_WRITE_LINE_MEMBER( reset_console ); - DECLARE_WRITE_LINE_MEMBER( hold_cpu ); - DECLARE_WRITE_LINE_MEMBER( ggrdy_in ); + void clock_in(int state); + void dbin_in(int state); + void msast_in(int state); + void crus_in(int state); + void ptgen_in(int state); + void reset_console(int state); + void hold_cpu(int state); + void ggrdy_in(int state); - DECLARE_WRITE_LINE_MEMBER( holda_line ); + void holda_line(int state); auto ready_cb() { return m_ready.bind(); } auto reset_cb() { return m_console_reset.bind(); } @@ -574,13 +574,13 @@ public: void set_paddress(int address); // Ready lines from GROMs - DECLARE_WRITE_LINE_MEMBER( system_grom_ready ); - DECLARE_WRITE_LINE_MEMBER( ptts_grom_ready ); - DECLARE_WRITE_LINE_MEMBER( p8_grom_ready ); - DECLARE_WRITE_LINE_MEMBER( p3_grom_ready ); - DECLARE_WRITE_LINE_MEMBER( sound_ready ); - DECLARE_WRITE_LINE_MEMBER( speech_ready ); - DECLARE_WRITE_LINE_MEMBER( pbox_ready ); + void system_grom_ready(int state); + void ptts_grom_ready(int state); + void p8_grom_ready(int state); + void p3_grom_ready(int state); + void sound_ready(int state); + void speech_ready(int state); + void pbox_ready(int state); protected: void device_start() override; diff --git a/src/devices/bus/ti99/internal/datamux.cpp b/src/devices/bus/ti99/internal/datamux.cpp index c9cf3d25fbf..1dd8ee3ed0a 100644 --- a/src/devices/bus/ti99/internal/datamux.cpp +++ b/src/devices/bus/ti99/internal/datamux.cpp @@ -481,7 +481,7 @@ void datamux_device::setaddress(offs_t offset, uint16_t busctrl) The datamux is connected to the clock line in order to operate the wait state counter and to read/write the bytes. */ -WRITE_LINE_MEMBER( datamux_device::clock_in ) +void datamux_device::clock_in(int state) { // return immediately if the datamux is currently inactive if (m_waitcount>0) @@ -548,7 +548,7 @@ void datamux_device::ready_join() m_ready((m_sysready==CLEAR_LINE || m_muxready==CLEAR_LINE)? CLEAR_LINE : ASSERT_LINE); } -WRITE_LINE_MEMBER( datamux_device::ready_line ) +void datamux_device::ready_line(int state) { if (state != m_sysready) LOGMASKED(LOG_READY, "READY line from PBox = %d\n", state); m_sysready = (line_state)state; @@ -557,7 +557,7 @@ WRITE_LINE_MEMBER( datamux_device::ready_line ) } /* Called from VDP via console. */ -WRITE_LINE_MEMBER( datamux_device::gromclk_in ) +void datamux_device::gromclk_in(int state) { // Don't propagate the clock in idle phase if (m_grom_idle) return; diff --git a/src/devices/bus/ti99/internal/datamux.h b/src/devices/bus/ti99/internal/datamux.h index 8fb9a7a8c08..f83b81dc807 100644 --- a/src/devices/bus/ti99/internal/datamux.h +++ b/src/devices/bus/ti99/internal/datamux.h @@ -48,11 +48,11 @@ public: void write(offs_t offset, uint16_t data); void setaddress(offs_t offset, uint16_t busctrl); - DECLARE_WRITE_LINE_MEMBER( clock_in ); - DECLARE_WRITE_LINE_MEMBER( dbin_in ); - DECLARE_WRITE_LINE_MEMBER( ready_line ); + void clock_in(int state); + void dbin_in(int state); + void ready_line(int state); - DECLARE_WRITE_LINE_MEMBER( gromclk_in ); + void gromclk_in(int state); auto ready_cb() { return m_ready.bind(); } diff --git a/src/devices/bus/ti99/internal/evpcconn.cpp b/src/devices/bus/ti99/internal/evpcconn.cpp index 2b7647d52dd..81598f3d893 100644 --- a/src/devices/bus/ti99/internal/evpcconn.cpp +++ b/src/devices/bus/ti99/internal/evpcconn.cpp @@ -32,7 +32,7 @@ evpc_clock_connector::evpc_clock_connector(const machine_config &mconfig, const { } -WRITE_LINE_MEMBER( evpc_clock_connector::vclock_line ) +void evpc_clock_connector::vclock_line(int state) { m_vdpint(state); } diff --git a/src/devices/bus/ti99/internal/evpcconn.h b/src/devices/bus/ti99/internal/evpcconn.h index 4216b7e0028..09b1b576521 100644 --- a/src/devices/bus/ti99/internal/evpcconn.h +++ b/src/devices/bus/ti99/internal/evpcconn.h @@ -20,7 +20,7 @@ class evpc_clock_connector : public device_t public: evpc_clock_connector(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - DECLARE_WRITE_LINE_MEMBER( vclock_line ); + void vclock_line(int state); void device_start() override; auto vdpint_cb() { return m_vdpint.bind(); } diff --git a/src/devices/bus/ti99/internal/genboard.cpp b/src/devices/bus/ti99/internal/genboard.cpp index 7905f150f8a..a4e6d127c4b 100644 --- a/src/devices/bus/ti99/internal/genboard.cpp +++ b/src/devices/bus/ti99/internal/genboard.cpp @@ -563,7 +563,7 @@ void geneve_gate_array_device::cru_ctrl_write(offs_t offset, uint8_t data) Pull down or release the clock line. Called by setting CRU bit 1EF0 to 0 or 1. */ -WRITE_LINE_MEMBER( geneve_gate_array_device::set_keyboard_clock) +void geneve_gate_array_device::set_keyboard_clock(int state) { m_keyb_clk(state); } @@ -576,7 +576,7 @@ WRITE_LINE_MEMBER( geneve_gate_array_device::set_keyboard_clock) Called by setting CRU bit 1EF2 to 0 or 1 */ -WRITE_LINE_MEMBER( geneve_gate_array_device::enable_shift_register) +void geneve_gate_array_device::enable_shift_register(int state) { m_shift_reg_enabled = (state==ASSERT_LINE); @@ -607,7 +607,7 @@ void geneve_gate_array_device::shift_reg_changed() Incoming keyboard strobe. When 0, push the current data line level into the shift register at the leftmost position. */ -WRITE_LINE_MEMBER( geneve_gate_array_device::kbdclk ) +void geneve_gate_array_device::kbdclk(int state) { LOGMASKED(LOG_KEYBOARD, "Keyboard clock: %d\n", state); bool clock_falling_edge = (m_keyboard_last_clock == ASSERT_LINE && state == CLEAR_LINE); @@ -624,7 +624,7 @@ WRITE_LINE_MEMBER( geneve_gate_array_device::kbdclk ) /* Latch the value of the incoming data line. */ -WRITE_LINE_MEMBER( geneve_gate_array_device::kbddata ) +void geneve_gate_array_device::kbddata(int state) { LOGMASKED(LOG_KEYBOARD, "Keyboard data: %d\n", state); m_keyboard_data_in = (line_state)state; @@ -890,7 +890,7 @@ void geneve_gate_array_device::setaddress(offs_t address, uint8_t busctrl) The Gate Array uses the clock to operate the wait state flags. The actual wait state generation is up to the PAL chip. */ -WRITE_LINE_MEMBER( geneve_gate_array_device::clock_in ) +void geneve_gate_array_device::clock_in(int state) { // Falling CLK if (state == CLEAR_LINE) @@ -906,64 +906,64 @@ WRITE_LINE_MEMBER( geneve_gate_array_device::clock_in ) READY line from the peribox. Together with the sndready and the READY output of the Gate Array itself, this forms a wired AND. */ -WRITE_LINE_MEMBER( geneve_gate_array_device::extready_in ) +void geneve_gate_array_device::extready_in(int state) { LOGMASKED(LOG_READY, "External READY = %d\n", state); m_extready = (state==ASSERT_LINE); } -WRITE_LINE_MEMBER( geneve_gate_array_device::sndready_in ) +void geneve_gate_array_device::sndready_in(int state) { LOGMASKED(LOG_READY, "Sound READY = %d\n", state); m_sndready = (state==ASSERT_LINE); } -READ_LINE_MEMBER(geneve_gate_array_device::csw_out) +int geneve_gate_array_device::csw_out() { // Do not access a port-based device in debugger mode if (m_debug) return CLEAR_LINE; return ((m_decoded.function == MLVIDEO) && !m_decoded.read)? ASSERT_LINE : CLEAR_LINE; } -READ_LINE_MEMBER(geneve_gate_array_device::csr_out) +int geneve_gate_array_device::csr_out() { // Do not access a port-based device in debugger mode if (m_debug) return CLEAR_LINE; return ((m_decoded.function == MLVIDEO) && m_decoded.read)? ASSERT_LINE : CLEAR_LINE; } -READ_LINE_MEMBER(geneve_gate_array_device::romen_out) +int geneve_gate_array_device::romen_out() { // Do not restrict to read-only, as we could have a PFM here decdata* dec = (m_debug)? &m_decdebug : &m_decoded; return (dec->function == MPEPROM)? ASSERT_LINE : CLEAR_LINE; } -READ_LINE_MEMBER(geneve_gate_array_device::ramen_out) +int geneve_gate_array_device::ramen_out() { decdata* dec = (m_debug)? &m_decdebug : &m_decoded; return (dec->function == MPSRAM)? ASSERT_LINE : CLEAR_LINE; } -READ_LINE_MEMBER(geneve_gate_array_device::ramenx_out) +int geneve_gate_array_device::ramenx_out() { decdata* dec = (m_debug)? &m_decdebug : &m_decoded; return (dec->function == MPSRAMX)? ASSERT_LINE : CLEAR_LINE; } -READ_LINE_MEMBER(geneve_gate_array_device::rtcen_out) +int geneve_gate_array_device::rtcen_out() { decdata* dec = (m_debug)? &m_decdebug : &m_decoded; return (dec->function == MLCLOCK)? ASSERT_LINE : CLEAR_LINE; } -READ_LINE_MEMBER(geneve_gate_array_device::snden_out) +int geneve_gate_array_device::snden_out() { decdata* dec = (m_debug)? &m_decdebug : &m_decoded; return ((dec->function == MLSOUND) && !dec->read)? ASSERT_LINE : CLEAR_LINE; } -READ_LINE_MEMBER(geneve_gate_array_device::dben_out) +int geneve_gate_array_device::dben_out() { decdata* dec = (m_debug)? &m_decdebug : &m_decoded; return accessing_box_s(dec->function, false)? ASSERT_LINE : CLEAR_LINE; @@ -980,7 +980,7 @@ READ_LINE_MEMBER(geneve_gate_array_device::dben_out) // - we access DRAM and have timode==1 OR // - extready = 0 -READ_LINE_MEMBER(geneve_gate_array_device::gaready_out) +int geneve_gate_array_device::gaready_out() { if (m_debug) return ASSERT_LINE; // Always READY when debugging // Return true (READY=1) when we are accessing SRAM/SRAMX and when we do not have extra waitstates @@ -1193,7 +1193,7 @@ geneve_pal_device::geneve_pal_device(const machine_config &mconfig, const char * /* READY input from the Gate Array. */ -WRITE_LINE_MEMBER(geneve_pal_device::gaready_in) +void geneve_pal_device::gaready_in(int state) { bool prev = m_pin3; m_pin3 = (state==ASSERT_LINE); @@ -1208,7 +1208,7 @@ WRITE_LINE_MEMBER(geneve_pal_device::gaready_in) /* Video read (ASSERT=low). */ -WRITE_LINE_MEMBER(geneve_pal_device::csr_in) +void geneve_pal_device::csr_in(int state) { bool prev = m_pin4; m_pin4 = (state==CLEAR_LINE); @@ -1222,7 +1222,7 @@ WRITE_LINE_MEMBER(geneve_pal_device::csr_in) /* Video write (ASSERT=low). */ -WRITE_LINE_MEMBER(geneve_pal_device::csw_in) +void geneve_pal_device::csw_in(int state) { bool prev = m_pin9; m_pin9 = (state==CLEAR_LINE); @@ -1236,7 +1236,7 @@ WRITE_LINE_MEMBER(geneve_pal_device::csw_in) /* Memory enable (ASSERT=low); pass through */ -WRITE_LINE_MEMBER(geneve_pal_device::memen) +void geneve_pal_device::memen(int state) { LOGMASKED(LOG_LINES, "MEMEN -> %d\n", state); m_peribox->memen_in(state); @@ -1249,7 +1249,7 @@ WRITE_LINE_MEMBER(geneve_pal_device::memen) This function seems to have no effect. So either the equations are wrong, or something else is going on. */ -WRITE_LINE_MEMBER(geneve_pal_device::sysspeed) +void geneve_pal_device::sysspeed(int state) { bool prev = m_pin5; m_pin5 = (state == ASSERT_LINE); @@ -1264,7 +1264,7 @@ WRITE_LINE_MEMBER(geneve_pal_device::sysspeed) Write vdp wait cycles (1=add 14 cycles, 0=add none) see above for waitstate handling */ -WRITE_LINE_MEMBER(geneve_pal_device::vwaiten) +void geneve_pal_device::vwaiten(int state) { bool prev = m_pin19; m_pin19 = (state==ASSERT_LINE); @@ -1278,7 +1278,7 @@ WRITE_LINE_MEMBER(geneve_pal_device::vwaiten) /* Clock input. This controls the state of the waitstate counter. */ -WRITE_LINE_MEMBER(geneve_pal_device::clock_in) +void geneve_pal_device::clock_in(int state) { LOGMASKED(LOG_CLOCK, "CLK%s\n", state? "?" : "?"); // Set the FF @@ -1438,7 +1438,7 @@ void genmod_decoder_device::set_function(int func, int page) } } -WRITE_LINE_MEMBER(genmod_decoder_device::gaready_in) +void genmod_decoder_device::gaready_in(int state) { m_gaready = state; } @@ -1447,7 +1447,7 @@ WRITE_LINE_MEMBER(genmod_decoder_device::gaready_in) READY line from the box. Do not ignore this line, as it is important for device operation. */ -WRITE_LINE_MEMBER(genmod_decoder_device::extready_in) +void genmod_decoder_device::extready_in(int state) { m_extready = state; } @@ -1455,7 +1455,7 @@ WRITE_LINE_MEMBER(genmod_decoder_device::extready_in) /* READY line from the sound chip. */ -WRITE_LINE_MEMBER(genmod_decoder_device::sndready_in) +void genmod_decoder_device::sndready_in(int state) { m_sndready = state; } @@ -1465,7 +1465,7 @@ WRITE_LINE_MEMBER(genmod_decoder_device::sndready_in) The Genmod board does not look inside the Gate Array. The call we are using is just a shorthand for evaluating the states of the select lines. */ -READ_LINE_MEMBER(genmod_decoder_device::gaready_out) +int genmod_decoder_device::gaready_out() { int func = m_debug? m_function_debug : m_function; int page = m_debug? m_page_debug : m_page; @@ -1496,7 +1496,7 @@ READ_LINE_MEMBER(genmod_decoder_device::gaready_out) Note: It is not sufficient to check for the page area; we need to check the select lines (via the static functions). */ -READ_LINE_MEMBER(genmod_decoder_device::dben_out) +int genmod_decoder_device::dben_out() { int func = m_debug? m_function_debug : m_function; diff --git a/src/devices/bus/ti99/internal/genboard.h b/src/devices/bus/ti99/internal/genboard.h index 4b5dd21124e..3f1d6a3e749 100644 --- a/src/devices/bus/ti99/internal/genboard.h +++ b/src/devices/bus/ti99/internal/genboard.h @@ -70,23 +70,23 @@ public: void write(uint8_t data); // Inputs - DECLARE_WRITE_LINE_MEMBER( clock_in ); - DECLARE_WRITE_LINE_MEMBER( dbin_in ); - DECLARE_WRITE_LINE_MEMBER( extready_in ); - DECLARE_WRITE_LINE_MEMBER( sndready_in ); + void clock_in(int state); + void dbin_in(int state); + void extready_in(int state); + void sndready_in(int state); void cru_sstep_write(offs_t offset, uint8_t data); void cru_ctrl_write(offs_t offset, uint8_t data); // Outputs - DECLARE_READ_LINE_MEMBER( csr_out ); - DECLARE_READ_LINE_MEMBER( csw_out ); - DECLARE_READ_LINE_MEMBER( rtcen_out ); - DECLARE_READ_LINE_MEMBER( romen_out ); - DECLARE_READ_LINE_MEMBER( ramen_out ); - DECLARE_READ_LINE_MEMBER( ramenx_out ); - DECLARE_READ_LINE_MEMBER( snden_out ); - DECLARE_READ_LINE_MEMBER( dben_out ); - DECLARE_READ_LINE_MEMBER( gaready_out ); + int csr_out(); + int csw_out(); + int rtcen_out(); + int romen_out(); + int ramen_out(); + int ramenx_out(); + int snden_out(); + int dben_out(); + int gaready_out(); int get_prefix(int lines); bool accessing_dram(); @@ -99,10 +99,10 @@ public: offs_t get_dram_address(); // Keyboard support - DECLARE_WRITE_LINE_MEMBER( set_keyboard_clock ); - DECLARE_WRITE_LINE_MEMBER( enable_shift_register ); - DECLARE_WRITE_LINE_MEMBER( kbdclk ); - DECLARE_WRITE_LINE_MEMBER( kbddata ); + void set_keyboard_clock(int state); + void enable_shift_register(int state); + void kbdclk(int state); + void kbddata(int state); auto kbdint_cb() { return m_keyint.bind(); } auto kbdclk_cb() { return m_keyb_clk.bind(); } auto kbddata_cb() { return m_keyb_data.bind(); } @@ -252,13 +252,13 @@ class geneve_pal_device : public device_t public: geneve_pal_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - DECLARE_WRITE_LINE_MEMBER( gaready_in ); - DECLARE_WRITE_LINE_MEMBER( csw_in ); - DECLARE_WRITE_LINE_MEMBER( csr_in ); - DECLARE_WRITE_LINE_MEMBER( memen ); - DECLARE_WRITE_LINE_MEMBER( vwaiten ); // pin 19 - DECLARE_WRITE_LINE_MEMBER( sysspeed ); // pin 5 - DECLARE_WRITE_LINE_MEMBER( clock_in ); + void gaready_in(int state); + void csw_in(int state); + void csr_in(int state); + void memen(int state); + void vwaiten(int state); // pin 19 + void sysspeed(int state); // pin 5 + void clock_in(int state); auto ready_cb() { return m_ready.bind(); } @@ -297,11 +297,11 @@ public: void set_turbo(bool turbo) { m_turbo = turbo; } void set_timode(bool timode) { m_timode = timode; } - DECLARE_READ_LINE_MEMBER( gaready_out ); - DECLARE_READ_LINE_MEMBER( dben_out ); - DECLARE_WRITE_LINE_MEMBER( gaready_in ); - DECLARE_WRITE_LINE_MEMBER( extready_in ); - DECLARE_WRITE_LINE_MEMBER( sndready_in ); + int gaready_out(); + int dben_out(); + void gaready_in(int state); + void extready_in(int state); + void sndready_in(int state); private: void device_start() override; diff --git a/src/devices/bus/ti99/internal/genkbd.cpp b/src/devices/bus/ti99/internal/genkbd.cpp index 6c0baf84947..14f444c620d 100644 --- a/src/devices/bus/ti99/internal/genkbd.cpp +++ b/src/devices/bus/ti99/internal/genkbd.cpp @@ -544,7 +544,7 @@ void geneve_xt_101_hle_keyboard_device::post_in_key_queue(int keycode) // clock_write - //------------------------------------------------- -WRITE_LINE_MEMBER(geneve_xt_101_hle_keyboard_device::clock_write) +void geneve_xt_101_hle_keyboard_device::clock_write(int state) { LOGMASKED(LOG_LINES, "Clock write: %d\n", state); m_clock_line = (line_state)state; @@ -562,7 +562,7 @@ WRITE_LINE_MEMBER(geneve_xt_101_hle_keyboard_device::clock_write) // data_write - //------------------------------------------------- -WRITE_LINE_MEMBER(geneve_xt_101_hle_keyboard_device::data_write) +void geneve_xt_101_hle_keyboard_device::data_write(int state) { LOGMASKED(LOG_LINES, "Data write: %d\n", state); m_data_line = (line_state)state; @@ -600,7 +600,7 @@ void geneve_xt_101_hle_keyboard_device::device_reset() } -WRITE_LINE_MEMBER(geneve_xt_101_hle_keyboard_device::reset_line) +void geneve_xt_101_hle_keyboard_device::reset_line(int state) { m_resetting = !state; diff --git a/src/devices/bus/ti99/internal/genkbd.h b/src/devices/bus/ti99/internal/genkbd.h index cf67ea8ee6c..94786af46fd 100644 --- a/src/devices/bus/ti99/internal/genkbd.h +++ b/src/devices/bus/ti99/internal/genkbd.h @@ -26,7 +26,7 @@ class geneve_xt_101_hle_keyboard_device : public device_t, public device_pc_kbd_ public: // construction/destruction geneve_xt_101_hle_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - DECLARE_WRITE_LINE_MEMBER(reset_line); + void reset_line(int state); protected: // device-level overrides @@ -35,8 +35,8 @@ protected: virtual ioport_constructor device_input_ports() const override; // device_pc_kbd_interface overrides - virtual DECLARE_WRITE_LINE_MEMBER(clock_write) override; - virtual DECLARE_WRITE_LINE_MEMBER(data_write) override; + virtual void clock_write(int state) override; + virtual void data_write(int state) override; TIMER_CALLBACK_MEMBER(poll_tick); TIMER_CALLBACK_MEMBER(send_tick); diff --git a/src/devices/bus/ti99/internal/ioport.cpp b/src/devices/bus/ti99/internal/ioport.cpp index 4ab42b201b4..0720a2e8116 100644 --- a/src/devices/bus/ti99/internal/ioport.cpp +++ b/src/devices/bus/ti99/internal/ioport.cpp @@ -123,25 +123,25 @@ void ioport_device::cruwrite(offs_t offset, uint8_t data) m_connected->cruwrite(offset, data); } -WRITE_LINE_MEMBER(ioport_device::memen_in) +void ioport_device::memen_in(int state) { if (m_connected != nullptr) m_connected->memen_in(state); } -WRITE_LINE_MEMBER(ioport_device::msast_in) +void ioport_device::msast_in(int state) { if (m_connected != nullptr) m_connected->msast_in(state); } -WRITE_LINE_MEMBER(ioport_device::clock_in) +void ioport_device::clock_in(int state) { if (m_connected != nullptr) m_connected->clock_in(state); } -WRITE_LINE_MEMBER(ioport_device::reset_in) +void ioport_device::reset_in(int state) { if (m_connected != nullptr) m_connected->reset_in(state); @@ -161,12 +161,12 @@ void ioport_device::device_config_complete() } -WRITE_LINE_MEMBER(ioport_attached_device::set_extint) +void ioport_attached_device::set_extint(int state) { m_ioport->m_console_extint(state); } -WRITE_LINE_MEMBER(ioport_attached_device::set_ready) +void ioport_attached_device::set_ready(int state) { m_ioport->m_console_ready(state); } diff --git a/src/devices/bus/ti99/internal/ioport.h b/src/devices/bus/ti99/internal/ioport.h index 5c08beec760..9658cef7a26 100644 --- a/src/devices/bus/ti99/internal/ioport.h +++ b/src/devices/bus/ti99/internal/ioport.h @@ -34,17 +34,17 @@ public: virtual void setaddress_dbin(offs_t offset, int state) { } virtual void crureadz(offs_t offset, uint8_t *value) { } virtual void cruwrite(offs_t offset, uint8_t data) { } - virtual DECLARE_WRITE_LINE_MEMBER( memen_in ) { } - virtual DECLARE_WRITE_LINE_MEMBER( msast_in ) { } - virtual DECLARE_WRITE_LINE_MEMBER( clock_in ) { } - virtual DECLARE_WRITE_LINE_MEMBER( reset_in ) { } + virtual void memen_in(int state) { } + virtual void msast_in(int state) { } + virtual void clock_in(int state) { } + virtual void reset_in(int state) { } void set_ioport(ioport_device* ioport) { m_ioport = ioport; } protected: // Methods called from the external device - DECLARE_WRITE_LINE_MEMBER( set_extint ); - DECLARE_WRITE_LINE_MEMBER( set_ready ); + void set_extint(int state); + void set_ready(int state); private: ioport_device* m_ioport; }; @@ -76,10 +76,10 @@ public: void setaddress_dbin(offs_t offset, int state); void crureadz(offs_t offset, uint8_t *value); void cruwrite(offs_t offset, uint8_t data); - DECLARE_WRITE_LINE_MEMBER( memen_in ); - DECLARE_WRITE_LINE_MEMBER( msast_in ); - DECLARE_WRITE_LINE_MEMBER( clock_in ); - DECLARE_WRITE_LINE_MEMBER( reset_in ); + void memen_in(int state); + void msast_in(int state); + void clock_in(int state); + void reset_in(int state); // Callbacks auto extint_cb() { return m_console_extint.bind(); } diff --git a/src/devices/bus/ti99/joyport/joyport.cpp b/src/devices/bus/ti99/joyport/joyport.cpp index 77825e85f96..b93d09d767f 100644 --- a/src/devices/bus/ti99/joyport/joyport.cpp +++ b/src/devices/bus/ti99/joyport/joyport.cpp @@ -87,7 +87,7 @@ void joyport_device::pulse_clock() Propagate the interrupt to the defined target. Only used for the handset at the prototype 99/4. */ -WRITE_LINE_MEMBER( joyport_device::set_interrupt ) +void joyport_device::set_interrupt(int state) { m_interrupt(state); } diff --git a/src/devices/bus/ti99/peb/bwg.cpp b/src/devices/bus/ti99/peb/bwg.cpp index 3bca57541c9..4787df88964 100644 --- a/src/devices/bus/ti99/peb/bwg.cpp +++ b/src/devices/bus/ti99/peb/bwg.cpp @@ -123,7 +123,7 @@ void snug_bwg_device::operate_ready_line() /* Callbacks from the WD1773 chip */ -WRITE_LINE_MEMBER( snug_bwg_device::fdc_irq_w ) +void snug_bwg_device::fdc_irq_w(int state) { LOGMASKED(LOG_SIGNALS, "set intrq = %d\n", state); m_IRQ = (line_state)state; @@ -132,7 +132,7 @@ WRITE_LINE_MEMBER( snug_bwg_device::fdc_irq_w ) operate_ready_line(); } -WRITE_LINE_MEMBER( snug_bwg_device::fdc_drq_w ) +void snug_bwg_device::fdc_drq_w(int state) { LOGMASKED(LOG_SIGNALS, "set drq = %d\n", state); m_DRQ = (line_state)state; @@ -390,19 +390,19 @@ void snug_bwg_device::cruwrite(offs_t offset, uint8_t data) } } -WRITE_LINE_MEMBER(snug_bwg_device::den_w) +void snug_bwg_device::den_w(int state) { // (De)select the card. Indicated by a LED on the board. m_selected = state; LOGMASKED(LOG_CRU, "Map DSR (bit 0) = %d\n", m_selected); } -WRITE_LINE_MEMBER(snug_bwg_device::mop_w) +void snug_bwg_device::mop_w(int state) { m_motormf->b_w(state); } -WRITE_LINE_MEMBER(snug_bwg_device::waiten_w) +void snug_bwg_device::waiten_w(int state) { /* Set disk ready/hold (bit 2) */ // 0: ignore IRQ and DRQ @@ -412,29 +412,29 @@ WRITE_LINE_MEMBER(snug_bwg_device::waiten_w) LOGMASKED(LOG_CRU, "Arm wait state logic (bit 2) = %d\n", state); } -WRITE_LINE_MEMBER(snug_bwg_device::hlt_w) +void snug_bwg_device::hlt_w(int state) { // Load disk heads (HLT pin) (bit 3). Not implemented. LOGMASKED(LOG_CRU, "Set head load (bit 3) = %d\n", state); } /* Drive selects */ -WRITE_LINE_MEMBER(snug_bwg_device::dsel1_w) +void snug_bwg_device::dsel1_w(int state) { select_drive(1, state); } -WRITE_LINE_MEMBER(snug_bwg_device::dsel2_w) +void snug_bwg_device::dsel2_w(int state) { select_drive(2, state); } -WRITE_LINE_MEMBER(snug_bwg_device::dsel3_w) +void snug_bwg_device::dsel3_w(int state) { select_drive(3, state); } -WRITE_LINE_MEMBER(snug_bwg_device::dsel4_w) +void snug_bwg_device::dsel4_w(int state) { select_drive(4, state); } @@ -472,7 +472,7 @@ void snug_bwg_device::select_drive(int n, int state) } } -WRITE_LINE_MEMBER(snug_bwg_device::sidsel_w) +void snug_bwg_device::sidsel_w(int state) { // Select side of disk (bit 7) if (m_sel_floppy != 0) @@ -482,7 +482,7 @@ WRITE_LINE_MEMBER(snug_bwg_device::sidsel_w) } } -WRITE_LINE_MEMBER(snug_bwg_device::dden_w) +void snug_bwg_device::dden_w(int state) { /* double density enable (active low) */ LOGMASKED(LOG_CRU, "Set density (bit 10) = %d (%s)\n", state, (state!=0)? "single" : "double"); @@ -492,7 +492,7 @@ WRITE_LINE_MEMBER(snug_bwg_device::dden_w) /* All floppy motors are operated by the same line. */ -WRITE_LINE_MEMBER(snug_bwg_device::motorona_w) +void snug_bwg_device::motorona_w(int state) { m_MOTOR_ON = state; LOGMASKED(LOG_MOTOR, "Motor %s\n", state? "on" : "off"); diff --git a/src/devices/bus/ti99/peb/bwg.h b/src/devices/bus/ti99/peb/bwg.h index 671f584dc9a..752eb3aff65 100644 --- a/src/devices/bus/ti99/peb/bwg.h +++ b/src/devices/bus/ti99/peb/bwg.h @@ -50,22 +50,22 @@ protected: private: static void floppy_formats(format_registration &fr); - DECLARE_WRITE_LINE_MEMBER( fdc_irq_w ); - DECLARE_WRITE_LINE_MEMBER( fdc_drq_w ); + void fdc_irq_w(int state); + void fdc_drq_w(int state); // Latch callbacks - DECLARE_WRITE_LINE_MEMBER( den_w ); - DECLARE_WRITE_LINE_MEMBER( mop_w ); - DECLARE_WRITE_LINE_MEMBER( waiten_w ); - DECLARE_WRITE_LINE_MEMBER( hlt_w ); - DECLARE_WRITE_LINE_MEMBER( dsel1_w ); - DECLARE_WRITE_LINE_MEMBER( dsel2_w ); - DECLARE_WRITE_LINE_MEMBER( dsel3_w ); - DECLARE_WRITE_LINE_MEMBER( dsel4_w ); - DECLARE_WRITE_LINE_MEMBER( sidsel_w ); - DECLARE_WRITE_LINE_MEMBER( dden_w ); - - DECLARE_WRITE_LINE_MEMBER( motorona_w ); + void den_w(int state); + void mop_w(int state); + void waiten_w(int state); + void hlt_w(int state); + void dsel1_w(int state); + void dsel2_w(int state); + void dsel3_w(int state); + void dsel4_w(int state); + void sidsel_w(int state); + void dden_w(int state); + + void motorona_w(int state); void select_drive(int n, int state); diff --git a/src/devices/bus/ti99/peb/cc_fdc.cpp b/src/devices/bus/ti99/peb/cc_fdc.cpp index 09067c4f7cd..d215560e8b0 100644 --- a/src/devices/bus/ti99/peb/cc_fdc.cpp +++ b/src/devices/bus/ti99/peb/cc_fdc.cpp @@ -177,19 +177,19 @@ void corcomp_fdc_device::operate_ready_line() /* Callbacks from the WDC chip */ -WRITE_LINE_MEMBER( corcomp_fdc_device::fdc_irq_w ) +void corcomp_fdc_device::fdc_irq_w(int state) { LOGMASKED(LOG_SIGNALS, "INTRQ callback = %d\n", state); operate_ready_line(); } -WRITE_LINE_MEMBER( corcomp_fdc_device::fdc_drq_w ) +void corcomp_fdc_device::fdc_drq_w(int state) { LOGMASKED(LOG_DRQ, "DRQ callback = %d\n", state); operate_ready_line(); } -WRITE_LINE_MEMBER( corcomp_fdc_device::fdc_hld_w ) +void corcomp_fdc_device::fdc_hld_w(int state) { LOGMASKED(LOG_SIGNALS, "HLD callback = %d\n", state); } @@ -281,7 +281,7 @@ void corcomp_fdc_device::cruwrite(offs_t offset, uint8_t data) } } -WRITE_LINE_MEMBER( corcomp_fdc_device::clock_in ) +void corcomp_fdc_device::clock_in(int state) { m_tms9901->phi_line(state); } @@ -329,7 +329,7 @@ uint8_t corcomp_fdc_device::tms9901_input(offs_t offset) } } -WRITE_LINE_MEMBER( corcomp_fdc_device::select_dsk ) +void corcomp_fdc_device::select_dsk(int state) { if (state == CLEAR_LINE) { @@ -371,7 +371,7 @@ WRITE_LINE_MEMBER( corcomp_fdc_device::select_dsk ) } } -WRITE_LINE_MEMBER( corcomp_fdc_device::side_select ) +void corcomp_fdc_device::side_select(int state) { // Select side of disk (bit 7) if (m_selected_drive != 0) @@ -384,7 +384,7 @@ WRITE_LINE_MEMBER( corcomp_fdc_device::side_select ) /* All floppy motors are operated by the same line. */ -WRITE_LINE_MEMBER( corcomp_fdc_device::motor_w ) +void corcomp_fdc_device::motor_w(int state) { LOGMASKED(LOG_DRIVE, "Motor %s\n", state? "on" : "off"); m_wdc->set_force_ready(state==ASSERT_LINE); @@ -398,14 +398,14 @@ WRITE_LINE_MEMBER( corcomp_fdc_device::motor_w ) /* Push the P11 state to the variable. */ -WRITE_LINE_MEMBER( corcomp_fdc_device::select_bank ) +void corcomp_fdc_device::select_bank(int state) { LOGMASKED(LOG_CRU, "Set bank %d\n", state); m_banksel = (state==ASSERT_LINE); operate_ready_line(); } -WRITE_LINE_MEMBER( corcomp_fdc_device::select_card ) +void corcomp_fdc_device::select_card(int state) { LOGMASKED(LOG_CRU, "Select card = %d\n", state); m_cardsel = (state==ASSERT_LINE); @@ -611,7 +611,7 @@ void ccfdc_dec_pal_device::device_config_complete() /* Indicates 9901 addressing. */ -READ_LINE_MEMBER( ccfdc_dec_pal_device::address9901 ) +int ccfdc_dec_pal_device::address9901() { return ((m_board->get_address() & 0xff80)==0x1100)? ASSERT_LINE : CLEAR_LINE; } @@ -619,7 +619,7 @@ READ_LINE_MEMBER( ccfdc_dec_pal_device::address9901 ) /* Indicates SRAM addressing. */ -READ_LINE_MEMBER( ccfdc_dec_pal_device::addressram ) +int ccfdc_dec_pal_device::addressram() { return ((m_board->card_selected()) && (m_board->get_address() & 0xff80)==0x4000)? ASSERT_LINE : CLEAR_LINE; @@ -628,7 +628,7 @@ READ_LINE_MEMBER( ccfdc_dec_pal_device::addressram ) /* Indicates WDC addressing. */ -READ_LINE_MEMBER( ccfdc_dec_pal_device::addresswdc ) +int ccfdc_dec_pal_device::addresswdc() { return ((m_board->card_selected()) && (m_board->get_address() & 0xff80)==0x5f80)? ASSERT_LINE : CLEAR_LINE; @@ -637,7 +637,7 @@ READ_LINE_MEMBER( ccfdc_dec_pal_device::addresswdc ) /* Indicates DSR addressing. */ -READ_LINE_MEMBER( ccfdc_dec_pal_device::address4 ) +int ccfdc_dec_pal_device::address4() { return ((m_board->card_selected()) && (m_board->get_address() & 0xe000)==0x4000)? ASSERT_LINE : CLEAR_LINE; @@ -646,7 +646,7 @@ READ_LINE_MEMBER( ccfdc_dec_pal_device::address4 ) /* Indicates SRAM selection. */ -READ_LINE_MEMBER( ccfdc_sel_pal_device::selectram ) +int ccfdc_sel_pal_device::selectram() { return (m_decpal->addressram() && (m_board->upper_bank())) ? ASSERT_LINE : CLEAR_LINE; @@ -655,7 +655,7 @@ READ_LINE_MEMBER( ccfdc_sel_pal_device::selectram ) /* Indicates WDC selection. */ -READ_LINE_MEMBER( ccfdc_sel_pal_device::selectwdc ) +int ccfdc_sel_pal_device::selectwdc() { return (m_decpal->addresswdc() && ((m_board->get_address()&1)==0))? ASSERT_LINE : CLEAR_LINE; } @@ -663,7 +663,7 @@ READ_LINE_MEMBER( ccfdc_sel_pal_device::selectwdc ) /* Indicates EPROM selection. */ -READ_LINE_MEMBER( ccfdc_sel_pal_device::selectdsr ) +int ccfdc_sel_pal_device::selectdsr() { return (m_decpal->address4() && !m_decpal->addresswdc() @@ -690,7 +690,7 @@ ccdcc_palu1_device::ccdcc_palu1_device(const machine_config &mconfig, const char /* Wait state logic */ -READ_LINE_MEMBER( ccdcc_palu1_device::ready_out ) +int ccdcc_palu1_device::ready_out() { bool wdc = m_decpal->addresswdc(); // Addressing the WDC bool lastdig = (m_board->get_address()&7)==6; // Address ends with 6 or e (5ff6, 5ffe) @@ -773,7 +773,7 @@ ccfdc_palu12_device::ccfdc_palu12_device(const machine_config &mconfig, const ch Indicates 9901 addressing. In this PAL version, the A9 address line is also used. */ -READ_LINE_MEMBER( ccfdc_palu12_device::address9901 ) +int ccfdc_palu12_device::address9901() { return ((m_board->get_address() & 0xffc0)==0x1100)? ASSERT_LINE : CLEAR_LINE; } @@ -788,7 +788,7 @@ ccfdc_palu6_device::ccfdc_palu6_device(const machine_config &mconfig, const char That is, when writing (/WE=0), A12 must be 1 (addresses 5ff8..e), otherwise (/WE=1), A12 must be 0 (addresses 5ff0..6) */ -READ_LINE_MEMBER( ccfdc_palu6_device::selectwdc ) +int ccfdc_palu6_device::selectwdc() { return (m_decpal->addresswdc() && ((m_board->get_address()&1)==0) @@ -799,7 +799,7 @@ READ_LINE_MEMBER( ccfdc_palu6_device::selectwdc ) Indicates EPROM selection. The Rev A selector PAL leads back some of its outputs for this calculation. */ -READ_LINE_MEMBER( ccfdc_palu6_device::selectdsr ) +int ccfdc_palu6_device::selectdsr() { return (m_decpal->address4() && !selectwdc() && !selectram())? ASSERT_LINE : CLEAR_LINE; } @@ -809,7 +809,7 @@ READ_LINE_MEMBER( ccfdc_palu6_device::selectdsr ) board which evaluates whether the trap is active. */ -READ_LINE_MEMBER( ccfdc_palu6_device::ready_out ) +int ccfdc_palu6_device::ready_out() { bool wdc = m_decpal->addresswdc(); // Addressing the WDC bool even = (m_board->get_address()&1)==0; // A15 = 0 diff --git a/src/devices/bus/ti99/peb/cc_fdc.h b/src/devices/bus/ti99/peb/cc_fdc.h index e72bfa3ea57..b668f2cc59d 100644 --- a/src/devices/bus/ti99/peb/cc_fdc.h +++ b/src/devices/bus/ti99/peb/cc_fdc.h @@ -44,17 +44,17 @@ public: void crureadz(offs_t offset, uint8_t *value) override; void cruwrite(offs_t offset, uint8_t data) override; - DECLARE_WRITE_LINE_MEMBER(clock_in) override; + void clock_in(int state) override; - DECLARE_WRITE_LINE_MEMBER( fdc_irq_w ); - DECLARE_WRITE_LINE_MEMBER( fdc_drq_w ); - DECLARE_WRITE_LINE_MEMBER( fdc_hld_w ); + void fdc_irq_w(int state); + void fdc_drq_w(int state); + void fdc_hld_w(int state); uint8_t tms9901_input(offs_t offset); - DECLARE_WRITE_LINE_MEMBER( select_dsk ); - DECLARE_WRITE_LINE_MEMBER( side_select ); - DECLARE_WRITE_LINE_MEMBER( motor_w ); - DECLARE_WRITE_LINE_MEMBER( select_card ); - DECLARE_WRITE_LINE_MEMBER( select_bank ); + void select_dsk(int state); + void side_select(int state); + void motor_w(int state); + void select_card(int state); + void select_bank(int state); protected: corcomp_fdc_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); @@ -141,10 +141,10 @@ private: class ccfdc_dec_pal_device : public device_t { public: - DECLARE_READ_LINE_MEMBER(addresswdc); - DECLARE_READ_LINE_MEMBER(address4); - DECLARE_READ_LINE_MEMBER(addressram); - virtual DECLARE_READ_LINE_MEMBER(address9901); + int addresswdc(); + int address4(); + int addressram(); + virtual int address9901(); protected: ccfdc_dec_pal_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); @@ -161,10 +161,10 @@ protected: class ccfdc_sel_pal_device : public device_t { public: - DECLARE_READ_LINE_MEMBER(selectram); - virtual DECLARE_READ_LINE_MEMBER(selectwdc); - virtual DECLARE_READ_LINE_MEMBER(selectdsr); - virtual DECLARE_READ_LINE_MEMBER(ready_out) =0; + int selectram(); + virtual int selectwdc(); + virtual int selectdsr(); + virtual int ready_out() =0; protected: ccfdc_sel_pal_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); @@ -193,7 +193,7 @@ class ccdcc_palu1_device : public ccfdc_sel_pal_device { public: ccdcc_palu1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - DECLARE_READ_LINE_MEMBER(ready_out) override; + int ready_out() override; private: void device_config_complete() override; @@ -222,7 +222,7 @@ class ccfdc_palu12_device : public ccfdc_dec_pal_device { public: ccfdc_palu12_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - DECLARE_READ_LINE_MEMBER(address9901) override; + int address9901() override; }; // =========== Specific selector PAL circuit of the CCFDC ================ @@ -231,10 +231,10 @@ class ccfdc_palu6_device : public ccfdc_sel_pal_device { public: ccfdc_palu6_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - DECLARE_READ_LINE_MEMBER(selectwdc) override; - DECLARE_READ_LINE_MEMBER(selectdsr) override; + int selectwdc() override; + int selectdsr() override; - DECLARE_READ_LINE_MEMBER(ready_out) override; + int ready_out() override; private: void device_config_complete() override; diff --git a/src/devices/bus/ti99/peb/evpc.cpp b/src/devices/bus/ti99/peb/evpc.cpp index f8acf7beafa..2ab3b98cf8e 100644 --- a/src/devices/bus/ti99/peb/evpc.cpp +++ b/src/devices/bus/ti99/peb/evpc.cpp @@ -399,7 +399,7 @@ void snug_enhanced_video_device::cruwrite(offs_t offset, uint8_t data) /* READY line for the sound chip */ -WRITE_LINE_MEMBER( snug_enhanced_video_device::ready_line ) +void snug_enhanced_video_device::ready_line(int state) { m_slot->set_ready(state); } @@ -438,7 +438,7 @@ void snug_enhanced_video_device::device_stop() For the SGCPU, the signal is delivered by the LCP line. */ -WRITE_LINE_MEMBER( snug_enhanced_video_device::video_interrupt_in ) +void snug_enhanced_video_device::video_interrupt_in(int state) { // This method is frequently called without level change, so we only // react on changes diff --git a/src/devices/bus/ti99/peb/evpc.h b/src/devices/bus/ti99/peb/evpc.h index 683933a5780..f2f14675cf1 100644 --- a/src/devices/bus/ti99/peb/evpc.h +++ b/src/devices/bus/ti99/peb/evpc.h @@ -62,9 +62,9 @@ protected: virtual bool nvram_write(util::write_stream &file) override; private: - DECLARE_WRITE_LINE_MEMBER( ready_line ); + void ready_line(int state); - DECLARE_WRITE_LINE_MEMBER( video_interrupt_in ); + void video_interrupt_in(int state); int m_address; int m_dsr_page; diff --git a/src/devices/bus/ti99/peb/forti.cpp b/src/devices/bus/ti99/peb/forti.cpp index 169cf94c437..25c00556534 100644 --- a/src/devices/bus/ti99/peb/forti.cpp +++ b/src/devices/bus/ti99/peb/forti.cpp @@ -66,7 +66,7 @@ void forti_device::readz(offs_t offset, uint8_t *value) /* READY callbacks from the sound chips. */ -WRITE_LINE_MEMBER( forti_device::ready_sound ) +void forti_device::ready_sound(int state) { LOGMASKED(LOG_READY, "READY (%d, %d, %d, %d)\n", m_generator1->ready_r(), m_generator2->ready_r(), m_generator3->ready_r(), m_generator4->ready_r()); diff --git a/src/devices/bus/ti99/peb/forti.h b/src/devices/bus/ti99/peb/forti.h index 69ad6ddfcab..6deb68f05ed 100644 --- a/src/devices/bus/ti99/peb/forti.h +++ b/src/devices/bus/ti99/peb/forti.h @@ -31,7 +31,7 @@ public: void crureadz(offs_t offset, uint8_t *value) override { } void cruwrite(offs_t offset, uint8_t data) override { } - DECLARE_WRITE_LINE_MEMBER( ready_sound ); + void ready_sound(int state); private: void device_start() override; diff --git a/src/devices/bus/ti99/peb/hfdc.cpp b/src/devices/bus/ti99/peb/hfdc.cpp index 31f91caa102..41df28c21ae 100644 --- a/src/devices/bus/ti99/peb/hfdc.cpp +++ b/src/devices/bus/ti99/peb/hfdc.cpp @@ -825,7 +825,7 @@ void myarc_hfdc_device::set_floppy_motors_running(bool run) /* Called whenever the state of the HDC9234 interrupt pin changes. */ -WRITE_LINE_MEMBER( myarc_hfdc_device::intrq_w ) +void myarc_hfdc_device::intrq_w(int state) { m_irq = (line_state)state; LOGMASKED(LOG_INT, "INT pin from controller = %d, propagating to INTA*\n", state); @@ -840,7 +840,7 @@ WRITE_LINE_MEMBER( myarc_hfdc_device::intrq_w ) Called whenever the HDC9234 desires bus access to the buffer RAM. The controller expects a call to dmarq in 1 byte time. */ -WRITE_LINE_MEMBER( myarc_hfdc_device::dmarq_w ) +void myarc_hfdc_device::dmarq_w(int state) { LOGMASKED(LOG_DMA, "DMARQ pin from controller = %d\n", state); if (state == ASSERT_LINE) @@ -852,7 +852,7 @@ WRITE_LINE_MEMBER( myarc_hfdc_device::dmarq_w ) /* Called whenever the state of the HDC9234 DMA in progress changes. */ -WRITE_LINE_MEMBER( myarc_hfdc_device::dip_w ) +void myarc_hfdc_device::dip_w(int state) { m_dip = (line_state)state; } diff --git a/src/devices/bus/ti99/peb/hfdc.h b/src/devices/bus/ti99/peb/hfdc.h index ee167421e48..aeff0cca3ad 100644 --- a/src/devices/bus/ti99/peb/hfdc.h +++ b/src/devices/bus/ti99/peb/hfdc.h @@ -56,9 +56,9 @@ protected: TIMER_CALLBACK_MEMBER(motor_off); private: - DECLARE_WRITE_LINE_MEMBER( dmarq_w ); - DECLARE_WRITE_LINE_MEMBER( intrq_w ); - DECLARE_WRITE_LINE_MEMBER( dip_w ); + void dmarq_w(int state); + void intrq_w(int state); + void dip_w(int state); void auxbus_out(offs_t offset, uint8_t data); uint8_t read_buffer(); void write_buffer(uint8_t data); diff --git a/src/devices/bus/ti99/peb/myarcfdc.cpp b/src/devices/bus/ti99/peb/myarcfdc.cpp index 46536208503..5e345f5ecb6 100644 --- a/src/devices/bus/ti99/peb/myarcfdc.cpp +++ b/src/devices/bus/ti99/peb/myarcfdc.cpp @@ -257,17 +257,17 @@ void myarc_fdc_device::cruwrite(offs_t offset, uint8_t data) /* Callbacks from the WDC chip */ -WRITE_LINE_MEMBER( myarc_fdc_device::fdc_irq_w ) +void myarc_fdc_device::fdc_irq_w(int state) { LOGMASKED(LOG_IRQ, "INTRQ callback = %d\n", state); } -WRITE_LINE_MEMBER( myarc_fdc_device::fdc_drq_w ) +void myarc_fdc_device::fdc_drq_w(int state) { LOGMASKED(LOG_DRQ, "DRQ callback = %d\n", state); } -WRITE_LINE_MEMBER( myarc_fdc_device::fdc_mon_w ) +void myarc_fdc_device::fdc_mon_w(int state) { LOGMASKED(LOG_DRIVE, "MON callback = %d\n", state); // All MON lines are connected @@ -281,19 +281,19 @@ WRITE_LINE_MEMBER( myarc_fdc_device::fdc_mon_w ) /* Callbacks from the 74LS259 latch */ -WRITE_LINE_MEMBER( myarc_fdc_device::den_w ) +void myarc_fdc_device::den_w(int state) { LOGMASKED(LOG_CRU, "Card enable = %d\n", state); m_cardsel = (state==1); } -WRITE_LINE_MEMBER( myarc_fdc_device::wdreset_w ) +void myarc_fdc_device::wdreset_w(int state) { LOGMASKED(LOG_CRU, "Controller reset = %d\n", state); m_wdc->mr_w(state); } -WRITE_LINE_MEMBER( myarc_fdc_device::sidsel_w ) +void myarc_fdc_device::sidsel_w(int state) { LOGMASKED(LOG_CRU, "Side select = %d\n", state); if (m_selected_drive != 0) @@ -304,14 +304,14 @@ WRITE_LINE_MEMBER( myarc_fdc_device::sidsel_w ) } // Selects the EPROM bank, and also controls the DDEN line -WRITE_LINE_MEMBER( myarc_fdc_device::bankdden_w ) +void myarc_fdc_device::bankdden_w(int state) { LOGMASKED(LOG_CRU, "EPROM bank select = %d\n", state); m_banksel = (state==ASSERT_LINE); m_wdc->dden_w(state==1); } -WRITE_LINE_MEMBER( myarc_fdc_device::drivesel_w ) +void myarc_fdc_device::drivesel_w(int state) { int driveno = 0; diff --git a/src/devices/bus/ti99/peb/myarcfdc.h b/src/devices/bus/ti99/peb/myarcfdc.h index 89106b73e5a..8e64b55e483 100644 --- a/src/devices/bus/ti99/peb/myarcfdc.h +++ b/src/devices/bus/ti99/peb/myarcfdc.h @@ -50,15 +50,15 @@ private: static void floppy_formats(format_registration &fr); // Callback methods - DECLARE_WRITE_LINE_MEMBER( fdc_irq_w ); - DECLARE_WRITE_LINE_MEMBER( fdc_drq_w ); - DECLARE_WRITE_LINE_MEMBER( fdc_mon_w ); - - DECLARE_WRITE_LINE_MEMBER( den_w ); - DECLARE_WRITE_LINE_MEMBER( wdreset_w ); - DECLARE_WRITE_LINE_MEMBER( sidsel_w ); - DECLARE_WRITE_LINE_MEMBER( bankdden_w ); - DECLARE_WRITE_LINE_MEMBER( drivesel_w ); + void fdc_irq_w(int state); + void fdc_drq_w(int state); + void fdc_mon_w(int state); + + void den_w(int state); + void wdreset_w(int state); + void sidsel_w(int state); + void bankdden_w(int state); + void drivesel_w(int state); // Deliver the current state of the address bus offs_t get_address(); diff --git a/src/devices/bus/ti99/peb/pcode.cpp b/src/devices/bus/ti99/peb/pcode.cpp index 90a6fc43315..270e18d169c 100644 --- a/src/devices/bus/ti99/peb/pcode.cpp +++ b/src/devices/bus/ti99/peb/pcode.cpp @@ -214,7 +214,7 @@ void ti_pcode_card_device::write(offs_t offset, uint8_t data) /* Common READY* line from the GROMs. */ -WRITE_LINE_MEMBER( ti_pcode_card_device::ready_line ) +void ti_pcode_card_device::ready_line(int state) { m_slot->set_ready(state); } @@ -224,7 +224,7 @@ WRITE_LINE_MEMBER( ti_pcode_card_device::ready_line ) clock input for the GROMs, which are thus running at a lower rate than those in the console driven by the VDP (477 kHz). */ -WRITE_LINE_MEMBER( ti_pcode_card_device::clock_in) +void ti_pcode_card_device::clock_in(int state) { m_clock_count = (m_clock_count+1) & 0x03; // four pulses high, four pulses low if (m_clock_count==0) @@ -260,12 +260,12 @@ void ti_pcode_card_device::cruwrite(offs_t offset, uint8_t data) m_crulatch->write_bit((offset & 0x80) >> 5 | (offset & 0x06) >> 1, data); } -WRITE_LINE_MEMBER(ti_pcode_card_device::pcpage_w) +void ti_pcode_card_device::pcpage_w(int state) { m_selected = state; } -WRITE_LINE_MEMBER(ti_pcode_card_device::ekrpg_w) +void ti_pcode_card_device::ekrpg_w(int state) { m_bank_select = state ? 2 : 1; // we're calling this bank 1 and bank 2 LOGMASKED(LOG_CRU, "Select rom bank %d\n", m_bank_select); diff --git a/src/devices/bus/ti99/peb/pcode.h b/src/devices/bus/ti99/peb/pcode.h index dd1ce542d1a..2092046b071 100644 --- a/src/devices/bus/ti99/peb/pcode.h +++ b/src/devices/bus/ti99/peb/pcode.h @@ -33,7 +33,7 @@ public: void cruwrite(offs_t offset, uint8_t data) override; void setaddress_dbin(offs_t offset, int state) override; - DECLARE_WRITE_LINE_MEMBER(clock_in) override; + void clock_in(int state) override; DECLARE_INPUT_CHANGED_MEMBER( switch_changed ); @@ -46,10 +46,10 @@ protected: virtual ioport_constructor device_input_ports() const override; private: - DECLARE_WRITE_LINE_MEMBER(ready_line); + void ready_line(int state); - DECLARE_WRITE_LINE_MEMBER(pcpage_w); - DECLARE_WRITE_LINE_MEMBER(ekrpg_w); + void pcpage_w(int state); + void ekrpg_w(int state); void debugger_read(offs_t addr, uint8_t& value); diff --git a/src/devices/bus/ti99/peb/peribox.cpp b/src/devices/bus/ti99/peb/peribox.cpp index fd79a004c48..83d9d29c37c 100644 --- a/src/devices/bus/ti99/peb/peribox.cpp +++ b/src/devices/bus/ti99/peb/peribox.cpp @@ -323,7 +323,7 @@ void peribox_device::cruwrite(offs_t offset, uint8_t data) /* RESET line from the console. */ -WRITE_LINE_MEMBER(peribox_device::reset_in) +void peribox_device::reset_in(int state) { for (int i=2; i <= 8; i++) { @@ -335,7 +335,7 @@ WRITE_LINE_MEMBER(peribox_device::reset_in) And here are finally the two mythical lines SENILA* and SENILB*; mythical since there is no report of any software that ever used them. */ -WRITE_LINE_MEMBER(peribox_device::senila) +void peribox_device::senila(int state) { for (int i=2; i <= 8; i++) { @@ -343,7 +343,7 @@ WRITE_LINE_MEMBER(peribox_device::senila) } } -WRITE_LINE_MEMBER(peribox_device::senilb) +void peribox_device::senilb(int state) { for (int i=2; i <= 8; i++) { @@ -354,7 +354,7 @@ WRITE_LINE_MEMBER(peribox_device::senilb) /* MEMEN input. Used to start the external memory access cycle. */ -WRITE_LINE_MEMBER(peribox_device::memen_in) +void peribox_device::memen_in(int state) { m_memen = (state==ASSERT_LINE); } @@ -362,7 +362,7 @@ WRITE_LINE_MEMBER(peribox_device::memen_in) /* MSAST input. Defined by TI-99/8; we ignore this part in the PEB. */ -WRITE_LINE_MEMBER(peribox_device::msast_in) +void peribox_device::msast_in(int state) { m_msast = (state==ASSERT_LINE); } @@ -371,7 +371,7 @@ WRITE_LINE_MEMBER(peribox_device::msast_in) CLKOUT line */ -WRITE_LINE_MEMBER(peribox_device::clock_in) +void peribox_device::clock_in(int state) { for (int i=2; i <= 8; i++) { @@ -718,22 +718,22 @@ void peribox_slot_device::cruwrite(offs_t offset, uint8_t data) m_card->cruwrite(offset, data); } -WRITE_LINE_MEMBER( peribox_slot_device::senila ) +void peribox_slot_device::senila(int state) { m_card->set_senila(state); } -WRITE_LINE_MEMBER( peribox_slot_device::senilb ) +void peribox_slot_device::senilb(int state) { m_card->set_senilb(state); } -WRITE_LINE_MEMBER( peribox_slot_device::clock_in ) +void peribox_slot_device::clock_in(int state) { m_card->clock_in(state); } -WRITE_LINE_MEMBER( peribox_slot_device::reset_in ) +void peribox_slot_device::reset_in(int state) { m_card->reset_in(state); } @@ -754,25 +754,25 @@ void peribox_slot_device::device_config_complete() These methods are called from the expansion cards. They add the slot number to identify the slot to the box. */ -WRITE_LINE_MEMBER( peribox_slot_device::set_inta ) +void peribox_slot_device::set_inta(int state) { peribox_device *peb = static_cast(owner()); peb->inta_join(m_slotnumber, state); } -WRITE_LINE_MEMBER( peribox_slot_device::set_intb ) +void peribox_slot_device::set_intb(int state) { peribox_device *peb = static_cast(owner()); peb->intb_join(m_slotnumber, state); } -WRITE_LINE_MEMBER( peribox_slot_device::lcp_line ) +void peribox_slot_device::lcp_line(int state) { peribox_device *peb = static_cast(owner()); peb->lcp_join(m_slotnumber, state); } -WRITE_LINE_MEMBER( peribox_slot_device::set_ready ) +void peribox_slot_device::set_ready(int state) { peribox_device *peb = static_cast(owner()); peb->ready_join(m_slotnumber, state); diff --git a/src/devices/bus/ti99/peb/peribox.h b/src/devices/bus/ti99/peb/peribox.h index b54467f1055..ca0c84f2ec3 100644 --- a/src/devices/bus/ti99/peb/peribox.h +++ b/src/devices/bus/ti99/peb/peribox.h @@ -44,14 +44,14 @@ public: void crureadz(offs_t offset, uint8_t *value) override; void cruwrite(offs_t offset, uint8_t data) override; - DECLARE_WRITE_LINE_MEMBER(senila); - DECLARE_WRITE_LINE_MEMBER(senilb); + void senila(int state); + void senilb(int state); - DECLARE_WRITE_LINE_MEMBER( memen_in ) override; - DECLARE_WRITE_LINE_MEMBER( msast_in ) override; + void memen_in(int state) override; + void msast_in(int state) override; - DECLARE_WRITE_LINE_MEMBER( clock_in ) override; - DECLARE_WRITE_LINE_MEMBER( reset_in ) override; + void clock_in(int state) override; + void reset_in(int state) override; // Part of configuration void set_prefix(int prefix) { m_address_prefix = prefix; } @@ -181,8 +181,8 @@ public: virtual void cruwrite(offs_t offset, uint8_t data) = 0; virtual void setaddress_dbin(offs_t offset, int state) { } - virtual DECLARE_WRITE_LINE_MEMBER(clock_in) { } - virtual DECLARE_WRITE_LINE_MEMBER(reset_in) { } + virtual void clock_in(int state) { } + virtual void reset_in(int state) { } void set_senila(int state) { m_senila = state; } void set_senilb(int state) { m_senilb = state; } @@ -233,16 +233,16 @@ public: void write(offs_t offset, uint8_t data); void setaddress_dbin(offs_t offset, int state); - DECLARE_WRITE_LINE_MEMBER(senila); - DECLARE_WRITE_LINE_MEMBER(senilb); - DECLARE_WRITE_LINE_MEMBER(clock_in); - DECLARE_WRITE_LINE_MEMBER(reset_in); + void senila(int state); + void senilb(int state); + void clock_in(int state); + void reset_in(int state); // Called from the card (direction to box) - DECLARE_WRITE_LINE_MEMBER( set_inta ); - DECLARE_WRITE_LINE_MEMBER( set_intb ); - DECLARE_WRITE_LINE_MEMBER( lcp_line ); - DECLARE_WRITE_LINE_MEMBER( set_ready ); + void set_inta(int state); + void set_intb(int state); + void lcp_line(int state); + void set_ready(int state); void crureadz(offs_t offset, uint8_t *value); void cruwrite(offs_t offset, uint8_t data); diff --git a/src/devices/bus/ti99/peb/samsmem.cpp b/src/devices/bus/ti99/peb/samsmem.cpp index d38f877fc9f..dd509e8e3d2 100644 --- a/src/devices/bus/ti99/peb/samsmem.cpp +++ b/src/devices/bus/ti99/peb/samsmem.cpp @@ -112,12 +112,12 @@ void sams_memory_expansion_device::cruwrite(offs_t offset, uint8_t data) m_crulatch->write_bit((offset & 0x000e) >> 1, data); } -WRITE_LINE_MEMBER(sams_memory_expansion_device::access_mapper_w) +void sams_memory_expansion_device::access_mapper_w(int state) { m_access_mapper = state; } -WRITE_LINE_MEMBER(sams_memory_expansion_device::map_mode_w) +void sams_memory_expansion_device::map_mode_w(int state) { m_map_mode = state; } diff --git a/src/devices/bus/ti99/peb/samsmem.h b/src/devices/bus/ti99/peb/samsmem.h index 8cf3105cc85..6cd900e7361 100644 --- a/src/devices/bus/ti99/peb/samsmem.h +++ b/src/devices/bus/ti99/peb/samsmem.h @@ -40,8 +40,8 @@ protected: virtual void device_add_mconfig(machine_config &config) override; private: - DECLARE_WRITE_LINE_MEMBER(access_mapper_w); - DECLARE_WRITE_LINE_MEMBER(map_mode_w); + void access_mapper_w(int state); + void map_mode_w(int state); // Console RAM required_device m_ram; diff --git a/src/devices/bus/ti99/peb/scsicard.cpp b/src/devices/bus/ti99/peb/scsicard.cpp index 24f5500106f..67a7fbb51d9 100644 --- a/src/devices/bus/ti99/peb/scsicard.cpp +++ b/src/devices/bus/ti99/peb/scsicard.cpp @@ -338,7 +338,7 @@ void whtech_scsi_card_device::cruwrite(offs_t offset, uint8_t data) /* Callbacks for the controller chip. */ -WRITE_LINE_MEMBER( whtech_scsi_card_device::drq_w ) +void whtech_scsi_card_device::drq_w(int state) { LOGMASKED(LOG_CB, "DRQ pin from controller = %d\n", state); bool drq = (state==ASSERT_LINE); @@ -350,7 +350,7 @@ WRITE_LINE_MEMBER( whtech_scsi_card_device::drq_w ) operate_ready_line(); } -WRITE_LINE_MEMBER( whtech_scsi_card_device::irq_w ) +void whtech_scsi_card_device::irq_w(int state) { LOGMASKED(LOG_CB, "IRQ pin from controller = %d\n", state); bool irq = (state==ASSERT_LINE); diff --git a/src/devices/bus/ti99/peb/scsicard.h b/src/devices/bus/ti99/peb/scsicard.h index a55ad228886..a50555c07f2 100644 --- a/src/devices/bus/ti99/peb/scsicard.h +++ b/src/devices/bus/ti99/peb/scsicard.h @@ -35,8 +35,8 @@ public: void crureadz(offs_t offset, uint8_t *value) override; void cruwrite(offs_t offset, uint8_t data) override; - DECLARE_WRITE_LINE_MEMBER( drq_w ); - DECLARE_WRITE_LINE_MEMBER( irq_w ); + void drq_w(int state); + void irq_w(int state); void debug_read(offs_t offset, uint8_t* value); void debug_write(offs_t offset, uint8_t data); diff --git a/src/devices/bus/ti99/peb/spchsyn.cpp b/src/devices/bus/ti99/peb/spchsyn.cpp index 559294bc8b0..8639f4ffa43 100644 --- a/src/devices/bus/ti99/peb/spchsyn.cpp +++ b/src/devices/bus/ti99/peb/spchsyn.cpp @@ -120,7 +120,7 @@ void ti_speech_synthesizer_device::setaddress_dbin(offs_t offset, int state) /****************************************************************************/ -WRITE_LINE_MEMBER( ti_speech_synthesizer_device::speech_ready ) +void ti_speech_synthesizer_device::speech_ready(int state) { // The TMS5200 implementation uses true/false, not ASSERT/CLEAR semantics // and we have to adapt a /READY to a READY line. diff --git a/src/devices/bus/ti99/peb/spchsyn.h b/src/devices/bus/ti99/peb/spchsyn.h index 5bf71658e4b..7322714883e 100644 --- a/src/devices/bus/ti99/peb/spchsyn.h +++ b/src/devices/bus/ti99/peb/spchsyn.h @@ -40,7 +40,7 @@ protected: virtual ioport_constructor device_input_ports() const override; private: - DECLARE_WRITE_LINE_MEMBER( speech_ready ); + void speech_ready(int state); required_device m_vsp; bool m_reading; diff --git a/src/devices/bus/ti99/peb/ti_fdc.cpp b/src/devices/bus/ti99/peb/ti_fdc.cpp index 1c7bffb7f97..bca56861607 100644 --- a/src/devices/bus/ti99/peb/ti_fdc.cpp +++ b/src/devices/bus/ti99/peb/ti_fdc.cpp @@ -79,21 +79,21 @@ void ti_fdc_device::operate_ready_line() /* * Callbacks from the FD1771 chip */ -WRITE_LINE_MEMBER( ti_fdc_device::fdc_irq_w ) +void ti_fdc_device::fdc_irq_w(int state) { m_IRQ = state? ASSERT_LINE : CLEAR_LINE; LOGMASKED(LOG_SIGNALS, "INTRQ callback = %d\n", m_IRQ); operate_ready_line(); } -WRITE_LINE_MEMBER( ti_fdc_device::fdc_drq_w ) +void ti_fdc_device::fdc_drq_w(int state) { m_DRQ = state? ASSERT_LINE : CLEAR_LINE; LOGMASKED(LOG_DRQ, "DRQ callback = %d\n", m_DRQ); operate_ready_line(); } -WRITE_LINE_MEMBER( ti_fdc_device::fdc_hld_w ) +void ti_fdc_device::fdc_hld_w(int state) { m_HLD = state? ASSERT_LINE : CLEAR_LINE; LOGMASKED(LOG_SIGNALS, "HLD callback = %d\n", m_HLD); @@ -230,7 +230,7 @@ void ti_fdc_device::cruwrite(offs_t offset, uint8_t data) m_crulatch->write_bit((offset >> 1) & 0x07, BIT(data, 0)); } -WRITE_LINE_MEMBER(ti_fdc_device::dskpgena_w) +void ti_fdc_device::dskpgena_w(int state) { // (De)select the card. Indicated by a LED on the board. m_selected = state; @@ -240,12 +240,12 @@ WRITE_LINE_MEMBER(ti_fdc_device::dskpgena_w) /* Trigger the motor monoflop. */ -WRITE_LINE_MEMBER(ti_fdc_device::kaclk_w) +void ti_fdc_device::kaclk_w(int state) { m_motormf->b_w(state); } -WRITE_LINE_MEMBER(ti_fdc_device::dvena_w) +void ti_fdc_device::dvena_w(int state) { m_DVENA = state; LOGMASKED(LOG_MOTOR, "Motor %s\n", state? "on" : "off"); @@ -261,7 +261,7 @@ WRITE_LINE_MEMBER(ti_fdc_device::dvena_w) operate_ready_line(); } -WRITE_LINE_MEMBER(ti_fdc_device::waiten_w) +void ti_fdc_device::waiten_w(int state) { // Set disk ready/hold (bit 2) // 0: ignore IRQ and DRQ @@ -271,13 +271,13 @@ WRITE_LINE_MEMBER(ti_fdc_device::waiten_w) LOGMASKED(LOG_CRU, "Arm wait state logic (bit 2) = %d\n", state); } -WRITE_LINE_MEMBER(ti_fdc_device::hlt_w) +void ti_fdc_device::hlt_w(int state) { // Load disk heads (HLT pin) (bit 3). Not implemented. LOGMASKED(LOG_CRU, "Set head load (bit 3) = %d\n", state); } -WRITE_LINE_MEMBER(ti_fdc_device::sidsel_w) +void ti_fdc_device::sidsel_w(int state) { // Select side of disk (bit 7) LOGMASKED(LOG_CRU, "Set side (bit 7) = %d\n", state); @@ -287,17 +287,17 @@ WRITE_LINE_MEMBER(ti_fdc_device::sidsel_w) /* Drive selects */ -WRITE_LINE_MEMBER(ti_fdc_device::dsel1_w) +void ti_fdc_device::dsel1_w(int state) { select_drive(1, state); } -WRITE_LINE_MEMBER(ti_fdc_device::dsel2_w) +void ti_fdc_device::dsel2_w(int state) { select_drive(2, state); } -WRITE_LINE_MEMBER(ti_fdc_device::dsel3_w) +void ti_fdc_device::dsel3_w(int state) { select_drive(3, state); } diff --git a/src/devices/bus/ti99/peb/ti_fdc.h b/src/devices/bus/ti99/peb/ti_fdc.h index 81c2324dbc9..0de44473001 100644 --- a/src/devices/bus/ti99/peb/ti_fdc.h +++ b/src/devices/bus/ti99/peb/ti_fdc.h @@ -48,20 +48,20 @@ protected: private: static void floppy_formats(format_registration &fr); - DECLARE_WRITE_LINE_MEMBER(fdc_irq_w); - DECLARE_WRITE_LINE_MEMBER(fdc_drq_w); - DECLARE_WRITE_LINE_MEMBER(fdc_hld_w); - - DECLARE_WRITE_LINE_MEMBER(dskpgena_w); - DECLARE_WRITE_LINE_MEMBER(kaclk_w); - DECLARE_WRITE_LINE_MEMBER(waiten_w); - DECLARE_WRITE_LINE_MEMBER(hlt_w); - DECLARE_WRITE_LINE_MEMBER(sidsel_w); - - DECLARE_WRITE_LINE_MEMBER(dvena_w); - DECLARE_WRITE_LINE_MEMBER(dsel1_w); - DECLARE_WRITE_LINE_MEMBER(dsel2_w); - DECLARE_WRITE_LINE_MEMBER(dsel3_w); + void fdc_irq_w(int state); + void fdc_drq_w(int state); + void fdc_hld_w(int state); + + void dskpgena_w(int state); + void kaclk_w(int state); + void waiten_w(int state); + void hlt_w(int state); + void sidsel_w(int state); + + void dvena_w(int state); + void dsel1_w(int state); + void dsel2_w(int state); + void dsel3_w(int state); void select_drive(int n, int state); diff --git a/src/devices/bus/ti99/peb/ti_rs232.cpp b/src/devices/bus/ti99/peb/ti_rs232.cpp index 817c038bd88..3fe4968630c 100644 --- a/src/devices/bus/ti99/peb/ti_rs232.cpp +++ b/src/devices/bus/ti99/peb/ti_rs232.cpp @@ -293,17 +293,17 @@ void ti_rs232_pio_device::cruwrite(offs_t offset, uint8_t data) } } -WRITE_LINE_MEMBER(ti_rs232_pio_device::selected_w) +void ti_rs232_pio_device::selected_w(int state) { m_selected = state; } -WRITE_LINE_MEMBER(ti_rs232_pio_device::pio_direction_in_w) +void ti_rs232_pio_device::pio_direction_in_w(int state) { m_pio_direction_in = state; } -WRITE_LINE_MEMBER(ti_rs232_pio_device::pio_handshake_out_w) +void ti_rs232_pio_device::pio_handshake_out_w(int state) { m_pio_handshakeout = state; if (m_pio_write && m_pio_writable && (!m_pio_direction_in)) @@ -342,31 +342,31 @@ WRITE_LINE_MEMBER(ti_rs232_pio_device::pio_handshake_out_w) } } -WRITE_LINE_MEMBER(ti_rs232_pio_device::pio_spareout_w) +void ti_rs232_pio_device::pio_spareout_w(int state) { m_pio_spareout = state; } -WRITE_LINE_MEMBER(ti_rs232_pio_device::flag0_w) +void ti_rs232_pio_device::flag0_w(int state) { m_flag0 = state; } -WRITE_LINE_MEMBER(ti_rs232_pio_device::cts0_w) +void ti_rs232_pio_device::cts0_w(int state) { // Set the CTS line for RS232/1 LOGMASKED(LOG_LINES, "(1/3) Setting CTS* via CRU to %d\n", state); output_line_state(0, tms9902_device::CTS, state ? 0 : tms9902_device::CTS); } -WRITE_LINE_MEMBER(ti_rs232_pio_device::cts1_w) +void ti_rs232_pio_device::cts1_w(int state) { // Set the CTS line for RS232/2 LOGMASKED(LOG_LINES, "(2/4) Setting CTS* via CRU to %d\n", state); output_line_state(1, tms9902_device::CTS, state ? 0 : tms9902_device::CTS); } -WRITE_LINE_MEMBER(ti_rs232_pio_device::led_w) +void ti_rs232_pio_device::led_w(int state) { m_led = state; } @@ -931,7 +931,7 @@ void ti_rs232_pio_device::output_line_state(int uartind, int mask, uint8_t value /* Propagates the /INT signal of the UARTs to the /INT line of the pbox. */ -WRITE_LINE_MEMBER( ti_rs232_pio_device::int0_callback ) +void ti_rs232_pio_device::int0_callback(int state) { int senila_bit = SENILA_0_BIT; @@ -941,7 +941,7 @@ WRITE_LINE_MEMBER( ti_rs232_pio_device::int0_callback ) m_slot->set_inta(state); } -WRITE_LINE_MEMBER( ti_rs232_pio_device::int1_callback ) +void ti_rs232_pio_device::int1_callback(int state) { int senila_bit = SENILA_1_BIT; @@ -957,12 +957,12 @@ WRITE_LINE_MEMBER( ti_rs232_pio_device::int1_callback ) Instead, we check for signal line change or data transmission and call the respective function */ -WRITE_LINE_MEMBER( ti_rs232_pio_device::rcv0_callback ) +void ti_rs232_pio_device::rcv0_callback(int state) { receive_data_or_line_state(0); } -WRITE_LINE_MEMBER( ti_rs232_pio_device::rcv1_callback ) +void ti_rs232_pio_device::rcv1_callback(int state) { receive_data_or_line_state(1); } diff --git a/src/devices/bus/ti99/peb/ti_rs232.h b/src/devices/bus/ti99/peb/ti_rs232.h index 8e304938fd0..c10fd7e81a4 100644 --- a/src/devices/bus/ti99/peb/ti_rs232.h +++ b/src/devices/bus/ti99/peb/ti_rs232.h @@ -46,23 +46,23 @@ protected: ioport_constructor device_input_ports() const override; private: - DECLARE_WRITE_LINE_MEMBER(int0_callback); - DECLARE_WRITE_LINE_MEMBER(int1_callback); - DECLARE_WRITE_LINE_MEMBER(rcv0_callback); - DECLARE_WRITE_LINE_MEMBER(rcv1_callback); + void int0_callback(int state); + void int1_callback(int state); + void rcv0_callback(int state); + void rcv1_callback(int state); void xmit0_callback(uint8_t data); void xmit1_callback(uint8_t data); void ctrl0_callback(offs_t offset, uint8_t data); void ctrl1_callback(offs_t offset, uint8_t data); - DECLARE_WRITE_LINE_MEMBER(selected_w); - DECLARE_WRITE_LINE_MEMBER(pio_direction_in_w); - DECLARE_WRITE_LINE_MEMBER(pio_handshake_out_w); - DECLARE_WRITE_LINE_MEMBER(pio_spareout_w); - DECLARE_WRITE_LINE_MEMBER(flag0_w); - DECLARE_WRITE_LINE_MEMBER(cts0_w); - DECLARE_WRITE_LINE_MEMBER(cts1_w); - DECLARE_WRITE_LINE_MEMBER(led_w); + void selected_w(int state); + void pio_direction_in_w(int state); + void pio_handshake_out_w(int state); + void pio_spareout_w(int state); + void flag0_w(int state); + void cts0_w(int state); + void cts1_w(int state); + void led_w(int state); void incoming_dtr(int uartind, line_state value); void transmit_data(int uartind, uint8_t value); diff --git a/src/devices/bus/ti99/peb/tn_ide.cpp b/src/devices/bus/ti99/peb/tn_ide.cpp index f886633141a..52c30daa262 100644 --- a/src/devices/bus/ti99/peb/tn_ide.cpp +++ b/src/devices/bus/ti99/peb/tn_ide.cpp @@ -594,7 +594,7 @@ void nouspikel_ide_card_device::cruwrite(offs_t offset, uint8_t data) } template -WRITE_LINE_MEMBER(nouspikel_ide_card_device::rtc_int_callback) +void nouspikel_ide_card_device::rtc_int_callback(int state) { if (state) m_rtc_int |= 1 << rtctype; @@ -605,13 +605,13 @@ WRITE_LINE_MEMBER(nouspikel_ide_card_device::rtc_int_callback) m_slot->set_inta(state ? CLEAR_LINE : ASSERT_LINE); } -WRITE_LINE_MEMBER(nouspikel_ide_card_device::ide_interrupt_callback) +void nouspikel_ide_card_device::ide_interrupt_callback(int state) { m_ideint = (state==ASSERT_LINE); if (m_crulatch->q6_r()==1) m_slot->set_inta(state); } -WRITE_LINE_MEMBER(nouspikel_ide_card_device::resetdr_callback) +void nouspikel_ide_card_device::resetdr_callback(int state) { if (m_crulatch->q6_r()==1 && (state==0)) // not implemented diff --git a/src/devices/bus/ti99/peb/tn_ide.h b/src/devices/bus/ti99/peb/tn_ide.h index f3174e2c0ee..fba16021778 100644 --- a/src/devices/bus/ti99/peb/tn_ide.h +++ b/src/devices/bus/ti99/peb/tn_ide.h @@ -71,9 +71,9 @@ private: // Genmod decoding. If not used, the AME line is pulled up, and the AMD line is pulled down bool m_genmod; - template DECLARE_WRITE_LINE_MEMBER(rtc_int_callback); - DECLARE_WRITE_LINE_MEMBER(ide_interrupt_callback); - DECLARE_WRITE_LINE_MEMBER(resetdr_callback); + template void rtc_int_callback(int state); + void ide_interrupt_callback(int state); + void resetdr_callback(int state); void decode(offs_t offset, bool& mmap, bool& sramsel, bool& xramsel, bool& rtcsel, bool& cs1fx, bool& cs3fx); diff --git a/src/devices/bus/tiki100/exp.cpp b/src/devices/bus/tiki100/exp.cpp index 3ada6616c65..1bef2819c10 100644 --- a/src/devices/bus/tiki100/exp.cpp +++ b/src/devices/bus/tiki100/exp.cpp @@ -147,7 +147,7 @@ void tiki100_bus_device::iorq_w(offs_t offset, uint8_t data) // busak_w - bus acknowledge write //------------------------------------------------- -WRITE_LINE_MEMBER( tiki100_bus_device::busak_w ) +void tiki100_bus_device::busak_w(int state) { for (device_tiki100bus_card_interface &entry : m_device_list) entry.busak_w(state); diff --git a/src/devices/bus/tiki100/exp.h b/src/devices/bus/tiki100/exp.h index 9afcbddfecd..4f49a8cd546 100644 --- a/src/devices/bus/tiki100/exp.h +++ b/src/devices/bus/tiki100/exp.h @@ -132,12 +132,12 @@ public: uint8_t iorq_r(offs_t offset, uint8_t data); void iorq_w(offs_t offset, uint8_t data); - DECLARE_WRITE_LINE_MEMBER( busak_w ); + void busak_w(int state); // peripheral interface - DECLARE_WRITE_LINE_MEMBER( irq_w ) { m_irq_cb(state); } - DECLARE_WRITE_LINE_MEMBER( nmi_w ) { m_nmi_cb(state); } - DECLARE_WRITE_LINE_MEMBER( busrq_w ) { m_busrq_cb(state); } + void irq_w(int state) { m_irq_cb(state); } + void nmi_w(int state) { m_nmi_cb(state); } + void busrq_w(int state) { m_busrq_cb(state); } uint8_t exin_mrq_r(offs_t offset) { return m_in_mrq_cb(offset); } void exin_mrq_w(offs_t offset, uint8_t data) { m_out_mrq_cb(offset, data); } diff --git a/src/devices/bus/uts_kbd/400kbd.cpp b/src/devices/bus/uts_kbd/400kbd.cpp index 37d54c7d670..54f30051408 100644 --- a/src/devices/bus/uts_kbd/400kbd.cpp +++ b/src/devices/bus/uts_kbd/400kbd.cpp @@ -54,7 +54,7 @@ void uts_400_keyboard_device::device_start() save_item(NAME(m_prog_line)); } -WRITE_LINE_MEMBER(uts_400_keyboard_device::ready_w) +void uts_400_keyboard_device::ready_w(int state) { m_ready_line = bool(state); } @@ -79,12 +79,12 @@ void uts_400_keyboard_device::p2_w(u8 data) m_p2_output = data; } -READ_LINE_MEMBER(uts_400_keyboard_device::t1_r) +int uts_400_keyboard_device::t1_r() { return m_ready_line; } -WRITE_LINE_MEMBER(uts_400_keyboard_device::prog_w) +void uts_400_keyboard_device::prog_w(int state) { if (!m_prog_line && state) m_input_select = m_p2_output & 0x0f; diff --git a/src/devices/bus/uts_kbd/400kbd.h b/src/devices/bus/uts_kbd/400kbd.h index 8e73bc10dbd..808c52fec5a 100644 --- a/src/devices/bus/uts_kbd/400kbd.h +++ b/src/devices/bus/uts_kbd/400kbd.h @@ -14,7 +14,7 @@ public: uts_400_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); protected: - virtual DECLARE_WRITE_LINE_MEMBER(ready_w) override; + virtual void ready_w(int state) override; virtual ioport_constructor device_input_ports() const override; virtual void device_start() override; @@ -25,8 +25,8 @@ private: u8 bus_r(); void p1_w(u8 data); void p2_w(u8 data); - DECLARE_READ_LINE_MEMBER(t1_r); - DECLARE_WRITE_LINE_MEMBER(prog_w); + int t1_r(); + void prog_w(int state); void ext_map(address_map &map); diff --git a/src/devices/bus/uts_kbd/extw.cpp b/src/devices/bus/uts_kbd/extw.cpp index 950d8b244f2..344159485a5 100644 --- a/src/devices/bus/uts_kbd/extw.cpp +++ b/src/devices/bus/uts_kbd/extw.cpp @@ -61,7 +61,7 @@ void uts_extw_keyboard_device::device_start() save_item(NAME(m_prog_line)); } -WRITE_LINE_MEMBER(uts_extw_keyboard_device::ready_w) +void uts_extw_keyboard_device::ready_w(int state) { m_ready_line = bool(state); } @@ -93,12 +93,12 @@ void uts_extw_keyboard_device::t0_clock(u32 clk) { } -READ_LINE_MEMBER(uts_extw_keyboard_device::t1_r) +int uts_extw_keyboard_device::t1_r() { return BIT(m_shift_register, 7); } -WRITE_LINE_MEMBER(uts_extw_keyboard_device::prog_w) +void uts_extw_keyboard_device::prog_w(int state) { if (!m_prog_line && state) { diff --git a/src/devices/bus/uts_kbd/extw.h b/src/devices/bus/uts_kbd/extw.h index 21599139ec1..1bde8144781 100644 --- a/src/devices/bus/uts_kbd/extw.h +++ b/src/devices/bus/uts_kbd/extw.h @@ -14,7 +14,7 @@ public: uts_extw_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); protected: - virtual DECLARE_WRITE_LINE_MEMBER(ready_w) override; + virtual void ready_w(int state) override; virtual ioport_constructor device_input_ports() const override; virtual void device_start() override; @@ -26,8 +26,8 @@ private: void p1_w(u8 data); void p2_w(u8 data); void t0_clock(u32 clk); - DECLARE_READ_LINE_MEMBER(t1_r); - DECLARE_WRITE_LINE_MEMBER(prog_w); + int t1_r(); + void prog_w(int state); void prog_map(address_map &map); void ext_map(address_map &map); diff --git a/src/devices/bus/uts_kbd/uts_kbd.h b/src/devices/bus/uts_kbd/uts_kbd.h index c0d6d9b0824..a70f9e7c5ff 100644 --- a/src/devices/bus/uts_kbd/uts_kbd.h +++ b/src/devices/bus/uts_kbd/uts_kbd.h @@ -42,7 +42,7 @@ public: auto rxd_callback() { return m_rxd_callback.bind(); } // line handler - inline DECLARE_WRITE_LINE_MEMBER(ready_w); + inline void ready_w(int state); protected: // device-level overrides @@ -51,7 +51,7 @@ protected: virtual void device_start() override; // called from keyboard - DECLARE_WRITE_LINE_MEMBER(write_rxd) { m_rxd_callback(state); } + void write_rxd(int state) { m_rxd_callback(state); } private: // user callback @@ -72,9 +72,9 @@ protected: device_uts_keyboard_interface(const machine_config &mconfig, device_t &device); virtual ~device_uts_keyboard_interface(); - DECLARE_WRITE_LINE_MEMBER(write_rxd) { m_port->write_rxd(state); } + void write_rxd(int state) { m_port->write_rxd(state); } - virtual DECLARE_WRITE_LINE_MEMBER(ready_w) = 0; + virtual void ready_w(int state) = 0; private: // parent port @@ -92,7 +92,7 @@ extern void uts10_keyboards(device_slot_interface &slot); // INLINE FUNCTIONS //************************************************************************** -WRITE_LINE_MEMBER(uts_keyboard_port_device::ready_w) +void uts_keyboard_port_device::ready_w(int state) { if (m_kbd != nullptr) m_kbd->ready_w(state); diff --git a/src/devices/bus/vic10/exp.cpp b/src/devices/bus/vic10/exp.cpp index 1c0f44301db..19f55c0bac7 100644 --- a/src/devices/bus/vic10/exp.cpp +++ b/src/devices/bus/vic10/exp.cpp @@ -184,8 +184,8 @@ void vic10_expansion_slot_device::cd_w(offs_t offset, uint8_t data, int lorom, i } } -READ_LINE_MEMBER( vic10_expansion_slot_device::p0_r ) { int state = 0; if (m_card != nullptr) state = m_card->vic10_p0_r(); return state; } -WRITE_LINE_MEMBER( vic10_expansion_slot_device::p0_w ) { if (m_card != nullptr) m_card->vic10_p0_w(state); } +int vic10_expansion_slot_device::p0_r() { int state = 0; if (m_card != nullptr) state = m_card->vic10_p0_r(); return state; } +void vic10_expansion_slot_device::p0_w(int state) { if (m_card != nullptr) m_card->vic10_p0_w(state); } //------------------------------------------------- diff --git a/src/devices/bus/vic10/exp.h b/src/devices/bus/vic10/exp.h index aa2aa14c1dd..d1ae951bbe2 100644 --- a/src/devices/bus/vic10/exp.h +++ b/src/devices/bus/vic10/exp.h @@ -73,14 +73,14 @@ public: // computer interface uint8_t cd_r(offs_t offset, uint8_t data, int lorom, int uprom, int exram); void cd_w(offs_t offset, uint8_t data, int lorom, int uprom, int exram); - DECLARE_READ_LINE_MEMBER( p0_r ); - DECLARE_WRITE_LINE_MEMBER( p0_w ); + int p0_r(); + void p0_w(int state); // cartridge interface - DECLARE_WRITE_LINE_MEMBER( irq_w ) { m_write_irq(state); } - DECLARE_WRITE_LINE_MEMBER( res_w ) { m_write_res(state); } - DECLARE_WRITE_LINE_MEMBER( cnt_w ) { m_write_cnt(state); } - DECLARE_WRITE_LINE_MEMBER( sp_w ) { m_write_sp(state); } + void irq_w(int state) { m_write_irq(state); } + void res_w(int state) { m_write_res(state); } + void cnt_w(int state) { m_write_cnt(state); } + void sp_w(int state) { m_write_sp(state); } protected: // device_t implementation diff --git a/src/devices/bus/vic20/4cga.cpp b/src/devices/bus/vic20/4cga.cpp index f806598433a..ea0b2ae5215 100644 --- a/src/devices/bus/vic20/4cga.cpp +++ b/src/devices/bus/vic20/4cga.cpp @@ -107,7 +107,7 @@ void c64_4cga_device::update_output() // c64_pb_w - port B write //------------------------------------------------- -WRITE_LINE_MEMBER( c64_4cga_device::input_l ) +void c64_4cga_device::input_l(int state) { m_port = state; update_output(); diff --git a/src/devices/bus/vic20/4cga.h b/src/devices/bus/vic20/4cga.h index b4e1ada9a05..e6d101f94ca 100644 --- a/src/devices/bus/vic20/4cga.h +++ b/src/devices/bus/vic20/4cga.h @@ -32,22 +32,22 @@ public: // optional information overrides virtual ioport_constructor device_input_ports() const override; - DECLARE_WRITE_LINE_MEMBER(write_joy3_0) { if (state) m_joy3 |= 1; else m_joy3 &= ~1; update_output(); } - DECLARE_WRITE_LINE_MEMBER(write_joy3_1) { if (state) m_joy3 |= 2; else m_joy3 &= ~2; update_output(); } - DECLARE_WRITE_LINE_MEMBER(write_joy3_2) { if (state) m_joy3 |= 4; else m_joy3 &= ~4; update_output(); } - DECLARE_WRITE_LINE_MEMBER(write_joy3_3) { if (state) m_joy3 |= 8; else m_joy3 &= ~8; update_output(); } + void write_joy3_0(int state) { if (state) m_joy3 |= 1; else m_joy3 &= ~1; update_output(); } + void write_joy3_1(int state) { if (state) m_joy3 |= 2; else m_joy3 &= ~2; update_output(); } + void write_joy3_2(int state) { if (state) m_joy3 |= 4; else m_joy3 &= ~4; update_output(); } + void write_joy3_3(int state) { if (state) m_joy3 |= 8; else m_joy3 &= ~8; update_output(); } - DECLARE_WRITE_LINE_MEMBER(write_joy4_0) { if (state) m_joy4 |= 1; else m_joy4 &= ~1; update_output(); } - DECLARE_WRITE_LINE_MEMBER(write_joy4_1) { if (state) m_joy4 |= 2; else m_joy4 &= ~2; update_output(); } - DECLARE_WRITE_LINE_MEMBER(write_joy4_2) { if (state) m_joy4 |= 4; else m_joy4 &= ~4; update_output(); } - DECLARE_WRITE_LINE_MEMBER(write_joy4_3) { if (state) m_joy4 |= 8; else m_joy4 &= ~8; update_output(); } + void write_joy4_0(int state) { if (state) m_joy4 |= 1; else m_joy4 &= ~1; update_output(); } + void write_joy4_1(int state) { if (state) m_joy4 |= 2; else m_joy4 &= ~2; update_output(); } + void write_joy4_2(int state) { if (state) m_joy4 |= 4; else m_joy4 &= ~4; update_output(); } + void write_joy4_3(int state) { if (state) m_joy4 |= 8; else m_joy4 &= ~8; update_output(); } protected: // device-level overrides virtual void device_start() override; // device_pet_user_port_interface overrides - virtual DECLARE_WRITE_LINE_MEMBER( input_l ) override; + virtual void input_l(int state) override; private: void update_output(); diff --git a/src/devices/bus/vic20/exp.h b/src/devices/bus/vic20/exp.h index 2a41869157a..53f5c3a33f4 100644 --- a/src/devices/bus/vic20/exp.h +++ b/src/devices/bus/vic20/exp.h @@ -75,9 +75,9 @@ public: void cd_w(offs_t offset, uint8_t data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3); // cartridge interface - DECLARE_WRITE_LINE_MEMBER( irq_w ) { m_write_irq(state); } - DECLARE_WRITE_LINE_MEMBER( nmi_w ) { m_write_nmi(state); } - DECLARE_WRITE_LINE_MEMBER( res_w ) { m_write_res(state); } + void irq_w(int state) { m_write_irq(state); } + void nmi_w(int state) { m_write_nmi(state); } + void res_w(int state) { m_write_res(state); } protected: // device_t implementation diff --git a/src/devices/bus/vic20/vic1011.cpp b/src/devices/bus/vic20/vic1011.cpp index 893536a5b09..0554fb07036 100644 --- a/src/devices/bus/vic20/vic1011.cpp +++ b/src/devices/bus/vic20/vic1011.cpp @@ -56,7 +56,7 @@ void vic1011_device::device_start() { } -WRITE_LINE_MEMBER( vic1011_device::output_rxd ) +void vic1011_device::output_rxd(int state) { output_b(state); output_c(state); diff --git a/src/devices/bus/vic20/vic1011.h b/src/devices/bus/vic20/vic1011.h index e13bc6550ba..63490aaf087 100644 --- a/src/devices/bus/vic20/vic1011.h +++ b/src/devices/bus/vic20/vic1011.h @@ -29,10 +29,10 @@ public: vic1011_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); // device_pet_user_port_interface overrides - virtual DECLARE_WRITE_LINE_MEMBER( input_d ) override; - virtual DECLARE_WRITE_LINE_MEMBER( input_e ) override; - virtual DECLARE_WRITE_LINE_MEMBER( input_j ) override; - virtual DECLARE_WRITE_LINE_MEMBER( input_m ) override; + virtual void input_d(int state) override; + virtual void input_e(int state) override; + virtual void input_j(int state) override; + virtual void input_m(int state) override; protected: // device-level overrides @@ -42,7 +42,7 @@ protected: virtual void device_add_mconfig(machine_config &config) override; private: - DECLARE_WRITE_LINE_MEMBER( output_rxd ); + void output_rxd(int state); required_device m_rs232; }; diff --git a/src/devices/bus/vic20/vic1112.cpp b/src/devices/bus/vic20/vic1112.cpp index ce878ee5f9f..c7043110992 100644 --- a/src/devices/bus/vic20/vic1112.cpp +++ b/src/devices/bus/vic20/vic1112.cpp @@ -27,7 +27,7 @@ DEFINE_DEVICE_TYPE(VIC1112, vic1112_device, "vic1112", "VIC-1112 IEEE-488 Interface") -WRITE_LINE_MEMBER( vic1112_device::via0_irq_w ) +void vic1112_device::via0_irq_w(int state) { m_via0_irq = state; @@ -85,7 +85,7 @@ void vic1112_device::via0_pb_w(uint8_t data) } -WRITE_LINE_MEMBER( vic1112_device::via1_irq_w ) +void vic1112_device::via1_irq_w(int state) { m_via1_irq = state; diff --git a/src/devices/bus/vic20/vic1112.h b/src/devices/bus/vic20/vic1112.h index 8353ad2390d..fc5c144a051 100644 --- a/src/devices/bus/vic20/vic1112.h +++ b/src/devices/bus/vic20/vic1112.h @@ -46,10 +46,10 @@ protected: virtual void vic20_cd_w(offs_t offset, uint8_t data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3) override; private: - DECLARE_WRITE_LINE_MEMBER( via0_irq_w ); + void via0_irq_w(int state); uint8_t via0_pb_r(); void via0_pb_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER( via1_irq_w ); + void via1_irq_w(int state); required_device m_via0; required_device m_via1; diff --git a/src/devices/bus/vidbrain/exp.h b/src/devices/bus/vidbrain/exp.h index ec4744cf11d..d2686a04c59 100644 --- a/src/devices/bus/vidbrain/exp.h +++ b/src/devices/bus/vidbrain/exp.h @@ -113,7 +113,7 @@ public: void unmap_w(offs_t offset, uint8_t data) { bo_w(offset + 0x3000, data, 1, 0); } // cartridge interface - DECLARE_WRITE_LINE_MEMBER( extres_w ) { m_write_extres(state); } + void extres_w(int state) { m_write_extres(state); } protected: // device_t implementation diff --git a/src/devices/bus/vip/byteio.cpp b/src/devices/bus/vip/byteio.cpp index 83236247ae7..a63fcce8d60 100644 --- a/src/devices/bus/vip/byteio.cpp +++ b/src/devices/bus/vip/byteio.cpp @@ -75,9 +75,9 @@ void vip_byteio_port_device::device_reset() uint8_t vip_byteio_port_device::in_r() { uint8_t data = 0xff; if (m_cart != nullptr) data = m_cart->vip_in_r(); return data; } void vip_byteio_port_device::out_w(uint8_t data) { if (m_cart != nullptr) m_cart->vip_out_w(data); } -READ_LINE_MEMBER( vip_byteio_port_device::ef3_r ) { int state = CLEAR_LINE; if (m_cart != nullptr) state = m_cart->vip_ef3_r(); return state; } -READ_LINE_MEMBER( vip_byteio_port_device::ef4_r ) { int state = CLEAR_LINE; if (m_cart != nullptr) state = m_cart->vip_ef4_r(); return state; } -WRITE_LINE_MEMBER( vip_byteio_port_device::q_w ) { if (m_cart != nullptr) m_cart->vip_q_w(state); } +int vip_byteio_port_device::ef3_r() { int state = CLEAR_LINE; if (m_cart != nullptr) state = m_cart->vip_ef3_r(); return state; } +int vip_byteio_port_device::ef4_r() { int state = CLEAR_LINE; if (m_cart != nullptr) state = m_cart->vip_ef4_r(); return state; } +void vip_byteio_port_device::q_w(int state) { if (m_cart != nullptr) m_cart->vip_q_w(state); } //------------------------------------------------- diff --git a/src/devices/bus/vip/byteio.h b/src/devices/bus/vip/byteio.h index 5cca82aea45..7d564f2bf03 100644 --- a/src/devices/bus/vip/byteio.h +++ b/src/devices/bus/vip/byteio.h @@ -74,12 +74,12 @@ public: // computer interface uint8_t in_r(); void out_w(uint8_t data); - DECLARE_READ_LINE_MEMBER( ef3_r ); - DECLARE_READ_LINE_MEMBER( ef4_r ); - DECLARE_WRITE_LINE_MEMBER( q_w ); + int ef3_r(); + int ef4_r(); + void q_w(int state); // cartridge interface - DECLARE_WRITE_LINE_MEMBER( inst_w ) { m_write_inst(state); } + void inst_w(int state) { m_write_inst(state); } protected: // device-level overrides diff --git a/src/devices/bus/vip/exp.cpp b/src/devices/bus/vip/exp.cpp index f6abf579f18..d538d653d17 100644 --- a/src/devices/bus/vip/exp.cpp +++ b/src/devices/bus/vip/exp.cpp @@ -182,7 +182,7 @@ uint32_t vip_expansion_slot_device::screen_update(screen_device &screen, bitmap_ return value; } -READ_LINE_MEMBER(vip_expansion_slot_device::ef1_r) +int vip_expansion_slot_device::ef1_r() { int state = CLEAR_LINE; if (m_card != nullptr) @@ -190,7 +190,7 @@ READ_LINE_MEMBER(vip_expansion_slot_device::ef1_r) return state; } -READ_LINE_MEMBER(vip_expansion_slot_device::ef3_r) +int vip_expansion_slot_device::ef3_r() { int state = CLEAR_LINE; if (m_card != nullptr) @@ -198,7 +198,7 @@ READ_LINE_MEMBER(vip_expansion_slot_device::ef3_r) return state; } -READ_LINE_MEMBER(vip_expansion_slot_device::ef4_r) +int vip_expansion_slot_device::ef4_r() { int state = CLEAR_LINE; if (m_card != nullptr) @@ -212,19 +212,19 @@ void vip_expansion_slot_device::sc_w(offs_t offset, uint8_t data) m_card->vip_sc_w(offset, data); } -WRITE_LINE_MEMBER(vip_expansion_slot_device::q_w) +void vip_expansion_slot_device::q_w(int state) { if (m_card != nullptr) m_card->vip_q_w(state); } -WRITE_LINE_MEMBER(vip_expansion_slot_device::tpb_w) +void vip_expansion_slot_device::tpb_w(int state) { if (m_card != nullptr) m_card->vip_tpb_w(state); } -WRITE_LINE_MEMBER(vip_expansion_slot_device::run_w) +void vip_expansion_slot_device::run_w(int state) { if (m_card != nullptr) m_card->vip_run_w(state); diff --git a/src/devices/bus/vip/exp.h b/src/devices/bus/vip/exp.h index aa50074e9ca..cdd03a768ea 100644 --- a/src/devices/bus/vip/exp.h +++ b/src/devices/bus/vip/exp.h @@ -74,18 +74,18 @@ public: uint8_t dma_r(offs_t offset); void dma_w(offs_t offset, uint8_t data); uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); - DECLARE_READ_LINE_MEMBER(ef1_r); - DECLARE_READ_LINE_MEMBER(ef3_r); - DECLARE_READ_LINE_MEMBER(ef4_r); + int ef1_r(); + int ef3_r(); + int ef4_r(); void sc_w(offs_t offset, uint8_t data); - DECLARE_WRITE_LINE_MEMBER(q_w); - DECLARE_WRITE_LINE_MEMBER(tpb_w); - DECLARE_WRITE_LINE_MEMBER(run_w); + void q_w(int state); + void tpb_w(int state); + void run_w(int state); // cartridge interface - DECLARE_WRITE_LINE_MEMBER(interrupt_w) { m_write_int(state); } - DECLARE_WRITE_LINE_MEMBER(dma_out_w) { m_write_dma_out(state); } - DECLARE_WRITE_LINE_MEMBER(dma_in_w) { m_write_dma_in(state); } + void interrupt_w(int state) { m_write_int(state); } + void dma_out_w(int state) { m_write_dma_out(state); } + void dma_in_w(int state) { m_write_dma_in(state); } protected: // device-level overrides diff --git a/src/devices/bus/vip/vp575.h b/src/devices/bus/vip/vp575.h index fb5c22f5628..19c1da4c50c 100644 --- a/src/devices/bus/vip/vp575.h +++ b/src/devices/bus/vip/vp575.h @@ -52,23 +52,23 @@ protected: private: static constexpr unsigned MAX_SLOTS = 5; - DECLARE_WRITE_LINE_MEMBER( exp1_int_w ) { m_int[0] = state; update_interrupts(); } - DECLARE_WRITE_LINE_MEMBER( exp2_int_w ) { m_int[1] = state; update_interrupts(); } - DECLARE_WRITE_LINE_MEMBER( exp3_int_w ) { m_int[2] = state; update_interrupts(); } - DECLARE_WRITE_LINE_MEMBER( exp4_int_w ) { m_int[3] = state; update_interrupts(); } - DECLARE_WRITE_LINE_MEMBER( exp5_int_w ) { m_int[4] = state; update_interrupts(); } - - DECLARE_WRITE_LINE_MEMBER( exp1_dma_out_w ) { m_dma_out[0] = state; update_interrupts(); } - DECLARE_WRITE_LINE_MEMBER( exp2_dma_out_w ) { m_dma_out[1] = state; update_interrupts(); } - DECLARE_WRITE_LINE_MEMBER( exp3_dma_out_w ) { m_dma_out[2] = state; update_interrupts(); } - DECLARE_WRITE_LINE_MEMBER( exp4_dma_out_w ) { m_dma_out[3] = state; update_interrupts(); } - DECLARE_WRITE_LINE_MEMBER( exp5_dma_out_w ) { m_dma_out[4] = state; update_interrupts(); } - - DECLARE_WRITE_LINE_MEMBER( exp1_dma_in_w ) { m_dma_in[0] = state; update_interrupts(); } - DECLARE_WRITE_LINE_MEMBER( exp2_dma_in_w ) { m_dma_in[1] = state; update_interrupts(); } - DECLARE_WRITE_LINE_MEMBER( exp3_dma_in_w ) { m_dma_in[2] = state; update_interrupts(); } - DECLARE_WRITE_LINE_MEMBER( exp4_dma_in_w ) { m_dma_in[3] = state; update_interrupts(); } - DECLARE_WRITE_LINE_MEMBER( exp5_dma_in_w ) { m_dma_in[4] = state; update_interrupts(); } + void exp1_int_w(int state) { m_int[0] = state; update_interrupts(); } + void exp2_int_w(int state) { m_int[1] = state; update_interrupts(); } + void exp3_int_w(int state) { m_int[2] = state; update_interrupts(); } + void exp4_int_w(int state) { m_int[3] = state; update_interrupts(); } + void exp5_int_w(int state) { m_int[4] = state; update_interrupts(); } + + void exp1_dma_out_w(int state) { m_dma_out[0] = state; update_interrupts(); } + void exp2_dma_out_w(int state) { m_dma_out[1] = state; update_interrupts(); } + void exp3_dma_out_w(int state) { m_dma_out[2] = state; update_interrupts(); } + void exp4_dma_out_w(int state) { m_dma_out[3] = state; update_interrupts(); } + void exp5_dma_out_w(int state) { m_dma_out[4] = state; update_interrupts(); } + + void exp1_dma_in_w(int state) { m_dma_in[0] = state; update_interrupts(); } + void exp2_dma_in_w(int state) { m_dma_in[1] = state; update_interrupts(); } + void exp3_dma_in_w(int state) { m_dma_in[2] = state; update_interrupts(); } + void exp4_dma_in_w(int state) { m_dma_in[3] = state; update_interrupts(); } + void exp5_dma_in_w(int state) { m_dma_in[4] = state; update_interrupts(); } void update_interrupts(); diff --git a/src/devices/bus/vip/vp590.cpp b/src/devices/bus/vip/vp590.cpp index 296ce70fb8b..3988600f336 100644 --- a/src/devices/bus/vip/vp590.cpp +++ b/src/devices/bus/vip/vp590.cpp @@ -33,17 +33,17 @@ DEFINE_DEVICE_TYPE(VP590, vp590_device, "vp590", "VP-590 Color Board + VP-580 16 // CDP1862_INTERFACE( cgc_intf ) //------------------------------------------------- -READ_LINE_MEMBER( vp590_device::rd_r ) +int vp590_device::rd_r() { return BIT(m_color, 1); } -READ_LINE_MEMBER( vp590_device::bd_r ) +int vp590_device::bd_r() { return BIT(m_color, 2); } -READ_LINE_MEMBER( vp590_device::gd_r ) +int vp590_device::gd_r() { return BIT(m_color, 3); } diff --git a/src/devices/bus/vip/vp590.h b/src/devices/bus/vip/vp590.h index 9c69762f7be..54306da55a4 100644 --- a/src/devices/bus/vip/vp590.h +++ b/src/devices/bus/vip/vp590.h @@ -45,9 +45,9 @@ protected: virtual int vip_ef4_r() override; private: - DECLARE_READ_LINE_MEMBER( rd_r ); - DECLARE_READ_LINE_MEMBER( bd_r ); - DECLARE_READ_LINE_MEMBER( gd_r ); + int rd_r(); + int bd_r(); + int gd_r(); required_device m_cgc; memory_share_creator m_color_ram; diff --git a/src/devices/bus/vme/vme_cp31.cpp b/src/devices/bus/vme/vme_cp31.cpp index 9480e9d1221..a5ec6914ccd 100644 --- a/src/devices/bus/vme/vme_cp31.cpp +++ b/src/devices/bus/vme/vme_cp31.cpp @@ -191,7 +191,7 @@ uint32_t vme_cp31_card_device::trap_r(offs_t offset, uint32_t mem_mask) return 0xffffffff; } -WRITE_LINE_MEMBER(vme_cp31_card_device::bim_irq_callback) +void vme_cp31_card_device::bim_irq_callback(int state) { LOGINT("%s(%02x)\n", FUNCNAME, state); diff --git a/src/devices/bus/vme/vme_cp31.h b/src/devices/bus/vme/vme_cp31.h index ad1f7c8905f..fec722976fa 100644 --- a/src/devices/bus/vme/vme_cp31.h +++ b/src/devices/bus/vme/vme_cp31.h @@ -53,7 +53,7 @@ private: uint8_t bim_irq_state; int bim_irq_level; - DECLARE_WRITE_LINE_MEMBER(bim_irq_callback); + void bim_irq_callback(int state); void update_irq_to_maincpu(); void pit1_pb_w(uint8_t data); diff --git a/src/devices/bus/vme/vme_fccpu20.cpp b/src/devices/bus/vme/vme_fccpu20.cpp index e9b00ff70f2..82ddcb0f59d 100644 --- a/src/devices/bus/vme/vme_fccpu20.cpp +++ b/src/devices/bus/vme/vme_fccpu20.cpp @@ -486,7 +486,7 @@ void vme_fccpu20_device::bootvect_w(offs_t offset, uint32_t data, uint32_t mem_m m_sysrom = &m_sysram[0]; // redirect all upcoming accesses to masking RAM until reset. } -WRITE_LINE_MEMBER(vme_fccpu20_device::bim_irq_callback) +void vme_fccpu20_device::bim_irq_callback(int state) { LOGINT("vme_fccpu20_device::bim_irq_callback(%02x)\n", state); diff --git a/src/devices/bus/vme/vme_fccpu20.h b/src/devices/bus/vme/vme_fccpu20.h index 42569041f87..7462229c82b 100644 --- a/src/devices/bus/vme/vme_fccpu20.h +++ b/src/devices/bus/vme/vme_fccpu20.h @@ -58,7 +58,7 @@ protected: required_device m_maincpu; private: - DECLARE_WRITE_LINE_MEMBER(bim_irq_callback); + void bim_irq_callback(int state); /* PIT callbacks */ uint8_t pita_r(); diff --git a/src/devices/bus/vme/vme_fcscsi.cpp b/src/devices/bus/vme/vme_fcscsi.cpp index 013f16a644f..f3dcce6e29d 100644 --- a/src/devices/bus/vme/vme_fcscsi.cpp +++ b/src/devices/bus/vme/vme_fcscsi.cpp @@ -398,7 +398,7 @@ void vme_fcscsi1_card_device::led_w(uint8_t data) { return; } -WRITE_LINE_MEMBER(vme_fcscsi1_card_device::dma_irq) +void vme_fcscsi1_card_device::dma_irq(int state) { if(state != CLEAR_LINE) { @@ -421,7 +421,7 @@ uint8_t vme_fcscsi1_card_device::dma_iack() return m68000_base_device::autovector(2); } -WRITE_LINE_MEMBER(vme_fcscsi1_card_device::fdc_irq) +void vme_fcscsi1_card_device::fdc_irq(int state) { if (state != 0) { diff --git a/src/devices/bus/vme/vme_fcscsi.h b/src/devices/bus/vme/vme_fcscsi.h index 58c57c88fdc..93ae87ae680 100644 --- a/src/devices/bus/vme/vme_fcscsi.h +++ b/src/devices/bus/vme/vme_fcscsi.h @@ -35,11 +35,11 @@ protected: private: //dmac - DECLARE_WRITE_LINE_MEMBER(dma_irq); + void dma_irq(int state); uint8_t dma_iack(); //fdc - DECLARE_WRITE_LINE_MEMBER(fdc_irq); + void fdc_irq(int state); uint8_t fdc_read_byte(); void fdc_write_byte(uint8_t data); diff --git a/src/devices/bus/vme/vme_hcpu30.cpp b/src/devices/bus/vme/vme_hcpu30.cpp index 7f795e5f0a1..dc8e8803f00 100644 --- a/src/devices/bus/vme/vme_hcpu30.cpp +++ b/src/devices/bus/vme/vme_hcpu30.cpp @@ -328,7 +328,7 @@ void vme_hcpu30_card_device::trap_w(offs_t offset, uint32_t data, uint32_t mem_m } // Active High? -WRITE_LINE_MEMBER(vme_hcpu30_card_device::dusirq_callback) +void vme_hcpu30_card_device::dusirq_callback(int state) { LOGINT("vme_hcpu30_card_device::dusirq_callback(%02x)\n", state); m_irq_state &= ~(1 << 12); @@ -336,7 +336,7 @@ WRITE_LINE_MEMBER(vme_hcpu30_card_device::dusirq_callback) } // Active Low? -WRITE_LINE_MEMBER(vme_hcpu30_card_device::scsiirq_callback) +void vme_hcpu30_card_device::scsiirq_callback(int state) { LOGINT("vme_hcpu30_card_device::scsiirq_callback(%02x)\n", state); m_irq_state &= ~(1 << 8); @@ -344,7 +344,7 @@ WRITE_LINE_MEMBER(vme_hcpu30_card_device::scsiirq_callback) } // Active Low? -WRITE_LINE_MEMBER(vme_hcpu30_card_device::scsidrq_callback) +void vme_hcpu30_card_device::scsidrq_callback(int state) { LOGINT("vme_hcpu30_card_device::scsidrq_callback(%02x)\n", state); m_irq_state &= ~(1 << 7); @@ -352,7 +352,7 @@ WRITE_LINE_MEMBER(vme_hcpu30_card_device::scsidrq_callback) } // Active Low? -WRITE_LINE_MEMBER(vme_hcpu30_card_device::fdcirq_callback) +void vme_hcpu30_card_device::fdcirq_callback(int state) { LOGINT("vme_hcpu30_card_device::fdcirq_callback(%02x)\n", state); m_irq_state &= ~(1 << (8+2)); @@ -360,7 +360,7 @@ WRITE_LINE_MEMBER(vme_hcpu30_card_device::fdcirq_callback) } // Active Low? -WRITE_LINE_MEMBER(vme_hcpu30_card_device::fdcdrq_callback) +void vme_hcpu30_card_device::fdcdrq_callback(int state) { LOGINT("vme_hcpu30_card_device::fdcdrq_callback(%02x)\n", state); #if 0 diff --git a/src/devices/bus/vme/vme_hcpu30.h b/src/devices/bus/vme/vme_hcpu30.h index 224d8e41ab2..065a989707a 100644 --- a/src/devices/bus/vme/vme_hcpu30.h +++ b/src/devices/bus/vme/vme_hcpu30.h @@ -57,11 +57,11 @@ private: required_region_ptr m_sysrom; required_ioport m_dips; - DECLARE_WRITE_LINE_MEMBER(dusirq_callback); - DECLARE_WRITE_LINE_MEMBER(scsiirq_callback); - DECLARE_WRITE_LINE_MEMBER(scsidrq_callback); - DECLARE_WRITE_LINE_MEMBER(fdcirq_callback); - DECLARE_WRITE_LINE_MEMBER(fdcdrq_callback); + void dusirq_callback(int state); + void scsiirq_callback(int state); + void scsidrq_callback(int state); + void fdcirq_callback(int state); + void fdcdrq_callback(int state); // Pointer to System ROMs needed by bootvect_r and masking RAM buffer for post reset accesses memory_passthrough_handler m_rom_shadow_tap; diff --git a/src/devices/bus/vme/vme_mvme120.cpp b/src/devices/bus/vme/vme_mvme120.cpp index 7933c782cd2..06a6659c391 100644 --- a/src/devices/bus/vme/vme_mvme120.cpp +++ b/src/devices/bus/vme/vme_mvme120.cpp @@ -255,7 +255,7 @@ void vme_mvme120_device::rom_shadow_tap(offs_t address, u16 data, u16 mem_mask) } } -WRITE_LINE_MEMBER(vme_mvme120_device::watchdog_reset) +void vme_mvme120_device::watchdog_reset(int state) { if(state) { @@ -264,7 +264,7 @@ WRITE_LINE_MEMBER(vme_mvme120_device::watchdog_reset) } } -WRITE_LINE_MEMBER(vme_mvme120_device::mfp_interrupt) +void vme_mvme120_device::mfp_interrupt(int state) { LOG("%s: MFP asserting interrupt\n", FUNCNAME); diff --git a/src/devices/bus/vme/vme_mvme120.h b/src/devices/bus/vme/vme_mvme120.h index 1ecafbcf794..e455ba0c2ce 100644 --- a/src/devices/bus/vme/vme_mvme120.h +++ b/src/devices/bus/vme/vme_mvme120.h @@ -81,8 +81,8 @@ protected: void rom_shadow_tap(offs_t address, u16 data, u16 mem_mask); - DECLARE_WRITE_LINE_MEMBER(watchdog_reset); - DECLARE_WRITE_LINE_MEMBER(mfp_interrupt); + void watchdog_reset(int state); + void mfp_interrupt(int state); const mvme12x_variant m_board_id; }; diff --git a/src/devices/bus/vtech/ioexp/printer.cpp b/src/devices/bus/vtech/ioexp/printer.cpp index b5eaa4e8a4b..ba549b22a5e 100644 --- a/src/devices/bus/vtech/ioexp/printer.cpp +++ b/src/devices/bus/vtech/ioexp/printer.cpp @@ -80,7 +80,7 @@ void vtech_printer_interface_device::device_start() // IMPLEMENTATION //************************************************************************** -WRITE_LINE_MEMBER( vtech_printer_interface_device::busy_w ) +void vtech_printer_interface_device::busy_w(int state) { m_centronics_busy = state; } diff --git a/src/devices/bus/vtech/ioexp/printer.h b/src/devices/bus/vtech/ioexp/printer.h index be25c7fd614..c45dfd9c836 100644 --- a/src/devices/bus/vtech/ioexp/printer.h +++ b/src/devices/bus/vtech/ioexp/printer.h @@ -39,7 +39,7 @@ private: required_device m_centronics; required_device m_latch; - DECLARE_WRITE_LINE_MEMBER( busy_w ); + void busy_w(int state); uint8_t busy_r(); void strobe_w(uint8_t data); diff --git a/src/devices/bus/vtech/memexp/memexp.h b/src/devices/bus/vtech/memexp/memexp.h index 5fd3ee6a449..6dc44bdba25 100644 --- a/src/devices/bus/vtech/memexp/memexp.h +++ b/src/devices/bus/vtech/memexp/memexp.h @@ -73,9 +73,9 @@ public: auto reset_handler() { return m_reset_handler.bind(); } // called from cart device - DECLARE_WRITE_LINE_MEMBER( int_w ) { m_int_handler(state); } - DECLARE_WRITE_LINE_MEMBER( nmi_w ) { m_nmi_handler(state); } - DECLARE_WRITE_LINE_MEMBER( reset_w ) { m_reset_handler(state); } + void int_w(int state) { m_int_handler(state); } + void nmi_w(int state) { m_nmi_handler(state); } + void reset_w(int state) { m_reset_handler(state); } protected: // device-level overrides diff --git a/src/devices/bus/wangpc/lvc.cpp b/src/devices/bus/wangpc/lvc.cpp index 2eb45e47db0..66b86493051 100644 --- a/src/devices/bus/wangpc/lvc.cpp +++ b/src/devices/bus/wangpc/lvc.cpp @@ -104,7 +104,7 @@ MC6845_UPDATE_ROW( wangpc_lvc_device::crtc_update_row ) } } -WRITE_LINE_MEMBER( wangpc_lvc_device::vsync_w ) +void wangpc_lvc_device::vsync_w(int state) { if (OPTION_VSYNC && state) { diff --git a/src/devices/bus/wangpc/lvc.h b/src/devices/bus/wangpc/lvc.h index 7f0cb5ac816..48e271f91ef 100644 --- a/src/devices/bus/wangpc/lvc.h +++ b/src/devices/bus/wangpc/lvc.h @@ -43,7 +43,7 @@ protected: private: MC6845_UPDATE_ROW( crtc_update_row ); - DECLARE_WRITE_LINE_MEMBER( vsync_w ); + void vsync_w(int state); inline void set_irq(int state); diff --git a/src/devices/bus/wangpc/mvc.cpp b/src/devices/bus/wangpc/mvc.cpp index 12aae997900..65985890f82 100644 --- a/src/devices/bus/wangpc/mvc.cpp +++ b/src/devices/bus/wangpc/mvc.cpp @@ -126,7 +126,7 @@ MC6845_UPDATE_ROW( wangpc_mvc_device::crtc_update_row ) } } -WRITE_LINE_MEMBER( wangpc_mvc_device::vsync_w ) +void wangpc_mvc_device::vsync_w(int state) { if (OPTION_VSYNC && state) { diff --git a/src/devices/bus/wangpc/mvc.h b/src/devices/bus/wangpc/mvc.h index 9911952f6ac..9e0d6cd5b44 100644 --- a/src/devices/bus/wangpc/mvc.h +++ b/src/devices/bus/wangpc/mvc.h @@ -43,7 +43,7 @@ protected: private: MC6845_UPDATE_ROW( crtc_update_row ); - DECLARE_WRITE_LINE_MEMBER( vsync_w ); + void vsync_w(int state); inline void set_irq(int state); diff --git a/src/devices/bus/wangpc/wangpc.cpp b/src/devices/bus/wangpc/wangpc.cpp index f2c2e4c3c65..bcf4612b928 100644 --- a/src/devices/bus/wangpc/wangpc.cpp +++ b/src/devices/bus/wangpc/wangpc.cpp @@ -195,7 +195,7 @@ void wangpcbus_device::dack_w(int line, uint8_t data) // tc_w - terminal count //------------------------------------------------- -WRITE_LINE_MEMBER( wangpcbus_device::tc_w ) +void wangpcbus_device::tc_w(int state) { for (device_wangpcbus_card_interface &entry : m_device_list) entry.wangpcbus_tc_w(state); diff --git a/src/devices/bus/wangpc/wangpc.h b/src/devices/bus/wangpc/wangpc.h index e04dda52d65..8da788e1398 100644 --- a/src/devices/bus/wangpc/wangpc.h +++ b/src/devices/bus/wangpc/wangpc.h @@ -106,19 +106,19 @@ public: uint8_t dack3_r() { return dack_r(3); } void dack3_w(uint8_t data) { dack_w(3, data); } - DECLARE_WRITE_LINE_MEMBER( tc_w ); + void tc_w(int state); // peripheral interface - DECLARE_WRITE_LINE_MEMBER( irq2_w ) { m_write_irq2(state); } - DECLARE_WRITE_LINE_MEMBER( irq3_w ) { m_write_irq3(state); } - DECLARE_WRITE_LINE_MEMBER( irq4_w ) { m_write_irq4(state); } - DECLARE_WRITE_LINE_MEMBER( irq5_w ) { m_write_irq5(state); } - DECLARE_WRITE_LINE_MEMBER( irq6_w ) { m_write_irq6(state); } - DECLARE_WRITE_LINE_MEMBER( irq7_w ) { m_write_irq7(state); } - DECLARE_WRITE_LINE_MEMBER( drq1_w ) { m_write_drq1(state); } - DECLARE_WRITE_LINE_MEMBER( drq2_w ) { m_write_drq2(state); } - DECLARE_WRITE_LINE_MEMBER( drq3_w ) { m_write_drq3(state); } - DECLARE_WRITE_LINE_MEMBER( ioerror_w ) { m_write_ioerror(state); } + void irq2_w(int state) { m_write_irq2(state); } + void irq3_w(int state) { m_write_irq3(state); } + void irq4_w(int state) { m_write_irq4(state); } + void irq5_w(int state) { m_write_irq5(state); } + void irq6_w(int state) { m_write_irq6(state); } + void irq7_w(int state) { m_write_irq7(state); } + void drq1_w(int state) { m_write_drq1(state); } + void drq2_w(int state) { m_write_drq2(state); } + void drq3_w(int state) { m_write_drq3(state); } + void ioerror_w(int state) { m_write_ioerror(state); } protected: // devicedevice_t implementation diff --git a/src/devices/bus/wysekbd/wysekbd.h b/src/devices/bus/wysekbd/wysekbd.h index d841d26ae48..86827182101 100644 --- a/src/devices/bus/wysekbd/wysekbd.h +++ b/src/devices/bus/wysekbd/wysekbd.h @@ -37,8 +37,8 @@ public: } // line handlers - DECLARE_WRITE_LINE_MEMBER(cmd_w); - DECLARE_READ_LINE_MEMBER(data_r); + void cmd_w(int state); + int data_r(); protected: // device-level overrides @@ -75,13 +75,13 @@ extern void wy60_keyboards(device_slot_interface &slot); // INLINE FUNCTIONS //************************************************************************** -inline WRITE_LINE_MEMBER(wyse_keyboard_port_device::cmd_w) +inline void wyse_keyboard_port_device::cmd_w(int state) { if (m_kbd != nullptr) m_kbd->wysekbd_write_cmd(state); } -inline READ_LINE_MEMBER(wyse_keyboard_port_device::data_r) +inline int wyse_keyboard_port_device::data_r() { if (m_kbd != nullptr) return m_kbd->wysekbd_read_data(); diff --git a/src/devices/bus/x68k/x68k_neptunex.cpp b/src/devices/bus/x68k/x68k_neptunex.cpp index b5c10545cd9..56ffe39951f 100644 --- a/src/devices/bus/x68k/x68k_neptunex.cpp +++ b/src/devices/bus/x68k/x68k_neptunex.cpp @@ -132,7 +132,7 @@ void x68k_neptune_device::x68k_neptune_mem_write(offs_t offset, uint8_t data) m_board_ram[offset - (16*1024)] = data; } -WRITE_LINE_MEMBER(x68k_neptune_device::x68k_neptune_irq_w) +void x68k_neptune_device::x68k_neptune_irq_w(int state) { m_slot->irq2_w(state); logerror("Neptune: IRQ2 set to %i\n",state); diff --git a/src/devices/bus/x68k/x68kexp.cpp b/src/devices/bus/x68k/x68kexp.cpp index 398c507802c..9b56c1bcfe2 100644 --- a/src/devices/bus/x68k/x68kexp.cpp +++ b/src/devices/bus/x68k/x68kexp.cpp @@ -77,7 +77,7 @@ void x68k_expansion_slot_device::device_start() } -WRITE_LINE_MEMBER( x68k_expansion_slot_device::irq2_w ) { m_out_irq2_cb(state); } -WRITE_LINE_MEMBER( x68k_expansion_slot_device::irq4_w ) { m_out_irq4_cb(state); } -WRITE_LINE_MEMBER( x68k_expansion_slot_device::nmi_w ) { m_out_nmi_cb(state); } -WRITE_LINE_MEMBER( x68k_expansion_slot_device::reset_w ) { m_out_reset_cb(state); } +void x68k_expansion_slot_device::irq2_w(int state) { m_out_irq2_cb(state); } +void x68k_expansion_slot_device::irq4_w(int state) { m_out_irq4_cb(state); } +void x68k_expansion_slot_device::nmi_w(int state) { m_out_nmi_cb(state); } +void x68k_expansion_slot_device::reset_w(int state) { m_out_reset_cb(state); } diff --git a/src/devices/bus/x68k/x68kexp.h b/src/devices/bus/x68k/x68kexp.h index 8b46c8e9cf5..ccf4ac51cb6 100644 --- a/src/devices/bus/x68k/x68kexp.h +++ b/src/devices/bus/x68k/x68kexp.h @@ -118,10 +118,10 @@ public: address_space &space() { return *m_space; } - DECLARE_WRITE_LINE_MEMBER( irq2_w ); - DECLARE_WRITE_LINE_MEMBER( irq4_w ); - DECLARE_WRITE_LINE_MEMBER( nmi_w ); - DECLARE_WRITE_LINE_MEMBER( reset_w ); + void irq2_w(int state); + void irq4_w(int state); + void nmi_w(int state); + void reset_w(int state); uint8_t iack2() { return (m_card != nullptr) ? m_card->iack2() : 0x18; } uint8_t iack4() { return (m_card != nullptr) ? m_card->iack4() : 0x18; } diff --git a/src/devices/bus/z29_kbd/he191_3425.cpp b/src/devices/bus/z29_kbd/he191_3425.cpp index 5a52f363590..b94293c6bac 100644 --- a/src/devices/bus/z29_kbd/he191_3425.cpp +++ b/src/devices/bus/z29_kbd/he191_3425.cpp @@ -75,12 +75,12 @@ void he191_3425_device::mcu_pc_w(u8 data) m_select = data & 0xf; } -READ_LINE_MEMBER(he191_3425_device::mcu_t1_r) +int he191_3425_device::mcu_t1_r() { return m_recv_data; } -WRITE_LINE_MEMBER(he191_3425_device::shift_reset) +void he191_3425_device::shift_reset(int state) { m_mcu->set_input_line(INPUT_LINE_RESET, (m_modifiers->read() & 0x06) != 0x00 ? CLEAR_LINE : ASSERT_LINE); reset_from_keyboard((m_modifiers->read() & 0x06) != 0x00); diff --git a/src/devices/bus/z29_kbd/he191_3425.h b/src/devices/bus/z29_kbd/he191_3425.h index cf0129936fb..9a9b94a6372 100644 --- a/src/devices/bus/z29_kbd/he191_3425.h +++ b/src/devices/bus/z29_kbd/he191_3425.h @@ -17,7 +17,7 @@ public: he191_3425_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); // miscellanous handlers - DECLARE_WRITE_LINE_MEMBER(shift_reset); + void shift_reset(int state); protected: // device-level overrides @@ -35,7 +35,7 @@ private: u8 mcu_pa_r(); void mcu_pb_w(u8 data); void mcu_pc_w(u8 data); - DECLARE_READ_LINE_MEMBER(mcu_t1_r); + int mcu_t1_r(); // misc. helpers TIMER_CALLBACK_MEMBER(receive_data_synced); diff --git a/src/devices/bus/z29_kbd/keyboard.h b/src/devices/bus/z29_kbd/keyboard.h index 501d8bbe569..ec3867f4aa7 100644 --- a/src/devices/bus/z29_kbd/keyboard.h +++ b/src/devices/bus/z29_kbd/keyboard.h @@ -43,7 +43,7 @@ public: auto reset_callback() { return m_reset_callback.bind(); } // line handler - inline DECLARE_WRITE_LINE_MEMBER(keyout_w); + inline void keyout_w(int state); protected: // device-level overrides @@ -95,7 +95,7 @@ extern void z29_keyboards(device_slot_interface &slot); // INLINE FUNCTIONS //************************************************************************** -WRITE_LINE_MEMBER(z29_keyboard_port_device::keyout_w) +void z29_keyboard_port_device::keyout_w(int state) { if (m_kbd != nullptr) m_kbd->receive_data(state); diff --git a/src/devices/bus/z29_kbd/md_kbd.cpp b/src/devices/bus/z29_kbd/md_kbd.cpp index 1a313af10ce..dbe9c81f46f 100644 --- a/src/devices/bus/z29_kbd/md_kbd.cpp +++ b/src/devices/bus/z29_kbd/md_kbd.cpp @@ -89,7 +89,7 @@ void md_keyboard_device::mcu_p1_w(u8 data) m_ls175_clock = BIT(data, 6); } -READ_LINE_MEMBER(md_keyboard_device::mcu_t1_r) +int md_keyboard_device::mcu_t1_r() { return m_recv_data; } diff --git a/src/devices/bus/z29_kbd/md_kbd.h b/src/devices/bus/z29_kbd/md_kbd.h index 8a81b9a461d..b9fc0beb9e6 100644 --- a/src/devices/bus/z29_kbd/md_kbd.h +++ b/src/devices/bus/z29_kbd/md_kbd.h @@ -32,7 +32,7 @@ private: // MCU handlers u8 mcu_p1_r(); void mcu_p1_w(u8 data); - DECLARE_READ_LINE_MEMBER(mcu_t1_r); + int mcu_t1_r(); void mcu_movx_w(u8 data); // misc. helpers diff --git a/src/devices/cpu/cosmac/cosmac.h b/src/devices/cpu/cosmac/cosmac.h index 2d29a10ce44..d89d2622156 100644 --- a/src/devices/cpu/cosmac/cosmac.h +++ b/src/devices/cpu/cosmac/cosmac.h @@ -171,15 +171,15 @@ public: // public interfaces offs_t get_memory_address(); - DECLARE_WRITE_LINE_MEMBER( wait_w ) { set_input_line(COSMAC_INPUT_LINE_WAIT, state); } - DECLARE_WRITE_LINE_MEMBER( clear_w ) { set_input_line(COSMAC_INPUT_LINE_CLEAR, state); } - DECLARE_WRITE_LINE_MEMBER( int_w ) { set_input_line(COSMAC_INPUT_LINE_INT, state); } - DECLARE_WRITE_LINE_MEMBER( dma_in_w ) { set_input_line(COSMAC_INPUT_LINE_DMAIN, state); } - DECLARE_WRITE_LINE_MEMBER( dma_out_w ) { set_input_line(COSMAC_INPUT_LINE_DMAOUT, state); } - DECLARE_WRITE_LINE_MEMBER( ef1_w ) { set_input_line(COSMAC_INPUT_LINE_EF1, state); } - DECLARE_WRITE_LINE_MEMBER( ef2_w ) { set_input_line(COSMAC_INPUT_LINE_EF2, state); } - DECLARE_WRITE_LINE_MEMBER( ef3_w ) { set_input_line(COSMAC_INPUT_LINE_EF3, state); } - DECLARE_WRITE_LINE_MEMBER( ef4_w ) { set_input_line(COSMAC_INPUT_LINE_EF4, state); } + void wait_w(int state) { set_input_line(COSMAC_INPUT_LINE_WAIT, state); } + void clear_w(int state) { set_input_line(COSMAC_INPUT_LINE_CLEAR, state); } + void int_w(int state) { set_input_line(COSMAC_INPUT_LINE_INT, state); } + void dma_in_w(int state) { set_input_line(COSMAC_INPUT_LINE_DMAIN, state); } + void dma_out_w(int state) { set_input_line(COSMAC_INPUT_LINE_DMAOUT, state); } + void ef1_w(int state) { set_input_line(COSMAC_INPUT_LINE_EF1, state); } + void ef2_w(int state) { set_input_line(COSMAC_INPUT_LINE_EF2, state); } + void ef3_w(int state) { set_input_line(COSMAC_INPUT_LINE_EF3, state); } + void ef4_w(int state) { set_input_line(COSMAC_INPUT_LINE_EF4, state); } protected: // construction/destruction diff --git a/src/devices/cpu/dsp16/dsp16.cpp b/src/devices/cpu/dsp16/dsp16.cpp index e0271683ceb..799bf5be2d2 100644 --- a/src/devices/cpu/dsp16/dsp16.cpp +++ b/src/devices/cpu/dsp16/dsp16.cpp @@ -113,7 +113,7 @@ ALLOW_SAVE_TYPE(dsp16_device_base::phase); ALLOW_SAVE_TYPE(dsp16_device_base::flags); ALLOW_SAVE_TYPE(dsp16_device_base::sio_flags); -WRITE_LINE_MEMBER(dsp16_device_base::exm_w) +void dsp16_device_base::exm_w(int state) { if (bool(state) != bool(m_exm_in)) { diff --git a/src/devices/cpu/dsp16/dsp16.h b/src/devices/cpu/dsp16/dsp16.h index 3f7ae66dd53..889fd0e356e 100644 --- a/src/devices/cpu/dsp16/dsp16.h +++ b/src/devices/cpu/dsp16/dsp16.h @@ -20,7 +20,7 @@ class dsp16_device_base : public cpu_device, protected dsp16_disassembler::cpu { public: - DECLARE_WRITE_LINE_MEMBER(exm_w); + void exm_w(int state); // interrupt output callbacks auto iack_cb() { return m_iack_cb.bind(); } @@ -44,24 +44,24 @@ public: auto pods_cb() { return m_pods_cb.bind(); } // interrupt outputs - DECLARE_READ_LINE_MEMBER(iack_r) { return m_iack_out; } + int iack_r() { return m_iack_out; } // serial outputs - DECLARE_READ_LINE_MEMBER(ick_r) { return sio_ick_active() ? m_sio_clk : 1; } - DECLARE_READ_LINE_MEMBER(ild_r) { return sio_ild_active() ? m_sio_ld : 1; } - DECLARE_READ_LINE_MEMBER(do_r) { return m_do_out; } - DECLARE_READ_LINE_MEMBER(ock_r) { return sio_ock_active() ? m_sio_clk : 1; } - DECLARE_READ_LINE_MEMBER(old_r) { return sio_old_active() ? m_sio_ld : 1; } - DECLARE_READ_LINE_MEMBER(ose_r) { return m_ose_out; } + int ick_r() { return sio_ick_active() ? m_sio_clk : 1; } + int ild_r() { return sio_ild_active() ? m_sio_ld : 1; } + int do_r() { return m_do_out; } + int ock_r() { return sio_ock_active() ? m_sio_clk : 1; } + int old_r() { return sio_old_active() ? m_sio_ld : 1; } + int ose_r() { return m_ose_out; } // high-level passive parallel I/O handlers u16 pio_r(); void pio_w(u16 data); // parallel I/O outputs - DECLARE_READ_LINE_MEMBER(psel_r) { return m_psel_out; } - DECLARE_READ_LINE_MEMBER(pids_r) { return m_pids_out; } - DECLARE_READ_LINE_MEMBER(pods_r) { return m_pods_out; } + int psel_r() { return m_psel_out; } + int pids_r() { return m_pids_out; } + int pods_r() { return m_pods_out; } protected: // construction/destruction diff --git a/src/devices/cpu/f2mc16/mb9061x.cpp b/src/devices/cpu/f2mc16/mb9061x.cpp index e8940162329..d53a519fcb1 100644 --- a/src/devices/cpu/f2mc16/mb9061x.cpp +++ b/src/devices/cpu/f2mc16/mb9061x.cpp @@ -219,12 +219,12 @@ void mb9061x_device::timer_w(offs_t offset, u8 data) } } -WRITE_LINE_MEMBER(mb9061x_device::tin0_w) +void mb9061x_device::tin0_w(int state) { tin_common(0, 0, state); } -WRITE_LINE_MEMBER(mb9061x_device::tin1_w) +void mb9061x_device::tin1_w(int state) { tin_common(1, 4, state); } diff --git a/src/devices/cpu/f2mc16/mb9061x.h b/src/devices/cpu/f2mc16/mb9061x.h index c09bdef1b96..4fd55db4205 100644 --- a/src/devices/cpu/f2mc16/mb9061x.h +++ b/src/devices/cpu/f2mc16/mb9061x.h @@ -33,8 +33,8 @@ public: }; // timer external counter tick functions - DECLARE_WRITE_LINE_MEMBER(tin0_w); - DECLARE_WRITE_LINE_MEMBER(tin1_w); + void tin0_w(int state); + void tin1_w(int state); protected: // construction/destruction diff --git a/src/devices/cpu/h8/h8_adc.cpp b/src/devices/cpu/h8/h8_adc.cpp index d0151ca0268..50cf4626847 100644 --- a/src/devices/cpu/h8/h8_adc.cpp +++ b/src/devices/cpu/h8/h8_adc.cpp @@ -83,7 +83,7 @@ void h8_adc_device::adcr_w(uint8_t data) mode_update(); } -WRITE_LINE_MEMBER(h8_adc_device::adtrg_w) +void h8_adc_device::adtrg_w(int state) { if(state != m_adtrg) { m_adtrg = state; diff --git a/src/devices/cpu/h8/h8_adc.h b/src/devices/cpu/h8/h8_adc.h index 389f6a9121f..128729f8f7c 100644 --- a/src/devices/cpu/h8/h8_adc.h +++ b/src/devices/cpu/h8/h8_adc.h @@ -27,7 +27,7 @@ public: uint8_t adcr_r(); void adcsr_w(uint8_t data); void adcr_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(adtrg_w); + void adtrg_w(int state); void set_suspend(bool suspend); uint64_t internal_update(uint64_t current_time); diff --git a/src/devices/cpu/h8/h8_sci.cpp b/src/devices/cpu/h8/h8_sci.cpp index 049795e40e1..4bda5c19621 100644 --- a/src/devices/cpu/h8/h8_sci.cpp +++ b/src/devices/cpu/h8/h8_sci.cpp @@ -317,7 +317,7 @@ TIMER_CALLBACK_MEMBER(h8_sci_device::sync_tick) // Used only to force system-wide syncs } -WRITE_LINE_MEMBER(h8_sci_device::rx_w) +void h8_sci_device::rx_w(int state) { m_rx_value = state; if(V>=2) logerror("rx=%d\n", state); @@ -325,7 +325,7 @@ WRITE_LINE_MEMBER(h8_sci_device::rx_w) clock_start(CLK_RX); } -WRITE_LINE_MEMBER(h8_sci_device::clk_w) +void h8_sci_device::clk_w(int state) { if(m_ext_clock_value != state) { m_ext_clock_value = state; diff --git a/src/devices/cpu/h8/h8_sci.h b/src/devices/cpu/h8/h8_sci.h index 2b177a34126..6602d948210 100644 --- a/src/devices/cpu/h8/h8_sci.h +++ b/src/devices/cpu/h8/h8_sci.h @@ -43,8 +43,8 @@ public: void scmr_w(uint8_t data); uint8_t scmr_r(); - DECLARE_WRITE_LINE_MEMBER(rx_w); - DECLARE_WRITE_LINE_MEMBER(clk_w); + void rx_w(int state); + void clk_w(int state); auto tx_handler() { return m_tx_cb.bind(); } auto clk_handler() { return m_clk_cb.bind(); } diff --git a/src/devices/cpu/hphybrid/hphybrid.cpp b/src/devices/cpu/hphybrid/hphybrid.cpp index c1289b0175a..5c80a88cc14 100644 --- a/src/devices/cpu/hphybrid/hphybrid.cpp +++ b/src/devices/cpu/hphybrid/hphybrid.cpp @@ -134,7 +134,7 @@ DEFINE_DEVICE_TYPE(HP_5061_3001, hp_5061_3001_cpu_device, "5061_3001", "Hewlett- DEFINE_DEVICE_TYPE(HP_5061_3011, hp_5061_3011_cpu_device, "5061_3011", "Hewlett-Packard HP-5061-3011") DEFINE_DEVICE_TYPE(HP_09825_67907, hp_09825_67907_cpu_device, "09825_67907", "Hewlett-Packard HP-09825-67907") -WRITE_LINE_MEMBER(hp_hybrid_cpu_device::dmar_w) +void hp_hybrid_cpu_device::dmar_w(int state) { if (state) BIT_SET(m_flags, HPHYBRID_DMAR_BIT); @@ -142,7 +142,7 @@ WRITE_LINE_MEMBER(hp_hybrid_cpu_device::dmar_w) BIT_CLR(m_flags, HPHYBRID_DMAR_BIT); } -WRITE_LINE_MEMBER(hp_hybrid_cpu_device::halt_w) +void hp_hybrid_cpu_device::halt_w(int state) { if (state) BIT_SET(m_flags, HPHYBRID_HALT_BIT); @@ -150,7 +150,7 @@ WRITE_LINE_MEMBER(hp_hybrid_cpu_device::halt_w) BIT_CLR(m_flags, HPHYBRID_HALT_BIT); } -WRITE_LINE_MEMBER(hp_hybrid_cpu_device::status_w) +void hp_hybrid_cpu_device::status_w(int state) { if (state) BIT_SET(m_flags, HPHYBRID_STS_BIT); @@ -158,7 +158,7 @@ WRITE_LINE_MEMBER(hp_hybrid_cpu_device::status_w) BIT_CLR(m_flags, HPHYBRID_STS_BIT); } -WRITE_LINE_MEMBER(hp_hybrid_cpu_device::flag_w) +void hp_hybrid_cpu_device::flag_w(int state) { if (state) BIT_SET(m_flags, HPHYBRID_FLG_BIT); diff --git a/src/devices/cpu/hphybrid/hphybrid.h b/src/devices/cpu/hphybrid/hphybrid.h index 3864282245d..48b8e37b59c 100644 --- a/src/devices/cpu/hphybrid/hphybrid.h +++ b/src/devices/cpu/hphybrid/hphybrid.h @@ -56,10 +56,10 @@ public: using opcode_delegate = device_delegate; using int_delegate = device_delegate; - DECLARE_WRITE_LINE_MEMBER(dmar_w); - DECLARE_WRITE_LINE_MEMBER(halt_w); - DECLARE_WRITE_LINE_MEMBER(status_w); - DECLARE_WRITE_LINE_MEMBER(flag_w); + void dmar_w(int state); + void halt_w(int state); + void status_w(int state); + void flag_w(int state); uint8_t pa_r() const { return m_reg_PA[0]; } diff --git a/src/devices/cpu/i8089/i8089.cpp b/src/devices/cpu/i8089/i8089.cpp index 7cc3420a619..915d30c551b 100644 --- a/src/devices/cpu/i8089/i8089.cpp +++ b/src/devices/cpu/i8089/i8089.cpp @@ -346,7 +346,7 @@ void i8089_device::execute_run() // EXTERNAL INPUTS //************************************************************************** -WRITE_LINE_MEMBER( i8089_device::ca_w ) +void i8089_device::ca_w(int state) { if (VERBOSE) logerror("%s('%s'): ca_w: %u\n", shortname(), basetag(), state); @@ -367,7 +367,7 @@ WRITE_LINE_MEMBER( i8089_device::ca_w ) m_ca = state; } -WRITE_LINE_MEMBER( i8089_device::drq1_w ) { m_ch1->drq_w(state); } -WRITE_LINE_MEMBER( i8089_device::drq2_w ) { m_ch2->drq_w(state); } -WRITE_LINE_MEMBER( i8089_device::ext1_w ) { m_ch1->ext_w(state); } -WRITE_LINE_MEMBER( i8089_device::ext2_w ) { m_ch2->ext_w(state); } +void i8089_device::drq1_w(int state) { m_ch1->drq_w(state); } +void i8089_device::drq2_w(int state) { m_ch2->drq_w(state); } +void i8089_device::ext1_w(int state) { m_ch1->ext_w(state); } +void i8089_device::ext2_w(int state) { m_ch2->ext_w(state); } diff --git a/src/devices/cpu/i8089/i8089.h b/src/devices/cpu/i8089/i8089.h index 19f81136336..abb278625b8 100644 --- a/src/devices/cpu/i8089/i8089.h +++ b/src/devices/cpu/i8089/i8089.h @@ -43,12 +43,12 @@ public: void set_data_width(uint8_t data_width) { m_data_width = data_width; } // input lines - DECLARE_WRITE_LINE_MEMBER( ca_w ); - DECLARE_WRITE_LINE_MEMBER( sel_w ) { m_sel = state; } - DECLARE_WRITE_LINE_MEMBER( drq1_w ); - DECLARE_WRITE_LINE_MEMBER( drq2_w ); - DECLARE_WRITE_LINE_MEMBER( ext1_w ); - DECLARE_WRITE_LINE_MEMBER( ext2_w ); + void ca_w(int state); + void sel_w(int state) { m_sel = state; } + void drq1_w(int state); + void drq2_w(int state); + void ext1_w(int state); + void ext2_w(int state); protected: // device-level overrides @@ -82,8 +82,8 @@ private: bool request_grant() const { return BIT(m_soc, 1); } // internal communication - DECLARE_WRITE_LINE_MEMBER( ch1_sintr_w ) { m_write_sintr1(state); } - DECLARE_WRITE_LINE_MEMBER( ch2_sintr_w ) { m_write_sintr2(state); } + void ch1_sintr_w(int state) { m_write_sintr1(state); } + void ch2_sintr_w(int state) { m_write_sintr2(state); } uint8_t read_byte(bool space, offs_t address); uint16_t read_word(bool space, offs_t address); diff --git a/src/devices/cpu/i8089/i8089_channel.cpp b/src/devices/cpu/i8089/i8089_channel.cpp index d13606a1ca5..dc8d75eabe1 100644 --- a/src/devices/cpu/i8089/i8089_channel.cpp +++ b/src/devices/cpu/i8089/i8089_channel.cpp @@ -845,7 +845,7 @@ void i8089_channel_device::ca() m_prio = PRIO_CHAN_ATTN; } -WRITE_LINE_MEMBER( i8089_channel_device::ext_w ) +void i8089_channel_device::ext_w(int state) { if (VERBOSE) logerror("%s('%s'): ext_w: %d\n", shortname(), tag(), state); @@ -854,7 +854,7 @@ WRITE_LINE_MEMBER( i8089_channel_device::ext_w ) terminate_dma((CC_TX - 1) * 4); } -WRITE_LINE_MEMBER( i8089_channel_device::drq_w ) +void i8089_channel_device::drq_w(int state) { if (VERBOSE_DMA) logerror("%s('%s'): drq_w: %d\n", shortname(), tag(), state); diff --git a/src/devices/cpu/i8089/i8089_channel.h b/src/devices/cpu/i8089/i8089_channel.h index 89aa511193b..8d002598b7b 100644 --- a/src/devices/cpu/i8089/i8089_channel.h +++ b/src/devices/cpu/i8089/i8089_channel.h @@ -44,8 +44,8 @@ public: bool lock(); void ca(); - DECLARE_WRITE_LINE_MEMBER( ext_w ); - DECLARE_WRITE_LINE_MEMBER( drq_w ); + void ext_w(int state); + void drq_w(int state); // register enum diff --git a/src/devices/cpu/i86/i186.h b/src/devices/cpu/i86/i186.h index f1b8c4633ea..b3159454138 100644 --- a/src/devices/cpu/i86/i186.h +++ b/src/devices/cpu/i86/i186.h @@ -28,14 +28,14 @@ public: IRQ_CALLBACK_MEMBER(int_callback); IRQ_CALLBACK_MEMBER(inta_callback); - DECLARE_WRITE_LINE_MEMBER(drq0_w) { m_dma[0].drq_state = state; } - DECLARE_WRITE_LINE_MEMBER(drq1_w) { m_dma[1].drq_state = state; } - DECLARE_WRITE_LINE_MEMBER(tmrin0_w) { external_tmrin(0, state); } - DECLARE_WRITE_LINE_MEMBER(tmrin1_w) { external_tmrin(1, state); } - DECLARE_WRITE_LINE_MEMBER(int0_w) { external_int(0, state); } - DECLARE_WRITE_LINE_MEMBER(int1_w) { external_int(1, state); } - DECLARE_WRITE_LINE_MEMBER(int2_w) { external_int(2, state); } - DECLARE_WRITE_LINE_MEMBER(int3_w) { external_int(3, state); } + void drq0_w(int state) { m_dma[0].drq_state = state; } + void drq1_w(int state) { m_dma[1].drq_state = state; } + void tmrin0_w(int state) { external_tmrin(0, state); } + void tmrin1_w(int state) { external_tmrin(1, state); } + void int0_w(int state) { external_int(0, state); } + void int1_w(int state) { external_int(1, state); } + void int2_w(int state) { external_int(2, state); } + void int3_w(int state) { external_int(3, state); } // device_memory_interface overrides virtual space_config_vector memory_space_config() const override; diff --git a/src/devices/cpu/jaguar/jaguar.cpp b/src/devices/cpu/jaguar/jaguar.cpp index 91319a64f1a..db5223dbf1d 100644 --- a/src/devices/cpu/jaguar/jaguar.cpp +++ b/src/devices/cpu/jaguar/jaguar.cpp @@ -1410,7 +1410,7 @@ u32 jaguar_cpu_device::status_r() return result; } -WRITE_LINE_MEMBER(jaguar_cpu_device::go_w) +void jaguar_cpu_device::go_w(int state) { m_go = state; set_input_line(INPUT_LINE_HALT, (m_go == true) ? CLEAR_LINE : ASSERT_LINE); diff --git a/src/devices/cpu/jaguar/jaguar.h b/src/devices/cpu/jaguar/jaguar.h index 90ee5aef405..90533c3bc7c 100644 --- a/src/devices/cpu/jaguar/jaguar.h +++ b/src/devices/cpu/jaguar/jaguar.h @@ -61,7 +61,7 @@ public: // TODO: add which device triggered the I/O void iobus_w(offs_t offset, u32 data, u32 mem_mask = ~0); u32 iobus_r(offs_t offset, u32 mem_mask = ~0); - DECLARE_WRITE_LINE_MEMBER(go_w); + void go_w(int state); protected: jaguar_cpu_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock, u8 version, bool isdsp, address_map_constructor io_map); diff --git a/src/devices/cpu/m6502/m6500_1.cpp b/src/devices/cpu/m6502/m6500_1.cpp index ab446bdf7f5..4a065a0a8e7 100644 --- a/src/devices/cpu/m6502/m6500_1.cpp +++ b/src/devices/cpu/m6502/m6500_1.cpp @@ -136,7 +136,7 @@ void m6500_1_device::pd_w(u8 data) } -WRITE_LINE_MEMBER(m6500_1_device::cntr_w) +void m6500_1_device::cntr_w(int state) { machine().scheduler().synchronize(timer_expired_delegate(FUNC(m6500_1_device::set_cntr_in), this), state); } diff --git a/src/devices/cpu/m6502/m6500_1.h b/src/devices/cpu/m6502/m6500_1.h index 0c0bb9706db..dc5d84f5492 100644 --- a/src/devices/cpu/m6502/m6500_1.h +++ b/src/devices/cpu/m6502/m6500_1.h @@ -65,7 +65,7 @@ public: void pc_w(u8 data); void pd_w(u8 data); - DECLARE_WRITE_LINE_MEMBER(cntr_w); + void cntr_w(int state); protected: enum diff --git a/src/devices/cpu/m6502/rp2a03.cpp b/src/devices/cpu/m6502/rp2a03.cpp index 4e5f7a2e5fd..0d9153b42f7 100644 --- a/src/devices/cpu/m6502/rp2a03.cpp +++ b/src/devices/cpu/m6502/rp2a03.cpp @@ -68,7 +68,7 @@ std::unique_ptr rp2a03_core_device::create_disassembler( return std::make_unique(); } -WRITE_LINE_MEMBER(rp2a03_device::apu_irq) +void rp2a03_device::apu_irq(int state) { // games relying on the APU_IRQ don't seem to work anyway? (nes software list : timelord, mig29sf, firehawk) set_input_line(RP2A03_APU_IRQ_LINE, state ? ASSERT_LINE : CLEAR_LINE); diff --git a/src/devices/cpu/m6502/rp2a03.h b/src/devices/cpu/m6502/rp2a03.h index f54b158c354..3f5d952065a 100644 --- a/src/devices/cpu/m6502/rp2a03.h +++ b/src/devices/cpu/m6502/rp2a03.h @@ -54,7 +54,7 @@ protected: virtual void device_add_mconfig(machine_config &config) override; - DECLARE_WRITE_LINE_MEMBER(apu_irq); + void apu_irq(int state); uint8_t apu_read_mem(offs_t offset); }; diff --git a/src/devices/cpu/m68000/tmp68301.h b/src/devices/cpu/m68000/tmp68301.h index 95bc18e4b7f..96001d21253 100644 --- a/src/devices/cpu/m68000/tmp68301.h +++ b/src/devices/cpu/m68000/tmp68301.h @@ -16,9 +16,9 @@ public: auto parallel_r_cb() { return m_parallel_r_cb.bind(); } auto parallel_w_cb() { return m_parallel_w_cb.bind(); } - DECLARE_WRITE_LINE_MEMBER(rx0_w) { serial_rx_w(0, state); } - DECLARE_WRITE_LINE_MEMBER(rx1_w) { serial_rx_w(1, state); } - DECLARE_WRITE_LINE_MEMBER(rx2_w) { serial_rx_w(2, state); } + void rx0_w(int state) { serial_rx_w(0, state); } + void rx1_w(int state) { serial_rx_w(1, state); } + void rx2_w(int state) { serial_rx_w(2, state); } auto tx0_handler() { return m_tx_cb[0].bind(); } auto tx1_handler() { return m_tx_cb[1].bind(); } diff --git a/src/devices/cpu/m6805/m68705.h b/src/devices/cpu/m6805/m68705.h index e8bd0659135..1cc0f26c476 100644 --- a/src/devices/cpu/m6805/m68705.h +++ b/src/devices/cpu/m6805/m68705.h @@ -129,7 +129,7 @@ public: auto portb_w() { return m_port_cb_w[1].bind(); } auto portc_w() { return m_port_cb_w[2].bind(); } - WRITE_LINE_MEMBER(timer_w) { m_timer.timer_w(state); } + void timer_w(int state) { m_timer.timer_w(state); } protected: // state index constants diff --git a/src/devices/cpu/mb86233/mb86233.cpp b/src/devices/cpu/mb86233/mb86233.cpp index 479b6fa0399..441fc521eff 100644 --- a/src/devices/cpu/mb86233/mb86233.cpp +++ b/src/devices/cpu/mb86233/mb86233.cpp @@ -165,22 +165,22 @@ void mb86233_device::state_string_export(const device_state_entry &entry, std::s { } -WRITE_LINE_MEMBER(mb86233_device::gpio0_w) +void mb86233_device::gpio0_w(int state) { m_gpio0 = state; } -WRITE_LINE_MEMBER(mb86233_device::gpio1_w) +void mb86233_device::gpio1_w(int state) { m_gpio1 = state; } -WRITE_LINE_MEMBER(mb86233_device::gpio2_w) +void mb86233_device::gpio2_w(int state) { m_gpio2 = state; } -WRITE_LINE_MEMBER(mb86233_device::gpio3_w) +void mb86233_device::gpio3_w(int state) { m_gpio3 = state; } diff --git a/src/devices/cpu/mb86233/mb86233.h b/src/devices/cpu/mb86233/mb86233.h index 4b1915dc836..e421aa21652 100644 --- a/src/devices/cpu/mb86233/mb86233.h +++ b/src/devices/cpu/mb86233/mb86233.h @@ -62,10 +62,10 @@ public: void stall() { m_stall = true; } - DECLARE_WRITE_LINE_MEMBER(gpio0_w); - DECLARE_WRITE_LINE_MEMBER(gpio1_w); - DECLARE_WRITE_LINE_MEMBER(gpio2_w); - DECLARE_WRITE_LINE_MEMBER(gpio3_w); + void gpio0_w(int state); + void gpio1_w(int state); + void gpio2_w(int state); + void gpio3_w(int state); protected: mb86233_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); diff --git a/src/devices/cpu/mb88xx/mb88xx.cpp b/src/devices/cpu/mb88xx/mb88xx.cpp index 5841169d763..0d6daeb6680 100644 --- a/src/devices/cpu/mb88xx/mb88xx.cpp +++ b/src/devices/cpu/mb88xx/mb88xx.cpp @@ -461,7 +461,7 @@ void mb88_cpu_device::update_pio( int cycles ) } } -WRITE_LINE_MEMBER( mb88_cpu_device::clock_w ) +void mb88_cpu_device::clock_w(int state) { if (state != m_ctr) { diff --git a/src/devices/cpu/mb88xx/mb88xx.h b/src/devices/cpu/mb88xx/mb88xx.h index 6bae70de879..1a22a00a0f1 100644 --- a/src/devices/cpu/mb88xx/mb88xx.h +++ b/src/devices/cpu/mb88xx/mb88xx.h @@ -96,7 +96,7 @@ public: void set_pla(uint8_t *pla) { m_PLA = pla; } - DECLARE_WRITE_LINE_MEMBER( clock_w ); + void clock_w(int state); void data_4bit(address_map &map); void data_5bit(address_map &map); diff --git a/src/devices/cpu/mcs40/mcs40.h b/src/devices/cpu/mcs40/mcs40.h index 68a8dca161f..9b538fd9255 100644 --- a/src/devices/cpu/mcs40/mcs40.h +++ b/src/devices/cpu/mcs40/mcs40.h @@ -62,8 +62,8 @@ public: // 4008/4009 or 4289 outputs u8 get_4289_a() const { return m_4289_a; } // 8-bit address u8 get_4289_c() const { return m_4289_c; } // 4-bit chip select - DECLARE_READ_LINE_MEMBER(get_4289_pm) const { return BIT(m_4289_pm, 0); } // 0 = active - DECLARE_READ_LINE_MEMBER(get_4289_f_l) const { return BIT(m_4289_f_l, 0); } // 1 = odd, 0 = even + int get_4289_pm() const { return BIT(m_4289_pm, 0); } // 0 = active + int get_4289_f_l() const { return BIT(m_4289_f_l, 0); } // 1 = odd, 0 = even protected: enum class cycle : u8 { OP, IM, IN }; diff --git a/src/devices/cpu/mips/mips3.cpp b/src/devices/cpu/mips/mips3.cpp index 751e8666018..dab8db3f7cb 100644 --- a/src/devices/cpu/mips/mips3.cpp +++ b/src/devices/cpu/mips/mips3.cpp @@ -5314,6 +5314,7 @@ void mips3_device::execute_run() { if (m_isdrc) { + printf("DRC on\n"); int execute_result; /* reset the cache if dirty */ @@ -5346,6 +5347,8 @@ void mips3_device::execute_run() return; } + printf("DRC off\n"); + /* count cycles and interrupt cycles */ m_core->icount -= m_interrupt_cycles; m_interrupt_cycles = 0; diff --git a/src/devices/cpu/nec/v5x.cpp b/src/devices/cpu/nec/v5x.cpp index 2c2064e4bf2..8791111fbe4 100644 --- a/src/devices/cpu/nec/v5x.cpp +++ b/src/devices/cpu/nec/v5x.cpp @@ -143,7 +143,7 @@ void device_v5x_interface::tcu_clock_update() m_tcu->set_clockin(i, BIT(m_TCKS, i + 2) ? m_tclk : device().clock() / double(4 << (m_TCKS & 3))); } -WRITE_LINE_MEMBER(device_v5x_interface::tclk_w) +void device_v5x_interface::tclk_w(int state) { if (BIT(m_TCKS, 2)) m_tcu->write_clk0(state); @@ -204,7 +204,7 @@ void device_v5x_interface::v5x_set_input(int irqline, int state) } // for hooking the interrupt controller output up to the core -WRITE_LINE_MEMBER(device_v5x_interface::internal_irq_w) +void device_v5x_interface::internal_irq_w(int state) { downcast(device()).set_int_line(state); } @@ -324,7 +324,7 @@ void v50_base_device::OPCN_w(u8 data) m_icu->ir2_w(BIT(data, 3) ? m_tout1 : m_intp2); } -WRITE_LINE_MEMBER(v50_base_device::tout1_w) +void v50_base_device::tout1_w(int state) { m_tout1 = state; if ((m_OPCN & 0x03) == 0x01) @@ -729,7 +729,7 @@ void v53_device::install_peripheral_io() } } -WRITE_LINE_MEMBER(v53_device::hack_w) +void v53_device::hack_w(int state) { if (!(m_SCTL & 0x02)) m_dmau->hack_w(state); diff --git a/src/devices/cpu/nec/v5x.h b/src/devices/cpu/nec/v5x.h index 47264cf9302..5e766bc77d1 100644 --- a/src/devices/cpu/nec/v5x.h +++ b/src/devices/cpu/nec/v5x.h @@ -19,7 +19,7 @@ public: // TCU void set_tclk(double clk) { m_tclk = clk; } void set_tclk(const XTAL &xtal) { set_tclk(xtal.dvalue()); } - DECLARE_WRITE_LINE_MEMBER(tclk_w); + void tclk_w(int state); // DMAU auto out_hreq_cb() { return device().subdevice("dmau")->out_hreq_callback(); } @@ -106,7 +106,7 @@ protected: u8 OPSEL_r(); void OPSEL_w(u8 data); virtual u8 get_pic_ack(offs_t offset) { return 0; } - DECLARE_WRITE_LINE_MEMBER(internal_irq_w); + void internal_irq_w(int state); void tcu_clock_update(); @@ -141,9 +141,9 @@ protected: class v50_base_device : public nec_common_device, public device_v5x_interface { public: - template DECLARE_WRITE_LINE_MEMBER(dreq_w) { m_dmau->dreq_w(state); } - DECLARE_WRITE_LINE_MEMBER(hack_w) { m_dmau->hack_w(state); } - DECLARE_WRITE_LINE_MEMBER(tctl2_w) { m_tcu->write_gate2(state); } + template void dreq_w(int state) { m_dmau->dreq_w(state); } + void hack_w(int state) { m_dmau->hack_w(state); } + void tctl2_w(int state) { m_tcu->write_gate2(state); } auto tout1_cb() { return m_tout1_callback.bind(); } auto tout2_cb() { return subdevice("tcu")->out_handler<2>(); } @@ -189,7 +189,7 @@ protected: } private: - DECLARE_WRITE_LINE_MEMBER(tout1_w); + void tout1_w(int state); devcb_write_line m_tout1_callback; devcb_read8 m_icu_slave_ack; @@ -223,7 +223,7 @@ class v53_device : public v33_base_device, public device_v5x_interface public: v53_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); - template DECLARE_WRITE_LINE_MEMBER(dreq_w) + template void dreq_w(int state) { // dreq0 could be wrong / nonexistent if (!(m_SCTL & 0x02)) @@ -235,7 +235,7 @@ public: logerror("dreq%d not in 71071mode\n", Channel); } } - DECLARE_WRITE_LINE_MEMBER(hack_w); + void hack_w(int state); template auto tout_handler() { return subdevice("tcu")->out_handler(); } diff --git a/src/devices/cpu/psx/irq.cpp b/src/devices/cpu/psx/irq.cpp index 48142be0d88..e5dcc5c02b9 100644 --- a/src/devices/cpu/psx/irq.cpp +++ b/src/devices/cpu/psx/irq.cpp @@ -107,7 +107,7 @@ uint32_t psxirq_device::read(offs_t offset) return 0; } -WRITE_LINE_MEMBER( psxirq_device::intin0 ) +void psxirq_device::intin0(int state) { if( state ) { @@ -115,7 +115,7 @@ WRITE_LINE_MEMBER( psxirq_device::intin0 ) } } -WRITE_LINE_MEMBER( psxirq_device::intin1 ) +void psxirq_device::intin1(int state) { if( state ) { @@ -123,7 +123,7 @@ WRITE_LINE_MEMBER( psxirq_device::intin1 ) } } -WRITE_LINE_MEMBER( psxirq_device::intin2 ) +void psxirq_device::intin2(int state) { if( state ) { @@ -131,7 +131,7 @@ WRITE_LINE_MEMBER( psxirq_device::intin2 ) } } -WRITE_LINE_MEMBER( psxirq_device::intin3 ) +void psxirq_device::intin3(int state) { if( state ) { @@ -139,7 +139,7 @@ WRITE_LINE_MEMBER( psxirq_device::intin3 ) } } -WRITE_LINE_MEMBER( psxirq_device::intin4 ) +void psxirq_device::intin4(int state) { if( state ) { @@ -147,7 +147,7 @@ WRITE_LINE_MEMBER( psxirq_device::intin4 ) } } -WRITE_LINE_MEMBER( psxirq_device::intin5 ) +void psxirq_device::intin5(int state) { if( state ) { @@ -155,7 +155,7 @@ WRITE_LINE_MEMBER( psxirq_device::intin5 ) } } -WRITE_LINE_MEMBER( psxirq_device::intin6 ) +void psxirq_device::intin6(int state) { if( state ) { @@ -163,7 +163,7 @@ WRITE_LINE_MEMBER( psxirq_device::intin6 ) } } -WRITE_LINE_MEMBER( psxirq_device::intin7 ) +void psxirq_device::intin7(int state) { if( state ) { @@ -171,7 +171,7 @@ WRITE_LINE_MEMBER( psxirq_device::intin7 ) } } -WRITE_LINE_MEMBER( psxirq_device::intin8 ) +void psxirq_device::intin8(int state) { if( state ) { @@ -179,7 +179,7 @@ WRITE_LINE_MEMBER( psxirq_device::intin8 ) } } -WRITE_LINE_MEMBER( psxirq_device::intin9 ) +void psxirq_device::intin9(int state) { if( state ) { @@ -187,7 +187,7 @@ WRITE_LINE_MEMBER( psxirq_device::intin9 ) } } -WRITE_LINE_MEMBER( psxirq_device::intin10 ) +void psxirq_device::intin10(int state) { if( state ) { diff --git a/src/devices/cpu/psx/irq.h b/src/devices/cpu/psx/irq.h index b4ee28e712a..e3d9c34408f 100644 --- a/src/devices/cpu/psx/irq.h +++ b/src/devices/cpu/psx/irq.h @@ -26,17 +26,17 @@ public: uint32_t read(offs_t offset); void write(offs_t offset, uint32_t data, uint32_t mem_mask = ~0); - DECLARE_WRITE_LINE_MEMBER( intin0 ); - DECLARE_WRITE_LINE_MEMBER( intin1 ); - DECLARE_WRITE_LINE_MEMBER( intin2 ); - DECLARE_WRITE_LINE_MEMBER( intin3 ); - DECLARE_WRITE_LINE_MEMBER( intin4 ); - DECLARE_WRITE_LINE_MEMBER( intin5 ); - DECLARE_WRITE_LINE_MEMBER( intin6 ); - DECLARE_WRITE_LINE_MEMBER( intin7 ); - DECLARE_WRITE_LINE_MEMBER( intin8 ); - DECLARE_WRITE_LINE_MEMBER( intin9 ); - DECLARE_WRITE_LINE_MEMBER( intin10 ); + void intin0(int state); + void intin1(int state); + void intin2(int state); + void intin3(int state); + void intin4(int state); + void intin5(int state); + void intin6(int state); + void intin7(int state); + void intin8(int state); + void intin9(int state); + void intin10(int state); protected: virtual void device_start() override; diff --git a/src/devices/cpu/psx/sio.cpp b/src/devices/cpu/psx/sio.cpp index b5f8644f705..25d9a693252 100644 --- a/src/devices/cpu/psx/sio.cpp +++ b/src/devices/cpu/psx/sio.cpp @@ -328,12 +328,12 @@ uint32_t psxsio_device::read(offs_t offset, uint32_t mem_mask) return data; } -WRITE_LINE_MEMBER(psxsio_device::write_rxd) +void psxsio_device::write_rxd(int state) { m_rxd = state; } -WRITE_LINE_MEMBER(psxsio_device::write_dsr) +void psxsio_device::write_dsr(int state) { if (state) { diff --git a/src/devices/cpu/psx/sio.h b/src/devices/cpu/psx/sio.h index 482a8081d6a..f751e7949cf 100644 --- a/src/devices/cpu/psx/sio.h +++ b/src/devices/cpu/psx/sio.h @@ -46,8 +46,8 @@ public: void write(offs_t offset, uint32_t data, uint32_t mem_mask = ~0); uint32_t read(offs_t offset, uint32_t mem_mask = ~0); - DECLARE_WRITE_LINE_MEMBER(write_rxd); - DECLARE_WRITE_LINE_MEMBER(write_dsr); + void write_rxd(int state); + void write_dsr(int state); protected: psxsio_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); diff --git a/src/devices/cpu/rx01/rx01.h b/src/devices/cpu/rx01/rx01.h index b8806c354f3..dd2fa02b523 100644 --- a/src/devices/cpu/rx01/rx01.h +++ b/src/devices/cpu/rx01/rx01.h @@ -48,7 +48,7 @@ public: auto shift_callback() { return m_interface_callback[4].bind(); } // serial input for controller - DECLARE_READ_LINE_MEMBER(data_r) { return !data_in(); } + int data_r() { return !data_in(); } protected: // device-level overrides diff --git a/src/devices/cpu/sharc/sharc.cpp b/src/devices/cpu/sharc/sharc.cpp index 7ce22652570..e3b965eb25d 100644 --- a/src/devices/cpu/sharc/sharc.cpp +++ b/src/devices/cpu/sharc/sharc.cpp @@ -976,7 +976,7 @@ void adsp21062_device::set_flag_input(int flag_num, int state) } } -WRITE_LINE_MEMBER(adsp21062_device::write_stall) +void adsp21062_device::write_stall(int state) { m_core->write_stalled = (state == 0) ? false : true; diff --git a/src/devices/cpu/sharc/sharc.h b/src/devices/cpu/sharc/sharc.h index 2189a1e6010..c9c008effdb 100644 --- a/src/devices/cpu/sharc/sharc.h +++ b/src/devices/cpu/sharc/sharc.h @@ -99,7 +99,7 @@ public: TIMER_CALLBACK_MEMBER(sharc_iop_delayed_write_callback); TIMER_CALLBACK_MEMBER(sharc_dma_callback); - WRITE_LINE_MEMBER(write_stall); + void write_stall(int state); void sharc_cfunc_unimplemented(); void sharc_cfunc_read_iop(); diff --git a/src/devices/cpu/st62xx/st62xx.cpp b/src/devices/cpu/st62xx/st62xx.cpp index c66bd58307f..76b21f05b39 100644 --- a/src/devices/cpu/st62xx/st62xx.cpp +++ b/src/devices/cpu/st62xx/st62xx.cpp @@ -199,29 +199,29 @@ std::unique_ptr st6228_device::create_disassembler() } // TODO: interrupts -WRITE_LINE_MEMBER(st6228_device::porta0_w) { m_port_input[PORT_A] &= ~(1 << 0); m_port_input[PORT_A] |= (state << 0); } -WRITE_LINE_MEMBER(st6228_device::porta1_w) { m_port_input[PORT_A] &= ~(1 << 1); m_port_input[PORT_A] |= (state << 1); } -WRITE_LINE_MEMBER(st6228_device::porta2_w) { m_port_input[PORT_A] &= ~(1 << 2); m_port_input[PORT_A] |= (state << 2); } -WRITE_LINE_MEMBER(st6228_device::porta3_w) { m_port_input[PORT_A] &= ~(1 << 3); m_port_input[PORT_A] |= (state << 3); } -WRITE_LINE_MEMBER(st6228_device::porta4_w) { m_port_input[PORT_A] &= ~(1 << 4); m_port_input[PORT_A] |= (state << 4); } -WRITE_LINE_MEMBER(st6228_device::porta5_w) { m_port_input[PORT_A] &= ~(1 << 5); m_port_input[PORT_A] |= (state << 5); } - -WRITE_LINE_MEMBER(st6228_device::portb4_w) { m_port_input[PORT_B] &= ~(1 << 4); m_port_input[PORT_B] |= (state << 4); } -WRITE_LINE_MEMBER(st6228_device::portb5_w) { m_port_input[PORT_B] &= ~(1 << 5); m_port_input[PORT_B] |= (state << 5); } -WRITE_LINE_MEMBER(st6228_device::portb6_w) { m_port_input[PORT_B] &= ~(1 << 6); m_port_input[PORT_B] |= (state << 6); } - -WRITE_LINE_MEMBER(st6228_device::portc4_w) { m_port_input[PORT_C] &= ~(1 << 4); m_port_input[PORT_C] |= (state << 4); } -WRITE_LINE_MEMBER(st6228_device::portc5_w) { m_port_input[PORT_C] &= ~(1 << 5); m_port_input[PORT_C] |= (state << 5); } -WRITE_LINE_MEMBER(st6228_device::portc6_w) { m_port_input[PORT_C] &= ~(1 << 6); m_port_input[PORT_C] |= (state << 6); } -WRITE_LINE_MEMBER(st6228_device::portc7_w) { m_port_input[PORT_C] &= ~(1 << 7); m_port_input[PORT_C] |= (state << 7); } - -WRITE_LINE_MEMBER(st6228_device::portd1_w) { m_port_input[PORT_D] &= ~(1 << 1); m_port_input[PORT_D] |= (state << 1); } -WRITE_LINE_MEMBER(st6228_device::portd2_w) { m_port_input[PORT_D] &= ~(1 << 2); m_port_input[PORT_D] |= (state << 2); } -WRITE_LINE_MEMBER(st6228_device::portd3_w) { m_port_input[PORT_D] &= ~(1 << 3); m_port_input[PORT_D] |= (state << 3); } -WRITE_LINE_MEMBER(st6228_device::portd4_w) { m_port_input[PORT_D] &= ~(1 << 4); m_port_input[PORT_D] |= (state << 4); } -WRITE_LINE_MEMBER(st6228_device::portd5_w) { m_port_input[PORT_D] &= ~(1 << 5); m_port_input[PORT_D] |= (state << 5); } -WRITE_LINE_MEMBER(st6228_device::portd6_w) { m_port_input[PORT_D] &= ~(1 << 6); m_port_input[PORT_D] |= (state << 6); } -WRITE_LINE_MEMBER(st6228_device::portd7_w) { m_port_input[PORT_D] &= ~(1 << 7); m_port_input[PORT_D] |= (state << 7); } +void st6228_device::porta0_w(int state) { m_port_input[PORT_A] &= ~(1 << 0); m_port_input[PORT_A] |= (state << 0); } +void st6228_device::porta1_w(int state) { m_port_input[PORT_A] &= ~(1 << 1); m_port_input[PORT_A] |= (state << 1); } +void st6228_device::porta2_w(int state) { m_port_input[PORT_A] &= ~(1 << 2); m_port_input[PORT_A] |= (state << 2); } +void st6228_device::porta3_w(int state) { m_port_input[PORT_A] &= ~(1 << 3); m_port_input[PORT_A] |= (state << 3); } +void st6228_device::porta4_w(int state) { m_port_input[PORT_A] &= ~(1 << 4); m_port_input[PORT_A] |= (state << 4); } +void st6228_device::porta5_w(int state) { m_port_input[PORT_A] &= ~(1 << 5); m_port_input[PORT_A] |= (state << 5); } + +void st6228_device::portb4_w(int state) { m_port_input[PORT_B] &= ~(1 << 4); m_port_input[PORT_B] |= (state << 4); } +void st6228_device::portb5_w(int state) { m_port_input[PORT_B] &= ~(1 << 5); m_port_input[PORT_B] |= (state << 5); } +void st6228_device::portb6_w(int state) { m_port_input[PORT_B] &= ~(1 << 6); m_port_input[PORT_B] |= (state << 6); } + +void st6228_device::portc4_w(int state) { m_port_input[PORT_C] &= ~(1 << 4); m_port_input[PORT_C] |= (state << 4); } +void st6228_device::portc5_w(int state) { m_port_input[PORT_C] &= ~(1 << 5); m_port_input[PORT_C] |= (state << 5); } +void st6228_device::portc6_w(int state) { m_port_input[PORT_C] &= ~(1 << 6); m_port_input[PORT_C] |= (state << 6); } +void st6228_device::portc7_w(int state) { m_port_input[PORT_C] &= ~(1 << 7); m_port_input[PORT_C] |= (state << 7); } + +void st6228_device::portd1_w(int state) { m_port_input[PORT_D] &= ~(1 << 1); m_port_input[PORT_D] |= (state << 1); } +void st6228_device::portd2_w(int state) { m_port_input[PORT_D] &= ~(1 << 2); m_port_input[PORT_D] |= (state << 2); } +void st6228_device::portd3_w(int state) { m_port_input[PORT_D] &= ~(1 << 3); m_port_input[PORT_D] |= (state << 3); } +void st6228_device::portd4_w(int state) { m_port_input[PORT_D] &= ~(1 << 4); m_port_input[PORT_D] |= (state << 4); } +void st6228_device::portd5_w(int state) { m_port_input[PORT_D] &= ~(1 << 5); m_port_input[PORT_D] |= (state << 5); } +void st6228_device::portd6_w(int state) { m_port_input[PORT_D] &= ~(1 << 6); m_port_input[PORT_D] |= (state << 6); } +void st6228_device::portd7_w(int state) { m_port_input[PORT_D] &= ~(1 << 7); m_port_input[PORT_D] |= (state << 7); } void st6228_device::gpio_set_output_bit(uint8_t index, uint8_t bit, uint8_t state) { @@ -392,7 +392,7 @@ uint8_t st6228_device::gpio_option_r(offs_t offset) return data; } -WRITE_LINE_MEMBER(st6228_device::timer_w) +void st6228_device::timer_w(int state) { const int old = m_timer_pin; m_timer_pin = state; diff --git a/src/devices/cpu/st62xx/st62xx.h b/src/devices/cpu/st62xx/st62xx.h index 8442e1e798b..30f17b5c155 100644 --- a/src/devices/cpu/st62xx/st62xx.h +++ b/src/devices/cpu/st62xx/st62xx.h @@ -61,31 +61,31 @@ public: return m_portd_out[Bit - 1].bind(); } - DECLARE_WRITE_LINE_MEMBER(porta0_w); - DECLARE_WRITE_LINE_MEMBER(porta1_w); - DECLARE_WRITE_LINE_MEMBER(porta2_w); - DECLARE_WRITE_LINE_MEMBER(porta3_w); - DECLARE_WRITE_LINE_MEMBER(porta4_w); - DECLARE_WRITE_LINE_MEMBER(porta5_w); - - DECLARE_WRITE_LINE_MEMBER(portb4_w); - DECLARE_WRITE_LINE_MEMBER(portb5_w); - DECLARE_WRITE_LINE_MEMBER(portb6_w); - - DECLARE_WRITE_LINE_MEMBER(portc4_w); - DECLARE_WRITE_LINE_MEMBER(portc5_w); - DECLARE_WRITE_LINE_MEMBER(portc6_w); - DECLARE_WRITE_LINE_MEMBER(portc7_w); - - DECLARE_WRITE_LINE_MEMBER(portd1_w); - DECLARE_WRITE_LINE_MEMBER(portd2_w); - DECLARE_WRITE_LINE_MEMBER(portd3_w); - DECLARE_WRITE_LINE_MEMBER(portd4_w); - DECLARE_WRITE_LINE_MEMBER(portd5_w); - DECLARE_WRITE_LINE_MEMBER(portd6_w); - DECLARE_WRITE_LINE_MEMBER(portd7_w); - - DECLARE_WRITE_LINE_MEMBER(timer_w); + void porta0_w(int state); + void porta1_w(int state); + void porta2_w(int state); + void porta3_w(int state); + void porta4_w(int state); + void porta5_w(int state); + + void portb4_w(int state); + void portb5_w(int state); + void portb6_w(int state); + + void portc4_w(int state); + void portc5_w(int state); + void portc6_w(int state); + void portc7_w(int state); + + void portd1_w(int state); + void portd2_w(int state); + void portd3_w(int state); + void portd4_w(int state); + void portd5_w(int state); + void portd6_w(int state); + void portd7_w(int state); + + void timer_w(int state); protected: // device-level overrides diff --git a/src/devices/cpu/tms57002/tms57002.cpp b/src/devices/cpu/tms57002/tms57002.cpp index e137a6b2efd..39f052328f8 100644 --- a/src/devices/cpu/tms57002/tms57002.cpp +++ b/src/devices/cpu/tms57002/tms57002.cpp @@ -37,7 +37,7 @@ std::unique_ptr tms57002_device::create_disassembler() return std::make_unique(); } -WRITE_LINE_MEMBER(tms57002_device::pload_w) +void tms57002_device::pload_w(int state) { u8 olds = sti; if (state) @@ -56,7 +56,7 @@ WRITE_LINE_MEMBER(tms57002_device::pload_w) } } -WRITE_LINE_MEMBER(tms57002_device::cload_w) +void tms57002_device::cload_w(int state) { u8 olds = sti; if (state) @@ -185,7 +185,7 @@ u8 tms57002_device::data_r() return res; } -READ_LINE_MEMBER(tms57002_device::dready_r) +int tms57002_device::dready_r() { return sti & S_HOST ? 0 : 1; } @@ -195,7 +195,7 @@ void tms57002_device::update_dready() m_dready_callback(sti & S_HOST ? 0 : 1); } -READ_LINE_MEMBER(tms57002_device::pc0_r) +int tms57002_device::pc0_r() { return pc == 0 ? 0 : 1; } @@ -205,7 +205,7 @@ void tms57002_device::update_pc0() m_pc0_callback(pc == 0 ? 0 : 1); } -READ_LINE_MEMBER(tms57002_device::empty_r) +int tms57002_device::empty_r() { return (update_counter_head == update_counter_tail); } @@ -215,7 +215,7 @@ void tms57002_device::update_empty() m_empty_callback(update_counter_head == update_counter_tail); } -WRITE_LINE_MEMBER(tms57002_device::sync_w) +void tms57002_device::sync_w(int state) { if (sti & (IN_PLOAD /*| IN_CLOAD*/)) return; diff --git a/src/devices/cpu/tms57002/tms57002.h b/src/devices/cpu/tms57002/tms57002.h index 12bcd732120..db5b217ee9b 100644 --- a/src/devices/cpu/tms57002/tms57002.h +++ b/src/devices/cpu/tms57002/tms57002.h @@ -24,12 +24,12 @@ public: u8 data_r(); void data_w(u8 data); - DECLARE_WRITE_LINE_MEMBER(pload_w); - DECLARE_WRITE_LINE_MEMBER(cload_w); - DECLARE_READ_LINE_MEMBER(empty_r); - DECLARE_READ_LINE_MEMBER(dready_r); - DECLARE_READ_LINE_MEMBER(pc0_r); - DECLARE_WRITE_LINE_MEMBER(sync_w); + void pload_w(int state); + void cload_w(int state); + int empty_r(); + int dready_r(); + int pc0_r(); + void sync_w(int state); void internal_pgm(address_map &map); protected: diff --git a/src/devices/cpu/tms9900/tms9995.cpp b/src/devices/cpu/tms9900/tms9995.cpp index f31f84de927..82c6f6c27ad 100644 --- a/src/devices/cpu/tms9900/tms9995.cpp +++ b/src/devices/cpu/tms9900/tms9995.cpp @@ -1343,7 +1343,7 @@ void tms9995_device::execute_set_input(int irqline, int state) /* Triggers a RESET. */ -WRITE_LINE_MEMBER( tms9995_device::reset_line ) +void tms9995_device::reset_line(int state) { if (state==ASSERT_LINE) { @@ -1386,7 +1386,7 @@ void tms9995_device::pulse_clock(int count) /* Enter the hold state. */ -WRITE_LINE_MEMBER( tms9995_device::hold_line ) +void tms9995_device::hold_line(int state) { m_hold_requested = (state==ASSERT_LINE); LOGMASKED(LOG_HOLD, "set HOLD = %d\n", state); @@ -1400,7 +1400,7 @@ WRITE_LINE_MEMBER( tms9995_device::hold_line ) Signal READY to the CPU. When cleared, the CPU enters wait states. This becomes effective on a clock pulse. */ -WRITE_LINE_MEMBER( tms9995_device::ready_line ) +void tms9995_device::ready_line(int state) { bool newready = (state==ASSERT_LINE); diff --git a/src/devices/cpu/tms9900/tms9995.h b/src/devices/cpu/tms9900/tms9995.h index 8022ca74459..e744aed93c1 100644 --- a/src/devices/cpu/tms9900/tms9995.h +++ b/src/devices/cpu/tms9900/tms9995.h @@ -36,16 +36,16 @@ public: // READY input line. When asserted (high), the memory is ready for data exchange. // We chose to use a direct method instead of a delegate to keep performance // footprint low; this method may be called very frequently. - DECLARE_WRITE_LINE_MEMBER( ready_line ); + void ready_line(int state); // HOLD input line. When asserted (low), the CPU is requested to release the // data and address bus and enter the HOLD state. The entrance of this state // is acknowledged by the HOLDA output line. - DECLARE_WRITE_LINE_MEMBER( hold_line ); + void hold_line(int state); // RESET input line. Unlike the standard set_input_line, this input method // is synchronous and will immediately lead to a reset of the CPU. - DECLARE_WRITE_LINE_MEMBER( reset_line ); + void reset_line(int state); // Callbacks auto extop_cb() { return m_external_operation.bind(); } diff --git a/src/devices/cpu/upd7810/upd7810.cpp b/src/devices/cpu/upd7810/upd7810.cpp index 9d0576f4d3b..09526b7fd85 100644 --- a/src/devices/cpu/upd7810/upd7810.cpp +++ b/src/devices/cpu/upd7810/upd7810.cpp @@ -585,7 +585,7 @@ void upd7810_device::pf_w(uint8_t data, uint8_t mem_mask) COMBINE_DATA(&m_pf_in); } -WRITE_LINE_MEMBER(upd7810_device::sck_w) +void upd7810_device::sck_w(int state) { if ((SMH & 0x03) == 0x03 && state != SCK) update_sio(1); diff --git a/src/devices/cpu/upd7810/upd7810.h b/src/devices/cpu/upd7810/upd7810.h index 96c0c949149..4b6315c1fd7 100644 --- a/src/devices/cpu/upd7810/upd7810.h +++ b/src/devices/cpu/upd7810/upd7810.h @@ -83,7 +83,7 @@ public: void pd_w(uint8_t data, uint8_t mem_mask = ~0); void pf_w(uint8_t data, uint8_t mem_mask = ~0); - DECLARE_WRITE_LINE_MEMBER(sck_w); + void sck_w(int state); protected: void upd_internal_128_ram_map(address_map &map); diff --git a/src/devices/cpu/z180/z180.h b/src/devices/cpu/z180/z180.h index d761bdfb9e7..62c701a1234 100644 --- a/src/devices/cpu/z180/z180.h +++ b/src/devices/cpu/z180/z180.h @@ -121,14 +121,14 @@ public: bool get_tend0(); bool get_tend1(); - DECLARE_WRITE_LINE_MEMBER( rxa0_w ) { m_asci[0]->rxa_wr(state); } - DECLARE_WRITE_LINE_MEMBER( rxa1_w ) { m_asci[1]->rxa_wr(state); } - DECLARE_WRITE_LINE_MEMBER( cts0_w ) { m_asci[0]->cts_wr(state); } - DECLARE_WRITE_LINE_MEMBER( rxs_cts1_w ) { m_asci[1]->cts_wr(state); m_csio->rxs_wr(state); } - DECLARE_WRITE_LINE_MEMBER( dcd0_w ) { m_asci[0]->dcd_wr(state); } - DECLARE_WRITE_LINE_MEMBER( cka0_w ) { m_asci[0]->cka_wr(state); } - DECLARE_WRITE_LINE_MEMBER( cka1_w ) { m_asci[1]->cka_wr(state); } - DECLARE_WRITE_LINE_MEMBER( cks_w ) { m_csio->cks_wr(state); } + void rxa0_w(int state) { m_asci[0]->rxa_wr(state); } + void rxa1_w(int state) { m_asci[1]->rxa_wr(state); } + void cts0_w(int state) { m_asci[0]->cts_wr(state); } + void rxs_cts1_w(int state) { m_asci[1]->cts_wr(state); m_csio->rxs_wr(state); } + void dcd0_w(int state) { m_asci[0]->dcd_wr(state); } + void cka0_w(int state) { m_asci[0]->cka_wr(state); } + void cka1_w(int state) { m_asci[1]->cka_wr(state); } + void cks_w(int state) { m_csio->cks_wr(state); } protected: // construction/destruction diff --git a/src/devices/cpu/z180/z180asci.cpp b/src/devices/cpu/z180/z180asci.cpp index 5b649a9a301..e49e2d0db93 100644 --- a/src/devices/cpu/z180/z180asci.cpp +++ b/src/devices/cpu/z180/z180asci.cpp @@ -341,7 +341,7 @@ void z180asci_channel_base::astch_w(uint8_t data) device_clock_changed(); } -DECLARE_WRITE_LINE_MEMBER( z180asci_channel_base::cts_wr ) +void z180asci_channel_base::cts_wr(int state) { if (m_id) { @@ -357,7 +357,7 @@ DECLARE_WRITE_LINE_MEMBER( z180asci_channel_base::cts_wr ) m_cts = state; } -DECLARE_WRITE_LINE_MEMBER( z180asci_channel_base::dcd_wr ) +void z180asci_channel_base::dcd_wr(int state) { if (m_id) return; @@ -375,12 +375,12 @@ DECLARE_WRITE_LINE_MEMBER( z180asci_channel_base::dcd_wr ) m_irq = 1; } -DECLARE_WRITE_LINE_MEMBER( z180asci_channel_base::rxa_wr ) +void z180asci_channel_base::rxa_wr(int state) { m_rxa = state; } -DECLARE_WRITE_LINE_MEMBER( z180asci_channel_base::cka_wr ) +void z180asci_channel_base::cka_wr(int state) { // For channel 1, CKA can be disabled if (m_id && (m_asci_cntla & Z180_CNTLA1_CKA1D)) return; diff --git a/src/devices/cpu/z180/z180asci.h b/src/devices/cpu/z180/z180asci.h index 3794fe635a8..525603e3c35 100644 --- a/src/devices/cpu/z180/z180asci.h +++ b/src/devices/cpu/z180/z180asci.h @@ -40,10 +40,10 @@ public: void astcl_w(uint8_t data); void astch_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER( rxa_wr ); - DECLARE_WRITE_LINE_MEMBER( cts_wr ); - DECLARE_WRITE_LINE_MEMBER( dcd_wr ); - DECLARE_WRITE_LINE_MEMBER( cka_wr ); + void rxa_wr(int state); + void cts_wr(int state); + void dcd_wr(int state); + void cka_wr(int state); virtual void state_add(device_state_interface &parent) = 0; diff --git a/src/devices/cpu/z180/z180csio.cpp b/src/devices/cpu/z180/z180csio.cpp index 20c230f76b7..aca83507e86 100644 --- a/src/devices/cpu/z180/z180csio.cpp +++ b/src/devices/cpu/z180/z180csio.cpp @@ -201,7 +201,7 @@ TIMER_CALLBACK_MEMBER(z180csio_device::internal_clock) } -WRITE_LINE_MEMBER(z180csio_device::cks_wr) +void z180csio_device::cks_wr(int state) { state = state ? 1 : 0; if (m_cks_in != state) @@ -213,7 +213,7 @@ WRITE_LINE_MEMBER(z180csio_device::cks_wr) } -WRITE_LINE_MEMBER(z180csio_device::rxs_wr) +void z180csio_device::rxs_wr(int state) { m_rxs_in = state ? 1 : 0; } diff --git a/src/devices/cpu/z180/z180csio.h b/src/devices/cpu/z180/z180csio.h index 380bbf07d77..3cc1c53393f 100644 --- a/src/devices/cpu/z180/z180csio.h +++ b/src/devices/cpu/z180/z180csio.h @@ -23,8 +23,8 @@ public: auto cks_handler() { return m_cks_cb.bind(); } auto txs_handler() { return m_txs_cb.bind(); } - DECLARE_WRITE_LINE_MEMBER(cks_wr); - DECLARE_WRITE_LINE_MEMBER(rxs_wr); + void cks_wr(int state); + void rxs_wr(int state); u8 cntr_r(); u8 trdr_r(); diff --git a/src/devices/cpu/z80/kp63.h b/src/devices/cpu/z80/kp63.h index 73e269fb72b..4d5a84c2349 100644 --- a/src/devices/cpu/z80/kp63.h +++ b/src/devices/cpu/z80/kp63.h @@ -28,7 +28,7 @@ public: void write(offs_t offset, u8 data); // input line interface - template DECLARE_WRITE_LINE_MEMBER(gate_w) { write_gate(N, state); } + template void gate_w(int state) { write_gate(N, state); } protected: // construction/destruction diff --git a/src/devices/cpu/z80/kp64.cpp b/src/devices/cpu/z80/kp64.cpp index 697ed65268a..0a40c4bad5b 100644 --- a/src/devices/cpu/z80/kp64.cpp +++ b/src/devices/cpu/z80/kp64.cpp @@ -473,7 +473,7 @@ void kp64_device::control_w(u8 data) // xclk_w - set external count input //------------------------------------------------- -WRITE_LINE_MEMBER(kp64_device::xclk_w) +void kp64_device::xclk_w(int state) { // Only falling edges count if (std::exchange(m_xclk, state) && !state) @@ -506,7 +506,7 @@ WRITE_LINE_MEMBER(kp64_device::xclk_w) // gate_w - set gate input //------------------------------------------------- -WRITE_LINE_MEMBER(kp64_device::gate_w) +void kp64_device::gate_w(int state) { if (m_gate == bool(state)) return; diff --git a/src/devices/cpu/z80/kp64.h b/src/devices/cpu/z80/kp64.h index 954076430d0..0bb09f8316a 100644 --- a/src/devices/cpu/z80/kp64.h +++ b/src/devices/cpu/z80/kp64.h @@ -32,8 +32,8 @@ public: void control_w(u8 data); // input line interface - DECLARE_WRITE_LINE_MEMBER(xclk_w); - DECLARE_WRITE_LINE_MEMBER(gate_w); + void xclk_w(int state); + void gate_w(int state); protected: // device-level overrides diff --git a/src/devices/cpu/z80/kp69.h b/src/devices/cpu/z80/kp69.h index f7747f795d6..285fc610119 100644 --- a/src/devices/cpu/z80/kp69.h +++ b/src/devices/cpu/z80/kp69.h @@ -31,7 +31,7 @@ public: u8 imrh_r(); // interrupt inputs - template DECLARE_WRITE_LINE_MEMBER(ir_w) + template void ir_w(int state) { static_assert(N >= 0 && N < 16, "Invalid level"); set_input_level(N, state); diff --git a/src/devices/cpu/z80/tmpz84c011.h b/src/devices/cpu/z80/tmpz84c011.h index 7e7455d077e..8349905d5b9 100644 --- a/src/devices/cpu/z80/tmpz84c011.h +++ b/src/devices/cpu/z80/tmpz84c011.h @@ -50,10 +50,10 @@ public: auto in_pe_callback() { return m_inportse.bind(); } // CTC public interface - DECLARE_WRITE_LINE_MEMBER( trg0 ) { m_ctc->trg0(state); } - DECLARE_WRITE_LINE_MEMBER( trg1 ) { m_ctc->trg1(state); } - DECLARE_WRITE_LINE_MEMBER( trg2 ) { m_ctc->trg2(state); } - DECLARE_WRITE_LINE_MEMBER( trg3 ) { m_ctc->trg3(state); } + void trg0(int state) { m_ctc->trg0(state); } + void trg1(int state) { m_ctc->trg1(state); } + void trg2(int state) { m_ctc->trg2(state); } + void trg3(int state) { m_ctc->trg3(state); } ///////////////////////////////////////////////////////// @@ -115,9 +115,9 @@ private: devcb_write_line m_zc1_cb; devcb_write_line m_zc2_cb; - DECLARE_WRITE_LINE_MEMBER( zc0_cb_trampoline_w ) { m_zc0_cb(state); } - DECLARE_WRITE_LINE_MEMBER( zc1_cb_trampoline_w ) { m_zc1_cb(state); } - DECLARE_WRITE_LINE_MEMBER( zc2_cb_trampoline_w ) { m_zc2_cb(state); } + void zc0_cb_trampoline_w(int state) { m_zc0_cb(state); } + void zc1_cb_trampoline_w(int state) { m_zc1_cb(state); } + void zc2_cb_trampoline_w(int state) { m_zc2_cb(state); } }; diff --git a/src/devices/cpu/z80/tmpz84c015.h b/src/devices/cpu/z80/tmpz84c015.h index 603d714925d..0888fe631ef 100644 --- a/src/devices/cpu/z80/tmpz84c015.h +++ b/src/devices/cpu/z80/tmpz84c015.h @@ -64,51 +64,51 @@ public: auto out_brdy_callback() { return m_out_brdy_cb.bind(); } // SIO public interface - DECLARE_WRITE_LINE_MEMBER( rxa_w ) { m_sio->rxa_w(state); } - DECLARE_WRITE_LINE_MEMBER( rxb_w ) { m_sio->rxb_w(state); } - DECLARE_WRITE_LINE_MEMBER( ctsa_w ) { m_sio->ctsa_w(state); } - DECLARE_WRITE_LINE_MEMBER( ctsb_w ) { m_sio->ctsb_w(state); } - DECLARE_WRITE_LINE_MEMBER( dcda_w ) { m_sio->dcda_w(state); } - DECLARE_WRITE_LINE_MEMBER( dcdb_w ) { m_sio->dcdb_w(state); } - DECLARE_WRITE_LINE_MEMBER( rxca_w ) { m_sio->rxca_w(state); } - DECLARE_WRITE_LINE_MEMBER( rxcb_w ) { m_sio->rxcb_w(state); } - DECLARE_WRITE_LINE_MEMBER( txca_w ) { m_sio->txca_w(state); } - DECLARE_WRITE_LINE_MEMBER( txcb_w ) { m_sio->txcb_w(state); } - DECLARE_WRITE_LINE_MEMBER( synca_w ) { m_sio->synca_w(state); } - DECLARE_WRITE_LINE_MEMBER( syncb_w ) { m_sio->syncb_w(state); } + void rxa_w(int state) { m_sio->rxa_w(state); } + void rxb_w(int state) { m_sio->rxb_w(state); } + void ctsa_w(int state) { m_sio->ctsa_w(state); } + void ctsb_w(int state) { m_sio->ctsb_w(state); } + void dcda_w(int state) { m_sio->dcda_w(state); } + void dcdb_w(int state) { m_sio->dcdb_w(state); } + void rxca_w(int state) { m_sio->rxca_w(state); } + void rxcb_w(int state) { m_sio->rxcb_w(state); } + void txca_w(int state) { m_sio->txca_w(state); } + void txcb_w(int state) { m_sio->txcb_w(state); } + void synca_w(int state) { m_sio->synca_w(state); } + void syncb_w(int state) { m_sio->syncb_w(state); } // CTC public interface - DECLARE_WRITE_LINE_MEMBER( trg0 ) { m_ctc->trg0(state); } - DECLARE_WRITE_LINE_MEMBER( trg1 ) { m_ctc->trg1(state); } - DECLARE_WRITE_LINE_MEMBER( trg2 ) { m_ctc->trg2(state); } - DECLARE_WRITE_LINE_MEMBER( trg3 ) { m_ctc->trg3(state); } + void trg0(int state) { m_ctc->trg0(state); } + void trg1(int state) { m_ctc->trg1(state); } + void trg2(int state) { m_ctc->trg2(state); } + void trg3(int state) { m_ctc->trg3(state); } // PIO public interface - DECLARE_READ_LINE_MEMBER( rdy_a ) { return m_pio->rdy_a(); } - DECLARE_READ_LINE_MEMBER( rdy_b ) { return m_pio->rdy_b(); } - DECLARE_WRITE_LINE_MEMBER( strobe_a ) { m_pio->strobe_a(state); } - DECLARE_WRITE_LINE_MEMBER( strobe_b ) { m_pio->strobe_b(state); } + int rdy_a() { return m_pio->rdy_a(); } + int rdy_b() { return m_pio->rdy_b(); } + void strobe_a(int state) { m_pio->strobe_a(state); } + void strobe_b(int state) { m_pio->strobe_b(state); } void pa_w(uint8_t data) { m_pio->port_a_write(data); } uint8_t pa_r() { return m_pio->port_a_read(); } void pb_w(uint8_t data) { m_pio->port_b_write(data); } uint8_t pb_r() { return m_pio->port_b_read(); } - DECLARE_WRITE_LINE_MEMBER( pa0_w ) { m_pio->pa0_w(state); } - DECLARE_WRITE_LINE_MEMBER( pa1_w ) { m_pio->pa1_w(state); } - DECLARE_WRITE_LINE_MEMBER( pa2_w ) { m_pio->pa2_w(state); } - DECLARE_WRITE_LINE_MEMBER( pa3_w ) { m_pio->pa3_w(state); } - DECLARE_WRITE_LINE_MEMBER( pa4_w ) { m_pio->pa4_w(state); } - DECLARE_WRITE_LINE_MEMBER( pa5_w ) { m_pio->pa5_w(state); } - DECLARE_WRITE_LINE_MEMBER( pa6_w ) { m_pio->pa6_w(state); } - DECLARE_WRITE_LINE_MEMBER( pa7_w ) { m_pio->pa7_w(state); } - DECLARE_WRITE_LINE_MEMBER( pb0_w ) { m_pio->pb0_w(state); } - DECLARE_WRITE_LINE_MEMBER( pb1_w ) { m_pio->pb1_w(state); } - DECLARE_WRITE_LINE_MEMBER( pb2_w ) { m_pio->pb2_w(state); } - DECLARE_WRITE_LINE_MEMBER( pb3_w ) { m_pio->pb3_w(state); } - DECLARE_WRITE_LINE_MEMBER( pb4_w ) { m_pio->pb4_w(state); } - DECLARE_WRITE_LINE_MEMBER( pb5_w ) { m_pio->pb5_w(state); } - DECLARE_WRITE_LINE_MEMBER( pb6_w ) { m_pio->pb6_w(state); } - DECLARE_WRITE_LINE_MEMBER( pb7_w ) { m_pio->pb7_w(state); } + void pa0_w(int state) { m_pio->pa0_w(state); } + void pa1_w(int state) { m_pio->pa1_w(state); } + void pa2_w(int state) { m_pio->pa2_w(state); } + void pa3_w(int state) { m_pio->pa3_w(state); } + void pa4_w(int state) { m_pio->pa4_w(state); } + void pa5_w(int state) { m_pio->pa5_w(state); } + void pa6_w(int state) { m_pio->pa6_w(state); } + void pa7_w(int state) { m_pio->pa7_w(state); } + void pb0_w(int state) { m_pio->pb0_w(state); } + void pb1_w(int state) { m_pio->pb1_w(state); } + void pb2_w(int state) { m_pio->pb2_w(state); } + void pb3_w(int state) { m_pio->pb3_w(state); } + void pb4_w(int state) { m_pio->pb4_w(state); } + void pb5_w(int state) { m_pio->pb5_w(state); } + void pb6_w(int state) { m_pio->pb6_w(state); } + void pb7_w(int state) { m_pio->pb7_w(state); } ///////////////////////////////////////////////////////// @@ -175,32 +175,32 @@ private: void irq_priority_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER( out_txda_cb_trampoline_w ) { m_out_txda_cb(state); } - DECLARE_WRITE_LINE_MEMBER( out_dtra_cb_trampoline_w ) { m_out_dtra_cb(state); } - DECLARE_WRITE_LINE_MEMBER( out_rtsa_cb_trampoline_w ) { m_out_rtsa_cb(state); } - DECLARE_WRITE_LINE_MEMBER( out_wrdya_cb_trampoline_w ) { m_out_wrdya_cb(state); } - DECLARE_WRITE_LINE_MEMBER( out_synca_cb_trampoline_w ) { m_out_synca_cb(state); } + void out_txda_cb_trampoline_w(int state) { m_out_txda_cb(state); } + void out_dtra_cb_trampoline_w(int state) { m_out_dtra_cb(state); } + void out_rtsa_cb_trampoline_w(int state) { m_out_rtsa_cb(state); } + void out_wrdya_cb_trampoline_w(int state) { m_out_wrdya_cb(state); } + void out_synca_cb_trampoline_w(int state) { m_out_synca_cb(state); } - DECLARE_WRITE_LINE_MEMBER( out_txdb_cb_trampoline_w ) { m_out_txdb_cb(state); } - DECLARE_WRITE_LINE_MEMBER( out_dtrb_cb_trampoline_w ) { m_out_dtrb_cb(state); } - DECLARE_WRITE_LINE_MEMBER( out_rtsb_cb_trampoline_w ) { m_out_rtsb_cb(state); } - DECLARE_WRITE_LINE_MEMBER( out_wrdyb_cb_trampoline_w ) { m_out_wrdyb_cb(state); } - DECLARE_WRITE_LINE_MEMBER( out_syncb_cb_trampoline_w ) { m_out_syncb_cb(state); } + void out_txdb_cb_trampoline_w(int state) { m_out_txdb_cb(state); } + void out_dtrb_cb_trampoline_w(int state) { m_out_dtrb_cb(state); } + void out_rtsb_cb_trampoline_w(int state) { m_out_rtsb_cb(state); } + void out_wrdyb_cb_trampoline_w(int state) { m_out_wrdyb_cb(state); } + void out_syncb_cb_trampoline_w(int state) { m_out_syncb_cb(state); } - DECLARE_WRITE_LINE_MEMBER( out_rxdrqa_cb_trampoline_w ) { m_out_rxdrqa_cb(state); } - DECLARE_WRITE_LINE_MEMBER( out_txdrqa_cb_trampoline_w ) { m_out_txdrqa_cb(state); } - DECLARE_WRITE_LINE_MEMBER( out_rxdrqb_cb_trampoline_w ) { m_out_rxdrqb_cb(state); } - DECLARE_WRITE_LINE_MEMBER( out_txdrqb_cb_trampoline_w ) { m_out_txdrqb_cb(state); } + void out_rxdrqa_cb_trampoline_w(int state) { m_out_rxdrqa_cb(state); } + void out_txdrqa_cb_trampoline_w(int state) { m_out_txdrqa_cb(state); } + void out_rxdrqb_cb_trampoline_w(int state) { m_out_rxdrqb_cb(state); } + void out_txdrqb_cb_trampoline_w(int state) { m_out_txdrqb_cb(state); } - template DECLARE_WRITE_LINE_MEMBER( zc_cb_trampoline_w ) { m_zc_cb[N](state); } + template void zc_cb_trampoline_w(int state) { m_zc_cb[N](state); } uint8_t in_pa_cb_trampoline_r() { return m_in_pa_cb(); } void out_pa_cb_trampoline_w(uint8_t data) { m_out_pa_cb(data); } - DECLARE_WRITE_LINE_MEMBER( out_ardy_cb_trampoline_w ) { m_out_ardy_cb(state); } + void out_ardy_cb_trampoline_w(int state) { m_out_ardy_cb(state); } uint8_t in_pb_cb_trampoline_r() { return m_in_pb_cb(); } void out_pb_cb_trampoline_w(uint8_t data) { m_out_pb_cb(data); } - DECLARE_WRITE_LINE_MEMBER( out_brdy_cb_trampoline_w ) { m_out_brdy_cb(state); } + void out_brdy_cb_trampoline_w(int state) { m_out_brdy_cb(state); } }; diff --git a/src/devices/cpu/z8000/z8000.h b/src/devices/cpu/z8000/z8000.h index 921f8f4eb0f..3f4900788a6 100644 --- a/src/devices/cpu/z8000/z8000.h +++ b/src/devices/cpu/z8000/z8000.h @@ -84,7 +84,7 @@ public: auto nviack() { return m_iack_in[2].bind(); } auto viack() { return m_iack_in[3].bind(); } auto mo() { return m_mo_out.bind(); } - DECLARE_WRITE_LINE_MEMBER(mi_w) { m_mi = state; } // XXX: this has to apply in the middle of an insn for now + void mi_w(int state) { m_mi = state; } // XXX: this has to apply in the middle of an insn for now protected: z8002_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock, int addrbits, int vecmult); diff --git a/src/devices/imagedev/flopdrv.cpp b/src/devices/imagedev/flopdrv.cpp index f5f982dd9c9..4443cbb461c 100644 --- a/src/devices/imagedev/flopdrv.cpp +++ b/src/devices/imagedev/flopdrv.cpp @@ -490,13 +490,13 @@ void legacy_floppy_image_device::floppy_set_type(int ftype) /* drive select */ -WRITE_LINE_MEMBER( legacy_floppy_image_device::floppy_ds_w ) +void legacy_floppy_image_device::floppy_ds_w(int state) { m_active = (state == 0); } /* motor on, active low */ -WRITE_LINE_MEMBER( legacy_floppy_image_device::floppy_mon_w ) +void legacy_floppy_image_device::floppy_mon_w(int state) { /* force off if there is no attached image */ if (!exists()) @@ -517,18 +517,18 @@ WRITE_LINE_MEMBER( legacy_floppy_image_device::floppy_mon_w ) } /* direction */ -WRITE_LINE_MEMBER( legacy_floppy_image_device::floppy_drtn_w ) +void legacy_floppy_image_device::floppy_drtn_w(int state) { m_drtn = state; } /* write data */ -WRITE_LINE_MEMBER( legacy_floppy_image_device::floppy_wtd_w ) +void legacy_floppy_image_device::floppy_wtd_w(int state) { } /* step */ -WRITE_LINE_MEMBER( legacy_floppy_image_device::floppy_stp_w ) +void legacy_floppy_image_device::floppy_stp_w(int state) { /* move head one track when going from high to low and write gate is high */ if (m_active && m_stp && state == CLEAR_LINE && m_wtg) @@ -565,31 +565,31 @@ WRITE_LINE_MEMBER( legacy_floppy_image_device::floppy_stp_w ) } /* write gate */ -WRITE_LINE_MEMBER( legacy_floppy_image_device::floppy_wtg_w ) +void legacy_floppy_image_device::floppy_wtg_w(int state) { m_wtg = state; } /* write protect signal, active low */ -READ_LINE_MEMBER( legacy_floppy_image_device::floppy_wpt_r ) +int legacy_floppy_image_device::floppy_wpt_r() { return m_wpt; } /* track 0 detect */ -READ_LINE_MEMBER( legacy_floppy_image_device::floppy_tk00_r ) +int legacy_floppy_image_device::floppy_tk00_r() { return m_tk00; } /* disk changed */ -READ_LINE_MEMBER( legacy_floppy_image_device::floppy_dskchg_r ) +int legacy_floppy_image_device::floppy_dskchg_r() { return m_dskchg; } /* 2-sided disk */ -READ_LINE_MEMBER( legacy_floppy_image_device::floppy_twosid_r ) +int legacy_floppy_image_device::floppy_twosid_r() { if (m_floppy == nullptr) return 1; @@ -597,12 +597,12 @@ READ_LINE_MEMBER( legacy_floppy_image_device::floppy_twosid_r ) return !floppy_get_heads_per_disk(m_floppy); } -READ_LINE_MEMBER( legacy_floppy_image_device::floppy_index_r ) +int legacy_floppy_image_device::floppy_index_r() { return m_idx; } -READ_LINE_MEMBER( legacy_floppy_image_device::floppy_ready_r ) +int legacy_floppy_image_device::floppy_ready_r() { return !(floppy_drive_get_flag_state(FLOPPY_DRIVE_READY) == FLOPPY_DRIVE_READY); } diff --git a/src/devices/imagedev/flopdrv.h b/src/devices/imagedev/flopdrv.h index 67de1597118..f16afe47af4 100644 --- a/src/devices/imagedev/flopdrv.h +++ b/src/devices/imagedev/flopdrv.h @@ -137,18 +137,18 @@ public: void floppy_drive_set_controller(device_t *controller); int floppy_get_drive_type(); void floppy_set_type(int ftype); - WRITE_LINE_MEMBER( floppy_ds_w ); - WRITE_LINE_MEMBER( floppy_mon_w ); - WRITE_LINE_MEMBER( floppy_drtn_w ); - WRITE_LINE_MEMBER( floppy_wtd_w ); - WRITE_LINE_MEMBER( floppy_stp_w ); - WRITE_LINE_MEMBER( floppy_wtg_w ); - READ_LINE_MEMBER( floppy_wpt_r ); - READ_LINE_MEMBER( floppy_tk00_r ); - READ_LINE_MEMBER( floppy_dskchg_r ); - READ_LINE_MEMBER( floppy_twosid_r ); - READ_LINE_MEMBER( floppy_index_r ); - READ_LINE_MEMBER( floppy_ready_r ); + void floppy_ds_w(int state); + void floppy_mon_w(int state); + void floppy_drtn_w(int state); + void floppy_wtd_w(int state); + void floppy_stp_w(int state); + void floppy_wtg_w(int state); + int floppy_wpt_r(); + int floppy_tk00_r(); + int floppy_dskchg_r(); + int floppy_twosid_r(); + int floppy_index_r(); + int floppy_ready_r(); private: diff --git a/src/devices/imagedev/microdrv.cpp b/src/devices/imagedev/microdrv.cpp index a40c79c9721..f85c2ea2421 100644 --- a/src/devices/imagedev/microdrv.cpp +++ b/src/devices/imagedev/microdrv.cpp @@ -122,7 +122,7 @@ TIMER_CALLBACK_MEMBER(microdrive_image_device::bit_timer) } } -WRITE_LINE_MEMBER( microdrive_image_device::clk_w ) +void microdrive_image_device::clk_w(int state) { if (LOG) logerror("Microdrive '%s' CLK: %u\n", tag(), state); if (!m_clk && state) @@ -135,25 +135,25 @@ WRITE_LINE_MEMBER( microdrive_image_device::clk_w ) m_clk = state; } -WRITE_LINE_MEMBER( microdrive_image_device::comms_in_w ) +void microdrive_image_device::comms_in_w(int state) { if (LOG) logerror("Microdrive '%s' COMMS IN: %u\n", tag(), state); m_comms_in = state; } -WRITE_LINE_MEMBER( microdrive_image_device::erase_w ) +void microdrive_image_device::erase_w(int state) { if (LOG) logerror("Microdrive '%s' ERASE: %u\n", tag(), state); m_erase = state; } -WRITE_LINE_MEMBER( microdrive_image_device::read_write_w ) +void microdrive_image_device::read_write_w(int state) { if (LOG) logerror("Microdrive '%s' READ/WRITE: %u\n", tag(), state); m_read_write = state; } -WRITE_LINE_MEMBER( microdrive_image_device::data1_w ) +void microdrive_image_device::data1_w(int state) { if (m_comms_out && !m_read_write) { @@ -161,7 +161,7 @@ WRITE_LINE_MEMBER( microdrive_image_device::data1_w ) } } -WRITE_LINE_MEMBER( microdrive_image_device::data2_w ) +void microdrive_image_device::data2_w(int state) { if (m_comms_out && !m_read_write) { @@ -169,7 +169,7 @@ WRITE_LINE_MEMBER( microdrive_image_device::data2_w ) } } -READ_LINE_MEMBER( microdrive_image_device::data1_r ) +int microdrive_image_device::data1_r() { int data = 0; if (m_comms_out && m_read_write) @@ -179,7 +179,7 @@ READ_LINE_MEMBER( microdrive_image_device::data1_r ) return data; } -READ_LINE_MEMBER( microdrive_image_device::data2_r ) +int microdrive_image_device::data2_r() { int data = 0; if (m_comms_out && m_read_write) diff --git a/src/devices/imagedev/microdrv.h b/src/devices/imagedev/microdrv.h index 465d091d10a..b698058261b 100644 --- a/src/devices/imagedev/microdrv.h +++ b/src/devices/imagedev/microdrv.h @@ -48,14 +48,14 @@ public: virtual const char *file_extensions() const noexcept override { return "mdv,mdr"; } // specific implementation - DECLARE_WRITE_LINE_MEMBER( clk_w ); - DECLARE_WRITE_LINE_MEMBER( comms_in_w ); - DECLARE_WRITE_LINE_MEMBER( erase_w ); - DECLARE_WRITE_LINE_MEMBER( read_write_w ); - DECLARE_WRITE_LINE_MEMBER( data1_w ); - DECLARE_WRITE_LINE_MEMBER( data2_w ); - DECLARE_READ_LINE_MEMBER ( data1_r ); - DECLARE_READ_LINE_MEMBER ( data2_r ); + void clk_w(int state); + void comms_in_w(int state); + void erase_w(int state); + void read_write_w(int state); + void data1_w(int state); + void data2_w(int state); + int data1_r(); + int data2_r(); protected: // device_t implementation diff --git a/src/devices/machine/1ma6.cpp b/src/devices/machine/1ma6.cpp index 621e6aa6960..97b3eeb7292 100644 --- a/src/devices/machine/1ma6.cpp +++ b/src/devices/machine/1ma6.cpp @@ -181,7 +181,7 @@ uint8_t hp_1ma6_device::reg_r(offs_t offset) return res; } -WRITE_LINE_MEMBER(hp_1ma6_device::cart_out_w) +void hp_1ma6_device::cart_out_w(int state) { LOG_DBG("cart_out_w %d\n" , state); if (state) { @@ -190,7 +190,7 @@ WRITE_LINE_MEMBER(hp_1ma6_device::cart_out_w) } } -WRITE_LINE_MEMBER(hp_1ma6_device::hole_w) +void hp_1ma6_device::hole_w(int state) { if (state) { LOG_DBG("hole_w\n"); @@ -198,7 +198,7 @@ WRITE_LINE_MEMBER(hp_1ma6_device::hole_w) } } -WRITE_LINE_MEMBER(hp_1ma6_device::tacho_tick_w) +void hp_1ma6_device::tacho_tick_w(int state) { if (state) { LOG_DBG("tacho_tick_w\n"); @@ -206,7 +206,7 @@ WRITE_LINE_MEMBER(hp_1ma6_device::tacho_tick_w) } } -WRITE_LINE_MEMBER(hp_1ma6_device::motion_w) +void hp_1ma6_device::motion_w(int state) { if (state) { LOG_DBG("motion_w @%.6f st=%d\n" , machine().time().as_double() , m_cmd_state); @@ -279,7 +279,7 @@ WRITE_LINE_MEMBER(hp_1ma6_device::motion_w) } } -WRITE_LINE_MEMBER(hp_1ma6_device::rd_bit_w) +void hp_1ma6_device::rd_bit_w(int state) { LOG_RW("RD bit %d (st=%d,sr=%02x,i=%u)\n" , state , m_cmd_state , m_data_sr , m_bit_idx); switch (m_cmd_state) { @@ -319,7 +319,7 @@ WRITE_LINE_MEMBER(hp_1ma6_device::rd_bit_w) } } -READ_LINE_MEMBER(hp_1ma6_device::wr_bit_r) +int hp_1ma6_device::wr_bit_r() { bool bit = m_cmd_state == CMD_WR_PREAMBLE ? false : BIT(m_data_sr , m_bit_idx); if (m_bit_idx) { diff --git a/src/devices/machine/1ma6.h b/src/devices/machine/1ma6.h index cb083e05c88..33075250055 100644 --- a/src/devices/machine/1ma6.h +++ b/src/devices/machine/1ma6.h @@ -26,12 +26,12 @@ public: void reg_w(offs_t offset, uint8_t data); uint8_t reg_r(offs_t offset); - DECLARE_WRITE_LINE_MEMBER(cart_out_w); - DECLARE_WRITE_LINE_MEMBER(hole_w); - DECLARE_WRITE_LINE_MEMBER(tacho_tick_w); - DECLARE_WRITE_LINE_MEMBER(motion_w); - DECLARE_WRITE_LINE_MEMBER(rd_bit_w); - DECLARE_READ_LINE_MEMBER(wr_bit_r); + void cart_out_w(int state); + void hole_w(int state); + void tacho_tick_w(int state); + void motion_w(int state); + void rd_bit_w(int state); + int wr_bit_r(); protected: // device-level overrides diff --git a/src/devices/machine/1mb5.cpp b/src/devices/machine/1mb5.cpp index 054202b06e1..b03b17bc4d7 100644 --- a/src/devices/machine/1mb5.cpp +++ b/src/devices/machine/1mb5.cpp @@ -160,22 +160,22 @@ void hp_1mb5_device::uc_w(offs_t offset, uint8_t data) } } -READ_LINE_MEMBER(hp_1mb5_device::irl_r) +int hp_1mb5_device::irl_r() { return m_service; } -READ_LINE_MEMBER(hp_1mb5_device::halt_r) +int hp_1mb5_device::halt_r() { return m_halt; } -READ_LINE_MEMBER(hp_1mb5_device::reset_r) +int hp_1mb5_device::reset_r() { return m_reset; } -READ_LINE_MEMBER(hp_1mb5_device::int_r) +int hp_1mb5_device::int_r() { return m_cint; } diff --git a/src/devices/machine/1mb5.h b/src/devices/machine/1mb5.h index 13b1296e6cc..34c081ed672 100644 --- a/src/devices/machine/1mb5.h +++ b/src/devices/machine/1mb5.h @@ -34,12 +34,12 @@ public: void uc_w(offs_t offset, uint8_t data); // Signals to CPU - DECLARE_READ_LINE_MEMBER(irl_r); - DECLARE_READ_LINE_MEMBER(halt_r); + int irl_r(); + int halt_r(); // Signals to uC - DECLARE_READ_LINE_MEMBER(reset_r); - DECLARE_READ_LINE_MEMBER(int_r); + int reset_r(); + int int_r(); // Interrupt enable void inten(); diff --git a/src/devices/machine/2812fifo.cpp b/src/devices/machine/2812fifo.cpp index 3cc10965ecb..5944508b94e 100644 --- a/src/devices/machine/2812fifo.cpp +++ b/src/devices/machine/2812fifo.cpp @@ -46,7 +46,7 @@ fifo2812_device::fifo2812_device(machine_config const &mconfig, char const *tag, } -WRITE_LINE_MEMBER(fifo2812_device::mr_w) +void fifo2812_device::mr_w(int state) { if (bool(state) != bool(m_mr)) { @@ -56,7 +56,7 @@ WRITE_LINE_MEMBER(fifo2812_device::mr_w) } } -WRITE_LINE_MEMBER(fifo2812_device::pl_w) +void fifo2812_device::pl_w(int state) { if (bool(state) != bool(m_pl)) { @@ -104,7 +104,7 @@ WRITE_LINE_MEMBER(fifo2812_device::pl_w) } } -WRITE_LINE_MEMBER(fifo2812_device::pd_w) +void fifo2812_device::pd_w(int state) { if (bool(state) != bool(m_pd)) { @@ -151,7 +151,7 @@ WRITE_LINE_MEMBER(fifo2812_device::pd_w) } } -WRITE_LINE_MEMBER(fifo2812_device::oe_w) +void fifo2812_device::oe_w(int state) { if (bool(state) != bool(m_oe)) { diff --git a/src/devices/machine/2812fifo.h b/src/devices/machine/2812fifo.h index 01c42624c09..5b56d70a77a 100644 --- a/src/devices/machine/2812fifo.h +++ b/src/devices/machine/2812fifo.h @@ -42,14 +42,14 @@ public: // control signal interface void d_w(u8 data) { m_d = data; } - DECLARE_WRITE_LINE_MEMBER(mr_w); - DECLARE_WRITE_LINE_MEMBER(pl_w); - DECLARE_WRITE_LINE_MEMBER(pd_w); - DECLARE_WRITE_LINE_MEMBER(oe_w); + void mr_w(int state); + void pl_w(int state); + void pd_w(int state); + void oe_w(int state); u8 q_r() const { return m_oe ? m_data[LENGTH - 1] : 0xff; } - DECLARE_READ_LINE_MEMBER(ir_r) const { return BIT(m_control, 0); } - DECLARE_READ_LINE_MEMBER(or_r) const { return BIT(m_control, LENGTH - 1); } - DECLARE_READ_LINE_MEMBER(flag_r); + int ir_r() const { return BIT(m_control, 0); } + int or_r() const { return BIT(m_control, LENGTH - 1); } + int flag_r(); // read/write interface u8 read(); diff --git a/src/devices/machine/28fxxx.h b/src/devices/machine/28fxxx.h index 9ec25a6a7d9..0551f874f27 100644 --- a/src/devices/machine/28fxxx.h +++ b/src/devices/machine/28fxxx.h @@ -21,7 +21,7 @@ public: RESET = 0xff }; - DECLARE_WRITE_LINE_MEMBER(vpp) { m_program_power = state; } + void vpp(int state) { m_program_power = state; } u8 read(address_space &space, offs_t offset, u8 mem_mask = ~0); void write(offs_t offset, u8 data); diff --git a/src/devices/machine/40105.cpp b/src/devices/machine/40105.cpp index ffcfab73da9..a05e3587c87 100644 --- a/src/devices/machine/40105.cpp +++ b/src/devices/machine/40105.cpp @@ -163,7 +163,7 @@ void cmos_40105_device::output_ready() // si_w - shift in write //------------------------------------------------- -WRITE_LINE_MEMBER( cmos_40105_device::si_w ) +void cmos_40105_device::si_w(int state) { // load input on rising edge when ready if (m_dir && !m_si && state) @@ -185,7 +185,7 @@ WRITE_LINE_MEMBER( cmos_40105_device::si_w ) // so_w - shift out write //------------------------------------------------- -WRITE_LINE_MEMBER( cmos_40105_device::so_w ) +void cmos_40105_device::so_w(int state) { // shift out on falling edge when ready if (m_dor && m_so && !state) @@ -218,7 +218,7 @@ WRITE_LINE_MEMBER( cmos_40105_device::so_w ) // dir_r - data in ready read //------------------------------------------------- -READ_LINE_MEMBER( cmos_40105_device::dir_r ) +int cmos_40105_device::dir_r() { return m_dir; } @@ -228,7 +228,7 @@ READ_LINE_MEMBER( cmos_40105_device::dir_r ) // dor_r - data out ready read //------------------------------------------------- -READ_LINE_MEMBER( cmos_40105_device::dor_r ) +int cmos_40105_device::dor_r() { return m_dor; } diff --git a/src/devices/machine/40105.h b/src/devices/machine/40105.h index 5b35de12a58..74f44da8d2a 100644 --- a/src/devices/machine/40105.h +++ b/src/devices/machine/40105.h @@ -44,11 +44,11 @@ public: u8 read(); void write(u8 data); - DECLARE_WRITE_LINE_MEMBER( si_w ); - DECLARE_WRITE_LINE_MEMBER( so_w ); + void si_w(int state); + void so_w(int state); - DECLARE_READ_LINE_MEMBER( dir_r ); - DECLARE_READ_LINE_MEMBER( dor_r ); + int dir_r(); + int dor_r(); protected: // device-level overrides diff --git a/src/devices/machine/64h156.cpp b/src/devices/machine/64h156.cpp index bf859402e55..8e9ecab1daa 100644 --- a/src/devices/machine/64h156.cpp +++ b/src/devices/machine/64h156.cpp @@ -455,7 +455,7 @@ void c64h156_device::yb_w(uint8_t data) // test_w - test write //------------------------------------------------- -WRITE_LINE_MEMBER( c64h156_device::test_w ) +void c64h156_device::test_w(int state) { } @@ -464,7 +464,7 @@ WRITE_LINE_MEMBER( c64h156_device::test_w ) // accl_w - //------------------------------------------------- -WRITE_LINE_MEMBER( c64h156_device::accl_w ) +void c64h156_device::accl_w(int state) { if (m_accl != state) { @@ -481,7 +481,7 @@ WRITE_LINE_MEMBER( c64h156_device::accl_w ) // ted_w - //------------------------------------------------- -WRITE_LINE_MEMBER( c64h156_device::ted_w ) +void c64h156_device::ted_w(int state) { if (m_ted != state) { @@ -502,7 +502,7 @@ WRITE_LINE_MEMBER( c64h156_device::ted_w ) // mtr_w - motor write //------------------------------------------------- -WRITE_LINE_MEMBER( c64h156_device::mtr_w ) +void c64h156_device::mtr_w(int state) { if (m_mtr != state) { @@ -529,7 +529,7 @@ WRITE_LINE_MEMBER( c64h156_device::mtr_w ) // oe_w - output enable write //------------------------------------------------- -WRITE_LINE_MEMBER( c64h156_device::oe_w ) +void c64h156_device::oe_w(int state) { if (m_oe != state) { @@ -551,7 +551,7 @@ WRITE_LINE_MEMBER( c64h156_device::oe_w ) // soe_w - SO enable write //------------------------------------------------- -WRITE_LINE_MEMBER( c64h156_device::soe_w ) +void c64h156_device::soe_w(int state) { if (m_soe != state) { @@ -568,7 +568,7 @@ WRITE_LINE_MEMBER( c64h156_device::soe_w ) // atni_w - serial attention input write //------------------------------------------------- -WRITE_LINE_MEMBER( c64h156_device::atni_w ) +void c64h156_device::atni_w(int state) { LOG("ATNI %u\n", state); @@ -582,7 +582,7 @@ WRITE_LINE_MEMBER( c64h156_device::atni_w ) // atna_w - serial attention acknowledge write //------------------------------------------------- -WRITE_LINE_MEMBER( c64h156_device::atna_w ) +void c64h156_device::atna_w(int state) { LOG("ATNA %u\n", state); diff --git a/src/devices/machine/64h156.h b/src/devices/machine/64h156.h index 0f6508caab6..610dd180b80 100644 --- a/src/devices/machine/64h156.h +++ b/src/devices/machine/64h156.h @@ -85,18 +85,18 @@ public: uint8_t yb_r(); void yb_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER( test_w ); - DECLARE_WRITE_LINE_MEMBER( accl_w ); - DECLARE_WRITE_LINE_MEMBER( ted_w ); - DECLARE_WRITE_LINE_MEMBER( mtr_w ); - DECLARE_WRITE_LINE_MEMBER( oe_w ); - DECLARE_WRITE_LINE_MEMBER( soe_w ); - DECLARE_WRITE_LINE_MEMBER( atni_w ); - DECLARE_WRITE_LINE_MEMBER( atna_w ); - - DECLARE_READ_LINE_MEMBER( sync_r ) { return checkpoint_live.sync; } - DECLARE_READ_LINE_MEMBER( byte_r ) { return checkpoint_live.byte; } - DECLARE_READ_LINE_MEMBER( atn_r ) { return m_atni ^ m_atna; } + void test_w(int state); + void accl_w(int state); + void ted_w(int state); + void mtr_w(int state); + void oe_w(int state); + void soe_w(int state); + void atni_w(int state); + void atna_w(int state); + + int sync_r() { return checkpoint_live.sync; } + int byte_r() { return checkpoint_live.byte; } + int atn_r() { return m_atni ^ m_atna; } void stp_w(int stp); void ds_w(int ds); diff --git a/src/devices/machine/6522via.cpp b/src/devices/machine/6522via.cpp index a7ef3be4077..91c4a85c992 100644 --- a/src/devices/machine/6522via.cpp +++ b/src/devices/machine/6522via.cpp @@ -1070,7 +1070,7 @@ void via6522_device::write_pa( u8 data ) ca1_w - interface setting VIA port CA1 input -------------------------------------------------*/ -WRITE_LINE_MEMBER( via6522_device::write_ca1 ) +void via6522_device::write_ca1(int state) { if (m_in_ca1 != state) { @@ -1102,7 +1102,7 @@ WRITE_LINE_MEMBER( via6522_device::write_ca1 ) ca2_w - interface setting VIA port CA2 input -------------------------------------------------*/ -WRITE_LINE_MEMBER( via6522_device::write_ca2 ) +void via6522_device::write_ca2(int state) { if (m_in_ca2 != state) { @@ -1144,7 +1144,7 @@ void via6522_device::write_pb( u8 data ) write_cb1 - interface setting VIA port CB1 input -------------------------------------------------*/ -WRITE_LINE_MEMBER( via6522_device::write_cb1 ) +void via6522_device::write_cb1(int state) { if (m_in_cb1 != state) { @@ -1185,7 +1185,7 @@ WRITE_LINE_MEMBER( via6522_device::write_cb1 ) write_cb2 - interface setting VIA port CB2 input -------------------------------------------------*/ -WRITE_LINE_MEMBER( via6522_device::write_cb2 ) +void via6522_device::write_cb2(int state) { if (m_in_cb2 != state) { diff --git a/src/devices/machine/6525tpi.cpp b/src/devices/machine/6525tpi.cpp index 83d28fc0355..26e75c06bf5 100644 --- a/src/devices/machine/6525tpi.cpp +++ b/src/devices/machine/6525tpi.cpp @@ -216,7 +216,7 @@ void tpi6525_device::clear_interrupt() } -WRITE_LINE_MEMBER( tpi6525_device::i0_w ) +void tpi6525_device::i0_w(int state) { if (INTERRUPT_MODE && (state != m_irq_level[0])) { @@ -231,7 +231,7 @@ WRITE_LINE_MEMBER( tpi6525_device::i0_w ) } -WRITE_LINE_MEMBER( tpi6525_device::i1_w ) +void tpi6525_device::i1_w(int state) { if (INTERRUPT_MODE && (state != m_irq_level[1])) { @@ -246,7 +246,7 @@ WRITE_LINE_MEMBER( tpi6525_device::i1_w ) } -WRITE_LINE_MEMBER( tpi6525_device::i2_w ) +void tpi6525_device::i2_w(int state) { if (INTERRUPT_MODE && (state != m_irq_level[2])) { @@ -261,7 +261,7 @@ WRITE_LINE_MEMBER( tpi6525_device::i2_w ) } -WRITE_LINE_MEMBER( tpi6525_device::i3_w ) +void tpi6525_device::i3_w(int state) { if (INTERRUPT_MODE && (state != m_irq_level[3])) { @@ -278,7 +278,7 @@ WRITE_LINE_MEMBER( tpi6525_device::i3_w ) } -WRITE_LINE_MEMBER( tpi6525_device::i4_w ) +void tpi6525_device::i4_w(int state) { if (INTERRUPT_MODE && (state != m_irq_level[4]) ) { diff --git a/src/devices/machine/6525tpi.h b/src/devices/machine/6525tpi.h index 4052662d50a..52fc12dd359 100644 --- a/src/devices/machine/6525tpi.h +++ b/src/devices/machine/6525tpi.h @@ -56,11 +56,11 @@ public: uint8_t read(offs_t offset); void write(offs_t offset, uint8_t data); - DECLARE_WRITE_LINE_MEMBER( i0_w ); - DECLARE_WRITE_LINE_MEMBER( i1_w ); - DECLARE_WRITE_LINE_MEMBER( i2_w ); - DECLARE_WRITE_LINE_MEMBER( i3_w ); - DECLARE_WRITE_LINE_MEMBER( i4_w ); + void i0_w(int state); + void i1_w(int state); + void i2_w(int state); + void i3_w(int state); + void i4_w(int state); uint8_t pa_r(); uint8_t pb_r(); @@ -69,14 +69,14 @@ public: void pb_w(uint8_t data); void pc_w(uint8_t data); - WRITE_LINE_MEMBER( pb0_w ) { port_line_w(m_in_b, 0, state); } - WRITE_LINE_MEMBER( pb1_w ) { port_line_w(m_in_b, 1, state); } - WRITE_LINE_MEMBER( pb2_w ) { port_line_w(m_in_b, 2, state); } - WRITE_LINE_MEMBER( pb3_w ) { port_line_w(m_in_b, 3, state); } - WRITE_LINE_MEMBER( pb4_w ) { port_line_w(m_in_b, 4, state); } - WRITE_LINE_MEMBER( pb5_w ) { port_line_w(m_in_b, 5, state); } - WRITE_LINE_MEMBER( pb6_w ) { port_line_w(m_in_b, 6, state); } - WRITE_LINE_MEMBER( pb7_w ) { port_line_w(m_in_b, 7, state); } + void pb0_w(int state) { port_line_w(m_in_b, 0, state); } + void pb1_w(int state) { port_line_w(m_in_b, 1, state); } + void pb2_w(int state) { port_line_w(m_in_b, 2, state); } + void pb3_w(int state) { port_line_w(m_in_b, 3, state); } + void pb4_w(int state) { port_line_w(m_in_b, 4, state); } + void pb5_w(int state) { port_line_w(m_in_b, 5, state); } + void pb6_w(int state) { port_line_w(m_in_b, 6, state); } + void pb7_w(int state) { port_line_w(m_in_b, 7, state); } uint8_t get_ddr_a(); uint8_t get_ddr_b(); diff --git a/src/devices/machine/6532riot.cpp b/src/devices/machine/6532riot.cpp index cdeb8e673af..daa2e65fc9d 100644 --- a/src/devices/machine/6532riot.cpp +++ b/src/devices/machine/6532riot.cpp @@ -382,27 +382,27 @@ uint8_t riot6532_device::portb_out_get() // paN_w - write Port A lines individually //------------------------------------------------- -WRITE_LINE_MEMBER(riot6532_device::pa0_w) { porta_in_set(state ? 0x01 : 0x00, 0x01); } -WRITE_LINE_MEMBER(riot6532_device::pa1_w) { porta_in_set(state ? 0x02 : 0x00, 0x02); } -WRITE_LINE_MEMBER(riot6532_device::pa2_w) { porta_in_set(state ? 0x04 : 0x00, 0x04); } -WRITE_LINE_MEMBER(riot6532_device::pa3_w) { porta_in_set(state ? 0x08 : 0x00, 0x08); } -WRITE_LINE_MEMBER(riot6532_device::pa4_w) { porta_in_set(state ? 0x10 : 0x00, 0x10); } -WRITE_LINE_MEMBER(riot6532_device::pa5_w) { porta_in_set(state ? 0x20 : 0x00, 0x20); } -WRITE_LINE_MEMBER(riot6532_device::pa6_w) { porta_in_set(state ? 0x40 : 0x00, 0x40); } -WRITE_LINE_MEMBER(riot6532_device::pa7_w) { porta_in_set(state ? 0x80 : 0x00, 0x80); } +void riot6532_device::pa0_w(int state) { porta_in_set(state ? 0x01 : 0x00, 0x01); } +void riot6532_device::pa1_w(int state) { porta_in_set(state ? 0x02 : 0x00, 0x02); } +void riot6532_device::pa2_w(int state) { porta_in_set(state ? 0x04 : 0x00, 0x04); } +void riot6532_device::pa3_w(int state) { porta_in_set(state ? 0x08 : 0x00, 0x08); } +void riot6532_device::pa4_w(int state) { porta_in_set(state ? 0x10 : 0x00, 0x10); } +void riot6532_device::pa5_w(int state) { porta_in_set(state ? 0x20 : 0x00, 0x20); } +void riot6532_device::pa6_w(int state) { porta_in_set(state ? 0x40 : 0x00, 0x40); } +void riot6532_device::pa7_w(int state) { porta_in_set(state ? 0x80 : 0x00, 0x80); } //------------------------------------------------- // pbN_w - write Port B lines individually //------------------------------------------------- -WRITE_LINE_MEMBER(riot6532_device::pb0_w) { portb_in_set(state ? 0x01 : 0x00, 0x01); } -WRITE_LINE_MEMBER(riot6532_device::pb1_w) { portb_in_set(state ? 0x02 : 0x00, 0x02); } -WRITE_LINE_MEMBER(riot6532_device::pb2_w) { portb_in_set(state ? 0x04 : 0x00, 0x04); } -WRITE_LINE_MEMBER(riot6532_device::pb3_w) { portb_in_set(state ? 0x08 : 0x00, 0x08); } -WRITE_LINE_MEMBER(riot6532_device::pb4_w) { portb_in_set(state ? 0x10 : 0x00, 0x10); } -WRITE_LINE_MEMBER(riot6532_device::pb5_w) { portb_in_set(state ? 0x20 : 0x00, 0x20); } -WRITE_LINE_MEMBER(riot6532_device::pb6_w) { portb_in_set(state ? 0x40 : 0x00, 0x40); } -WRITE_LINE_MEMBER(riot6532_device::pb7_w) { portb_in_set(state ? 0x80 : 0x00, 0x80); } +void riot6532_device::pb0_w(int state) { portb_in_set(state ? 0x01 : 0x00, 0x01); } +void riot6532_device::pb1_w(int state) { portb_in_set(state ? 0x02 : 0x00, 0x02); } +void riot6532_device::pb2_w(int state) { portb_in_set(state ? 0x04 : 0x00, 0x04); } +void riot6532_device::pb3_w(int state) { portb_in_set(state ? 0x08 : 0x00, 0x08); } +void riot6532_device::pb4_w(int state) { portb_in_set(state ? 0x10 : 0x00, 0x10); } +void riot6532_device::pb5_w(int state) { portb_in_set(state ? 0x20 : 0x00, 0x20); } +void riot6532_device::pb6_w(int state) { portb_in_set(state ? 0x40 : 0x00, 0x40); } +void riot6532_device::pb7_w(int state) { portb_in_set(state ? 0x80 : 0x00, 0x80); } //************************************************************************** diff --git a/src/devices/machine/6532riot.h b/src/devices/machine/6532riot.h index 56156f929c3..56a9c55e583 100644 --- a/src/devices/machine/6532riot.h +++ b/src/devices/machine/6532riot.h @@ -41,22 +41,22 @@ public: void porta_in_set(uint8_t data, uint8_t mask); void portb_in_set(uint8_t data, uint8_t mask); - DECLARE_WRITE_LINE_MEMBER(pa0_w); - DECLARE_WRITE_LINE_MEMBER(pa1_w); - DECLARE_WRITE_LINE_MEMBER(pa2_w); - DECLARE_WRITE_LINE_MEMBER(pa3_w); - DECLARE_WRITE_LINE_MEMBER(pa4_w); - DECLARE_WRITE_LINE_MEMBER(pa5_w); - DECLARE_WRITE_LINE_MEMBER(pa6_w); - DECLARE_WRITE_LINE_MEMBER(pa7_w); - DECLARE_WRITE_LINE_MEMBER(pb0_w); - DECLARE_WRITE_LINE_MEMBER(pb1_w); - DECLARE_WRITE_LINE_MEMBER(pb2_w); - DECLARE_WRITE_LINE_MEMBER(pb3_w); - DECLARE_WRITE_LINE_MEMBER(pb4_w); - DECLARE_WRITE_LINE_MEMBER(pb5_w); - DECLARE_WRITE_LINE_MEMBER(pb6_w); - DECLARE_WRITE_LINE_MEMBER(pb7_w); + void pa0_w(int state); + void pa1_w(int state); + void pa2_w(int state); + void pa3_w(int state); + void pa4_w(int state); + void pa5_w(int state); + void pa6_w(int state); + void pa7_w(int state); + void pb0_w(int state); + void pb1_w(int state); + void pb2_w(int state); + void pb3_w(int state); + void pb4_w(int state); + void pb5_w(int state); + void pb6_w(int state); + void pb7_w(int state); uint8_t porta_in_get(); uint8_t portb_in_get(); diff --git a/src/devices/machine/68153bim.cpp b/src/devices/machine/68153bim.cpp index 978960aa275..f00eb88bf10 100644 --- a/src/devices/machine/68153bim.cpp +++ b/src/devices/machine/68153bim.cpp @@ -362,7 +362,7 @@ void bim68153_channel::device_reset() } /* Trigger an interrupt */ -WRITE_LINE_MEMBER( bim68153_channel::int_w ) +void bim68153_channel::int_w(int state) { LOGINT("%s Ch %d: %s\n",FUNCNAME, m_index, state == CLEAR_LINE ? "Cleared" : "Asserted"); if (state == ASSERT_LINE) diff --git a/src/devices/machine/68153bim.h b/src/devices/machine/68153bim.h index 124870b8194..5a8dd59428e 100644 --- a/src/devices/machine/68153bim.h +++ b/src/devices/machine/68153bim.h @@ -59,7 +59,7 @@ public: void do_bimreg_control_w(uint8_t data); void do_bimreg_vector_w(uint8_t vector); - DECLARE_WRITE_LINE_MEMBER( int_w ); + void int_w(int state); devcb_read8 m_out_iack_cb; uint8_t m_int_state; @@ -126,11 +126,11 @@ public: void write(offs_t offset, uint8_t data); - DECLARE_WRITE_LINE_MEMBER( iackin_w ) { m_iackin = state; } - DECLARE_WRITE_LINE_MEMBER( int0_w ) { m_chn[CHN_0]->int_w(state); } - DECLARE_WRITE_LINE_MEMBER( int1_w ) { m_chn[CHN_1]->int_w(state); } - DECLARE_WRITE_LINE_MEMBER( int2_w ) { m_chn[CHN_2]->int_w(state); } - DECLARE_WRITE_LINE_MEMBER( int3_w ) { m_chn[CHN_3]->int_w(state); } + void iackin_w(int state) { m_iackin = state; } + void int0_w(int state) { m_chn[CHN_0]->int_w(state); } + void int1_w(int state) { m_chn[CHN_1]->int_w(state); } + void int2_w(int state) { m_chn[CHN_2]->int_w(state); } + void int3_w(int state) { m_chn[CHN_3]->int_w(state); } protected: bim68153_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock, uint32_t variant); diff --git a/src/devices/machine/6821pia.cpp b/src/devices/machine/6821pia.cpp index 0d517159939..feae3e965c7 100644 --- a/src/devices/machine/6821pia.cpp +++ b/src/devices/machine/6821pia.cpp @@ -921,7 +921,7 @@ uint8_t pia6821_device::a_output() // ca1_w //------------------------------------------------- -WRITE_LINE_MEMBER( pia6821_device::ca1_w ) +void pia6821_device::ca1_w(int state) { LOGCA1("Set PIA input CA1 = %d\n", state); @@ -951,7 +951,7 @@ WRITE_LINE_MEMBER( pia6821_device::ca1_w ) // ca2_w //------------------------------------------------- -WRITE_LINE_MEMBER( pia6821_device::ca2_w ) +void pia6821_device::ca2_w(int state) { LOG("Set PIA input CA2 = %d\n", state); @@ -1046,7 +1046,7 @@ uint8_t pia6821_device::b_output() // cb1_w //------------------------------------------------- -WRITE_LINE_MEMBER( pia6821_device::cb1_w ) +void pia6821_device::cb1_w(int state) { LOGCB1("Set PIA input CB1 = %d\n", state); @@ -1077,7 +1077,7 @@ WRITE_LINE_MEMBER( pia6821_device::cb1_w ) // cb2_w //------------------------------------------------- -WRITE_LINE_MEMBER( pia6821_device::cb2_w ) +void pia6821_device::cb2_w(int state) { LOG("Set PIA input CB2 = %d\n", state); diff --git a/src/devices/machine/6821pia.h b/src/devices/machine/6821pia.h index 397b584fa3b..88c941578b4 100644 --- a/src/devices/machine/6821pia.h +++ b/src/devices/machine/6821pia.h @@ -65,18 +65,18 @@ public: uint8_t a_output(); void set_port_a_input_overrides_output_mask(uint8_t mask) { m_a_input_overrides_output_mask = mask; } - DECLARE_WRITE_LINE_MEMBER( pa0_w ) { write_porta_line(0, state); } - DECLARE_WRITE_LINE_MEMBER( pa1_w ) { write_porta_line(1, state); } - DECLARE_WRITE_LINE_MEMBER( pa2_w ) { write_porta_line(2, state); } - DECLARE_WRITE_LINE_MEMBER( pa3_w ) { write_porta_line(3, state); } - DECLARE_WRITE_LINE_MEMBER( pa4_w ) { write_porta_line(4, state); } - DECLARE_WRITE_LINE_MEMBER( pa5_w ) { write_porta_line(5, state); } - DECLARE_WRITE_LINE_MEMBER( pa6_w ) { write_porta_line(6, state); } - DECLARE_WRITE_LINE_MEMBER( pa7_w ) { write_porta_line(7, state); } - - DECLARE_WRITE_LINE_MEMBER( ca1_w ); - - DECLARE_WRITE_LINE_MEMBER( ca2_w ); + void pa0_w(int state) { write_porta_line(0, state); } + void pa1_w(int state) { write_porta_line(1, state); } + void pa2_w(int state) { write_porta_line(2, state); } + void pa3_w(int state) { write_porta_line(3, state); } + void pa4_w(int state) { write_porta_line(4, state); } + void pa5_w(int state) { write_porta_line(5, state); } + void pa6_w(int state) { write_porta_line(6, state); } + void pa7_w(int state) { write_porta_line(7, state); } + + void ca1_w(int state); + + void ca2_w(int state); bool ca2_output(); bool ca2_output_z(); @@ -84,18 +84,18 @@ public: void write_portb_line(int line, bool state); uint8_t b_output(); - DECLARE_WRITE_LINE_MEMBER( pb0_w ) { write_portb_line(0, state); } - DECLARE_WRITE_LINE_MEMBER( pb1_w ) { write_portb_line(1, state); } - DECLARE_WRITE_LINE_MEMBER( pb2_w ) { write_portb_line(2, state); } - DECLARE_WRITE_LINE_MEMBER( pb3_w ) { write_portb_line(3, state); } - DECLARE_WRITE_LINE_MEMBER( pb4_w ) { write_portb_line(4, state); } - DECLARE_WRITE_LINE_MEMBER( pb5_w ) { write_portb_line(5, state); } - DECLARE_WRITE_LINE_MEMBER( pb6_w ) { write_portb_line(6, state); } - DECLARE_WRITE_LINE_MEMBER( pb7_w ) { write_portb_line(7, state); } + void pb0_w(int state) { write_portb_line(0, state); } + void pb1_w(int state) { write_portb_line(1, state); } + void pb2_w(int state) { write_portb_line(2, state); } + void pb3_w(int state) { write_portb_line(3, state); } + void pb4_w(int state) { write_portb_line(4, state); } + void pb5_w(int state) { write_portb_line(5, state); } + void pb6_w(int state) { write_portb_line(6, state); } + void pb7_w(int state) { write_portb_line(7, state); } - DECLARE_WRITE_LINE_MEMBER( cb1_w ); + void cb1_w(int state); - DECLARE_WRITE_LINE_MEMBER( cb2_w ); + void cb2_w(int state); bool cb2_output(); bool cb2_output_z(); diff --git a/src/devices/machine/68230pit.cpp b/src/devices/machine/68230pit.cpp index d5aeafd4c76..30005950805 100644 --- a/src/devices/machine/68230pit.cpp +++ b/src/devices/machine/68230pit.cpp @@ -231,7 +231,7 @@ TIMER_CALLBACK_MEMBER(pit68230_device::tick_clock) } } -WRITE_LINE_MEMBER( pit68230_device::h1_w ) +void pit68230_device::h1_w(int state) { LOGBIT("%s pit68230_device::h1_w H1 set to %d\n", tag(), state); @@ -245,7 +245,7 @@ WRITE_LINE_MEMBER( pit68230_device::h1_w ) m_psr = ((state == 0) ? (m_psr & ~REG_PSR_H1S) : (m_psr | REG_PSR_H1S)); } -WRITE_LINE_MEMBER( pit68230_device::h2_w ) +void pit68230_device::h2_w(int state) { LOGBIT("%s pit68230_device::h2_w H2 set to %d\n", tag(), state); @@ -259,7 +259,7 @@ WRITE_LINE_MEMBER( pit68230_device::h2_w ) m_psr = ((state == 0) ? (m_psr & ~REG_PSR_H2S) : (m_psr | REG_PSR_H2S)); } -WRITE_LINE_MEMBER( pit68230_device::h3_w ) +void pit68230_device::h3_w(int state) { LOGBIT("%s pit68230_device::h3_w H3 set to %d\n", tag(), state); @@ -273,7 +273,7 @@ WRITE_LINE_MEMBER( pit68230_device::h3_w ) m_psr = ((state == 0) ? (m_psr & ~REG_PSR_H3S) : (m_psr | REG_PSR_H3S)); } -WRITE_LINE_MEMBER( pit68230_device::h4_w ) +void pit68230_device::h4_w(int state) { LOGBIT("%s pit68230_device::h4_w H4 set to %d\n", tag(), state); diff --git a/src/devices/machine/68230pit.h b/src/devices/machine/68230pit.h index f99c3e541ee..663be81b151 100644 --- a/src/devices/machine/68230pit.h +++ b/src/devices/machine/68230pit.h @@ -100,37 +100,37 @@ public: void pc_update_bit(uint8_t bit, uint8_t state); void update_tin(uint8_t); - DECLARE_WRITE_LINE_MEMBER( h1_w ); - DECLARE_WRITE_LINE_MEMBER( h2_w ); - DECLARE_WRITE_LINE_MEMBER( h3_w ); - DECLARE_WRITE_LINE_MEMBER( h4_w ); - - DECLARE_WRITE_LINE_MEMBER( pa0_w ) { pa_update_bit(0, state); } - DECLARE_WRITE_LINE_MEMBER( pa1_w ) { pa_update_bit(1, state); } - DECLARE_WRITE_LINE_MEMBER( pa2_w ) { pa_update_bit(2, state); } - DECLARE_WRITE_LINE_MEMBER( pa3_w ) { pa_update_bit(3, state); } - DECLARE_WRITE_LINE_MEMBER( pa4_w ) { pa_update_bit(4, state); } - DECLARE_WRITE_LINE_MEMBER( pa5_w ) { pa_update_bit(5, state); } - DECLARE_WRITE_LINE_MEMBER( pa6_w ) { pa_update_bit(6, state); } - DECLARE_WRITE_LINE_MEMBER( pa7_w ) { pa_update_bit(7, state); } - - DECLARE_WRITE_LINE_MEMBER( pb0_w ) { pb_update_bit(0, state); } - DECLARE_WRITE_LINE_MEMBER( pb1_w ) { pb_update_bit(1, state); } - DECLARE_WRITE_LINE_MEMBER( pb2_w ) { pb_update_bit(2, state); } - DECLARE_WRITE_LINE_MEMBER( pb3_w ) { pb_update_bit(3, state); } - DECLARE_WRITE_LINE_MEMBER( pb4_w ) { pb_update_bit(4, state); } - DECLARE_WRITE_LINE_MEMBER( pb5_w ) { pb_update_bit(5, state); } - DECLARE_WRITE_LINE_MEMBER( pb6_w ) { pb_update_bit(6, state); } - DECLARE_WRITE_LINE_MEMBER( pb7_w ) { pb_update_bit(7, state); } - - DECLARE_WRITE_LINE_MEMBER( pc0_w ) { pc_update_bit(0, state); } - DECLARE_WRITE_LINE_MEMBER( pc1_w ) { pc_update_bit(1, state); } - DECLARE_WRITE_LINE_MEMBER( pc2_w ) { pc_update_bit(2, state); } - DECLARE_WRITE_LINE_MEMBER( pc3_w ) { pc_update_bit(3, state); } - DECLARE_WRITE_LINE_MEMBER( pc4_w ) { pc_update_bit(4, state); } - DECLARE_WRITE_LINE_MEMBER( pc5_w ) { pc_update_bit(5, state); } - DECLARE_WRITE_LINE_MEMBER( pc6_w ) { pc_update_bit(6, state); } - DECLARE_WRITE_LINE_MEMBER( pc7_w ) { pc_update_bit(7, state); } + void h1_w(int state); + void h2_w(int state); + void h3_w(int state); + void h4_w(int state); + + void pa0_w(int state) { pa_update_bit(0, state); } + void pa1_w(int state) { pa_update_bit(1, state); } + void pa2_w(int state) { pa_update_bit(2, state); } + void pa3_w(int state) { pa_update_bit(3, state); } + void pa4_w(int state) { pa_update_bit(4, state); } + void pa5_w(int state) { pa_update_bit(5, state); } + void pa6_w(int state) { pa_update_bit(6, state); } + void pa7_w(int state) { pa_update_bit(7, state); } + + void pb0_w(int state) { pb_update_bit(0, state); } + void pb1_w(int state) { pb_update_bit(1, state); } + void pb2_w(int state) { pb_update_bit(2, state); } + void pb3_w(int state) { pb_update_bit(3, state); } + void pb4_w(int state) { pb_update_bit(4, state); } + void pb5_w(int state) { pb_update_bit(5, state); } + void pb6_w(int state) { pb_update_bit(6, state); } + void pb7_w(int state) { pb_update_bit(7, state); } + + void pc0_w(int state) { pc_update_bit(0, state); } + void pc1_w(int state) { pc_update_bit(1, state); } + void pc2_w(int state) { pc_update_bit(2, state); } + void pc3_w(int state) { pc_update_bit(3, state); } + void pc4_w(int state) { pc_update_bit(4, state); } + void pc5_w(int state) { pc_update_bit(5, state); } + void pc6_w(int state) { pc_update_bit(6, state); } + void pc7_w(int state) { pc_update_bit(7, state); } uint8_t irq_tiack(); uint8_t irq_piack(); diff --git a/src/devices/machine/68307.cpp b/src/devices/machine/68307.cpp index 3543b0c3e7c..599cdf4bb9b 100644 --- a/src/devices/machine/68307.cpp +++ b/src/devices/machine/68307.cpp @@ -106,7 +106,7 @@ void m68307_cpu_device::device_reset() set_ipl(0); } -WRITE_LINE_MEMBER(m68307_cpu_device::reset_peripherals) +void m68307_cpu_device::reset_peripherals(int state) { m_duart->reset(); @@ -170,7 +170,7 @@ void m68307_cpu_device::set_ipl(int level) } } -WRITE_LINE_MEMBER(m68307_cpu_device::timer0_interrupt) +void m68307_cpu_device::timer0_interrupt(int state) { int prioritylevel = (m_m68307SIM->m_picr & 0x7000) >> 12; if (state && m_ipl < prioritylevel) @@ -179,7 +179,7 @@ WRITE_LINE_MEMBER(m68307_cpu_device::timer0_interrupt) set_ipl(m_m68307SIM->get_ipl(this)); } -WRITE_LINE_MEMBER(m68307_cpu_device::timer1_interrupt) +void m68307_cpu_device::timer1_interrupt(int state) { int prioritylevel = (m_m68307SIM->m_picr & 0x0700) >> 8; if (state && m_ipl < prioritylevel) @@ -188,7 +188,7 @@ WRITE_LINE_MEMBER(m68307_cpu_device::timer1_interrupt) set_ipl(m_m68307SIM->get_ipl(this)); } -WRITE_LINE_MEMBER(m68307_cpu_device::m68307_duart_irq_handler) +void m68307_cpu_device::m68307_duart_irq_handler(int state) { int prioritylevel = (m_m68307SIM->m_picr & 0x0070) >> 4; if (state && m_ipl < prioritylevel) @@ -197,7 +197,7 @@ WRITE_LINE_MEMBER(m68307_cpu_device::m68307_duart_irq_handler) set_ipl(m_m68307SIM->get_ipl(this)); } -WRITE_LINE_MEMBER(m68307_cpu_device::mbus_interrupt) +void m68307_cpu_device::mbus_interrupt(int state) { int prioritylevel = (m_m68307SIM->m_picr & 0x0007) >> 0; if (state && m_ipl < prioritylevel) diff --git a/src/devices/machine/68307.h b/src/devices/machine/68307.h index 9221310d0de..7056c21548b 100644 --- a/src/devices/machine/68307.h +++ b/src/devices/machine/68307.h @@ -41,18 +41,18 @@ protected: virtual void device_add_mconfig(machine_config &config) override; private: - DECLARE_WRITE_LINE_MEMBER(reset_peripherals); + void reset_peripherals(int state); void set_ipl(int level); - DECLARE_WRITE_LINE_MEMBER(timer0_interrupt); - DECLARE_WRITE_LINE_MEMBER(timer1_interrupt); - DECLARE_WRITE_LINE_MEMBER(mbus_interrupt); + void timer0_interrupt(int state); + void timer1_interrupt(int state); + void mbus_interrupt(int state); uint8_t int_ack(offs_t offset); - DECLARE_WRITE_LINE_MEMBER(m68307_duart_irq_handler); - DECLARE_WRITE_LINE_MEMBER(m68307_duart_txa) { m_write_a_tx(state); } - DECLARE_WRITE_LINE_MEMBER(m68307_duart_txb) { m_write_b_tx(state); } + void m68307_duart_irq_handler(int state); + void m68307_duart_txa(int state) { m_write_a_tx(state); } + void m68307_duart_txb(int state) { m_write_b_tx(state); } uint8_t m68307_duart_input_r() { return m_read_inport(); } void m68307_duart_output_w(uint8_t data) { m_write_outport(data); } diff --git a/src/devices/machine/68340.cpp b/src/devices/machine/68340.cpp index 56d9f7cd19c..0e21dfeac3e 100644 --- a/src/devices/machine/68340.cpp +++ b/src/devices/machine/68340.cpp @@ -247,7 +247,7 @@ void m68340_cpu_device::device_reset() // Some hardwares pulls this low when resetting peripherals, most just ties this line to GND or VCC // TODO: Support Limp mode and external clock with no PLL -WRITE_LINE_MEMBER( m68340_cpu_device::set_modck ) +void m68340_cpu_device::set_modck(int state) { m_modck = state; m_clock_mode &= ~(m68340_sim::CLOCK_MODCK | m68340_sim::CLOCK_PLL); @@ -273,7 +273,7 @@ void m68340_cpu_device::device_start() m_internal = &space(AS_PROGRAM); } -WRITE_LINE_MEMBER(m68340_cpu_device::reset_peripherals) +void m68340_cpu_device::reset_peripherals(int state) { m_m68340SIM->module_reset(); m_m68340DMA->module_reset(); diff --git a/src/devices/machine/68340.h b/src/devices/machine/68340.h index 1ee3e8c8f43..4731da74ac6 100644 --- a/src/devices/machine/68340.h +++ b/src/devices/machine/68340.h @@ -39,17 +39,17 @@ public: void set_crystal(const XTAL &crystal) { set_crystal(crystal.value()); } // Timer input methods, can be used instead of the corresponding polling MCFG callbacks - DECLARE_WRITE_LINE_MEMBER( tin1_w ) { m_timer[0]->tin_w(state); } - DECLARE_WRITE_LINE_MEMBER( tgate1_w ){ m_timer[0]->tgate_w(state); } - DECLARE_WRITE_LINE_MEMBER( tin2_w ) { m_timer[1]->tin_w(state); } - DECLARE_WRITE_LINE_MEMBER( tgate2_w ){ m_timer[1]->tgate_w(state); } + void tin1_w(int state) { m_timer[0]->tin_w(state); } + void tgate1_w(int state){ m_timer[0]->tgate_w(state); } + void tin2_w(int state) { m_timer[1]->tin_w(state); } + void tgate2_w(int state){ m_timer[1]->tgate_w(state); } protected: virtual void device_start() override; virtual void device_reset() override; virtual void device_add_mconfig(machine_config &config) override; - DECLARE_WRITE_LINE_MEMBER(reset_peripherals); + void reset_peripherals(int state); private: required_device m_serial; @@ -95,8 +95,8 @@ private: void m68340_internal_sim_cs_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); // Clock/VCO setting TODO: support external clock with PLL and Limp mode - DECLARE_WRITE_LINE_MEMBER( set_modck ); - DECLARE_WRITE_LINE_MEMBER( extal_w ); + void set_modck(int state); + void extal_w(int state); void m68340_internal_map(address_map &map); diff --git a/src/devices/machine/68340ser.cpp b/src/devices/machine/68340ser.cpp index 1bda87d6e24..c74fc375f04 100644 --- a/src/devices/machine/68340ser.cpp +++ b/src/devices/machine/68340ser.cpp @@ -144,7 +144,7 @@ void mc68340_serial_module_device::write(offs_t offset, uint8_t data) } -WRITE_LINE_MEMBER( mc68340_serial_module_device::irq_w ) +void mc68340_serial_module_device::irq_w(int state) { LOGINT("IRQ!\n%s\n", FUNCNAME); m_cpu->update_ipl(); diff --git a/src/devices/machine/68340ser.h b/src/devices/machine/68340ser.h index b9775f2ad86..35a2f77e92b 100644 --- a/src/devices/machine/68340ser.h +++ b/src/devices/machine/68340ser.h @@ -21,7 +21,7 @@ public: virtual uint8_t read(offs_t offset) override; virtual void write(offs_t offset, uint8_t data) override; - DECLARE_WRITE_LINE_MEMBER(irq_w); + void irq_w(int state); uint8_t irq_level() const { return irq_pending() ? (m_ilr & REG_ILR_MASK) : 0; } uint8_t irq_vector() const { return m_ivr; } diff --git a/src/devices/machine/68340sim.cpp b/src/devices/machine/68340sim.cpp index 82b4f0d8ceb..3f23bdafc89 100644 --- a/src/devices/machine/68340sim.cpp +++ b/src/devices/machine/68340sim.cpp @@ -560,7 +560,7 @@ void m68340_cpu_device::do_tick_pit() } } -WRITE_LINE_MEMBER( m68340_cpu_device::extal_w ) +void m68340_cpu_device::extal_w(int state) { LOGPIT("%s H1 set to %d\n", FUNCNAME, state); m_extal = state; diff --git a/src/devices/machine/68340tmu.cpp b/src/devices/machine/68340tmu.cpp index 9d4253ed595..5c39122aac9 100644 --- a/src/devices/machine/68340tmu.cpp +++ b/src/devices/machine/68340tmu.cpp @@ -263,14 +263,14 @@ void mc68340_timer_module_device::write(offs_t offset, uint16_t data, uint16_t m LOG("%08x m68340_internal_timer_w %08x, %08x (%08x)\n", m_cpu->pcbase(), offset * 2, data, mem_mask); } -WRITE_LINE_MEMBER( mc68340_timer_module_device::tin_w) +void mc68340_timer_module_device::tin_w(int state) { LOGTIMER("%s\n", FUNCNAME); m_tin = state; } -WRITE_LINE_MEMBER( mc68340_timer_module_device::tgate_w) +void mc68340_timer_module_device::tgate_w(int state) { LOGTIMER("%s\n", FUNCNAME); diff --git a/src/devices/machine/68340tmu.h b/src/devices/machine/68340tmu.h index 653226f8887..c450d8003f9 100644 --- a/src/devices/machine/68340tmu.h +++ b/src/devices/machine/68340tmu.h @@ -16,8 +16,8 @@ public: uint16_t read(offs_t offset, uint16_t mem_mask = ~0); void write(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); - DECLARE_WRITE_LINE_MEMBER( tin_w ); - DECLARE_WRITE_LINE_MEMBER( tgate_w ); + void tin_w(int state); + void tgate_w(int state); uint8_t irq_level() const { return (m_sr & REG_SR_IRQ) ? (m_ir & REG_IR_INTLEV) >> 8 : 0; } uint8_t irq_vector() const { return m_ir & REG_IR_INTVEC; } diff --git a/src/devices/machine/6840ptm.h b/src/devices/machine/6840ptm.h index 614901625a4..844298c5d23 100644 --- a/src/devices/machine/6840ptm.h +++ b/src/devices/machine/6840ptm.h @@ -43,14 +43,14 @@ public: uint8_t read(offs_t offset); void set_gate(int idx, int state); - DECLARE_WRITE_LINE_MEMBER( set_g1 ) { set_gate(0, state); } - DECLARE_WRITE_LINE_MEMBER( set_g2 ) { set_gate(1, state); } - DECLARE_WRITE_LINE_MEMBER( set_g3 ) { set_gate(2, state); } + void set_g1(int state) { set_gate(0, state); } + void set_g2(int state) { set_gate(1, state); } + void set_g3(int state) { set_gate(2, state); } void set_clock(int idx, int state); - DECLARE_WRITE_LINE_MEMBER( set_c1 ) { set_clock(0, state); } - DECLARE_WRITE_LINE_MEMBER( set_c2 ) { set_clock(1, state); } - DECLARE_WRITE_LINE_MEMBER( set_c3 ) { set_clock(2, state); } + void set_c1(int state) { set_clock(0, state); } + void set_c2(int state) { set_clock(1, state); } + void set_c3(int state) { set_clock(2, state); } void update_interrupts(); diff --git a/src/devices/machine/6850acia.cpp b/src/devices/machine/6850acia.cpp index 364fcfdfc92..57b8fa74cd7 100644 --- a/src/devices/machine/6850acia.cpp +++ b/src/devices/machine/6850acia.cpp @@ -319,7 +319,7 @@ uint8_t acia6850_device::read(offs_t offset) return BIT(offset, 0) ? data_r() : status_r(); } -DECLARE_WRITE_LINE_MEMBER( acia6850_device::write_cts ) +void acia6850_device::write_cts(int state) { if (state) { @@ -331,12 +331,12 @@ DECLARE_WRITE_LINE_MEMBER( acia6850_device::write_cts ) } } -DECLARE_WRITE_LINE_MEMBER( acia6850_device::write_dcd ) +void acia6850_device::write_dcd(int state) { m_dcd = state; } -WRITE_LINE_MEMBER( acia6850_device::write_rxc ) +void acia6850_device::write_rxc(int state) { if (m_rxc != state) { @@ -484,12 +484,12 @@ WRITE_LINE_MEMBER( acia6850_device::write_rxc ) } } -DECLARE_WRITE_LINE_MEMBER( acia6850_device::write_rxd ) +void acia6850_device::write_rxd(int state) { m_rxd = state; } -WRITE_LINE_MEMBER( acia6850_device::write_txc ) +void acia6850_device::write_txc(int state) { if (m_txc != state) { diff --git a/src/devices/machine/6850acia.h b/src/devices/machine/6850acia.h index 4d99209d519..b95e4101bae 100644 --- a/src/devices/machine/6850acia.h +++ b/src/devices/machine/6850acia.h @@ -31,11 +31,11 @@ public: void write(offs_t offset, uint8_t data); uint8_t read(offs_t offset); - DECLARE_WRITE_LINE_MEMBER( write_cts ); - DECLARE_WRITE_LINE_MEMBER( write_dcd ); - DECLARE_WRITE_LINE_MEMBER( write_rxd ); - DECLARE_WRITE_LINE_MEMBER( write_rxc ); - DECLARE_WRITE_LINE_MEMBER( write_txc ); + void write_cts(int state); + void write_dcd(int state); + void write_rxd(int state); + void write_rxc(int state); + void write_txc(int state); protected: acia6850_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); diff --git a/src/devices/machine/68561mpcc.cpp b/src/devices/machine/68561mpcc.cpp index 8ec174c0711..4ca3b4d7cfe 100644 --- a/src/devices/machine/68561mpcc.cpp +++ b/src/devices/machine/68561mpcc.cpp @@ -254,7 +254,7 @@ void mpcc_device::device_reset() /* * Serial device implementation */ -WRITE_LINE_MEMBER(mpcc_device::cts_w) +void mpcc_device::cts_w(int state) { if (state == CLEAR_LINE) { @@ -278,7 +278,7 @@ WRITE_LINE_MEMBER(mpcc_device::cts_w) m_sisr |= REG_SISR_CTSLVL; } -WRITE_LINE_MEMBER(mpcc_device::dsr_w) +void mpcc_device::dsr_w(int state) { if (state == ASSERT_LINE) { @@ -301,7 +301,7 @@ WRITE_LINE_MEMBER(mpcc_device::dsr_w) m_sisr &= ~REG_SISR_DSRLVL; } -WRITE_LINE_MEMBER(mpcc_device::dcd_w) +void mpcc_device::dcd_w(int state) { if (state == CLEAR_LINE) { @@ -646,7 +646,7 @@ void mpcc_device::rcv_complete() // write_rx - called by terminal through rs232/diserial // when character is sent to board //------------------------------------------------- -WRITE_LINE_MEMBER(mpcc_device::write_rx) +void mpcc_device::write_rx(int state) { LOGRCV("%s(%d)\n", FUNCNAME, state); m_rxd = state; diff --git a/src/devices/machine/68561mpcc.h b/src/devices/machine/68561mpcc.h index 9758f387976..4de388254b9 100644 --- a/src/devices/machine/68561mpcc.h +++ b/src/devices/machine/68561mpcc.h @@ -69,12 +69,12 @@ public: uint8_t iack(offs_t offset); // declared but not defined? /* Callbacks to be called by others for signals driven by connected devices */ - DECLARE_WRITE_LINE_MEMBER( write_rx ); - DECLARE_WRITE_LINE_MEMBER( cts_w ); - DECLARE_WRITE_LINE_MEMBER( dsr_w ); - DECLARE_WRITE_LINE_MEMBER( dcd_w ); - DECLARE_WRITE_LINE_MEMBER( rxc_w ) {} // { m_chanA->rxc_w(state); } - DECLARE_WRITE_LINE_MEMBER( txc_w ) {} // { m_chanA->txc_w(state); } + void write_rx(int state); + void cts_w(int state); + void dsr_w(int state); + void dcd_w(int state); + void rxc_w(int state) {} // { m_chanA->rxc_w(state); } + void txc_w(int state) {} // { m_chanA->txc_w(state); } protected: mpcc_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock, uint32_t variant); diff --git a/src/devices/machine/7200fifo.h b/src/devices/machine/7200fifo.h index 6609d4efad6..3d9bf1fa703 100644 --- a/src/devices/machine/7200fifo.h +++ b/src/devices/machine/7200fifo.h @@ -66,9 +66,9 @@ public: auto ff_handler() { return m_ff_handler.bind(); } auto hf_handler() { return m_hf_handler.bind(); } - DECLARE_READ_LINE_MEMBER( ef_r ) { return !m_ef; } // _EF - DECLARE_READ_LINE_MEMBER( ff_r ) { return !m_ff; } // _FF - DECLARE_READ_LINE_MEMBER( hf_r ) { return !m_hf; } // _HF + int ef_r() { return !m_ef; } // _EF + int ff_r() { return !m_ff; } // _FF + int hf_r() { return !m_hf; } // _HF // normal configuration void data_word_w(uint16_t data) { fifo_write(data); } diff --git a/src/devices/machine/7400.cpp b/src/devices/machine/7400.cpp index f8ab747715d..73bad879e73 100644 --- a/src/devices/machine/7400.cpp +++ b/src/devices/machine/7400.cpp @@ -78,17 +78,17 @@ uint8_t ttl7400_device::y_r(uint8_t line) } -WRITE_LINE_MEMBER( ttl7400_device::a1_w ) { a_w(0, state); } -WRITE_LINE_MEMBER( ttl7400_device::a2_w ) { a_w(1, state); } -WRITE_LINE_MEMBER( ttl7400_device::a3_w ) { a_w(2, state); } -WRITE_LINE_MEMBER( ttl7400_device::a4_w ) { a_w(3, state); } - -WRITE_LINE_MEMBER( ttl7400_device::b1_w ) { b_w(0, state); } -WRITE_LINE_MEMBER( ttl7400_device::b2_w ) { b_w(1, state); } -WRITE_LINE_MEMBER( ttl7400_device::b3_w ) { b_w(2, state); } -WRITE_LINE_MEMBER( ttl7400_device::b4_w ) { b_w(3, state); } - -READ_LINE_MEMBER( ttl7400_device::y1_r ) { return y_r(0); } -READ_LINE_MEMBER( ttl7400_device::y2_r ) { return y_r(1); } -READ_LINE_MEMBER( ttl7400_device::y3_r ) { return y_r(2); } -READ_LINE_MEMBER( ttl7400_device::y4_r ) { return y_r(3); } +void ttl7400_device::a1_w(int state) { a_w(0, state); } +void ttl7400_device::a2_w(int state) { a_w(1, state); } +void ttl7400_device::a3_w(int state) { a_w(2, state); } +void ttl7400_device::a4_w(int state) { a_w(3, state); } + +void ttl7400_device::b1_w(int state) { b_w(0, state); } +void ttl7400_device::b2_w(int state) { b_w(1, state); } +void ttl7400_device::b3_w(int state) { b_w(2, state); } +void ttl7400_device::b4_w(int state) { b_w(3, state); } + +int ttl7400_device::y1_r() { return y_r(0); } +int ttl7400_device::y2_r() { return y_r(1); } +int ttl7400_device::y3_r() { return y_r(2); } +int ttl7400_device::y4_r() { return y_r(3); } diff --git a/src/devices/machine/7400.h b/src/devices/machine/7400.h index 13939cda7a7..ec449aabc7c 100644 --- a/src/devices/machine/7400.h +++ b/src/devices/machine/7400.h @@ -42,19 +42,19 @@ public: template auto y_cb() { return m_y_func[Bit].bind(); } // public interfaces - DECLARE_WRITE_LINE_MEMBER( a1_w ); - DECLARE_WRITE_LINE_MEMBER( a2_w ); - DECLARE_WRITE_LINE_MEMBER( a3_w ); - DECLARE_WRITE_LINE_MEMBER( a4_w ); - DECLARE_WRITE_LINE_MEMBER( b1_w ); - DECLARE_WRITE_LINE_MEMBER( b2_w ); - DECLARE_WRITE_LINE_MEMBER( b3_w ); - DECLARE_WRITE_LINE_MEMBER( b4_w ); - - DECLARE_READ_LINE_MEMBER( y1_r ); - DECLARE_READ_LINE_MEMBER( y2_r ); - DECLARE_READ_LINE_MEMBER( y3_r ); - DECLARE_READ_LINE_MEMBER( y4_r ); + void a1_w(int state); + void a2_w(int state); + void a3_w(int state); + void a4_w(int state); + void b1_w(int state); + void b2_w(int state); + void b3_w(int state); + void b4_w(int state); + + int y1_r(); + int y2_r(); + int y3_r(); + int y4_r(); protected: void a_w(uint8_t line, uint8_t state); diff --git a/src/devices/machine/7404.cpp b/src/devices/machine/7404.cpp index ad3ca9e234e..3a614a3525a 100644 --- a/src/devices/machine/7404.cpp +++ b/src/devices/machine/7404.cpp @@ -66,16 +66,16 @@ uint8_t ttl7404_device::y_r(uint8_t line) } -WRITE_LINE_MEMBER( ttl7404_device::a1_w ) { a_w(0, state); } -WRITE_LINE_MEMBER( ttl7404_device::a2_w ) { a_w(1, state); } -WRITE_LINE_MEMBER( ttl7404_device::a3_w ) { a_w(2, state); } -WRITE_LINE_MEMBER( ttl7404_device::a4_w ) { a_w(3, state); } -WRITE_LINE_MEMBER( ttl7404_device::a5_w ) { a_w(4, state); } -WRITE_LINE_MEMBER( ttl7404_device::a6_w ) { a_w(5, state); } - -READ_LINE_MEMBER( ttl7404_device::y1_r ) { return y_r(0); } -READ_LINE_MEMBER( ttl7404_device::y2_r ) { return y_r(1); } -READ_LINE_MEMBER( ttl7404_device::y3_r ) { return y_r(2); } -READ_LINE_MEMBER( ttl7404_device::y4_r ) { return y_r(3); } -READ_LINE_MEMBER( ttl7404_device::y5_r ) { return y_r(4); } -READ_LINE_MEMBER( ttl7404_device::y6_r ) { return y_r(5); } +void ttl7404_device::a1_w(int state) { a_w(0, state); } +void ttl7404_device::a2_w(int state) { a_w(1, state); } +void ttl7404_device::a3_w(int state) { a_w(2, state); } +void ttl7404_device::a4_w(int state) { a_w(3, state); } +void ttl7404_device::a5_w(int state) { a_w(4, state); } +void ttl7404_device::a6_w(int state) { a_w(5, state); } + +int ttl7404_device::y1_r() { return y_r(0); } +int ttl7404_device::y2_r() { return y_r(1); } +int ttl7404_device::y3_r() { return y_r(2); } +int ttl7404_device::y4_r() { return y_r(3); } +int ttl7404_device::y5_r() { return y_r(4); } +int ttl7404_device::y6_r() { return y_r(5); } diff --git a/src/devices/machine/7404.h b/src/devices/machine/7404.h index 9bc680997e5..873cb95fc11 100644 --- a/src/devices/machine/7404.h +++ b/src/devices/machine/7404.h @@ -69,19 +69,19 @@ public: template auto y_cb() { return m_y_func[Bit].bind(); } // public interfaces - DECLARE_WRITE_LINE_MEMBER( a1_w ); - DECLARE_WRITE_LINE_MEMBER( a2_w ); - DECLARE_WRITE_LINE_MEMBER( a3_w ); - DECLARE_WRITE_LINE_MEMBER( a4_w ); - DECLARE_WRITE_LINE_MEMBER( a5_w ); - DECLARE_WRITE_LINE_MEMBER( a6_w ); - - DECLARE_READ_LINE_MEMBER( y1_r ); - DECLARE_READ_LINE_MEMBER( y2_r ); - DECLARE_READ_LINE_MEMBER( y3_r ); - DECLARE_READ_LINE_MEMBER( y4_r ); - DECLARE_READ_LINE_MEMBER( y5_r ); - DECLARE_READ_LINE_MEMBER( y6_r ); + void a1_w(int state); + void a2_w(int state); + void a3_w(int state); + void a4_w(int state); + void a5_w(int state); + void a6_w(int state); + + int y1_r(); + int y2_r(); + int y3_r(); + int y4_r(); + int y5_r(); + int y6_r(); protected: void a_w(uint8_t line, uint8_t state); diff --git a/src/devices/machine/74123.cpp b/src/devices/machine/74123.cpp index d895a72c4e4..4dd56f98b92 100644 --- a/src/devices/machine/74123.cpp +++ b/src/devices/machine/74123.cpp @@ -191,7 +191,7 @@ void ttl74123_device::start_pulse() // a_w - write register a data //------------------------------------------------- -WRITE_LINE_MEMBER( ttl74123_device::a_w ) +void ttl74123_device::a_w(int state) { /* start/regtrigger pulse if B=HI and falling edge on A (while clear is HI) */ if (!state && m_a && m_b && m_clear) @@ -207,7 +207,7 @@ WRITE_LINE_MEMBER( ttl74123_device::a_w ) // b_w - write register b data //------------------------------------------------- -WRITE_LINE_MEMBER( ttl74123_device::b_w ) +void ttl74123_device::b_w(int state) { /* start/regtrigger pulse if A=LO and rising edge on B (while clear is HI) */ if (state && !m_b && !m_a && m_clear) @@ -223,7 +223,7 @@ WRITE_LINE_MEMBER( ttl74123_device::b_w ) // clear_w - write register clear data //------------------------------------------------- -WRITE_LINE_MEMBER( ttl74123_device::clear_w ) +void ttl74123_device::clear_w(int state) { /* start/regtrigger pulse if B=HI and A=LO and rising edge on clear */ if (state && !m_a && m_b && !m_clear) @@ -244,7 +244,7 @@ WRITE_LINE_MEMBER( ttl74123_device::clear_w ) // reset_w - reset device //------------------------------------------------- -WRITE_LINE_MEMBER( ttl74123_device::reset_w ) +void ttl74123_device::reset_w(int state) { set_output(); } diff --git a/src/devices/machine/74123.h b/src/devices/machine/74123.h index 1aeed9d3ef7..ed571f12273 100644 --- a/src/devices/machine/74123.h +++ b/src/devices/machine/74123.h @@ -84,12 +84,12 @@ public: auto out_cb() { return m_output_changed_cb.bind(); } - DECLARE_WRITE_LINE_MEMBER(a_w); - DECLARE_WRITE_LINE_MEMBER(b_w); - DECLARE_WRITE_LINE_MEMBER(clear_w); - DECLARE_WRITE_LINE_MEMBER(reset_w); + void a_w(int state); + void b_w(int state); + void clear_w(int state); + void reset_w(int state); - DECLARE_READ_LINE_MEMBER(q_r) { return timer_running(); } + int q_r() { return timer_running(); } protected: // device-level overrides diff --git a/src/devices/machine/74153.cpp b/src/devices/machine/74153.cpp index 18352ff7e06..258933ae547 100644 --- a/src/devices/machine/74153.cpp +++ b/src/devices/machine/74153.cpp @@ -112,14 +112,14 @@ void ttl153_device::update_b() // INTERFACE //************************************************************************** -WRITE_LINE_MEMBER( ttl153_device::s0_w ) +void ttl153_device::s0_w(int state) { m_s[0] = bool(state); update_a(); update_b(); } -WRITE_LINE_MEMBER( ttl153_device::s1_w ) +void ttl153_device::s1_w(int state) { m_s[1] = bool(state); update_a(); @@ -134,25 +134,25 @@ void ttl153_device::s_w(uint8_t data) update_b(); } -WRITE_LINE_MEMBER( ttl153_device::i0a_w ) +void ttl153_device::i0a_w(int state) { m_ia[0] = bool(state); update_a(); } -WRITE_LINE_MEMBER( ttl153_device::i1a_w ) +void ttl153_device::i1a_w(int state) { m_ia[1] = bool(state); update_a(); } -WRITE_LINE_MEMBER( ttl153_device::i2a_w ) +void ttl153_device::i2a_w(int state) { m_ia[2] = bool(state); update_a(); } -WRITE_LINE_MEMBER( ttl153_device::i3a_w ) +void ttl153_device::i3a_w(int state) { m_ia[3] = bool(state); update_a(); @@ -167,25 +167,25 @@ void ttl153_device::ia_w(uint8_t data) update_a(); } -WRITE_LINE_MEMBER( ttl153_device::i0b_w ) +void ttl153_device::i0b_w(int state) { m_ib[0] = bool(state); update_b(); } -WRITE_LINE_MEMBER( ttl153_device::i1b_w ) +void ttl153_device::i1b_w(int state) { m_ib[1] = bool(state); update_b(); } -WRITE_LINE_MEMBER( ttl153_device::i2b_w ) +void ttl153_device::i2b_w(int state) { m_ib[2] = bool(state); update_b(); } -WRITE_LINE_MEMBER( ttl153_device::i3b_w ) +void ttl153_device::i3b_w(int state) { m_ib[3] = bool(state); update_b(); @@ -200,12 +200,12 @@ void ttl153_device::ib_w(uint8_t data) update_b(); } -READ_LINE_MEMBER( ttl153_device::za_r ) +int ttl153_device::za_r() { return m_z[0] ? 1 : 0; } -READ_LINE_MEMBER( ttl153_device::zb_r ) +int ttl153_device::zb_r() { return m_z[1] ? 1 : 0; } diff --git a/src/devices/machine/74153.h b/src/devices/machine/74153.h index ae2f3a37353..6cc412b28cd 100644 --- a/src/devices/machine/74153.h +++ b/src/devices/machine/74153.h @@ -38,27 +38,27 @@ public: auto zb_cb() { return m_zb_cb.bind(); } // select - DECLARE_WRITE_LINE_MEMBER(s0_w); - DECLARE_WRITE_LINE_MEMBER(s1_w); + void s0_w(int state); + void s1_w(int state); void s_w(uint8_t data); // input a - DECLARE_WRITE_LINE_MEMBER(i0a_w); - DECLARE_WRITE_LINE_MEMBER(i1a_w); - DECLARE_WRITE_LINE_MEMBER(i2a_w); - DECLARE_WRITE_LINE_MEMBER(i3a_w); + void i0a_w(int state); + void i1a_w(int state); + void i2a_w(int state); + void i3a_w(int state); void ia_w(uint8_t data); // input b - DECLARE_WRITE_LINE_MEMBER(i0b_w); - DECLARE_WRITE_LINE_MEMBER(i1b_w); - DECLARE_WRITE_LINE_MEMBER(i2b_w); - DECLARE_WRITE_LINE_MEMBER(i3b_w); + void i0b_w(int state); + void i1b_w(int state); + void i2b_w(int state); + void i3b_w(int state); void ib_w(uint8_t data); // output - DECLARE_READ_LINE_MEMBER(za_r); - DECLARE_READ_LINE_MEMBER(zb_r); + int za_r(); + int zb_r(); protected: // device-level overrides diff --git a/src/devices/machine/74157.cpp b/src/devices/machine/74157.cpp index 1dc7eb1289b..d70ba821f04 100644 --- a/src/devices/machine/74157.cpp +++ b/src/devices/machine/74157.cpp @@ -156,10 +156,10 @@ void ls157_device::interleave_w(u8 data) // aN_w -- update one bit of first data input //------------------------------------------------- -WRITE_LINE_MEMBER(ls157_device::a0_w) { write_a_bit(0, state); } -WRITE_LINE_MEMBER(ls157_device::a1_w) { write_a_bit(1, state); } -WRITE_LINE_MEMBER(ls157_device::a2_w) { write_a_bit(2, state); } -WRITE_LINE_MEMBER(ls157_device::a3_w) { write_a_bit(3, state); } +void ls157_device::a0_w(int state) { write_a_bit(0, state); } +void ls157_device::a1_w(int state) { write_a_bit(1, state); } +void ls157_device::a2_w(int state) { write_a_bit(2, state); } +void ls157_device::a3_w(int state) { write_a_bit(3, state); } void ls157_device::write_a_bit(int bit, bool state) { @@ -180,10 +180,10 @@ void ls157_device::write_a_bit(int bit, bool state) // bN_w -- update one bit of second data input //------------------------------------------------- -WRITE_LINE_MEMBER(ls157_device::b0_w) { write_b_bit(0, state); } -WRITE_LINE_MEMBER(ls157_device::b1_w) { write_b_bit(1, state); } -WRITE_LINE_MEMBER(ls157_device::b2_w) { write_b_bit(2, state); } -WRITE_LINE_MEMBER(ls157_device::b3_w) { write_b_bit(3, state); } +void ls157_device::b0_w(int state) { write_b_bit(0, state); } +void ls157_device::b1_w(int state) { write_b_bit(1, state); } +void ls157_device::b2_w(int state) { write_b_bit(2, state); } +void ls157_device::b3_w(int state) { write_b_bit(3, state); } void ls157_device::write_b_bit(int bit, bool state) { @@ -208,7 +208,7 @@ void ls157_device::write_b_bit(int bit, bool state) // select_w -- set select input //------------------------------------------------- -WRITE_LINE_MEMBER(ls157_device::select_w) +void ls157_device::select_w(int state) { if (m_select != bool(state)) { @@ -222,7 +222,7 @@ WRITE_LINE_MEMBER(ls157_device::select_w) // strobe_w -- set strobe input (active low) //------------------------------------------------- -WRITE_LINE_MEMBER(ls157_device::strobe_w) +void ls157_device::strobe_w(int state) { if (m_strobe != bool(state)) { diff --git a/src/devices/machine/74157.h b/src/devices/machine/74157.h index da34d879221..fbeec1aaea3 100644 --- a/src/devices/machine/74157.h +++ b/src/devices/machine/74157.h @@ -49,18 +49,18 @@ public: void interleave_w(u8 data); // data line writes - DECLARE_WRITE_LINE_MEMBER(a0_w); - DECLARE_WRITE_LINE_MEMBER(a1_w); - DECLARE_WRITE_LINE_MEMBER(a2_w); - DECLARE_WRITE_LINE_MEMBER(a3_w); - DECLARE_WRITE_LINE_MEMBER(b0_w); - DECLARE_WRITE_LINE_MEMBER(b1_w); - DECLARE_WRITE_LINE_MEMBER(b2_w); - DECLARE_WRITE_LINE_MEMBER(b3_w); + void a0_w(int state); + void a1_w(int state); + void a2_w(int state); + void a3_w(int state); + void b0_w(int state); + void b1_w(int state); + void b2_w(int state); + void b3_w(int state); // control line writes - DECLARE_WRITE_LINE_MEMBER(select_w); - DECLARE_WRITE_LINE_MEMBER(strobe_w); + void select_w(int state); + void strobe_w(int state); // output read u8 output_r(); diff --git a/src/devices/machine/74161.cpp b/src/devices/machine/74161.cpp index 64e935152f5..7bd4e720d20 100644 --- a/src/devices/machine/74161.cpp +++ b/src/devices/machine/74161.cpp @@ -141,7 +141,7 @@ void ttl7416x_device::increment() m_out &= 0x0f; } -WRITE_LINE_MEMBER( ttl7416x_device::clear_w ) +void ttl7416x_device::clear_w(int state) { m_clear = state; if (!m_synchronous_reset) @@ -149,22 +149,22 @@ WRITE_LINE_MEMBER( ttl7416x_device::clear_w ) } -WRITE_LINE_MEMBER( ttl7416x_device::pe_w ) +void ttl7416x_device::pe_w(int state) { m_pe = state ^ 1; } -WRITE_LINE_MEMBER( ttl7416x_device::cet_w ) +void ttl7416x_device::cet_w(int state) { m_cet = state; } -WRITE_LINE_MEMBER( ttl7416x_device::cep_w ) +void ttl7416x_device::cep_w(int state) { m_cep = state; } -WRITE_LINE_MEMBER( ttl7416x_device::clock_w ) +void ttl7416x_device::clock_w(int state) { uint8_t last_clock = m_pclock; m_pclock = state; @@ -179,31 +179,31 @@ void ttl7416x_device::p_w(uint8_t data) m_p = data & 0xf; } -WRITE_LINE_MEMBER( ttl7416x_device::p1_w ) +void ttl7416x_device::p1_w(int state) { m_p &= ~(1 << 0); m_p |= (state << 0); } -WRITE_LINE_MEMBER( ttl7416x_device::p2_w ) +void ttl7416x_device::p2_w(int state) { m_p &= ~(1 << 1); m_p |= (state << 1); } -WRITE_LINE_MEMBER( ttl7416x_device::p3_w ) +void ttl7416x_device::p3_w(int state) { m_p &= ~(1 << 2); m_p |= (state << 2); } -WRITE_LINE_MEMBER( ttl7416x_device::p4_w ) +void ttl7416x_device::p4_w(int state) { m_p &= ~(1 << 3); m_p |= (state << 3); } -READ_LINE_MEMBER( ttl7416x_device::output_r ) +int ttl7416x_device::output_r() { return m_out; } @@ -212,7 +212,7 @@ READ_LINE_MEMBER( ttl7416x_device::output_r ) TC is an asynchronous signal, depending on the current states of CET, CEP, and the counter value. */ -READ_LINE_MEMBER( ttl7416x_device::tc_r ) +int ttl7416x_device::tc_r() { return ((m_cet==1) && (m_cep==1) && (m_out==m_limit-1))? 1:0; } diff --git a/src/devices/machine/74161.h b/src/devices/machine/74161.h index 0145e08a9fb..f265f9b4243 100644 --- a/src/devices/machine/74161.h +++ b/src/devices/machine/74161.h @@ -68,19 +68,19 @@ public: auto tc_cb() { return m_tc_func.bind(); } // public interfaces - DECLARE_WRITE_LINE_MEMBER( clear_w ); - DECLARE_WRITE_LINE_MEMBER( pe_w ); - DECLARE_WRITE_LINE_MEMBER( cet_w ); - DECLARE_WRITE_LINE_MEMBER( cep_w ); - DECLARE_WRITE_LINE_MEMBER( clock_w ); + void clear_w(int state); + void pe_w(int state); + void cet_w(int state); + void cep_w(int state); + void clock_w(int state); void p_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER( p1_w ); - DECLARE_WRITE_LINE_MEMBER( p2_w ); - DECLARE_WRITE_LINE_MEMBER( p3_w ); - DECLARE_WRITE_LINE_MEMBER( p4_w ); + void p1_w(int state); + void p2_w(int state); + void p3_w(int state); + void p4_w(int state); - DECLARE_READ_LINE_MEMBER( output_r ); - DECLARE_READ_LINE_MEMBER( tc_r ); + int output_r(); + int tc_r(); void set_cet_pin_value(int value) { m_cetpre = value; } void set_cep_pin_value(int value) { m_ceppre = value; } diff --git a/src/devices/machine/74165.cpp b/src/devices/machine/74165.cpp index 9ba4415d56c..7d588525677 100644 --- a/src/devices/machine/74165.cpp +++ b/src/devices/machine/74165.cpp @@ -89,7 +89,7 @@ TIMER_DEVICE_CALLBACK_MEMBER( ttl165_device::qh_output ) // INTERFACE //************************************************************************** -WRITE_LINE_MEMBER( ttl165_device::serial_w ) +void ttl165_device::serial_w(int state) { m_ser = state; } @@ -100,7 +100,7 @@ void ttl165_device::update_qh() m_timer->adjust(attotime::from_nsec(25), BIT(m_data, 7)); } -WRITE_LINE_MEMBER( ttl165_device::clock_w ) +void ttl165_device::clock_w(int state) { if (m_shld && !m_clk && state) { @@ -114,7 +114,7 @@ WRITE_LINE_MEMBER( ttl165_device::clock_w ) m_clk = state; } -WRITE_LINE_MEMBER( ttl165_device::shift_load_w ) +void ttl165_device::shift_load_w(int state) { if (!m_shld || !state) { diff --git a/src/devices/machine/74165.h b/src/devices/machine/74165.h index 145f3195172..b20de384c16 100644 --- a/src/devices/machine/74165.h +++ b/src/devices/machine/74165.h @@ -39,9 +39,9 @@ public: auto data_callback() { return m_data_cb.bind(); } auto qh_callback() { return m_qh_cb.bind(); } - DECLARE_WRITE_LINE_MEMBER(serial_w); - DECLARE_WRITE_LINE_MEMBER(clock_w); - DECLARE_WRITE_LINE_MEMBER(shift_load_w); + void serial_w(int state); + void clock_w(int state); + void shift_load_w(int state); protected: // device-level overrides diff --git a/src/devices/machine/74166.cpp b/src/devices/machine/74166.cpp index 1611b526762..a5a32187266 100644 --- a/src/devices/machine/74166.cpp +++ b/src/devices/machine/74166.cpp @@ -89,12 +89,12 @@ TIMER_DEVICE_CALLBACK_MEMBER( ttl166_device::qh_output ) // INTERFACE //************************************************************************** -WRITE_LINE_MEMBER( ttl166_device::serial_w ) +void ttl166_device::serial_w(int state) { m_ser = state; } -WRITE_LINE_MEMBER( ttl166_device::clock_w ) +void ttl166_device::clock_w(int state) { if (m_clk == 0 && state == 1) { @@ -117,7 +117,7 @@ WRITE_LINE_MEMBER( ttl166_device::clock_w ) m_clk = state; } -WRITE_LINE_MEMBER( ttl166_device::shift_load_w ) +void ttl166_device::shift_load_w(int state) { m_shld = state; } diff --git a/src/devices/machine/74166.h b/src/devices/machine/74166.h index e15149a50cd..2547fdd5bff 100644 --- a/src/devices/machine/74166.h +++ b/src/devices/machine/74166.h @@ -39,9 +39,9 @@ public: auto data_callback() { return m_data_cb.bind(); } auto qh_callback() { return m_qh_cb.bind(); } - DECLARE_WRITE_LINE_MEMBER(serial_w); - DECLARE_WRITE_LINE_MEMBER(clock_w); - DECLARE_WRITE_LINE_MEMBER(shift_load_w); + void serial_w(int state); + void clock_w(int state); + void shift_load_w(int state); protected: // device-level overrides diff --git a/src/devices/machine/74175.cpp b/src/devices/machine/74175.cpp index 28d3152dbeb..48f1eae439a 100644 --- a/src/devices/machine/74175.cpp +++ b/src/devices/machine/74175.cpp @@ -149,12 +149,12 @@ void ttl741745_device::tick() m_q4_func(m_q4); } -WRITE_LINE_MEMBER( ttl741745_device::clear_w ) +void ttl741745_device::clear_w(int state) { m_clear = state; } -WRITE_LINE_MEMBER( ttl741745_device::clock_w ) +void ttl741745_device::clock_w(int state) { uint8_t last_clock = m_clock; m_clock = state; @@ -164,32 +164,32 @@ WRITE_LINE_MEMBER( ttl741745_device::clock_w ) } } -WRITE_LINE_MEMBER( ttl741745_device::d1_w ) +void ttl741745_device::d1_w(int state) { m_d1 = state; } -WRITE_LINE_MEMBER( ttl741745_device::d2_w ) +void ttl741745_device::d2_w(int state) { m_d2 = state; } -WRITE_LINE_MEMBER( ttl741745_device::d3_w ) +void ttl741745_device::d3_w(int state) { m_d3 = state; } -WRITE_LINE_MEMBER( ttl741745_device::d4_w ) +void ttl741745_device::d4_w(int state) { m_d4 = state; } -WRITE_LINE_MEMBER( ttl74174_device::d5_w ) +void ttl74174_device::d5_w(int state) { m_d5 = state; } -WRITE_LINE_MEMBER( ttl74174_device::d6_w ) +void ttl74174_device::d6_w(int state) { m_d6 = state; } diff --git a/src/devices/machine/74175.h b/src/devices/machine/74175.h index 2eb716d481c..531afa4f743 100644 --- a/src/devices/machine/74175.h +++ b/src/devices/machine/74175.h @@ -56,12 +56,12 @@ public: auto q3_callback() { return m_q3_func.bind(); } auto q4_callback() { return m_q4_func.bind(); } - DECLARE_WRITE_LINE_MEMBER( clear_w ); - DECLARE_WRITE_LINE_MEMBER( d1_w ); - DECLARE_WRITE_LINE_MEMBER( d2_w ); - DECLARE_WRITE_LINE_MEMBER( d3_w ); - DECLARE_WRITE_LINE_MEMBER( d4_w ); - DECLARE_WRITE_LINE_MEMBER( clock_w ); + void clear_w(int state); + void d1_w(int state); + void d2_w(int state); + void d3_w(int state); + void d4_w(int state); + void clock_w(int state); uint8_t q_w(); @@ -101,8 +101,8 @@ public: auto q5_cb() { return m_q5_func.bind(); } auto q6_cb() { return m_q6_func.bind(); } - DECLARE_WRITE_LINE_MEMBER( d5_w ); - DECLARE_WRITE_LINE_MEMBER( d6_w ); + void d5_w(int state); + void d6_w(int state); protected: virtual void device_start() override; diff --git a/src/devices/machine/74181.cpp b/src/devices/machine/74181.cpp index 66901510b32..a3fef1451a0 100644 --- a/src/devices/machine/74181.cpp +++ b/src/devices/machine/74181.cpp @@ -132,7 +132,7 @@ void ttl74181_device::select_w(uint8_t data) } } -WRITE_LINE_MEMBER( ttl74181_device::mode_w ) +void ttl74181_device::mode_w(int state) { if (m_m != state) { @@ -141,7 +141,7 @@ WRITE_LINE_MEMBER( ttl74181_device::mode_w ) } } -WRITE_LINE_MEMBER( ttl74181_device::carry_w ) +void ttl74181_device::carry_w(int state) { if (m_c != state) { diff --git a/src/devices/machine/74181.h b/src/devices/machine/74181.h index 40a55abc042..018eb3efaa0 100644 --- a/src/devices/machine/74181.h +++ b/src/devices/machine/74181.h @@ -30,15 +30,15 @@ public: void input_a_w(uint8_t data); void input_b_w(uint8_t data); void select_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER( mode_w ); - DECLARE_WRITE_LINE_MEMBER( carry_w ); + void mode_w(int state); + void carry_w(int state); // outputs uint8_t function_r() { return m_f; } - DECLARE_READ_LINE_MEMBER( carry_r ) { return m_cn; } - DECLARE_READ_LINE_MEMBER( generate_r ) { return m_g; } - DECLARE_READ_LINE_MEMBER( propagate_r ) { return m_p; } - DECLARE_READ_LINE_MEMBER( equals_r ) { return m_equals; } + int carry_r() { return m_cn; } + int generate_r() { return m_g; } + int propagate_r() { return m_p; } + int equals_r() { return m_equals; } protected: // device-level overrides diff --git a/src/devices/machine/74259.cpp b/src/devices/machine/74259.cpp index 806ea280eb1..90cafc4210a 100644 --- a/src/devices/machine/74259.cpp +++ b/src/devices/machine/74259.cpp @@ -181,7 +181,7 @@ void addressable_latch_device::write_abcd(u8 a, bool d) // enable_w - handle enable input (active low) //------------------------------------------------- -WRITE_LINE_MEMBER(addressable_latch_device::enable_w) +void addressable_latch_device::enable_w(int state) { m_enable = !state; if (m_enable) @@ -346,7 +346,7 @@ void addressable_latch_device::clear(u8 data) // clear_w - handle clear/reset input //------------------------------------------------- -WRITE_LINE_MEMBER(addressable_latch_device::clear_w) +void addressable_latch_device::clear_w(int state) { m_clear = bool(state) == m_clear_active; if (m_clear) diff --git a/src/devices/machine/74259.h b/src/devices/machine/74259.h index a2192701cba..4f758b753df 100644 --- a/src/devices/machine/74259.h +++ b/src/devices/machine/74259.h @@ -58,19 +58,19 @@ public: void clear(u8 data = 0); // read handlers (inlined for the sake of optimization) - DECLARE_READ_LINE_MEMBER(q0_r) { return BIT(m_q, 0); } - DECLARE_READ_LINE_MEMBER(q1_r) { return BIT(m_q, 1); } - DECLARE_READ_LINE_MEMBER(q2_r) { return BIT(m_q, 2); } - DECLARE_READ_LINE_MEMBER(q3_r) { return BIT(m_q, 3); } - DECLARE_READ_LINE_MEMBER(q4_r) { return BIT(m_q, 4); } - DECLARE_READ_LINE_MEMBER(q5_r) { return BIT(m_q, 5); } - DECLARE_READ_LINE_MEMBER(q6_r) { return BIT(m_q, 6); } - DECLARE_READ_LINE_MEMBER(q7_r) { return BIT(m_q, 7); } + int q0_r() { return BIT(m_q, 0); } + int q1_r() { return BIT(m_q, 1); } + int q2_r() { return BIT(m_q, 2); } + int q3_r() { return BIT(m_q, 3); } + int q4_r() { return BIT(m_q, 4); } + int q5_r() { return BIT(m_q, 5); } + int q6_r() { return BIT(m_q, 6); } + int q7_r() { return BIT(m_q, 7); } u8 output_state() const { return m_q; } // control inputs - DECLARE_WRITE_LINE_MEMBER(enable_w); - DECLARE_WRITE_LINE_MEMBER(clear_w); + void enable_w(int state); + void clear_w(int state); protected: // construction/destruction diff --git a/src/devices/machine/74543.cpp b/src/devices/machine/74543.cpp index 2abba597941..643ff829e50 100644 --- a/src/devices/machine/74543.cpp +++ b/src/devices/machine/74543.cpp @@ -85,35 +85,35 @@ void ttl74543_device::outputa_rz(uint8_t& value) if (m_ceba && m_oeba) value = m_latch; } -WRITE_LINE_MEMBER( ttl74543_device::ceab_w ) +void ttl74543_device::ceab_w(int state) { m_ceab = (state == 0); if (m_ceab && m_oeab) m_output_b(m_latch); } -WRITE_LINE_MEMBER( ttl74543_device::leab_w ) +void ttl74543_device::leab_w(int state) { m_leab = (state == 0); } -WRITE_LINE_MEMBER( ttl74543_device::oeab_w ) +void ttl74543_device::oeab_w(int state) { m_oeab = (state == 0); if (m_ceab && m_oeab) m_output_b(m_latch); } -WRITE_LINE_MEMBER( ttl74543_device::ceba_w ) +void ttl74543_device::ceba_w(int state) { m_ceba = (state == 0); if (m_ceba && m_oeba) m_output_a(m_latch); } -WRITE_LINE_MEMBER( ttl74543_device::leba_w ) +void ttl74543_device::leba_w(int state) { m_leba = (state == 0); } -WRITE_LINE_MEMBER( ttl74543_device::oeba_w ) +void ttl74543_device::oeba_w(int state) { m_oeba = (state == 0); if (m_ceba && m_oeba) m_output_a(m_latch); diff --git a/src/devices/machine/74543.h b/src/devices/machine/74543.h index ab2c7a561d2..4c333f5fd90 100644 --- a/src/devices/machine/74543.h +++ b/src/devices/machine/74543.h @@ -71,12 +71,12 @@ public: auto outputb_cb() { return m_output_b.bind(); } // public interfaces - DECLARE_WRITE_LINE_MEMBER(ceab_w); - DECLARE_WRITE_LINE_MEMBER(leab_w); - DECLARE_WRITE_LINE_MEMBER(oeab_w); - DECLARE_WRITE_LINE_MEMBER(ceba_w); - DECLARE_WRITE_LINE_MEMBER(leba_w); - DECLARE_WRITE_LINE_MEMBER(oeba_w); + void ceab_w(int state); + void leab_w(int state); + void oeab_w(int state); + void ceba_w(int state); + void leba_w(int state); + void oeba_w(int state); void a_w(uint8_t a); void b_w(uint8_t a); diff --git a/src/devices/machine/7474.cpp b/src/devices/machine/7474.cpp index 33e4e5af696..1952f7fe869 100644 --- a/src/devices/machine/7474.cpp +++ b/src/devices/machine/7474.cpp @@ -153,7 +153,7 @@ void ttl7474_device::update() // clear_w - set the clear line state //------------------------------------------------- -WRITE_LINE_MEMBER( ttl7474_device::clear_w ) +void ttl7474_device::clear_w(int state) { m_clear = state & 1; update(); @@ -164,7 +164,7 @@ WRITE_LINE_MEMBER( ttl7474_device::clear_w ) // clear_w - set the clear line state //------------------------------------------------- -WRITE_LINE_MEMBER( ttl7474_device::preset_w ) +void ttl7474_device::preset_w(int state) { m_preset = state & 1; update(); @@ -175,7 +175,7 @@ WRITE_LINE_MEMBER( ttl7474_device::preset_w ) // clock_w - set the clock line state //------------------------------------------------- -WRITE_LINE_MEMBER( ttl7474_device::clock_w ) +void ttl7474_device::clock_w(int state) { m_clk = state & 1; update(); @@ -186,7 +186,7 @@ WRITE_LINE_MEMBER( ttl7474_device::clock_w ) // d_w - set the d line state //------------------------------------------------- -WRITE_LINE_MEMBER( ttl7474_device::d_w ) +void ttl7474_device::d_w(int state) { m_d = state & 1; update(); @@ -197,7 +197,7 @@ WRITE_LINE_MEMBER( ttl7474_device::d_w ) // output_r - get the output line state //------------------------------------------------- -READ_LINE_MEMBER( ttl7474_device::output_r ) +int ttl7474_device::output_r() { return m_output!=0; } @@ -207,7 +207,7 @@ READ_LINE_MEMBER( ttl7474_device::output_r ) // output_comp_r - get the output-compare line state //----------------------------------------------------- -READ_LINE_MEMBER( ttl7474_device::output_comp_r ) +int ttl7474_device::output_comp_r() { return m_output_comp!=0; } diff --git a/src/devices/machine/7474.h b/src/devices/machine/7474.h index 4e2069d0afa..d8082d3e8ac 100644 --- a/src/devices/machine/7474.h +++ b/src/devices/machine/7474.h @@ -62,12 +62,12 @@ public: auto comp_output_cb() { return m_comp_output_func.bind(); } // public interfaces - DECLARE_WRITE_LINE_MEMBER( clear_w ); - DECLARE_WRITE_LINE_MEMBER( preset_w ); - DECLARE_WRITE_LINE_MEMBER( clock_w ); - DECLARE_WRITE_LINE_MEMBER( d_w ); - DECLARE_READ_LINE_MEMBER( output_r ); - DECLARE_READ_LINE_MEMBER( output_comp_r ); // NOT strictly the same as !output_r() + void clear_w(int state); + void preset_w(int state); + void clock_w(int state); + void d_w(int state); + int output_r(); + int output_comp_r(); // NOT strictly the same as !output_r() protected: // device-level overrides diff --git a/src/devices/machine/8042kbdc.cpp b/src/devices/machine/8042kbdc.cpp index ec111724d8a..57ae9d44edc 100644 --- a/src/devices/machine/8042kbdc.cpp +++ b/src/devices/machine/8042kbdc.cpp @@ -116,7 +116,7 @@ void kbdc8042_device::at_8042_set_outport(uint8_t data, int initial) } } -WRITE_LINE_MEMBER( kbdc8042_device::keyboard_w ) +void kbdc8042_device::keyboard_w(int state) { if(state) at_8042_check_keyboard(); @@ -590,7 +590,7 @@ void kbdc8042_device::data_w(offs_t offset, uint8_t data) } } -WRITE_LINE_MEMBER(kbdc8042_device::write_out2) +void kbdc8042_device::write_out2(int state) { m_out2 = state; } diff --git a/src/devices/machine/8042kbdc.h b/src/devices/machine/8042kbdc.h index 64a45c8993a..6f3552b6dde 100644 --- a/src/devices/machine/8042kbdc.h +++ b/src/devices/machine/8042kbdc.h @@ -51,7 +51,7 @@ public: uint8_t data_r(offs_t offset); void data_w(offs_t offset, uint8_t data); - DECLARE_WRITE_LINE_MEMBER( write_out2 ); + void write_out2(int state); void at_8042_set_outport(uint8_t data, int initial); void at_8042_receive(uint8_t data, bool mouse = false); @@ -129,7 +129,7 @@ private: emu_timer * m_update_timer; - DECLARE_WRITE_LINE_MEMBER( keyboard_w ); + void keyboard_w(int state); }; // device type definition diff --git a/src/devices/machine/82s129.cpp b/src/devices/machine/82s129.cpp index ca147f17c2f..573d1b2aa65 100644 --- a/src/devices/machine/82s129.cpp +++ b/src/devices/machine/82s129.cpp @@ -100,7 +100,7 @@ void prom82s129_base_device::update() } } -WRITE_LINE_MEMBER( prom82s129_base_device::ce1_w ) +void prom82s129_base_device::ce1_w(int state) { uint8_t last_ce1 = m_ce1; m_ce1 = state; @@ -108,7 +108,7 @@ WRITE_LINE_MEMBER( prom82s129_base_device::ce1_w ) update(); } -WRITE_LINE_MEMBER( prom82s129_base_device::ce2_w ) +void prom82s129_base_device::ce2_w(int state) { uint8_t last_ce2 = m_ce2; m_ce2 = state; @@ -133,21 +133,21 @@ void prom82s129_base_device::write_line(uint8_t line, uint8_t state) update(); } -WRITE_LINE_MEMBER( prom82s129_base_device::a0_w ) { write_line(0, state); } -WRITE_LINE_MEMBER( prom82s129_base_device::a1_w ) { write_line(1, state); } -WRITE_LINE_MEMBER( prom82s129_base_device::a2_w ) { write_line(2, state); } -WRITE_LINE_MEMBER( prom82s129_base_device::a3_w ) { write_line(3, state); } -WRITE_LINE_MEMBER( prom82s129_base_device::a4_w ) { write_line(4, state); } -WRITE_LINE_MEMBER( prom82s129_base_device::a5_w ) { write_line(5, state); } -WRITE_LINE_MEMBER( prom82s129_base_device::a6_w ) { write_line(6, state); } -WRITE_LINE_MEMBER( prom82s129_base_device::a7_w ) { write_line(7, state); } +void prom82s129_base_device::a0_w(int state) { write_line(0, state); } +void prom82s129_base_device::a1_w(int state) { write_line(1, state); } +void prom82s129_base_device::a2_w(int state) { write_line(2, state); } +void prom82s129_base_device::a3_w(int state) { write_line(3, state); } +void prom82s129_base_device::a4_w(int state) { write_line(4, state); } +void prom82s129_base_device::a5_w(int state) { write_line(5, state); } +void prom82s129_base_device::a6_w(int state) { write_line(6, state); } +void prom82s129_base_device::a7_w(int state) { write_line(7, state); } uint8_t prom82s129_base_device::output_r() { return m_out; } -READ_LINE_MEMBER( prom82s129_base_device::o1_r ) { return BIT(m_out, 0); } -READ_LINE_MEMBER( prom82s129_base_device::o2_r ) { return BIT(m_out, 1); } -READ_LINE_MEMBER( prom82s129_base_device::o3_r ) { return BIT(m_out, 2); } -READ_LINE_MEMBER( prom82s129_base_device::o4_r ) { return BIT(m_out, 3); } +int prom82s129_base_device::o1_r() { return BIT(m_out, 0); } +int prom82s129_base_device::o2_r() { return BIT(m_out, 1); } +int prom82s129_base_device::o3_r() { return BIT(m_out, 2); } +int prom82s129_base_device::o4_r() { return BIT(m_out, 3); } diff --git a/src/devices/machine/82s129.h b/src/devices/machine/82s129.h index 96f278c85e9..244c85ce01a 100644 --- a/src/devices/machine/82s129.h +++ b/src/devices/machine/82s129.h @@ -55,24 +55,24 @@ public: auto o3_callback() { return m_o3_func.bind(); } auto o4_callback() { return m_o4_func.bind(); } - DECLARE_WRITE_LINE_MEMBER( ce1_w ); - DECLARE_WRITE_LINE_MEMBER( ce2_w ); + void ce1_w(int state); + void ce2_w(int state); void a_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER( a0_w ); - DECLARE_WRITE_LINE_MEMBER( a1_w ); - DECLARE_WRITE_LINE_MEMBER( a2_w ); - DECLARE_WRITE_LINE_MEMBER( a3_w ); - DECLARE_WRITE_LINE_MEMBER( a4_w ); - DECLARE_WRITE_LINE_MEMBER( a5_w ); - DECLARE_WRITE_LINE_MEMBER( a6_w ); - DECLARE_WRITE_LINE_MEMBER( a7_w ); + void a0_w(int state); + void a1_w(int state); + void a2_w(int state); + void a3_w(int state); + void a4_w(int state); + void a5_w(int state); + void a6_w(int state); + void a7_w(int state); uint8_t output_r(); - DECLARE_READ_LINE_MEMBER( o1_r ); - DECLARE_READ_LINE_MEMBER( o2_r ); - DECLARE_READ_LINE_MEMBER( o3_r ); - DECLARE_READ_LINE_MEMBER( o4_r ); + int o1_r(); + int o2_r(); + int o3_r(); + int o4_r(); uint8_t get_output() const { return m_out; } diff --git a/src/devices/machine/acorn_bmu.cpp b/src/devices/machine/acorn_bmu.cpp index 77cb3ad313b..94f5e953a53 100644 --- a/src/devices/machine/acorn_bmu.cpp +++ b/src/devices/machine/acorn_bmu.cpp @@ -72,7 +72,7 @@ void acorn_bmu_device::device_start() // READ/WRITE HANDLERS //************************************************************************** -WRITE_LINE_MEMBER(acorn_bmu_device::scl_w) +void acorn_bmu_device::scl_w(int state) { if (m_scl != state) { @@ -230,7 +230,7 @@ WRITE_LINE_MEMBER(acorn_bmu_device::scl_w) } } -WRITE_LINE_MEMBER(acorn_bmu_device::sda_w) +void acorn_bmu_device::sda_w(int state) { state &= 1; if (m_sdaw != state) @@ -257,7 +257,7 @@ WRITE_LINE_MEMBER(acorn_bmu_device::sda_w) } } -READ_LINE_MEMBER(acorn_bmu_device::sda_r) +int acorn_bmu_device::sda_r() { int res = m_sdar & 1; diff --git a/src/devices/machine/acorn_bmu.h b/src/devices/machine/acorn_bmu.h index 52ff13db040..8cb4bb556a0 100644 --- a/src/devices/machine/acorn_bmu.h +++ b/src/devices/machine/acorn_bmu.h @@ -23,9 +23,9 @@ class acorn_bmu_device : public device_t public: acorn_bmu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - DECLARE_WRITE_LINE_MEMBER(scl_w); - DECLARE_WRITE_LINE_MEMBER(sda_w); - DECLARE_READ_LINE_MEMBER(sda_r); + void scl_w(int state); + void sda_w(int state); + int sda_r(); protected: // device-level overrides diff --git a/src/devices/machine/acorn_ioc.cpp b/src/devices/machine/acorn_ioc.cpp index 3f59b4a66d1..08910c880fa 100644 --- a/src/devices/machine/acorn_ioc.cpp +++ b/src/devices/machine/acorn_ioc.cpp @@ -190,7 +190,7 @@ void acorn_ioc_device::latch_timer_cnt(int tmr) m_timerout[tmr] = m_timercnt[tmr] - (uint32_t)m_timers[tmr]->elapsed().as_ticks(clock() / 4); } -WRITE_LINE_MEMBER(acorn_ioc_device::if_w) +void acorn_ioc_device::if_w(int state) { // set on falling edge if (m_if && !state) @@ -199,7 +199,7 @@ WRITE_LINE_MEMBER(acorn_ioc_device::if_w) m_if = state; } -WRITE_LINE_MEMBER(acorn_ioc_device::ir_w) +void acorn_ioc_device::ir_w(int state) { // set on rising edge if (!m_ir && state) diff --git a/src/devices/machine/acorn_ioc.h b/src/devices/machine/acorn_ioc.h index 50477cf8b24..899e6ba3201 100644 --- a/src/devices/machine/acorn_ioc.h +++ b/src/devices/machine/acorn_ioc.h @@ -40,21 +40,21 @@ public: template uint32_t periph_r(offs_t offset, uint32_t mem_mask = ~0) { return m_peripherals_r[N - 1](offset, mem_mask); } template void periph_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0) { m_peripherals_w[N - 1](offset, data, mem_mask); } - DECLARE_WRITE_LINE_MEMBER(il0_w) { change_interrupt(IRQ_STATUS_B, 0x01, state); change_interrupt(FIQ_STATUS, 0x40, state); } - DECLARE_WRITE_LINE_MEMBER(il1_w) { change_interrupt(IRQ_STATUS_B, 0x02, state); } - DECLARE_WRITE_LINE_MEMBER(il2_w) { change_interrupt(IRQ_STATUS_B, 0x04, state); } - DECLARE_WRITE_LINE_MEMBER(il3_w) { change_interrupt(IRQ_STATUS_B, 0x08, state); } - DECLARE_WRITE_LINE_MEMBER(il4_w) { change_interrupt(IRQ_STATUS_B, 0x10, state); } - DECLARE_WRITE_LINE_MEMBER(il5_w) { change_interrupt(IRQ_STATUS_B, 0x20, state); } - DECLARE_WRITE_LINE_MEMBER(il6_w) { change_interrupt(IRQ_STATUS_A, 0x01, state); } - DECLARE_WRITE_LINE_MEMBER(il7_w) { change_interrupt(IRQ_STATUS_A, 0x02, state); } - DECLARE_WRITE_LINE_MEMBER(fh0_w) { change_interrupt(FIQ_STATUS , 0x01, state); } - DECLARE_WRITE_LINE_MEMBER(fh1_w) { change_interrupt(FIQ_STATUS , 0x02, state); } - DECLARE_WRITE_LINE_MEMBER(fl_w) { change_interrupt(FIQ_STATUS , 0x04, !state); } - DECLARE_WRITE_LINE_MEMBER(por_w) { if (state) change_interrupt(IRQ_STATUS_A, 0x10, state); } - DECLARE_WRITE_LINE_MEMBER(kin_w) { rx_w(state); } - DECLARE_WRITE_LINE_MEMBER(if_w); - DECLARE_WRITE_LINE_MEMBER(ir_w); + void il0_w(int state) { change_interrupt(IRQ_STATUS_B, 0x01, state); change_interrupt(FIQ_STATUS, 0x40, state); } + void il1_w(int state) { change_interrupt(IRQ_STATUS_B, 0x02, state); } + void il2_w(int state) { change_interrupt(IRQ_STATUS_B, 0x04, state); } + void il3_w(int state) { change_interrupt(IRQ_STATUS_B, 0x08, state); } + void il4_w(int state) { change_interrupt(IRQ_STATUS_B, 0x10, state); } + void il5_w(int state) { change_interrupt(IRQ_STATUS_B, 0x20, state); } + void il6_w(int state) { change_interrupt(IRQ_STATUS_A, 0x01, state); } + void il7_w(int state) { change_interrupt(IRQ_STATUS_A, 0x02, state); } + void fh0_w(int state) { change_interrupt(FIQ_STATUS , 0x01, state); } + void fh1_w(int state) { change_interrupt(FIQ_STATUS , 0x02, state); } + void fl_w(int state) { change_interrupt(FIQ_STATUS , 0x04, !state); } + void por_w(int state) { if (state) change_interrupt(IRQ_STATUS_A, 0x10, state); } + void kin_w(int state) { rx_w(state); } + void if_w(int state); + void ir_w(int state); protected: // device-level overrides diff --git a/src/devices/machine/acorn_memc.cpp b/src/devices/machine/acorn_memc.cpp index c8b12050478..a68fdab7c0b 100644 --- a/src/devices/machine/acorn_memc.cpp +++ b/src/devices/machine/acorn_memc.cpp @@ -403,20 +403,20 @@ void acorn_memc_device::do_sound_dma() } } -WRITE_LINE_MEMBER(acorn_memc_device::spvmd_w) +void acorn_memc_device::spvmd_w(int state) { m_spvmd = state; m_abort_w(CLEAR_LINE); } -WRITE_LINE_MEMBER(acorn_memc_device::sndrq_w) +void acorn_memc_device::sndrq_w(int state) { if (state && m_sound_dma_on) do_sound_dma(); } -WRITE_LINE_MEMBER(acorn_memc_device::vidrq_w) +void acorn_memc_device::vidrq_w(int state) { if (state && m_video_dma_on) do_video_dma(); diff --git a/src/devices/machine/acorn_memc.h b/src/devices/machine/acorn_memc.h index 9664e07d7f0..fd9a306b4c3 100644 --- a/src/devices/machine/acorn_memc.h +++ b/src/devices/machine/acorn_memc.h @@ -46,9 +46,9 @@ public: uint32_t high_mem_r(offs_t offset, uint32_t mem_mask = ~0); void high_mem_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0); - DECLARE_WRITE_LINE_MEMBER(spvmd_w); - DECLARE_WRITE_LINE_MEMBER(sndrq_w); - DECLARE_WRITE_LINE_MEMBER(vidrq_w); + void spvmd_w(int state); + void sndrq_w(int state); + void vidrq_w(int state); protected: // device-level overrides diff --git a/src/devices/machine/acorn_vidc.cpp b/src/devices/machine/acorn_vidc.cpp index 9440c339711..6ba1f3ee9df 100644 --- a/src/devices/machine/acorn_vidc.cpp +++ b/src/devices/machine/acorn_vidc.cpp @@ -532,7 +532,7 @@ u32 acorn_vidc10_device::screen_update(screen_device &screen, bitmap_rgb32 &bitm return 0; } -READ_LINE_MEMBER(acorn_vidc10_device::flyback_r) +int acorn_vidc10_device::flyback_r() { int vert_pos = screen().vpos(); if (vert_pos <= m_crtc_regs[CRTC_VDSR] * (m_crtc_interlace+1)) diff --git a/src/devices/machine/acorn_vidc.h b/src/devices/machine/acorn_vidc.h index f2009b255b2..436ee7a920b 100644 --- a/src/devices/machine/acorn_vidc.h +++ b/src/devices/machine/acorn_vidc.h @@ -34,7 +34,7 @@ class acorn_vidc10_device : public device_t, public: // I/O operations void write(offs_t offset, u32 data, u32 mem_mask = ~0); - DECLARE_READ_LINE_MEMBER( flyback_r ); + int flyback_r(); auto vblank() { return m_vblank_cb.bind(); } auto sound_drq() { return m_sound_drq_cb.bind(); } // MEMC comms diff --git a/src/devices/machine/adc0804.cpp b/src/devices/machine/adc0804.cpp index 12eb9e7754d..5d41988d2c3 100644 --- a/src/devices/machine/adc0804.cpp +++ b/src/devices/machine/adc0804.cpp @@ -244,7 +244,7 @@ u8 adc0804_device::read_and_write() // rd_w - enable data bus by line write //------------------------------------------------- -WRITE_LINE_MEMBER(adc0804_device::rd_w) +void adc0804_device::rd_w(int state) { assert(m_rd_mode == RD_BITBANGED); @@ -263,7 +263,7 @@ WRITE_LINE_MEMBER(adc0804_device::rd_w) // wr_w - begin conversion by line write //------------------------------------------------- -WRITE_LINE_MEMBER(adc0804_device::wr_w) +void adc0804_device::wr_w(int state) { // WR input is active low if (!state && !m_wr_active) diff --git a/src/devices/machine/adc0804.h b/src/devices/machine/adc0804.h index d8fe6ad950e..8e5ca6596b2 100644 --- a/src/devices/machine/adc0804.h +++ b/src/devices/machine/adc0804.h @@ -63,11 +63,11 @@ public: void write(u8 data = 0); // control line interface - DECLARE_WRITE_LINE_MEMBER(rd_w); - DECLARE_WRITE_LINE_MEMBER(wr_w); + void rd_w(int state); + void wr_w(int state); // status line interface - DECLARE_READ_LINE_MEMBER(intr_r) { return m_intr_active ? 0 : 1; } + int intr_r() { return m_intr_active ? 0 : 1; } protected: adc0804_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock); diff --git a/src/devices/machine/adc0808.cpp b/src/devices/machine/adc0808.cpp index edee765fcd9..9df9e8052f0 100644 --- a/src/devices/machine/adc0808.cpp +++ b/src/devices/machine/adc0808.cpp @@ -173,7 +173,7 @@ void adc0808_device::address_w(u8 data) m_address = data & 7; } -WRITE_LINE_MEMBER( adc0808_device::start_w ) +void adc0808_device::start_w(int state) { if (m_start == state) return; @@ -191,7 +191,7 @@ WRITE_LINE_MEMBER( adc0808_device::start_w ) m_start = state; } -READ_LINE_MEMBER( adc0808_device::eoc_r ) +int adc0808_device::eoc_r() { return m_eoc; } diff --git a/src/devices/machine/adc0808.h b/src/devices/machine/adc0808.h index 9d69c67daef..91237a949b3 100644 --- a/src/devices/machine/adc0808.h +++ b/src/devices/machine/adc0808.h @@ -53,8 +53,8 @@ public: u8 data_r(); void address_w(u8 data); - DECLARE_WRITE_LINE_MEMBER(start_w); - DECLARE_READ_LINE_MEMBER(eoc_r); + void start_w(int state); + int eoc_r(); // common hookups void address_offset_start_w(offs_t offset, u8 data); // start and ale connected, address to the address bus diff --git a/src/devices/machine/adc083x.cpp b/src/devices/machine/adc083x.cpp index c5c75655625..8759cabe095 100644 --- a/src/devices/machine/adc083x.cpp +++ b/src/devices/machine/adc083x.cpp @@ -139,7 +139,7 @@ void adc083x_device::clear_sars() adc083x_device::cs_write -------------------------------------------------*/ -WRITE_LINE_MEMBER( adc083x_device::cs_write ) +void adc083x_device::cs_write(int state) { if( m_cs != state ) { @@ -254,7 +254,7 @@ uint8_t adc083x_device::conversion() adc083x_device::clk_write -------------------------------------------------*/ -WRITE_LINE_MEMBER( adc083x_device::clk_write ) +void adc083x_device::clk_write(int state) { if( m_clk != state ) { @@ -402,7 +402,7 @@ WRITE_LINE_MEMBER( adc083x_device::clk_write ) adc083x_device::di_write -------------------------------------------------*/ -WRITE_LINE_MEMBER( adc083x_device::di_write ) +void adc083x_device::di_write(int state) { if( m_di != state ) { @@ -416,7 +416,7 @@ WRITE_LINE_MEMBER( adc083x_device::di_write ) adc083x_device::se_write -------------------------------------------------*/ -WRITE_LINE_MEMBER( adc083x_device::se_write ) +void adc083x_device::se_write(int state) { if( m_se != state ) { @@ -430,7 +430,7 @@ WRITE_LINE_MEMBER( adc083x_device::se_write ) adc083x_device::sars_read -------------------------------------------------*/ -READ_LINE_MEMBER( adc083x_device::sars_read ) +int adc083x_device::sars_read() { verboselog( 1, *this, "adc083x_sars_read( %s ) %d\n", tag(), m_sars ); return m_sars; @@ -440,7 +440,7 @@ READ_LINE_MEMBER( adc083x_device::sars_read ) adc083x_device::do_read -------------------------------------------------*/ -READ_LINE_MEMBER( adc083x_device::do_read ) +int adc083x_device::do_read() { verboselog( 1, *this, "adc083x_do_read( %s ) %d\n", tag(), m_do ); return m_do; diff --git a/src/devices/machine/adc083x.h b/src/devices/machine/adc083x.h index babde2515b1..3ccc6da79da 100644 --- a/src/devices/machine/adc083x.h +++ b/src/devices/machine/adc083x.h @@ -42,12 +42,12 @@ public: // configuration helpers template void set_input_callback(T &&... args) { m_input_callback.set(std::forward(args)...); } - DECLARE_WRITE_LINE_MEMBER( cs_write ); - DECLARE_WRITE_LINE_MEMBER( clk_write ); - DECLARE_WRITE_LINE_MEMBER( di_write ); - DECLARE_WRITE_LINE_MEMBER( se_write ); - DECLARE_READ_LINE_MEMBER( sars_read ); - DECLARE_READ_LINE_MEMBER( do_read ); + void cs_write(int state); + void clk_write(int state); + void di_write(int state); + void se_write(int state); + int sars_read(); + int do_read(); protected: adc083x_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock, uint32_t mux_bits); diff --git a/src/devices/machine/adc1038.cpp b/src/devices/machine/adc1038.cpp index 3baac1fd1be..33de2805f96 100644 --- a/src/devices/machine/adc1038.cpp +++ b/src/devices/machine/adc1038.cpp @@ -65,7 +65,7 @@ void adc1038_device::device_reset() DEVICE HANDLERS *****************************************************************************/ -READ_LINE_MEMBER( adc1038_device::do_read ) +int adc1038_device::do_read() { m_data_out = (m_adc_data & 0x200) ? 1 : 0; m_adc_data <<= 1; @@ -74,12 +74,12 @@ READ_LINE_MEMBER( adc1038_device::do_read ) return m_data_out; } -WRITE_LINE_MEMBER( adc1038_device::di_write ) +void adc1038_device::di_write(int state) { m_data_in = state; } -WRITE_LINE_MEMBER( adc1038_device::clk_write ) +void adc1038_device::clk_write(int state) { // GTI Club doesn't sync on SARS if (m_gticlub_hack) @@ -117,7 +117,7 @@ WRITE_LINE_MEMBER( adc1038_device::clk_write ) m_clk = state; } -READ_LINE_MEMBER( adc1038_device::sars_read ) +int adc1038_device::sars_read() { m_cycle = 0; diff --git a/src/devices/machine/adc1038.h b/src/devices/machine/adc1038.h index d4ee5362fd0..ea399ba550d 100644 --- a/src/devices/machine/adc1038.h +++ b/src/devices/machine/adc1038.h @@ -35,10 +35,10 @@ public: void set_gti_club_hack(bool hack) { m_gticlub_hack = hack; } - DECLARE_READ_LINE_MEMBER( do_read ); - DECLARE_READ_LINE_MEMBER( sars_read ); - DECLARE_WRITE_LINE_MEMBER( di_write ); - DECLARE_WRITE_LINE_MEMBER( clk_write ); + int do_read(); + int sars_read(); + void di_write(int state); + void clk_write(int state); protected: // device-level overrides diff --git a/src/devices/machine/aic580.cpp b/src/devices/machine/aic580.cpp index c5bf3a51e96..db7b202238a 100644 --- a/src/devices/machine/aic580.cpp +++ b/src/devices/machine/aic580.cpp @@ -97,7 +97,7 @@ void aic580_device::device_reset() // breq_w - handle transfer requests for port B //------------------------------------------------- -WRITE_LINE_MEMBER(aic580_device::breq_w) +void aic580_device::breq_w(int state) { if (state) { diff --git a/src/devices/machine/aic580.h b/src/devices/machine/aic580.h index b764daa1710..ea11d412e18 100644 --- a/src/devices/machine/aic580.h +++ b/src/devices/machine/aic580.h @@ -34,7 +34,7 @@ public: void mpu_map(address_map &map); // port B DMA interface - DECLARE_WRITE_LINE_MEMBER(breq_w); + void breq_w(int state); protected: // device-specific overrides diff --git a/src/devices/machine/aic6250.cpp b/src/devices/machine/aic6250.cpp index a39c067ea3c..9c5fb08cb1c 100644 --- a/src/devices/machine/aic6250.cpp +++ b/src/devices/machine/aic6250.cpp @@ -1014,7 +1014,7 @@ void aic6250_device::set_int_state(bool asserted) * the DMA transfer count falls below 8, data is transferred via individual * cycles on demand rather than prefetched. */ -WRITE_LINE_MEMBER(aic6250_device::back_w) +void aic6250_device::back_w(int state) { LOGMASKED(LOG_DMA, "back_w %d\n", state); diff --git a/src/devices/machine/aic6250.h b/src/devices/machine/aic6250.h index 048aa6de0c8..8b8b283b0ba 100644 --- a/src/devices/machine/aic6250.h +++ b/src/devices/machine/aic6250.h @@ -23,7 +23,7 @@ public: auto port_b_r_cb() { return m_port_b_r_cb.bind(); } auto port_b_w_cb() { return m_port_b_w_cb.bind(); } - DECLARE_WRITE_LINE_MEMBER(back_w); + void back_w(int state); u8 read(address_space &space, offs_t offset); void write(offs_t offset, u8 data); diff --git a/src/devices/machine/alpha_8921.cpp b/src/devices/machine/alpha_8921.cpp index bf57902b31e..b0217e8bfd2 100644 --- a/src/devices/machine/alpha_8921.cpp +++ b/src/devices/machine/alpha_8921.cpp @@ -89,7 +89,7 @@ void alpha_8921_device::device_reset() // clk_w - Change clock pin status //------------------------------------------------- -WRITE_LINE_MEMBER(alpha_8921_device::clk_w) +void alpha_8921_device::clk_w(int state) { if (m_clk != state) { @@ -110,7 +110,7 @@ WRITE_LINE_MEMBER(alpha_8921_device::clk_w) // load_w - Change LOAD pin status //------------------------------------------------- -WRITE_LINE_MEMBER(alpha_8921_device::load_w) +void alpha_8921_device::load_w(int state) { m_load = state; } @@ -119,7 +119,7 @@ WRITE_LINE_MEMBER(alpha_8921_device::load_w) // even_w - Change EVEN pin status //------------------------------------------------- -WRITE_LINE_MEMBER(alpha_8921_device::even_w) +void alpha_8921_device::even_w(int state) { m_even = state; } @@ -128,7 +128,7 @@ WRITE_LINE_MEMBER(alpha_8921_device::even_w) // h_w - Change H pin status //------------------------------------------------- -WRITE_LINE_MEMBER(alpha_8921_device::h_w) +void alpha_8921_device::h_w(int state) { m_h = state; } @@ -195,7 +195,7 @@ u8 alpha_8921_device::gbd_r() // dota_r - Read DOTA pin data (GAD isn't 0) //------------------------------------------------- -READ_LINE_MEMBER(alpha_8921_device::dota_r) +int alpha_8921_device::dota_r() { update_output(); return m_dota; @@ -205,7 +205,7 @@ READ_LINE_MEMBER(alpha_8921_device::dota_r) // dotb_r - Read DOTB pin data (GBD isn't 0) //------------------------------------------------- -READ_LINE_MEMBER(alpha_8921_device::dotb_r) +int alpha_8921_device::dotb_r() { update_output(); return m_dotb; diff --git a/src/devices/machine/alpha_8921.h b/src/devices/machine/alpha_8921.h index a6e8ccdb0ad..54d7599cd7d 100644 --- a/src/devices/machine/alpha_8921.h +++ b/src/devices/machine/alpha_8921.h @@ -21,17 +21,17 @@ public: alpha_8921_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); // inputs - DECLARE_WRITE_LINE_MEMBER(clk_w); - DECLARE_WRITE_LINE_MEMBER(load_w); - DECLARE_WRITE_LINE_MEMBER(even_w); - DECLARE_WRITE_LINE_MEMBER(h_w); + void clk_w(int state); + void load_w(int state); + void even_w(int state); + void h_w(int state); void c_w(u32 data); // outputs u8 gad_r(); u8 gbd_r(); - DECLARE_READ_LINE_MEMBER(dota_r); - DECLARE_READ_LINE_MEMBER(dotb_r); + int dota_r(); + int dotb_r(); protected: // device-level overrides diff --git a/src/devices/machine/am2847.cpp b/src/devices/machine/am2847.cpp index 7e7992a2e85..125a50b7965 100644 --- a/src/devices/machine/am2847.cpp +++ b/src/devices/machine/am2847.cpp @@ -62,25 +62,25 @@ void am2847_base_device::init() m_out = 0; } -WRITE_LINE_MEMBER( am2847_base_device::in_a_w ) +void am2847_base_device::in_a_w(int state) { m_in &= ~0x01; m_in |= state; } -WRITE_LINE_MEMBER( am2847_base_device::in_b_w ) +void am2847_base_device::in_b_w(int state) { m_in &= ~0x02; m_in |= state << 1; } -WRITE_LINE_MEMBER( am2847_base_device::in_c_w ) +void am2847_base_device::in_c_w(int state) { m_in &= ~0x04; m_in |= state << 2; } -WRITE_LINE_MEMBER( am2847_base_device::in_d_w ) +void am2847_base_device::in_d_w(int state) { m_in &= ~0x08; m_in |= state << 3; @@ -91,25 +91,25 @@ void am2847_base_device::in_w(uint8_t data) m_in = data & 0x0f; } -WRITE_LINE_MEMBER( am2847_base_device::rc_a_w ) +void am2847_base_device::rc_a_w(int state) { m_rc &= ~0x01; m_rc |= state; } -WRITE_LINE_MEMBER( am2847_base_device::rc_b_w ) +void am2847_base_device::rc_b_w(int state) { m_rc &= ~0x02; m_rc |= state << 1; } -WRITE_LINE_MEMBER( am2847_base_device::rc_c_w ) +void am2847_base_device::rc_c_w(int state) { m_rc &= ~0x04; m_rc |= state << 2; } -WRITE_LINE_MEMBER( am2847_base_device::rc_d_w ) +void am2847_base_device::rc_d_w(int state) { m_rc &= ~0x08; m_rc |= state << 3; @@ -120,7 +120,7 @@ void am2847_base_device::rc_w(uint8_t data) m_rc = data & 0x0f; } -WRITE_LINE_MEMBER( am2847_base_device::cp_w ) +void am2847_base_device::cp_w(int state) { if (m_cp != state && state != 0) { diff --git a/src/devices/machine/am2847.h b/src/devices/machine/am2847.h index b5d90642e32..f0139233f12 100644 --- a/src/devices/machine/am2847.h +++ b/src/devices/machine/am2847.h @@ -48,19 +48,19 @@ class am2847_base_device : public device_t { public: - DECLARE_WRITE_LINE_MEMBER( in_a_w ); - DECLARE_WRITE_LINE_MEMBER( in_b_w ); - DECLARE_WRITE_LINE_MEMBER( in_c_w ); - DECLARE_WRITE_LINE_MEMBER( in_d_w ); + void in_a_w(int state); + void in_b_w(int state); + void in_c_w(int state); + void in_d_w(int state); void in_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER( rc_a_w ); - DECLARE_WRITE_LINE_MEMBER( rc_b_w ); - DECLARE_WRITE_LINE_MEMBER( rc_c_w ); - DECLARE_WRITE_LINE_MEMBER( rc_d_w ); + void rc_a_w(int state); + void rc_b_w(int state); + void rc_c_w(int state); + void rc_d_w(int state); void rc_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER( cp_w ); + void cp_w(int state); uint8_t out_r() const { return m_out; } diff --git a/src/devices/machine/am2901b.cpp b/src/devices/machine/am2901b.cpp index 87b370a24b4..f1dafdfcffd 100644 --- a/src/devices/machine/am2901b.cpp +++ b/src/devices/machine/am2901b.cpp @@ -160,32 +160,32 @@ void am2901b_device::i_w(uint16_t data) m_i = data; } -WRITE_LINE_MEMBER(am2901b_device::q0_w) +void am2901b_device::q0_w(int state) { m_q0_in = (bool)state; } -WRITE_LINE_MEMBER(am2901b_device::q3_w) +void am2901b_device::q3_w(int state) { m_q3_in = (bool)state; } -WRITE_LINE_MEMBER(am2901b_device::ram0_w) +void am2901b_device::ram0_w(int state) { m_ram0_in = (bool)state; } -WRITE_LINE_MEMBER(am2901b_device::ram3_w) +void am2901b_device::ram3_w(int state) { m_ram3_in = (bool)state; } -WRITE_LINE_MEMBER(am2901b_device::ci_w) +void am2901b_device::ci_w(int state) { m_ci = (bool)state; } -WRITE_LINE_MEMBER(am2901b_device::cp_w) +void am2901b_device::cp_w(int state) { bool old = m_cp; m_cp = (bool)state; diff --git a/src/devices/machine/am2901b.h b/src/devices/machine/am2901b.h index 4e7a25e3915..aa35d4589b7 100644 --- a/src/devices/machine/am2901b.h +++ b/src/devices/machine/am2901b.h @@ -41,12 +41,12 @@ public: void d_w(uint8_t data); void i_w(uint16_t data); - DECLARE_WRITE_LINE_MEMBER(q0_w); - DECLARE_WRITE_LINE_MEMBER(q3_w); - DECLARE_WRITE_LINE_MEMBER(ram0_w); - DECLARE_WRITE_LINE_MEMBER(ram3_w); - DECLARE_WRITE_LINE_MEMBER(ci_w); - DECLARE_WRITE_LINE_MEMBER(cp_w); + void q0_w(int state); + void q3_w(int state); + void ram0_w(int state); + void ram3_w(int state); + void ci_w(int state); + void cp_w(int state); private: // device-level overrides diff --git a/src/devices/machine/am2910.cpp b/src/devices/machine/am2910.cpp index 5ea3541938b..70fb066deee 100644 --- a/src/devices/machine/am2910.cpp +++ b/src/devices/machine/am2910.cpp @@ -91,27 +91,27 @@ TIMER_CALLBACK_MEMBER(am2910_device::clock_tick) cp_w(m_cp ? 0 : 1); } -WRITE_LINE_MEMBER(am2910_device::cc_w) +void am2910_device::cc_w(int state) { m_cc = state; } -WRITE_LINE_MEMBER(am2910_device::ccen_w) +void am2910_device::ccen_w(int state) { m_ccen = state; } -WRITE_LINE_MEMBER(am2910_device::ci_w) +void am2910_device::ci_w(int state) { m_ci = state; } -WRITE_LINE_MEMBER(am2910_device::rld_w) +void am2910_device::rld_w(int state) { m_rld = state; } -WRITE_LINE_MEMBER(am2910_device::cp_w) +void am2910_device::cp_w(int state) { int old_state = m_cp; m_cp = state; diff --git a/src/devices/machine/am2910.h b/src/devices/machine/am2910.h index 52c075ea52a..6cbcbb15489 100644 --- a/src/devices/machine/am2910.h +++ b/src/devices/machine/am2910.h @@ -24,11 +24,11 @@ public: // construction/destruction am2910_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - DECLARE_WRITE_LINE_MEMBER(cc_w); // !CC - DECLARE_WRITE_LINE_MEMBER(ccen_w); // !CCEN - DECLARE_WRITE_LINE_MEMBER(ci_w); // CI - DECLARE_WRITE_LINE_MEMBER(rld_w); // !RLD - DECLARE_WRITE_LINE_MEMBER(cp_w); // CP + void cc_w(int state); // !CC + void ccen_w(int state); // !CCEN + void ci_w(int state); // CI + void rld_w(int state); // !RLD + void cp_w(int state); // CP void d_w(uint16_t data); void i_w(uint8_t data); diff --git a/src/devices/machine/am9513.h b/src/devices/machine/am9513.h index 34c3cc3598c..b19de879739 100644 --- a/src/devices/machine/am9513.h +++ b/src/devices/machine/am9513.h @@ -63,25 +63,25 @@ public: void write16(offs_t offset, u16 data); // Source N inputs - DECLARE_WRITE_LINE_MEMBER(source1_w) { write_source(0, state); } - DECLARE_WRITE_LINE_MEMBER(source2_w) { write_source(1, state); } - DECLARE_WRITE_LINE_MEMBER(source3_w) { write_source(2, state); } - DECLARE_WRITE_LINE_MEMBER(source4_w) { write_source(3, state); } - DECLARE_WRITE_LINE_MEMBER(source5_w) { write_source(4, state); } + void source1_w(int state) { write_source(0, state); } + void source2_w(int state) { write_source(1, state); } + void source3_w(int state) { write_source(2, state); } + void source4_w(int state) { write_source(3, state); } + void source5_w(int state) { write_source(4, state); } // Gate N inputs - DECLARE_WRITE_LINE_MEMBER(gate1_w) { write_gate(0, state); } - DECLARE_WRITE_LINE_MEMBER(gate2_w) { write_gate(1, state); } - DECLARE_WRITE_LINE_MEMBER(gate3_w) { write_gate(2, state); } - DECLARE_WRITE_LINE_MEMBER(gate4_w) { write_gate(3, state); } - DECLARE_WRITE_LINE_MEMBER(gate5_w) { write_gate(4, state); } + void gate1_w(int state) { write_gate(0, state); } + void gate2_w(int state) { write_gate(1, state); } + void gate3_w(int state) { write_gate(2, state); } + void gate4_w(int state) { write_gate(3, state); } + void gate5_w(int state) { write_gate(4, state); } // Gate N alternate inputs (8-bit mode only; multiplexed with DB8-DB12) - DECLARE_WRITE_LINE_MEMBER(gate1a_w) { write_gate_alt(0, state); } - DECLARE_WRITE_LINE_MEMBER(gate2a_w) { write_gate_alt(1, state); } - DECLARE_WRITE_LINE_MEMBER(gate3a_w) { write_gate_alt(2, state); } - DECLARE_WRITE_LINE_MEMBER(gate4a_w) { write_gate_alt(3, state); } - DECLARE_WRITE_LINE_MEMBER(gate5a_w) { write_gate_alt(4, state); } + void gate1a_w(int state) { write_gate_alt(0, state); } + void gate2a_w(int state) { write_gate_alt(1, state); } + void gate3a_w(int state) { write_gate_alt(2, state); } + void gate4a_w(int state) { write_gate_alt(3, state); } + void gate5a_w(int state) { write_gate_alt(4, state); } // diagnostic helper std::string describe_register() const; diff --git a/src/devices/machine/am9516.cpp b/src/devices/machine/am9516.cpp index c5b24a5f636..0311e76d2ee 100644 --- a/src/devices/machine/am9516.cpp +++ b/src/devices/machine/am9516.cpp @@ -497,13 +497,13 @@ void am9516_device::command(u8 data) } } -WRITE_LINE_MEMBER(am9516_device::eop_w) +void am9516_device::eop_w(int state) { LOGMASKED(LOG_DMA, "eop %s\n", state ? "cleared" : "asserted"); m_eop_in_state = !state; } -template WRITE_LINE_MEMBER(am9516_device::dreq_w) +template void am9516_device::dreq_w(int state) { LOGMASKED(LOG_DMA, "channel %d dreq %s\n", Channel, state ? "cleared" : "asserted"); channel &ch = m_channel[Channel]; diff --git a/src/devices/machine/am9516.h b/src/devices/machine/am9516.h index 3c0d74249a8..e4fc6863ff1 100644 --- a/src/devices/machine/am9516.h +++ b/src/devices/machine/am9516.h @@ -26,8 +26,8 @@ public: auto out_eop() { return m_eop.bind(); } // input lines - DECLARE_WRITE_LINE_MEMBER(eop_w); - template DECLARE_WRITE_LINE_MEMBER(dreq_w); + void eop_w(int state); + template void dreq_w(int state); template auto flyby_byte_r() { return m_channel[Channel].flyby_byte_r.bind(); } template auto flyby_byte_w() { return m_channel[Channel].flyby_byte_w.bind(); } diff --git a/src/devices/machine/am9517a.cpp b/src/devices/machine/am9517a.cpp index 533c617f1b5..ac7e6eba19c 100644 --- a/src/devices/machine/am9517a.cpp +++ b/src/devices/machine/am9517a.cpp @@ -942,7 +942,7 @@ void am9517a_device::write(offs_t offset, uint8_t data) // hack_w - hold acknowledge //------------------------------------------------- -WRITE_LINE_MEMBER( am9517a_device::hack_w ) +void am9517a_device::hack_w(int state) { LOG("AM9517A Hold Acknowledge: %u\n", state); @@ -955,7 +955,7 @@ WRITE_LINE_MEMBER( am9517a_device::hack_w ) // ready_w - ready //------------------------------------------------- -WRITE_LINE_MEMBER( am9517a_device::ready_w ) +void am9517a_device::ready_w(int state) { LOG("AM9517A Ready: %u\n", state); @@ -967,7 +967,7 @@ WRITE_LINE_MEMBER( am9517a_device::ready_w ) // eop_w - end of process //------------------------------------------------- -WRITE_LINE_MEMBER( am9517a_device::eop_w ) +void am9517a_device::eop_w(int state) { LOG("AM9517A End of Process: %u\n", state); } @@ -977,7 +977,7 @@ WRITE_LINE_MEMBER( am9517a_device::eop_w ) // dreq0_w - DMA request for channel 0 //------------------------------------------------- -WRITE_LINE_MEMBER( am9517a_device::dreq0_w ) +void am9517a_device::dreq0_w(int state) { dma_request(0, state); } @@ -987,7 +987,7 @@ WRITE_LINE_MEMBER( am9517a_device::dreq0_w ) // dreq0_w - DMA request for channel 1 //------------------------------------------------- -WRITE_LINE_MEMBER( am9517a_device::dreq1_w ) +void am9517a_device::dreq1_w(int state) { dma_request(1, state); } @@ -997,7 +997,7 @@ WRITE_LINE_MEMBER( am9517a_device::dreq1_w ) // dreq1_w - DMA request for channel 2 //------------------------------------------------- -WRITE_LINE_MEMBER( am9517a_device::dreq2_w ) +void am9517a_device::dreq2_w(int state) { dma_request(2, state); } @@ -1007,7 +1007,7 @@ WRITE_LINE_MEMBER( am9517a_device::dreq2_w ) // dreq3_w - DMA request for channel 3 //------------------------------------------------- -WRITE_LINE_MEMBER( am9517a_device::dreq3_w ) +void am9517a_device::dreq3_w(int state) { dma_request(3, state); } diff --git a/src/devices/machine/am9517a.h b/src/devices/machine/am9517a.h index e1dcec9576e..67b10351290 100644 --- a/src/devices/machine/am9517a.h +++ b/src/devices/machine/am9517a.h @@ -68,15 +68,15 @@ public: virtual uint8_t read(offs_t offset); virtual void write(offs_t offset, uint8_t data); - DECLARE_WRITE_LINE_MEMBER( hack_w ); - DECLARE_WRITE_LINE_MEMBER( ready_w ); - DECLARE_WRITE_LINE_MEMBER( eop_w ); - - template DECLARE_WRITE_LINE_MEMBER( dreq_w ) { dma_request(C, state); } - DECLARE_WRITE_LINE_MEMBER( dreq0_w ); - DECLARE_WRITE_LINE_MEMBER( dreq1_w ); - DECLARE_WRITE_LINE_MEMBER( dreq2_w ); - DECLARE_WRITE_LINE_MEMBER( dreq3_w ); + void hack_w(int state); + void ready_w(int state); + void eop_w(int state); + + template void dreq_w(int state) { dma_request(C, state); } + void dreq0_w(int state); + void dreq1_w(int state); + void dreq2_w(int state); + void dreq3_w(int state); protected: am9517a_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); diff --git a/src/devices/machine/am9519.h b/src/devices/machine/am9519.h index bccd4534faf..20a76809070 100644 --- a/src/devices/machine/am9519.h +++ b/src/devices/machine/am9519.h @@ -42,14 +42,14 @@ public: void data_w(u8 data); u32 acknowledge(); - DECLARE_WRITE_LINE_MEMBER( ireq0_w ) { set_irq_line(0, state); } - DECLARE_WRITE_LINE_MEMBER( ireq1_w ) { set_irq_line(1, state); } - DECLARE_WRITE_LINE_MEMBER( ireq2_w ) { set_irq_line(2, state); } - DECLARE_WRITE_LINE_MEMBER( ireq3_w ) { set_irq_line(3, state); } - DECLARE_WRITE_LINE_MEMBER( ireq4_w ) { set_irq_line(4, state); } - DECLARE_WRITE_LINE_MEMBER( ireq5_w ) { set_irq_line(5, state); } - DECLARE_WRITE_LINE_MEMBER( ireq6_w ) { set_irq_line(6, state); } - DECLARE_WRITE_LINE_MEMBER( ireq7_w ) { set_irq_line(7, state); } + void ireq0_w(int state) { set_irq_line(0, state); } + void ireq1_w(int state) { set_irq_line(1, state); } + void ireq2_w(int state) { set_irq_line(2, state); } + void ireq3_w(int state) { set_irq_line(3, state); } + void ireq4_w(int state) { set_irq_line(4, state); } + void ireq5_w(int state) { set_irq_line(5, state); } + void ireq6_w(int state) { set_irq_line(6, state); } + void ireq7_w(int state) { set_irq_line(7, state); } IRQ_CALLBACK_MEMBER(iack_cb); diff --git a/src/devices/machine/applepic.cpp b/src/devices/machine/applepic.cpp index 0383bb6817c..aa9e958f8fe 100644 --- a/src/devices/machine/applepic.cpp +++ b/src/devices/machine/applepic.cpp @@ -182,7 +182,7 @@ void applepic_device::host_w(offs_t offset, u8 data) m_ram_address = u16(data) << 8 | (m_ram_address & 0x00ff); } -WRITE_LINE_MEMBER(applepic_device::pint_w) +void applepic_device::pint_w(int state) { if (state == ASSERT_LINE) { @@ -198,7 +198,7 @@ WRITE_LINE_MEMBER(applepic_device::pint_w) } } -WRITE_LINE_MEMBER(applepic_device::reqa_w) +void applepic_device::reqa_w(int state) { if (state == ASSERT_LINE) m_dma_channel[0].control |= 0x02; @@ -206,7 +206,7 @@ WRITE_LINE_MEMBER(applepic_device::reqa_w) m_dma_channel[0].control &= 0xfd; } -WRITE_LINE_MEMBER(applepic_device::reqb_w) +void applepic_device::reqb_w(int state) { if (state == ASSERT_LINE) m_dma_channel[1].control |= 0x02; diff --git a/src/devices/machine/applepic.h b/src/devices/machine/applepic.h index 67d6186a963..f43ccb6ddb8 100644 --- a/src/devices/machine/applepic.h +++ b/src/devices/machine/applepic.h @@ -33,9 +33,9 @@ public: void host_w(offs_t offset, u8 data); // peripheral device requests - DECLARE_WRITE_LINE_MEMBER(pint_w); - DECLARE_WRITE_LINE_MEMBER(reqa_w); - DECLARE_WRITE_LINE_MEMBER(reqb_w); + void pint_w(int state); + void reqa_w(int state); + void reqb_w(int state); protected: // device-level overrides diff --git a/src/devices/machine/archimedes_keyb.cpp b/src/devices/machine/archimedes_keyb.cpp index ff97b22bd58..01a2d97a7df 100644 --- a/src/devices/machine/archimedes_keyb.cpp +++ b/src/devices/machine/archimedes_keyb.cpp @@ -409,7 +409,7 @@ uint8_t archimedes_keyboard_device::mouse_r() return (m_mouse_xref << 4) | (m_mouse_xdir << 5) | (m_mouse_yref << 6) | (m_mouse_ydir << 7); } -WRITE_LINE_MEMBER(archimedes_keyboard_device::kin_w) +void archimedes_keyboard_device::kin_w(int state) { m_kin = state; } diff --git a/src/devices/machine/archimedes_keyb.h b/src/devices/machine/archimedes_keyb.h index 2690f4bac71..82311124581 100644 --- a/src/devices/machine/archimedes_keyb.h +++ b/src/devices/machine/archimedes_keyb.h @@ -27,7 +27,7 @@ public: auto kout() { return m_kout.bind(); } - DECLARE_WRITE_LINE_MEMBER(kin_w); + void kin_w(int state); protected: // device-level overrides diff --git a/src/devices/machine/arm_iomd.cpp b/src/devices/machine/arm_iomd.cpp index e1c32d8d3f3..893399387ea 100644 --- a/src/devices/machine/arm_iomd.cpp +++ b/src/devices/machine/arm_iomd.cpp @@ -671,7 +671,7 @@ void arm_iomd_device::vidinita_w(offs_t offset, u32 data, u32 mem_mask) // IRQ/DRQ/Reset signals //************************************************************************** -WRITE_LINE_MEMBER( arm_iomd_device::vblank_irq ) +void arm_iomd_device::vblank_irq(int state) { if (!state) return; @@ -715,7 +715,7 @@ inline void arm_iomd_device::sounddma_swap_buffer() // m_sndbuffer_ok[m_sndcur_buffer] = true; } -WRITE_LINE_MEMBER( arm_iomd_device::sound_drq ) +void arm_iomd_device::sound_drq(int state) { if (!state) return; @@ -751,7 +751,7 @@ WRITE_LINE_MEMBER( arm_iomd_device::sound_drq ) } } -WRITE_LINE_MEMBER( arm_iomd_device::keyboard_irq ) +void arm_iomd_device::keyboard_irq(int state) { printf("IRQ %d\n",state); if (!state) @@ -760,7 +760,7 @@ WRITE_LINE_MEMBER( arm_iomd_device::keyboard_irq ) trigger_irq(0x80); } -WRITE_LINE_MEMBER( arm_iomd_device::keyboard_reset ) +void arm_iomd_device::keyboard_reset(int state) { printf("RST %d\n",state); } diff --git a/src/devices/machine/arm_iomd.h b/src/devices/machine/arm_iomd.h index e072a7c8a31..a6e371cfd6e 100644 --- a/src/devices/machine/arm_iomd.h +++ b/src/devices/machine/arm_iomd.h @@ -42,13 +42,13 @@ public: auto iocr_read_id() { return m_iocr_read_id_cb.bind(); } auto iocr_write_id() { return m_iocr_write_id_cb.bind(); } // IRQA - DECLARE_WRITE_LINE_MEMBER( vblank_irq ); + void vblank_irq(int state); // IRQB - DECLARE_WRITE_LINE_MEMBER( keyboard_irq ); + void keyboard_irq(int state); // DRQs - DECLARE_WRITE_LINE_MEMBER( sound_drq ); + void sound_drq(int state); // Reset - DECLARE_WRITE_LINE_MEMBER( keyboard_reset ); + void keyboard_reset(int state); // I/O operations virtual void map(address_map &map); diff --git a/src/devices/machine/at.cpp b/src/devices/machine/at.cpp index 043403c934a..c1ddc37699c 100644 --- a/src/devices/machine/at.cpp +++ b/src/devices/machine/at.cpp @@ -194,7 +194,7 @@ void at_mb_device::speaker_set_spkrdata(uint8_t data) * *************************************************************/ -WRITE_LINE_MEMBER( at_mb_device::pit8254_out2_changed ) +void at_mb_device::pit8254_out2_changed(int state) { m_pit_out2 = state ? 1 : 0; m_speaker->level_w(m_at_spkrdata & m_pit_out2); @@ -257,7 +257,7 @@ void at_mb_device::page8_w(offs_t offset, uint8_t data) } -WRITE_LINE_MEMBER( at_mb_device::dma_hrq_changed ) +void at_mb_device::dma_hrq_changed(int state) { m_maincpu->set_input_line(INPUT_LINE_HALT, state ? ASSERT_LINE : CLEAR_LINE); @@ -331,14 +331,14 @@ void at_mb_device::dma8237_5_dack_w(uint8_t data) { m_isabus->dack16_w(5, m_dma_ void at_mb_device::dma8237_6_dack_w(uint8_t data) { m_isabus->dack16_w(6, m_dma_high_byte | data); } void at_mb_device::dma8237_7_dack_w(uint8_t data) { m_isabus->dack16_w(7, m_dma_high_byte | data); } -WRITE_LINE_MEMBER( at_mb_device::dma8237_out_eop ) +void at_mb_device::dma8237_out_eop(int state) { m_cur_eop = state == ASSERT_LINE; if(m_dma_channel != -1) m_isabus->eop_w(m_dma_channel, m_cur_eop ? ASSERT_LINE : CLEAR_LINE ); } -WRITE_LINE_MEMBER( at_mb_device::dma8237_2_out_eop ) +void at_mb_device::dma8237_2_out_eop(int state) { m_cur_eop2 = state == ASSERT_LINE; if(m_dma_channel != -1) @@ -377,22 +377,22 @@ uint32_t at_mb_device::a20_286(bool state) return (state ? 0xffffff : 0xefffff); } -WRITE_LINE_MEMBER( at_mb_device::shutdown ) +void at_mb_device::shutdown(int state) { if(state) m_maincpu->reset(); } -WRITE_LINE_MEMBER( at_mb_device::dack0_w ) { set_dma_channel(0, state); } -WRITE_LINE_MEMBER( at_mb_device::dack1_w ) { set_dma_channel(1, state); } -WRITE_LINE_MEMBER( at_mb_device::dack2_w ) { set_dma_channel(2, state); } -WRITE_LINE_MEMBER( at_mb_device::dack3_w ) { set_dma_channel(3, state); } -WRITE_LINE_MEMBER( at_mb_device::dack4_w ) { m_dma8237_1->hack_w(state ? 0 : 1); } // it's inverted -WRITE_LINE_MEMBER( at_mb_device::dack5_w ) { set_dma_channel(5, state); } -WRITE_LINE_MEMBER( at_mb_device::dack6_w ) { set_dma_channel(6, state); } -WRITE_LINE_MEMBER( at_mb_device::dack7_w ) { set_dma_channel(7, state); } - -WRITE_LINE_MEMBER( at_mb_device::kbd_clk_w ) { m_keybc->kbd_clk_w(state); } -WRITE_LINE_MEMBER( at_mb_device::kbd_data_w ) { m_keybc->kbd_data_w(state); } +void at_mb_device::dack0_w(int state) { set_dma_channel(0, state); } +void at_mb_device::dack1_w(int state) { set_dma_channel(1, state); } +void at_mb_device::dack2_w(int state) { set_dma_channel(2, state); } +void at_mb_device::dack3_w(int state) { set_dma_channel(3, state); } +void at_mb_device::dack4_w(int state) { m_dma8237_1->hack_w(state ? 0 : 1); } // it's inverted +void at_mb_device::dack5_w(int state) { set_dma_channel(5, state); } +void at_mb_device::dack6_w(int state) { set_dma_channel(6, state); } +void at_mb_device::dack7_w(int state) { set_dma_channel(7, state); } + +void at_mb_device::kbd_clk_w(int state) { m_keybc->kbd_clk_w(state); } +void at_mb_device::kbd_data_w(int state) { m_keybc->kbd_data_w(state); } uint8_t at_mb_device::portb_r() { @@ -420,7 +420,7 @@ void at_mb_device::portb_w(uint8_t data) m_maincpu->set_input_line(INPUT_LINE_NMI, CLEAR_LINE); } -WRITE_LINE_MEMBER( at_mb_device::iochck_w ) +void at_mb_device::iochck_w(int state) { if (!state && m_nmi_enabled && !m_channel_check) m_maincpu->set_input_line(INPUT_LINE_NMI, ASSERT_LINE); diff --git a/src/devices/machine/at.h b/src/devices/machine/at.h index 346721ffbbd..41a83f7ead1 100644 --- a/src/devices/machine/at.h +++ b/src/devices/machine/at.h @@ -24,14 +24,14 @@ public: uint8_t page8_r(offs_t offset); void page8_w(offs_t offset, uint8_t data); - DECLARE_WRITE_LINE_MEMBER(kbd_clk_w); - DECLARE_WRITE_LINE_MEMBER(kbd_data_w); + void kbd_clk_w(int state); + void kbd_data_w(int state); uint8_t portb_r(); void portb_w(uint8_t data); void write_rtc(offs_t offset, uint8_t data); - DECLARE_WRITE_LINE_MEMBER(iochck_w); + void iochck_w(int state); - DECLARE_WRITE_LINE_MEMBER(shutdown); + void shutdown(int state); uint32_t a20_286(bool state); @@ -66,10 +66,10 @@ private: uint8_t m_channel_check = 0; uint8_t m_nmi_enabled = 0; - DECLARE_WRITE_LINE_MEMBER(pit8254_out2_changed); + void pit8254_out2_changed(int state); - DECLARE_WRITE_LINE_MEMBER(dma8237_out_eop); - DECLARE_WRITE_LINE_MEMBER(dma8237_2_out_eop); + void dma8237_out_eop(int state); + void dma8237_2_out_eop(int state); uint8_t dma8237_0_dack_r(); uint8_t dma8237_1_dack_r(); uint8_t dma8237_2_dack_r(); @@ -84,16 +84,16 @@ private: void dma8237_5_dack_w(uint8_t data); void dma8237_6_dack_w(uint8_t data); void dma8237_7_dack_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(dack0_w); - DECLARE_WRITE_LINE_MEMBER(dack1_w); - DECLARE_WRITE_LINE_MEMBER(dack2_w); - DECLARE_WRITE_LINE_MEMBER(dack3_w); - DECLARE_WRITE_LINE_MEMBER(dack4_w); - DECLARE_WRITE_LINE_MEMBER(dack5_w); - DECLARE_WRITE_LINE_MEMBER(dack6_w); - DECLARE_WRITE_LINE_MEMBER(dack7_w); + void dack0_w(int state); + void dack1_w(int state); + void dack2_w(int state); + void dack3_w(int state); + void dack4_w(int state); + void dack5_w(int state); + void dack6_w(int state); + void dack7_w(int state); uint8_t get_slave_ack(offs_t offset); - DECLARE_WRITE_LINE_MEMBER(dma_hrq_changed); + void dma_hrq_changed(int state); uint8_t dma_read_byte(offs_t offset); void dma_write_byte(offs_t offset, uint8_t data); diff --git a/src/devices/machine/at28c16.cpp b/src/devices/machine/at28c16.cpp index 38dbdc25117..48676f534a8 100644 --- a/src/devices/machine/at28c16.cpp +++ b/src/devices/machine/at28c16.cpp @@ -207,7 +207,7 @@ uint8_t at28c16_device::read(offs_t offset) } -WRITE_LINE_MEMBER( at28c16_device::set_a9_12v ) +void at28c16_device::set_a9_12v(int state) { state &= 1; if( m_a9_12v != state ) @@ -218,7 +218,7 @@ WRITE_LINE_MEMBER( at28c16_device::set_a9_12v ) } -WRITE_LINE_MEMBER( at28c16_device::set_oe_12v ) +void at28c16_device::set_oe_12v(int state) { state &= 1; if( m_oe_12v != state ) diff --git a/src/devices/machine/at28c16.h b/src/devices/machine/at28c16.h index ca412d7c0af..e7b564929c5 100644 --- a/src/devices/machine/at28c16.h +++ b/src/devices/machine/at28c16.h @@ -54,8 +54,8 @@ private: optional_region_ptr m_default_data; // I/O operations - DECLARE_WRITE_LINE_MEMBER( set_a9_12v ); - DECLARE_WRITE_LINE_MEMBER( set_oe_12v ); + void set_a9_12v(int state); + void set_oe_12v(int state); TIMER_CALLBACK_MEMBER( write_complete ); void at28c16_map8(address_map &map); diff --git a/src/devices/machine/at28c64b.cpp b/src/devices/machine/at28c64b.cpp index 7187a3cd093..ebb794b38e8 100644 --- a/src/devices/machine/at28c64b.cpp +++ b/src/devices/machine/at28c64b.cpp @@ -249,7 +249,7 @@ uint8_t at28c64b_device::read(offs_t offset) } -WRITE_LINE_MEMBER( at28c64b_device::set_a9_12v ) +void at28c64b_device::set_a9_12v(int state) { state &= 1; if( m_a9_12v != state ) @@ -260,7 +260,7 @@ WRITE_LINE_MEMBER( at28c64b_device::set_a9_12v ) } -WRITE_LINE_MEMBER( at28c64b_device::set_oe_12v ) +void at28c64b_device::set_oe_12v(int state) { state &= 1; if( m_oe_12v != state ) diff --git a/src/devices/machine/at28c64b.h b/src/devices/machine/at28c64b.h index c94ac1eec62..f0c903e3952 100644 --- a/src/devices/machine/at28c64b.h +++ b/src/devices/machine/at28c64b.h @@ -66,8 +66,8 @@ private: optional_region_ptr m_default_data; // I/O operations - DECLARE_WRITE_LINE_MEMBER( set_a9_12v ); - DECLARE_WRITE_LINE_MEMBER( set_oe_12v ); + void set_a9_12v(int state); + void set_oe_12v(int state); TIMER_CALLBACK_MEMBER( write_complete ); void at28c64b_map8(address_map &map); diff --git a/src/devices/machine/at45dbxx.cpp b/src/devices/machine/at45dbxx.cpp index c69ce077e4e..4a130702074 100644 --- a/src/devices/machine/at45dbxx.cpp +++ b/src/devices/machine/at45dbxx.cpp @@ -323,19 +323,19 @@ void at45db041_device::write_byte(uint8_t data) } } -READ_LINE_MEMBER(at45db041_device::so_r) +int at45db041_device::so_r() { if (m_pin.cs == 0) return 0; return m_pin.so; } -WRITE_LINE_MEMBER(at45db041_device::si_w) +void at45db041_device::si_w(int state) { if (m_pin.cs == 0) return; m_pin.si = state; } -WRITE_LINE_MEMBER(at45db041_device::cs_w) +void at45db041_device::cs_w(int state) { // check if changed if (m_pin.cs == state) return; @@ -358,7 +358,7 @@ WRITE_LINE_MEMBER(at45db041_device::cs_w) m_pin.cs = state; } -WRITE_LINE_MEMBER(at45db041_device::sck_w) +void at45db041_device::sck_w(int state) { // check if changed if (m_pin.sck == state) return; diff --git a/src/devices/machine/at45dbxx.h b/src/devices/machine/at45dbxx.h index 2521ac10acc..79f0a8aafd5 100644 --- a/src/devices/machine/at45dbxx.h +++ b/src/devices/machine/at45dbxx.h @@ -26,10 +26,10 @@ class at45db041_device : public device_t, public: at45db041_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - DECLARE_WRITE_LINE_MEMBER(cs_w); - DECLARE_WRITE_LINE_MEMBER(sck_w); - DECLARE_WRITE_LINE_MEMBER(si_w); - DECLARE_READ_LINE_MEMBER(so_r); + void cs_w(int state); + void sck_w(int state); + void si_w(int state); + int so_r(); uint8_t *get_ptr() { return &m_data[0]; } diff --git a/src/devices/machine/at_keybc.cpp b/src/devices/machine/at_keybc.cpp index 45bfd86059c..21f26da6255 100644 --- a/src/devices/machine/at_keybc.cpp +++ b/src/devices/machine/at_keybc.cpp @@ -271,12 +271,12 @@ void at_kbc_device_base::command_w(uint8_t data) machine().scheduler().synchronize(timer_expired_delegate(FUNC(at_kbc_device_base::write_command), this), unsigned(data)); } -WRITE_LINE_MEMBER(at_kbc_device_base::kbd_clk_w) +void at_kbc_device_base::kbd_clk_w(int state) { machine().scheduler().synchronize(timer_expired_delegate(FUNC(at_kbc_device_base::set_kbd_clk_in), this), state); } -WRITE_LINE_MEMBER(at_kbc_device_base::kbd_data_w) +void at_kbc_device_base::kbd_data_w(int state) { machine().scheduler().synchronize(timer_expired_delegate(FUNC(at_kbc_device_base::set_kbd_data_in), this), state); } @@ -441,12 +441,12 @@ uint8_t ps2_keyboard_controller_device::status_r() return data; } -WRITE_LINE_MEMBER(ps2_keyboard_controller_device::aux_clk_w) +void ps2_keyboard_controller_device::aux_clk_w(int state) { machine().scheduler().synchronize(timer_expired_delegate(FUNC(ps2_keyboard_controller_device::set_aux_clk_in), this), state); } -WRITE_LINE_MEMBER(ps2_keyboard_controller_device::aux_data_w) +void ps2_keyboard_controller_device::aux_data_w(int state) { machine().scheduler().synchronize(timer_expired_delegate(FUNC(ps2_keyboard_controller_device::set_aux_data_in), this), state); } diff --git a/src/devices/machine/at_keybc.h b/src/devices/machine/at_keybc.h index 9e769416cb2..18e5d0b6804 100644 --- a/src/devices/machine/at_keybc.h +++ b/src/devices/machine/at_keybc.h @@ -36,8 +36,8 @@ public: void command_w(uint8_t data); // inputs from keyboard - DECLARE_WRITE_LINE_MEMBER(kbd_clk_w); - DECLARE_WRITE_LINE_MEMBER(kbd_data_w); + void kbd_clk_w(int state); + void kbd_data_w(int state); protected: // trampoline constructor @@ -116,8 +116,8 @@ public: virtual uint8_t status_r() override; // inputs from aux - DECLARE_WRITE_LINE_MEMBER(aux_clk_w); - DECLARE_WRITE_LINE_MEMBER(aux_data_w); + void aux_clk_w(int state); + void aux_data_w(int state); // standard constructor ps2_keyboard_controller_device(machine_config const &mconfig, char const *tag, device_t *owner, u32 clock); diff --git a/src/devices/machine/ay31015.h b/src/devices/machine/ay31015.h index 4e27bc8e11f..94185a23db9 100644 --- a/src/devices/machine/ay31015.h +++ b/src/devices/machine/ay31015.h @@ -32,27 +32,27 @@ public: auto write_eoc_callback() { return m_write_eoc_cb.bind(); } /* Set an input pin */ - DECLARE_WRITE_LINE_MEMBER(write_swe) { set_input_pin(SWE, state); } - DECLARE_WRITE_LINE_MEMBER(write_rcp) { set_input_pin(RCP, state); } - DECLARE_WRITE_LINE_MEMBER(write_rdav) { set_input_pin(RDAV, state); } - DECLARE_WRITE_LINE_MEMBER(write_si) { set_input_pin(SI, state); } - DECLARE_WRITE_LINE_MEMBER(write_xr) { set_input_pin(XR, state); } - DECLARE_WRITE_LINE_MEMBER(write_cs) { set_input_pin(CS, state); } - DECLARE_WRITE_LINE_MEMBER(write_np) { set_input_pin(NP, state); } - DECLARE_WRITE_LINE_MEMBER(write_tsb) { set_input_pin(TSB, state); } - DECLARE_WRITE_LINE_MEMBER(write_nb2) { set_input_pin(NB2, state); } - DECLARE_WRITE_LINE_MEMBER(write_nb1) { set_input_pin(NB1, state); } - DECLARE_WRITE_LINE_MEMBER(write_eps) { set_input_pin(EPS, state); } - DECLARE_WRITE_LINE_MEMBER(write_tcp) { set_input_pin(TCP, state); } + void write_swe(int state) { set_input_pin(SWE, state); } + void write_rcp(int state) { set_input_pin(RCP, state); } + void write_rdav(int state) { set_input_pin(RDAV, state); } + void write_si(int state) { set_input_pin(SI, state); } + void write_xr(int state) { set_input_pin(XR, state); } + void write_cs(int state) { set_input_pin(CS, state); } + void write_np(int state) { set_input_pin(NP, state); } + void write_tsb(int state) { set_input_pin(TSB, state); } + void write_nb2(int state) { set_input_pin(NB2, state); } + void write_nb1(int state) { set_input_pin(NB1, state); } + void write_eps(int state) { set_input_pin(EPS, state); } + void write_tcp(int state) { set_input_pin(TCP, state); } /* Get an output pin */ - DECLARE_READ_LINE_MEMBER(pe_r) { return get_output_pin(PE); } - DECLARE_READ_LINE_MEMBER(fe_r) { return get_output_pin(FE); } - DECLARE_READ_LINE_MEMBER(or_r) { return get_output_pin(OR); } - DECLARE_READ_LINE_MEMBER(dav_r) { return get_output_pin(DAV); } - DECLARE_READ_LINE_MEMBER(tbmt_r) { return get_output_pin(TBMT); } - DECLARE_READ_LINE_MEMBER(eoc_r) { return get_output_pin(EOC); } - DECLARE_READ_LINE_MEMBER(so_r) { return get_output_pin(SO); } + int pe_r() { return get_output_pin(PE); } + int fe_r() { return get_output_pin(FE); } + int or_r() { return get_output_pin(OR); } + int dav_r() { return get_output_pin(DAV); } + int tbmt_r() { return get_output_pin(TBMT); } + int eoc_r() { return get_output_pin(EOC); } + int so_r() { return get_output_pin(SO); } /* Read the received data */ /* The received data is available on RD8-RD1 (pins 5-12) */ diff --git a/src/devices/machine/bacta_datalogger.h b/src/devices/machine/bacta_datalogger.h index 61555d85acd..a2592a0d183 100644 --- a/src/devices/machine/bacta_datalogger.h +++ b/src/devices/machine/bacta_datalogger.h @@ -11,10 +11,10 @@ class bacta_datalogger_device : public device_t, public: bacta_datalogger_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = 0); - virtual WRITE_LINE_MEMBER( write_txd ) {device_serial_interface::rx_w(state); } + virtual void write_txd(int state) {device_serial_interface::rx_w(state); } auto rxd_handler() { return m_rxd_handler.bind(); } - DECLARE_WRITE_LINE_MEMBER( output_rxd ) { m_rxd_handler(state); } + void output_rxd(int state) { m_rxd_handler(state); } protected: bacta_datalogger_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); diff --git a/src/devices/machine/bl_handhelds_menucontrol.cpp b/src/devices/machine/bl_handhelds_menucontrol.cpp index 18982731069..f4495b004e4 100644 --- a/src/devices/machine/bl_handhelds_menucontrol.cpp +++ b/src/devices/machine/bl_handhelds_menucontrol.cpp @@ -14,12 +14,12 @@ bl_handhelds_menucontrol_device::bl_handhelds_menucontrol_device(const machine_c { } -READ_LINE_MEMBER(bl_handhelds_menucontrol_device::status_r) +int bl_handhelds_menucontrol_device::status_r() { return m_clockstate; } -READ_LINE_MEMBER(bl_handhelds_menucontrol_device::data_r) +int bl_handhelds_menucontrol_device::data_r() { return m_responsebit; } @@ -156,7 +156,7 @@ void bl_handhelds_menucontrol_device::handle_command() } } -WRITE_LINE_MEMBER(bl_handhelds_menucontrol_device::clock_w) +void bl_handhelds_menucontrol_device::clock_w(int state) { if (state) { @@ -178,12 +178,12 @@ WRITE_LINE_MEMBER(bl_handhelds_menucontrol_device::clock_w) } } -WRITE_LINE_MEMBER(bl_handhelds_menucontrol_device::data_w) +void bl_handhelds_menucontrol_device::data_w(int state) { m_commandbit = state; } -WRITE_LINE_MEMBER(bl_handhelds_menucontrol_device::reset_w) +void bl_handhelds_menucontrol_device::reset_w(int state) { m_datashifterpos = 0; } diff --git a/src/devices/machine/bl_handhelds_menucontrol.h b/src/devices/machine/bl_handhelds_menucontrol.h index 747a60db76b..8b3e52b4f48 100644 --- a/src/devices/machine/bl_handhelds_menucontrol.h +++ b/src/devices/machine/bl_handhelds_menucontrol.h @@ -17,11 +17,11 @@ public: // the chip is the same between systems, but there's some logic not fully understood that is causing off-by-1 errors on some calcs void set_is_unsp_type_hack() { m_is_unsp_type_hack = true; } - DECLARE_READ_LINE_MEMBER(status_r); - DECLARE_READ_LINE_MEMBER(data_r); - DECLARE_WRITE_LINE_MEMBER(clock_w); - DECLARE_WRITE_LINE_MEMBER(data_w); - DECLARE_WRITE_LINE_MEMBER(reset_w); + int status_r(); + int data_r(); + void clock_w(int state); + void data_w(int state); + void reset_w(int state); protected: virtual void device_start() override; diff --git a/src/devices/machine/bq4847.cpp b/src/devices/machine/bq4847.cpp index 6b24519d5d7..ba5dfc3b8f8 100644 --- a/src/devices/machine/bq4847.cpp +++ b/src/devices/machine/bq4847.cpp @@ -405,7 +405,7 @@ void bq4847_device::set_wdo(int state) } } -WRITE_LINE_MEMBER(bq4847_device::write_wdi) +void bq4847_device::write_wdi(int state) { if (m_wdi_state != state) { diff --git a/src/devices/machine/bq4847.h b/src/devices/machine/bq4847.h index 2658e207962..50cee115be5 100644 --- a/src/devices/machine/bq4847.h +++ b/src/devices/machine/bq4847.h @@ -29,7 +29,7 @@ public: uint8_t read(offs_t address); void write(offs_t address, uint8_t data); - DECLARE_WRITE_LINE_MEMBER(write_wdi); // watchdog disabled if wdi pin is left floating + void write_wdi(int state); // watchdog disabled if wdi pin is left floating protected: bq4847_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock = 32768); diff --git a/src/devices/machine/bq48x2.cpp b/src/devices/machine/bq48x2.cpp index fa98d8314ab..df14b1c0e41 100644 --- a/src/devices/machine/bq48x2.cpp +++ b/src/devices/machine/bq48x2.cpp @@ -474,7 +474,7 @@ TIMER_CALLBACK_MEMBER(bq48x2_device::rtc_watchdog_cb) Indicates that there is an interrupt condition. Also used to drive the outgoing line. */ -READ_LINE_MEMBER(bq48x2_device::intrq_r) +int bq48x2_device::intrq_r() { bool alarm = (is_set(reg_interrupts, FLAG_AIE) && is_set(reg_flags, FLAG_AF)); bool period = (is_set(reg_interrupts, FLAG_PIE) && is_set(reg_flags, FLAG_PF)); diff --git a/src/devices/machine/bq48x2.h b/src/devices/machine/bq48x2.h index f19b9778c7c..6a25cc45b5f 100644 --- a/src/devices/machine/bq48x2.h +++ b/src/devices/machine/bq48x2.h @@ -28,7 +28,7 @@ public: virtual uint8_t read(offs_t address); virtual void write(offs_t address, uint8_t data); - DECLARE_READ_LINE_MEMBER(intrq_r); + int intrq_r(); // Mainly used to disconnect from oscillator void connect_osc(bool conn); diff --git a/src/devices/machine/buffer.h b/src/devices/machine/buffer.h index 5df28af6c6b..e3f3c3bdd83 100644 --- a/src/devices/machine/buffer.h +++ b/src/devices/machine/buffer.h @@ -10,14 +10,14 @@ public: uint8_t read() { return m_input_data; } - DECLARE_WRITE_LINE_MEMBER(write_bit0) { if (state) m_input_data |= 0x01; else m_input_data &= ~0x01; } - DECLARE_WRITE_LINE_MEMBER(write_bit1) { if (state) m_input_data |= 0x02; else m_input_data &= ~0x02; } - DECLARE_WRITE_LINE_MEMBER(write_bit2) { if (state) m_input_data |= 0x04; else m_input_data &= ~0x04; } - DECLARE_WRITE_LINE_MEMBER(write_bit3) { if (state) m_input_data |= 0x08; else m_input_data &= ~0x08; } - DECLARE_WRITE_LINE_MEMBER(write_bit4) { if (state) m_input_data |= 0x10; else m_input_data &= ~0x10; } - DECLARE_WRITE_LINE_MEMBER(write_bit5) { if (state) m_input_data |= 0x20; else m_input_data &= ~0x20; } - DECLARE_WRITE_LINE_MEMBER(write_bit6) { if (state) m_input_data |= 0x40; else m_input_data &= ~0x40; } - DECLARE_WRITE_LINE_MEMBER(write_bit7) { if (state) m_input_data |= 0x80; else m_input_data &= ~0x80; } + void write_bit0(int state) { if (state) m_input_data |= 0x01; else m_input_data &= ~0x01; } + void write_bit1(int state) { if (state) m_input_data |= 0x02; else m_input_data &= ~0x02; } + void write_bit2(int state) { if (state) m_input_data |= 0x04; else m_input_data &= ~0x04; } + void write_bit3(int state) { if (state) m_input_data |= 0x08; else m_input_data &= ~0x08; } + void write_bit4(int state) { if (state) m_input_data |= 0x10; else m_input_data &= ~0x10; } + void write_bit5(int state) { if (state) m_input_data |= 0x20; else m_input_data &= ~0x20; } + void write_bit6(int state) { if (state) m_input_data |= 0x40; else m_input_data &= ~0x40; } + void write_bit7(int state) { if (state) m_input_data |= 0x80; else m_input_data &= ~0x80; } protected: virtual void device_start() override; diff --git a/src/devices/machine/cdp1852.cpp b/src/devices/machine/cdp1852.cpp index b4850ac669e..c101e2cacd5 100644 --- a/src/devices/machine/cdp1852.cpp +++ b/src/devices/machine/cdp1852.cpp @@ -107,7 +107,7 @@ void cdp1852_device::device_reset() // clock_w - clock write //------------------------------------------------- -WRITE_LINE_MEMBER(cdp1852_device::clock_w) +void cdp1852_device::clock_w(int state) { if (m_clock_active != bool(state)) return; diff --git a/src/devices/machine/cdp1852.h b/src/devices/machine/cdp1852.h index 4f4bec622f9..2ccb214a632 100644 --- a/src/devices/machine/cdp1852.h +++ b/src/devices/machine/cdp1852.h @@ -40,7 +40,7 @@ public: uint8_t read(); void write(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(clock_w); + void clock_w(int state); uint8_t do_r() { return m_data; } diff --git a/src/devices/machine/cdp1871.h b/src/devices/machine/cdp1871.h index a359980f7fb..4c560396dfb 100644 --- a/src/devices/machine/cdp1871.h +++ b/src/devices/machine/cdp1871.h @@ -56,12 +56,12 @@ public: uint8_t read(); - DECLARE_READ_LINE_MEMBER( da_r ) { return m_da; } - DECLARE_READ_LINE_MEMBER( rpt_r ) { return m_rpt; } + int da_r() { return m_da; } + int rpt_r() { return m_rpt; } - DECLARE_WRITE_LINE_MEMBER( shift_w ) { m_shift = state; } - DECLARE_WRITE_LINE_MEMBER( control_w ) { m_control = state; } - DECLARE_WRITE_LINE_MEMBER( alpha_w ) { m_alpha = state; } + void shift_w(int state) { m_shift = state; } + void control_w(int state) { m_control = state; } + void alpha_w(int state) { m_alpha = state; } protected: // device-level overrides diff --git a/src/devices/machine/clock.h b/src/devices/machine/clock.h index 1dc4739ce6c..0fceeb7d9cd 100644 --- a/src/devices/machine/clock.h +++ b/src/devices/machine/clock.h @@ -21,7 +21,7 @@ public: auto &set_pulse_width(attotime pw) { assert(!pw.is_never()); m_pw = pw; reinit(); return *this; } auto &set_duty_cycle(double duty) { assert(duty >= 0.0 && duty <= 1.0); m_duty = duty; m_pw = attotime::never; reinit(); return *this; } - DECLARE_READ_LINE_MEMBER(signal_r) { return m_signal; } + int signal_r() { return m_signal; } protected: virtual void device_start() override; diff --git a/src/devices/machine/cop452.cpp b/src/devices/machine/cop452.cpp index 87e2d0954d5..e03a1a91aaa 100644 --- a/src/devices/machine/cop452.cpp +++ b/src/devices/machine/cop452.cpp @@ -25,7 +25,7 @@ cop452_device::cop452_device(const machine_config &mconfig, const char *tag, dev { } -WRITE_LINE_MEMBER(cop452_device::cs_w) +void cop452_device::cs_w(int state) { m_cs = state; if (m_cs) { @@ -35,7 +35,7 @@ WRITE_LINE_MEMBER(cop452_device::cs_w) } } -WRITE_LINE_MEMBER(cop452_device::sk_w) +void cop452_device::sk_w(int state) { if (!m_cs && !m_sk && state) { // Rising edge on SK @@ -132,12 +132,12 @@ WRITE_LINE_MEMBER(cop452_device::sk_w) m_sk = state; } -WRITE_LINE_MEMBER(cop452_device::di_w) +void cop452_device::di_w(int state) { m_di = state; } -READ_LINE_MEMBER(cop452_device::do_r) +int cop452_device::do_r() { // TODO: return 0; diff --git a/src/devices/machine/cop452.h b/src/devices/machine/cop452.h index 238e5c8b5ca..7aaaa668b4c 100644 --- a/src/devices/machine/cop452.h +++ b/src/devices/machine/cop452.h @@ -29,10 +29,10 @@ public: cop452_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock = 0); // SPI I/O - DECLARE_WRITE_LINE_MEMBER(cs_w); - DECLARE_WRITE_LINE_MEMBER(sk_w); - DECLARE_WRITE_LINE_MEMBER(di_w); - DECLARE_READ_LINE_MEMBER(do_r); + void cs_w(int state); + void sk_w(int state); + void di_w(int state); + int do_r(); // Signal outputs auto oa_w() { return m_out_handlers[0].bind(); } diff --git a/src/devices/machine/cr511b.cpp b/src/devices/machine/cr511b.cpp index 350fd45f6b5..a42d85c03c6 100644 --- a/src/devices/machine/cr511b.cpp +++ b/src/devices/machine/cr511b.cpp @@ -93,12 +93,12 @@ void cr511b_device::write(uint8_t data) { } -WRITE_LINE_MEMBER( cr511b_device::enable_w ) +void cr511b_device::enable_w(int state) { m_enabled = state; } -WRITE_LINE_MEMBER( cr511b_device::cmd_w ) +void cr511b_device::cmd_w(int state) { m_cmd = state; } diff --git a/src/devices/machine/cr511b.h b/src/devices/machine/cr511b.h index 5737d805aa8..034423c29b4 100644 --- a/src/devices/machine/cr511b.h +++ b/src/devices/machine/cr511b.h @@ -55,8 +55,8 @@ public: uint8_t read(); void write(uint8_t data); - DECLARE_WRITE_LINE_MEMBER( enable_w ); - DECLARE_WRITE_LINE_MEMBER( cmd_w ); + void enable_w(int state); + void cmd_w(int state); protected: // device-level overrides diff --git a/src/devices/machine/cs4031.cpp b/src/devices/machine/cs4031.cpp index 6805a7602b1..77252f66686 100644 --- a/src/devices/machine/cs4031.cpp +++ b/src/devices/machine/cs4031.cpp @@ -359,12 +359,12 @@ void cs4031_device::dma_write_word(offs_t offset, uint8_t data) m_space->write_word((page_offset() & 0xfe0000) | (offset << 1), (m_dma_high_byte << 8) | data); } -WRITE_LINE_MEMBER( cs4031_device::dma2_dack0_w ) +void cs4031_device::dma2_dack0_w(int state) { m_dma1->hack_w(state ? 0 : 1); // inverted? } -WRITE_LINE_MEMBER( cs4031_device::dma1_eop_w ) +void cs4031_device::dma1_eop_w(int state) { m_dma_eop = state; if (m_dma_channel != -1) @@ -435,7 +435,7 @@ uint8_t cs4031_device::intc1_slave_ack_r(offs_t offset) return 0x00; } -WRITE_LINE_MEMBER( cs4031_device::iochck_w ) +void cs4031_device::iochck_w(int state) { LOGIO("cs4031_device::iochck_w: %u\n", state); @@ -457,13 +457,13 @@ WRITE_LINE_MEMBER( cs4031_device::iochck_w ) // TIMER //************************************************************************** -WRITE_LINE_MEMBER( cs4031_device::ctc_out1_w ) +void cs4031_device::ctc_out1_w(int state) { m_refresh_toggle ^= state; m_portb = (m_portb & 0xef) | (m_refresh_toggle << 4); } -WRITE_LINE_MEMBER( cs4031_device::ctc_out2_w ) +void cs4031_device::ctc_out2_w(int state) { m_write_spkr(!(state & BIT(m_portb, 1))); m_portb = (m_portb & 0xdf) | (state << 5); @@ -794,14 +794,14 @@ void cs4031_device::keyb_data_w(uint8_t data) } } -WRITE_LINE_MEMBER( cs4031_device::gatea20_w ) +void cs4031_device::gatea20_w(int state) { LOGKEYBOARD("cs4031_device::gatea20_w: %u\n", state); keyboard_gatea20(state); } -WRITE_LINE_MEMBER( cs4031_device::kbrst_w ) +void cs4031_device::kbrst_w(int state) { LOGKEYBOARD("cs4031_device::kbrst_w: %u\n", state); diff --git a/src/devices/machine/cs4031.h b/src/devices/machine/cs4031.h index 5e7ea81b4e0..09c7f97fc82 100644 --- a/src/devices/machine/cs4031.h +++ b/src/devices/machine/cs4031.h @@ -80,30 +80,30 @@ public: void keyb_command_blocked_w(uint8_t data); // input lines - DECLARE_WRITE_LINE_MEMBER( irq01_w ) { m_intc1->ir1_w(state); } - DECLARE_WRITE_LINE_MEMBER( irq03_w ) { m_intc1->ir3_w(state); } - DECLARE_WRITE_LINE_MEMBER( irq04_w ) { m_intc1->ir4_w(state); } - DECLARE_WRITE_LINE_MEMBER( irq05_w ) { m_intc1->ir5_w(state); } - DECLARE_WRITE_LINE_MEMBER( irq06_w ) { m_intc1->ir6_w(state); } - DECLARE_WRITE_LINE_MEMBER( irq07_w ) { m_intc1->ir7_w(state); } - DECLARE_WRITE_LINE_MEMBER( irq09_w ) { m_intc2->ir1_w(state); } - DECLARE_WRITE_LINE_MEMBER( irq10_w ) { m_intc2->ir2_w(state); } - DECLARE_WRITE_LINE_MEMBER( irq11_w ) { m_intc2->ir3_w(state); } - DECLARE_WRITE_LINE_MEMBER( irq12_w ) { m_intc2->ir4_w(state); } - DECLARE_WRITE_LINE_MEMBER( irq13_w ) { m_intc2->ir5_w(state); } // also FERR# - DECLARE_WRITE_LINE_MEMBER( irq14_w ) { m_intc2->ir6_w(state); } - DECLARE_WRITE_LINE_MEMBER( irq15_w ) { m_intc2->ir7_w(state); } - DECLARE_WRITE_LINE_MEMBER( dreq0_w ) { m_dma1->dreq0_w(state); } - DECLARE_WRITE_LINE_MEMBER( dreq1_w ) { m_dma1->dreq1_w(state); } - DECLARE_WRITE_LINE_MEMBER( dreq2_w ) { m_dma1->dreq2_w(state); } - DECLARE_WRITE_LINE_MEMBER( dreq3_w ) { m_dma1->dreq3_w(state); } - DECLARE_WRITE_LINE_MEMBER( dreq5_w ) { m_dma2->dreq1_w(state); } - DECLARE_WRITE_LINE_MEMBER( dreq6_w ) { m_dma2->dreq2_w(state); } - DECLARE_WRITE_LINE_MEMBER( dreq7_w ) { m_dma2->dreq3_w(state); } - DECLARE_WRITE_LINE_MEMBER( hlda_w ) { m_dma2->hack_w(state); } - DECLARE_WRITE_LINE_MEMBER( iochck_w ); - DECLARE_WRITE_LINE_MEMBER( gatea20_w ); - DECLARE_WRITE_LINE_MEMBER( kbrst_w ); + void irq01_w(int state) { m_intc1->ir1_w(state); } + void irq03_w(int state) { m_intc1->ir3_w(state); } + void irq04_w(int state) { m_intc1->ir4_w(state); } + void irq05_w(int state) { m_intc1->ir5_w(state); } + void irq06_w(int state) { m_intc1->ir6_w(state); } + void irq07_w(int state) { m_intc1->ir7_w(state); } + void irq09_w(int state) { m_intc2->ir1_w(state); } + void irq10_w(int state) { m_intc2->ir2_w(state); } + void irq11_w(int state) { m_intc2->ir3_w(state); } + void irq12_w(int state) { m_intc2->ir4_w(state); } + void irq13_w(int state) { m_intc2->ir5_w(state); } // also FERR# + void irq14_w(int state) { m_intc2->ir6_w(state); } + void irq15_w(int state) { m_intc2->ir7_w(state); } + void dreq0_w(int state) { m_dma1->dreq0_w(state); } + void dreq1_w(int state) { m_dma1->dreq1_w(state); } + void dreq2_w(int state) { m_dma1->dreq2_w(state); } + void dreq3_w(int state) { m_dma1->dreq3_w(state); } + void dreq5_w(int state) { m_dma2->dreq1_w(state); } + void dreq6_w(int state) { m_dma2->dreq2_w(state); } + void dreq7_w(int state) { m_dma2->dreq3_w(state); } + void hlda_w(int state) { m_dma2->hack_w(state); } + void iochck_w(int state); + void gatea20_w(int state); + void kbrst_w(int state); IRQ_CALLBACK_MEMBER(int_ack_r) { return m_intc1->acknowledge(); } @@ -213,7 +213,7 @@ private: void dma_write_byte(offs_t offset, uint8_t data); uint8_t dma_read_word(offs_t offset); void dma_write_word(offs_t offset, uint8_t data); - DECLARE_WRITE_LINE_MEMBER( dma1_eop_w ); + void dma1_eop_w(int state); uint8_t dma1_ior0_r() { return m_read_ior(0); } uint8_t dma1_ior1_r() { return m_read_ior(1); } uint8_t dma1_ior2_r() { return m_read_ior(2); } @@ -228,19 +228,19 @@ private: void dma2_iow1_w(uint8_t data) { m_write_iow(5, (m_dma_high_byte << 8) | data, 0xffff); } void dma2_iow2_w(uint8_t data) { m_write_iow(6, (m_dma_high_byte << 8) | data, 0xffff); } void dma2_iow3_w(uint8_t data) { m_write_iow(7, (m_dma_high_byte << 8) | data, 0xffff); } - DECLARE_WRITE_LINE_MEMBER( dma1_dack0_w ) { set_dma_channel(0, state); } - DECLARE_WRITE_LINE_MEMBER( dma1_dack1_w ) { set_dma_channel(1, state); } - DECLARE_WRITE_LINE_MEMBER( dma1_dack2_w ) { set_dma_channel(2, state); } - DECLARE_WRITE_LINE_MEMBER( dma1_dack3_w ) { set_dma_channel(3, state); } - DECLARE_WRITE_LINE_MEMBER( dma2_dack0_w ); - DECLARE_WRITE_LINE_MEMBER( dma2_dack1_w ) { set_dma_channel(5, state); } - DECLARE_WRITE_LINE_MEMBER( dma2_dack2_w ) { set_dma_channel(6, state); } - DECLARE_WRITE_LINE_MEMBER( dma2_dack3_w ) { set_dma_channel(7, state); } - DECLARE_WRITE_LINE_MEMBER( dma2_hreq_w ) { m_write_hold(state); } - DECLARE_WRITE_LINE_MEMBER( intc1_int_w ) { m_write_intr(state); } + void dma1_dack0_w(int state) { set_dma_channel(0, state); } + void dma1_dack1_w(int state) { set_dma_channel(1, state); } + void dma1_dack2_w(int state) { set_dma_channel(2, state); } + void dma1_dack3_w(int state) { set_dma_channel(3, state); } + void dma2_dack0_w(int state); + void dma2_dack1_w(int state) { set_dma_channel(5, state); } + void dma2_dack2_w(int state) { set_dma_channel(6, state); } + void dma2_dack3_w(int state) { set_dma_channel(7, state); } + void dma2_hreq_w(int state) { m_write_hold(state); } + void intc1_int_w(int state) { m_write_intr(state); } uint8_t intc1_slave_ack_r(offs_t offset); - DECLARE_WRITE_LINE_MEMBER( ctc_out1_w ); - DECLARE_WRITE_LINE_MEMBER( ctc_out2_w ); + void ctc_out1_w(int state); + void ctc_out2_w(int state); }; DECLARE_DEVICE_TYPE(CS4031, cs4031_device) diff --git a/src/devices/machine/dl11.cpp b/src/devices/machine/dl11.cpp index cde90816cc3..3e42b3b9c71 100644 --- a/src/devices/machine/dl11.cpp +++ b/src/devices/machine/dl11.cpp @@ -272,7 +272,7 @@ void dl11_device::write(offs_t offset, uint16_t data, uint16_t mem_mask) // rxrdy_r - receiver ready //------------------------------------------------- -READ_LINE_MEMBER(dl11_device::rxrdy_r) +int dl11_device::rxrdy_r() { return ((m_rcsr & (CSR_DONE | CSR_IE)) == (CSR_DONE | CSR_IE)) ? ASSERT_LINE : CLEAR_LINE; } @@ -282,7 +282,7 @@ READ_LINE_MEMBER(dl11_device::rxrdy_r) // txrdy_r - transmitter empty //------------------------------------------------- -READ_LINE_MEMBER(dl11_device::txrdy_r) +int dl11_device::txrdy_r() { return ((m_tcsr & (CSR_DONE | CSR_IE)) == (CSR_DONE | CSR_IE)) ? ASSERT_LINE : CLEAR_LINE; } diff --git a/src/devices/machine/dl11.h b/src/devices/machine/dl11.h index 37dd3d9c614..d3120f5e6af 100644 --- a/src/devices/machine/dl11.h +++ b/src/devices/machine/dl11.h @@ -43,10 +43,10 @@ public: uint16_t read(offs_t offset); void write(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); - DECLARE_READ_LINE_MEMBER( rxrdy_r ); - DECLARE_READ_LINE_MEMBER( txrdy_r ); + int rxrdy_r(); + int txrdy_r(); - DECLARE_WRITE_LINE_MEMBER( rx_w ) { device_serial_interface::rx_w(state); } + void rx_w(int state) { device_serial_interface::rx_w(state); } protected: // device-level overrides diff --git a/src/devices/machine/dmac.cpp b/src/devices/machine/dmac.cpp index 0705f28c060..8852bc2f4cf 100644 --- a/src/devices/machine/dmac.cpp +++ b/src/devices/machine/dmac.cpp @@ -333,7 +333,7 @@ void amiga_dmac_device::register_write(offs_t offset, uint16_t data, uint16_t me } // this signal tells us to expose our autoconfig values -WRITE_LINE_MEMBER( amiga_dmac_device::configin_w ) +void amiga_dmac_device::configin_w(int state) { LOG("%s('%s'): configin_w (%d)\n", shortname(), basetag(), state); @@ -388,7 +388,7 @@ WRITE_LINE_MEMBER( amiga_dmac_device::configin_w ) } // this sets the ram size depending on the line voltage -WRITE_LINE_MEMBER( amiga_dmac_device::ramsz_w ) +void amiga_dmac_device::ramsz_w(int state) { LOG("%s('%s'): ramsz_w (%d)\n", shortname(), basetag(), state); @@ -402,7 +402,7 @@ WRITE_LINE_MEMBER( amiga_dmac_device::ramsz_w ) } // reset the device -WRITE_LINE_MEMBER( amiga_dmac_device::rst_w ) +void amiga_dmac_device::rst_w(int state) { LOG("%s('%s'): rst_w (%d)\n", shortname(), basetag(), state); @@ -413,7 +413,7 @@ WRITE_LINE_MEMBER( amiga_dmac_device::rst_w ) } // external interrupt -WRITE_LINE_MEMBER( amiga_dmac_device::intx_w ) +void amiga_dmac_device::intx_w(int state) { LOG("%s('%s'): intx_w (%d)\n", shortname(), basetag(), state); @@ -426,7 +426,7 @@ WRITE_LINE_MEMBER( amiga_dmac_device::intx_w ) } // data request -WRITE_LINE_MEMBER( amiga_dmac_device::xdreq_w ) +void amiga_dmac_device::xdreq_w(int state) { LOG("%s('%s'): xdreq_w (%d)\n", shortname(), basetag(), state); diff --git a/src/devices/machine/dmac.h b/src/devices/machine/dmac.h index 47c5f9f93d3..e6af4efa049 100644 --- a/src/devices/machine/dmac.h +++ b/src/devices/machine/dmac.h @@ -40,11 +40,11 @@ public: void set_ram(uint8_t *ram) { m_ram = ram; } // input lines - DECLARE_WRITE_LINE_MEMBER( configin_w ); - DECLARE_WRITE_LINE_MEMBER( ramsz_w ); - DECLARE_WRITE_LINE_MEMBER( rst_w ); - DECLARE_WRITE_LINE_MEMBER( intx_w ); - DECLARE_WRITE_LINE_MEMBER( xdreq_w ); + void configin_w(int state); + void ramsz_w(int state); + void rst_w(int state); + void intx_w(int state); + void xdreq_w(int state); // dmac register access uint16_t register_read(address_space &space, offs_t offset, uint16_t mem_mask = ~0); diff --git a/src/devices/machine/dp8390.cpp b/src/devices/machine/dp8390.cpp index 49b98e94846..3790b543acf 100644 --- a/src/devices/machine/dp8390.cpp +++ b/src/devices/machine/dp8390.cpp @@ -171,7 +171,7 @@ void dp8390_device::recv_cb(uint8_t *buf, int len) { if(!LOOPBACK) recv(buf, len); } -WRITE_LINE_MEMBER(dp8390_device::dp8390_reset) { +void dp8390_device::dp8390_reset(int state) { if(!state) device_reset(); } diff --git a/src/devices/machine/dp8390.h b/src/devices/machine/dp8390.h index 7e87ffe44db..0f484c5e45f 100644 --- a/src/devices/machine/dp8390.h +++ b/src/devices/machine/dp8390.h @@ -22,7 +22,7 @@ public: void cs_write(offs_t offset, uint8_t data); uint16_t remote_read(); uint8_t cs_read(offs_t offset); - DECLARE_WRITE_LINE_MEMBER( dp8390_reset ); + void dp8390_reset(int state); void recv_cb(uint8_t *buf, int len) override; protected: diff --git a/src/devices/machine/ds1204.cpp b/src/devices/machine/ds1204.cpp index 6d4fd46fc54..cb00558207d 100644 --- a/src/devices/machine/ds1204.cpp +++ b/src/devices/machine/ds1204.cpp @@ -160,7 +160,7 @@ void ds1204_device::readbit( uint8_t *buffer ) } } -WRITE_LINE_MEMBER( ds1204_device::write_rst ) +void ds1204_device::write_rst(int state) { if( m_rst != state ) { @@ -192,7 +192,7 @@ WRITE_LINE_MEMBER( ds1204_device::write_rst ) } } -WRITE_LINE_MEMBER( ds1204_device::write_clk ) +void ds1204_device::write_clk(int state) { if( m_clk != state ) { @@ -360,7 +360,7 @@ WRITE_LINE_MEMBER( ds1204_device::write_clk ) } } -WRITE_LINE_MEMBER( ds1204_device::write_dq ) +void ds1204_device::write_dq(int state) { if( m_dqw != state ) { @@ -370,7 +370,7 @@ WRITE_LINE_MEMBER( ds1204_device::write_dq ) } } -READ_LINE_MEMBER( ds1204_device::read_dq ) +int ds1204_device::read_dq() { if( m_dqr == DQ_HIGH_IMPEDANCE ) { diff --git a/src/devices/machine/ds1204.h b/src/devices/machine/ds1204.h index 7a51463ac67..fd7b9f8b39f 100644 --- a/src/devices/machine/ds1204.h +++ b/src/devices/machine/ds1204.h @@ -19,10 +19,10 @@ public: // construction/destruction ds1204_device( const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = 0 ); - DECLARE_WRITE_LINE_MEMBER( write_rst ); - DECLARE_WRITE_LINE_MEMBER( write_clk ); - DECLARE_WRITE_LINE_MEMBER( write_dq ); - DECLARE_READ_LINE_MEMBER( read_dq ); + void write_rst(int state); + void write_clk(int state); + void write_dq(int state); + int read_dq(); protected: // device-level overrides diff --git a/src/devices/machine/ds1205.cpp b/src/devices/machine/ds1205.cpp index 7bafe3b6a88..e5d1335cf75 100644 --- a/src/devices/machine/ds1205.cpp +++ b/src/devices/machine/ds1205.cpp @@ -174,7 +174,7 @@ void ds1205_device::readbit( u8 *buffer ) } } -WRITE_LINE_MEMBER( ds1205_device::write_rst ) +void ds1205_device::write_rst(int state) { if( m_rst != state ) { @@ -206,7 +206,7 @@ WRITE_LINE_MEMBER( ds1205_device::write_rst ) } } -WRITE_LINE_MEMBER( ds1205_device::write_clk ) +void ds1205_device::write_clk(int state) { if( m_clk != state ) { @@ -383,7 +383,7 @@ WRITE_LINE_MEMBER( ds1205_device::write_clk ) } } -WRITE_LINE_MEMBER( ds1205_device::write_dq ) +void ds1205_device::write_dq(int state) { if( m_dqw != state ) { @@ -393,7 +393,7 @@ WRITE_LINE_MEMBER( ds1205_device::write_dq ) } } -READ_LINE_MEMBER( ds1205_device::read_dq ) +int ds1205_device::read_dq() { if( m_dqr == DQ_HIGH_IMPEDANCE ) { diff --git a/src/devices/machine/ds1205.h b/src/devices/machine/ds1205.h index 0098142e65f..f406fa428ca 100644 --- a/src/devices/machine/ds1205.h +++ b/src/devices/machine/ds1205.h @@ -19,10 +19,10 @@ public: // construction/destruction ds1205_device( const machine_config &mconfig, const char *tag, device_t *owner, u32 clock = 0); - DECLARE_WRITE_LINE_MEMBER( write_rst ); - DECLARE_WRITE_LINE_MEMBER( write_clk ); - DECLARE_WRITE_LINE_MEMBER( write_dq ); - DECLARE_READ_LINE_MEMBER( read_dq ); + void write_rst(int state); + void write_clk(int state); + void write_dq(int state); + int read_dq(); protected: // device-level overrides diff --git a/src/devices/machine/ds1207.cpp b/src/devices/machine/ds1207.cpp index 84a46097f08..64eae8ab879 100644 --- a/src/devices/machine/ds1207.cpp +++ b/src/devices/machine/ds1207.cpp @@ -210,7 +210,7 @@ void ds1207_device::readbit(uint8_t *buffer) } } -WRITE_LINE_MEMBER(ds1207_device::write_rst) +void ds1207_device::write_rst(int state) { const uint8_t this_state = state ? 1 : 0; if(m_rst != this_state) @@ -245,7 +245,7 @@ WRITE_LINE_MEMBER(ds1207_device::write_rst) } } -WRITE_LINE_MEMBER(ds1207_device::write_clk) +void ds1207_device::write_clk(int state) { const uint8_t this_state = state ? 1 : 0; if(m_clk != this_state) @@ -491,7 +491,7 @@ WRITE_LINE_MEMBER(ds1207_device::write_clk) } } -WRITE_LINE_MEMBER(ds1207_device::write_dq) +void ds1207_device::write_dq(int state) { const uint8_t this_state = state ? 1 : 0; if(m_dqw != this_state) @@ -502,7 +502,7 @@ WRITE_LINE_MEMBER(ds1207_device::write_dq) } } -READ_LINE_MEMBER(ds1207_device::read_dq) +int ds1207_device::read_dq() { if(m_dqr == DQ_HIGH_IMPEDANCE) { diff --git a/src/devices/machine/ds1207.h b/src/devices/machine/ds1207.h index d93af480b1b..8afdeeb755d 100644 --- a/src/devices/machine/ds1207.h +++ b/src/devices/machine/ds1207.h @@ -20,10 +20,10 @@ public: // construction/destruction ds1207_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = 0); - DECLARE_WRITE_LINE_MEMBER(write_rst); - DECLARE_WRITE_LINE_MEMBER(write_clk); - DECLARE_WRITE_LINE_MEMBER(write_dq); - DECLARE_READ_LINE_MEMBER(read_dq); + void write_rst(int state); + void write_clk(int state); + void write_dq(int state); + int read_dq(); protected: // device-level overrides diff --git a/src/devices/machine/ds1302.cpp b/src/devices/machine/ds1302.cpp index 8d32c3fd3ff..154716aa346 100644 --- a/src/devices/machine/ds1302.cpp +++ b/src/devices/machine/ds1302.cpp @@ -196,7 +196,7 @@ void ds1302_device::rtc_clock_updated(int year, int month, int day, int day_of_w // ce_w - chip enable write //------------------------------------------------- -WRITE_LINE_MEMBER( ds1302_device::ce_w ) +void ds1302_device::ce_w(int state) { if (state && !m_ce) { @@ -388,7 +388,7 @@ void ds1302_device::output_bit() // sclk_w - serial clock write //------------------------------------------------- -WRITE_LINE_MEMBER( ds1302_device::sclk_w ) +void ds1302_device::sclk_w(int state) { //LOG("Serial CLK: %u\n", state); @@ -408,7 +408,7 @@ WRITE_LINE_MEMBER( ds1302_device::sclk_w ) // io_w - I/O write //------------------------------------------------- -WRITE_LINE_MEMBER( ds1302_device::io_w ) +void ds1302_device::io_w(int state) { //LOG("Serial I/O: %u\n", state); @@ -420,7 +420,7 @@ WRITE_LINE_MEMBER( ds1302_device::io_w ) // io_r - I/O read //------------------------------------------------- -READ_LINE_MEMBER( ds1302_device::io_r ) +int ds1302_device::io_r() { return m_io; } diff --git a/src/devices/machine/ds1302.h b/src/devices/machine/ds1302.h index 9b1d09e9840..6d79cbb2c11 100644 --- a/src/devices/machine/ds1302.h +++ b/src/devices/machine/ds1302.h @@ -36,10 +36,10 @@ public: // construction/destruction ds1302_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - DECLARE_WRITE_LINE_MEMBER( ce_w ); - DECLARE_WRITE_LINE_MEMBER( sclk_w ); - DECLARE_WRITE_LINE_MEMBER( io_w ); - DECLARE_READ_LINE_MEMBER( io_r ); + void ce_w(int state); + void sclk_w(int state); + void io_w(int state); + int io_r(); protected: ds1302_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock, uint8_t ram_size); diff --git a/src/devices/machine/ds1386.h b/src/devices/machine/ds1386.h index dd07c49c79f..72740b7eeda 100644 --- a/src/devices/machine/ds1386.h +++ b/src/devices/machine/ds1386.h @@ -88,9 +88,9 @@ public: void data_w(offs_t offset, uint8_t data); uint8_t data_r(offs_t offset); - DECLARE_WRITE_LINE_MEMBER( ce_w ); - DECLARE_WRITE_LINE_MEMBER( oe_w ); - DECLARE_WRITE_LINE_MEMBER( we_w ); + void ce_w(int state); + void oe_w(int state); + void we_w(int state); protected: enum diff --git a/src/devices/machine/ds1994.cpp b/src/devices/machine/ds1994.cpp index cff5a921c05..a64a36b5c26 100644 --- a/src/devices/machine/ds1994.cpp +++ b/src/devices/machine/ds1994.cpp @@ -584,7 +584,7 @@ TIMER_CALLBACK_MEMBER(ds1994_device::clock_tick) /* */ /*********************/ -WRITE_LINE_MEMBER(ds1994_device::write) +void ds1994_device::write(int state) { LOGMASKED(LOG_WRITES, "write(%d)\n", state); if (!state && m_rx) @@ -723,7 +723,7 @@ WRITE_LINE_MEMBER(ds1994_device::write) /* */ /*********************/ -READ_LINE_MEMBER(ds1994_device::read) +int ds1994_device::read() { LOGMASKED(LOG_READS, "read %d\n", m_tx && m_rx); return m_tx && m_rx; diff --git a/src/devices/machine/ds1994.h b/src/devices/machine/ds1994.h index c6629b6fbb9..248fc6e8e90 100644 --- a/src/devices/machine/ds1994.h +++ b/src/devices/machine/ds1994.h @@ -30,8 +30,8 @@ class ds1994_device : public device_t, public device_nvram_interface void ref_month(uint8_t month) { m_ref_month = month; } void ref_day(uint8_t day) { m_ref_day = day; } - DECLARE_WRITE_LINE_MEMBER(write); - DECLARE_READ_LINE_MEMBER(read); + void write(int state); + int read(); protected: // device-level overrides diff --git a/src/devices/machine/ds2401.cpp b/src/devices/machine/ds2401.cpp index e2236eef5d2..d3a6abc3f54 100644 --- a/src/devices/machine/ds2401.cpp +++ b/src/devices/machine/ds2401.cpp @@ -169,7 +169,7 @@ TIMER_CALLBACK_MEMBER(ds2401_device::main_tick) } } -WRITE_LINE_MEMBER( ds2401_device::write ) +void ds2401_device::write(int state) { verboselog(1, "write(%d)\n", state); @@ -229,7 +229,7 @@ WRITE_LINE_MEMBER( ds2401_device::write ) m_rx = state; } -READ_LINE_MEMBER( ds2401_device::read ) +int ds2401_device::read() { verboselog(2, "read %d\n", m_tx && m_rx); return m_tx && m_rx; diff --git a/src/devices/machine/ds2401.h b/src/devices/machine/ds2401.h index f29132d381e..30d266be796 100644 --- a/src/devices/machine/ds2401.h +++ b/src/devices/machine/ds2401.h @@ -24,8 +24,8 @@ public: ds2401_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - DECLARE_WRITE_LINE_MEMBER( write ); - DECLARE_READ_LINE_MEMBER( read ); + void write(int state); + int read(); uint8_t direct_read(int index); protected: diff --git a/src/devices/machine/ds2430a.cpp b/src/devices/machine/ds2430a.cpp index 1d659a3ef6f..d7b38285e23 100644 --- a/src/devices/machine/ds2430a.cpp +++ b/src/devices/machine/ds2430a.cpp @@ -137,7 +137,7 @@ void ds1wire_device::device_start() // data_r - read signal on data line //------------------------------------------------- -READ_LINE_MEMBER(ds1wire_device::data_r) +int ds1wire_device::data_r() { // Open drain output produces wired-AND signal return m_data_in && m_data_out; @@ -148,7 +148,7 @@ READ_LINE_MEMBER(ds1wire_device::data_r) // data_w - write bit to data line //------------------------------------------------- -WRITE_LINE_MEMBER(ds1wire_device::data_w) +void ds1wire_device::data_w(int state) { // Look for transitions if (m_data_in && !state) diff --git a/src/devices/machine/ds2430a.h b/src/devices/machine/ds2430a.h index 64d426c9b77..2d00e9f31ff 100644 --- a/src/devices/machine/ds2430a.h +++ b/src/devices/machine/ds2430a.h @@ -54,8 +54,8 @@ public: void set_timing_scale(double scale) { m_timing_scale = scale; } // serial data line handlers - DECLARE_READ_LINE_MEMBER(data_r); - DECLARE_WRITE_LINE_MEMBER(data_w); + int data_r(); + void data_w(int state); protected: // device-level overrides diff --git a/src/devices/machine/ds6417.cpp b/src/devices/machine/ds6417.cpp index f04e857473c..dcde73f2a43 100644 --- a/src/devices/machine/ds6417.cpp +++ b/src/devices/machine/ds6417.cpp @@ -61,7 +61,7 @@ uint8_t ds6417_device::calccrc(uint8_t bit, uint8_t crc) const return crc >> 1; } -WRITE_LINE_MEMBER( ds6417_device::clock_w ) +void ds6417_device::clock_w(int state) { if(!m_reset || !exists()) return; diff --git a/src/devices/machine/ds6417.h b/src/devices/machine/ds6417.h index 457639bfcbf..c71f7186d14 100644 --- a/src/devices/machine/ds6417.h +++ b/src/devices/machine/ds6417.h @@ -24,10 +24,10 @@ public: virtual std::pair call_load() override; virtual std::pair call_create(int format_type, util::option_resolution *format_options) override; - DECLARE_WRITE_LINE_MEMBER(data_w) { if(!m_read) m_data = state; } - DECLARE_WRITE_LINE_MEMBER(clock_w); - DECLARE_WRITE_LINE_MEMBER(reset_w) { if(!state && m_reset) reset(); m_reset = state; } - DECLARE_READ_LINE_MEMBER(data_r) { return m_read ? m_data : 0; } + void data_w(int state) { if(!m_read) m_data = state; } + void clock_w(int state); + void reset_w(int state) { if(!state && m_reset) reset(); m_reset = state; } + int data_r() { return m_read ? m_data : 0; } protected: virtual void device_start() override; diff --git a/src/devices/machine/ds75160a.cpp b/src/devices/machine/ds75160a.cpp index d5ad8007a61..e376b96606a 100644 --- a/src/devices/machine/ds75160a.cpp +++ b/src/devices/machine/ds75160a.cpp @@ -91,7 +91,7 @@ void ds75160a_device::write(uint8_t data) // te_w - transmit enable //------------------------------------------------- -WRITE_LINE_MEMBER( ds75160a_device::te_w ) +void ds75160a_device::te_w(int state) { if (m_te != state) { @@ -106,7 +106,7 @@ WRITE_LINE_MEMBER( ds75160a_device::te_w ) // pe_w - parallel enable //------------------------------------------------- -WRITE_LINE_MEMBER( ds75160a_device::pe_w ) +void ds75160a_device::pe_w(int state) { m_pe = state; } diff --git a/src/devices/machine/ds75160a.h b/src/devices/machine/ds75160a.h index 5e2498d28ad..d26f2cabd46 100644 --- a/src/devices/machine/ds75160a.h +++ b/src/devices/machine/ds75160a.h @@ -43,8 +43,8 @@ public: uint8_t read(); void write(uint8_t data); - DECLARE_WRITE_LINE_MEMBER( te_w ); - DECLARE_WRITE_LINE_MEMBER( pe_w ); + void te_w(int state); + void pe_w(int state); protected: // device-level overrides diff --git a/src/devices/machine/ds75161a.cpp b/src/devices/machine/ds75161a.cpp index 9d75d6b65a0..19535dec193 100644 --- a/src/devices/machine/ds75161a.cpp +++ b/src/devices/machine/ds75161a.cpp @@ -123,7 +123,7 @@ void ds75161a_device::update_signals() // te_w - transmit enable //------------------------------------------------- -WRITE_LINE_MEMBER( ds75161a_device::te_w ) +void ds75161a_device::te_w(int state) { if (m_te != state) { @@ -138,7 +138,7 @@ WRITE_LINE_MEMBER( ds75161a_device::te_w ) // dc_w - direction control //------------------------------------------------- -WRITE_LINE_MEMBER( ds75161a_device::dc_w ) +void ds75161a_device::dc_w(int state) { if (m_dc != state) { @@ -153,7 +153,7 @@ WRITE_LINE_MEMBER( ds75161a_device::dc_w ) // ren_r - remote enable read //------------------------------------------------- -READ_LINE_MEMBER( ds75161a_device::ren_r ) +int ds75161a_device::ren_r() { return m_dc ? m_in_ren_cb() : 0; } @@ -163,7 +163,7 @@ READ_LINE_MEMBER( ds75161a_device::ren_r ) // ifc_r - interface clear read //------------------------------------------------- -READ_LINE_MEMBER( ds75161a_device::ifc_r ) +int ds75161a_device::ifc_r() { return m_dc ? m_in_ifc_cb() : 0; } @@ -173,7 +173,7 @@ READ_LINE_MEMBER( ds75161a_device::ifc_r ) // ndac_r - not data acknowledge read //------------------------------------------------- -READ_LINE_MEMBER( ds75161a_device::ndac_r ) +int ds75161a_device::ndac_r() { return m_te ? m_in_ndac_cb() : 0; } @@ -183,7 +183,7 @@ READ_LINE_MEMBER( ds75161a_device::ndac_r ) // nrfd_r - not ready for data read //------------------------------------------------- -READ_LINE_MEMBER( ds75161a_device::nrfd_r ) +int ds75161a_device::nrfd_r() { return m_te ? m_in_nrfd_cb() : 0; } @@ -193,7 +193,7 @@ READ_LINE_MEMBER( ds75161a_device::nrfd_r ) // dav_r - data valid read //------------------------------------------------- -READ_LINE_MEMBER( ds75161a_device::dav_r ) +int ds75161a_device::dav_r() { return m_te ? 0 : m_in_dav_cb(); } @@ -203,7 +203,7 @@ READ_LINE_MEMBER( ds75161a_device::dav_r ) // eoi_r - end or identify read //------------------------------------------------- -READ_LINE_MEMBER( ds75161a_device::eoi_r ) +int ds75161a_device::eoi_r() { int atn = m_in_atn_cb(); int eoi = m_in_eoi_cb(); @@ -218,7 +218,7 @@ READ_LINE_MEMBER( ds75161a_device::eoi_r ) // atn_r - attention read //------------------------------------------------- -READ_LINE_MEMBER( ds75161a_device::atn_r ) +int ds75161a_device::atn_r() { return m_dc ? m_in_atn_cb() : 0; } @@ -228,7 +228,7 @@ READ_LINE_MEMBER( ds75161a_device::atn_r ) // srq_r - service request read //------------------------------------------------- -READ_LINE_MEMBER( ds75161a_device::srq_r ) +int ds75161a_device::srq_r() { return m_dc ? 0 : m_in_srq_cb(); } @@ -238,7 +238,7 @@ READ_LINE_MEMBER( ds75161a_device::srq_r ) // ren_w - remote enable write //------------------------------------------------- -WRITE_LINE_MEMBER( ds75161a_device::ren_w ) +void ds75161a_device::ren_w(int state) { if (m_ren != state) { @@ -253,7 +253,7 @@ WRITE_LINE_MEMBER( ds75161a_device::ren_w ) // ifc_w - interface clear write //------------------------------------------------- -WRITE_LINE_MEMBER( ds75161a_device::ifc_w ) +void ds75161a_device::ifc_w(int state) { if (m_ifc != state) { @@ -268,7 +268,7 @@ WRITE_LINE_MEMBER( ds75161a_device::ifc_w ) // ndac_w - not data acknowledge write //------------------------------------------------- -WRITE_LINE_MEMBER( ds75161a_device::ndac_w ) +void ds75161a_device::ndac_w(int state) { if (m_ndac != state) { @@ -283,7 +283,7 @@ WRITE_LINE_MEMBER( ds75161a_device::ndac_w ) // nrfd_w - not ready for data write //------------------------------------------------- -WRITE_LINE_MEMBER( ds75161a_device::nrfd_w ) +void ds75161a_device::nrfd_w(int state) { if (m_nrfd != state) { @@ -298,7 +298,7 @@ WRITE_LINE_MEMBER( ds75161a_device::nrfd_w ) // dav_w - data valid write //------------------------------------------------- -WRITE_LINE_MEMBER( ds75161a_device::dav_w ) +void ds75161a_device::dav_w(int state) { if (m_dav != state) { @@ -313,7 +313,7 @@ WRITE_LINE_MEMBER( ds75161a_device::dav_w ) // eoi_w - end or identify write //------------------------------------------------- -WRITE_LINE_MEMBER( ds75161a_device::eoi_w ) +void ds75161a_device::eoi_w(int state) { if (m_eoi != state) { @@ -328,7 +328,7 @@ WRITE_LINE_MEMBER( ds75161a_device::eoi_w ) // atn_w - attention write //------------------------------------------------- -WRITE_LINE_MEMBER( ds75161a_device::atn_w ) +void ds75161a_device::atn_w(int state) { if (m_atn != state) { @@ -343,7 +343,7 @@ WRITE_LINE_MEMBER( ds75161a_device::atn_w ) // srq_w - service request write //------------------------------------------------- -WRITE_LINE_MEMBER( ds75161a_device::srq_w ) +void ds75161a_device::srq_w(int state) { if (m_srq != state) { diff --git a/src/devices/machine/ds75161a.h b/src/devices/machine/ds75161a.h index 8ea0a0b9632..a304b2893b3 100644 --- a/src/devices/machine/ds75161a.h +++ b/src/devices/machine/ds75161a.h @@ -47,26 +47,26 @@ public: auto out_atn() { return m_out_atn_cb.bind(); } auto out_srq() { return m_out_srq_cb.bind(); } - DECLARE_WRITE_LINE_MEMBER( te_w ); - DECLARE_WRITE_LINE_MEMBER( dc_w ); - - DECLARE_READ_LINE_MEMBER( ren_r ); - DECLARE_READ_LINE_MEMBER( ifc_r ); - DECLARE_READ_LINE_MEMBER( ndac_r ); - DECLARE_READ_LINE_MEMBER( nrfd_r ); - DECLARE_READ_LINE_MEMBER( dav_r ); - DECLARE_READ_LINE_MEMBER( eoi_r ); - DECLARE_READ_LINE_MEMBER( atn_r ); - DECLARE_READ_LINE_MEMBER( srq_r ); - - DECLARE_WRITE_LINE_MEMBER( ren_w ); - DECLARE_WRITE_LINE_MEMBER( ifc_w ); - DECLARE_WRITE_LINE_MEMBER( ndac_w ); - DECLARE_WRITE_LINE_MEMBER( nrfd_w ); - DECLARE_WRITE_LINE_MEMBER( dav_w ); - DECLARE_WRITE_LINE_MEMBER( eoi_w ); - DECLARE_WRITE_LINE_MEMBER( atn_w ); - DECLARE_WRITE_LINE_MEMBER( srq_w ); + void te_w(int state); + void dc_w(int state); + + int ren_r(); + int ifc_r(); + int ndac_r(); + int nrfd_r(); + int dav_r(); + int eoi_r(); + int atn_r(); + int srq_r(); + + void ren_w(int state); + void ifc_w(int state); + void ndac_w(int state); + void nrfd_w(int state); + void dav_w(int state); + void eoi_w(int state); + void atn_w(int state); + void srq_w(int state); protected: // device-level overrides diff --git a/src/devices/machine/ds8874.cpp b/src/devices/machine/ds8874.cpp index 8b6003dcad3..97dcce35bea 100644 --- a/src/devices/machine/ds8874.cpp +++ b/src/devices/machine/ds8874.cpp @@ -60,7 +60,7 @@ void ds8874_device::refresh_output() m_write_output(m_shift); } -WRITE_LINE_MEMBER(ds8874_device::data_w) +void ds8874_device::data_w(int state) { state = (state) ? 1 : 0; @@ -74,7 +74,7 @@ WRITE_LINE_MEMBER(ds8874_device::data_w) m_data = state; } -WRITE_LINE_MEMBER(ds8874_device::cp_w) +void ds8874_device::cp_w(int state) { state = (state) ? 1 : 0; diff --git a/src/devices/machine/ds8874.h b/src/devices/machine/ds8874.h index 444f15a020c..c7f0355f33d 100644 --- a/src/devices/machine/ds8874.h +++ b/src/devices/machine/ds8874.h @@ -36,8 +36,8 @@ public: // configuration helpers auto write_output() { return m_write_output.bind(); } // OUT pins - DECLARE_WRITE_LINE_MEMBER(data_w); - DECLARE_WRITE_LINE_MEMBER(cp_w); + void data_w(int state); + void cp_w(int state); protected: // device-level overrides diff --git a/src/devices/machine/e0516.cpp b/src/devices/machine/e0516.cpp index 3297f3a4242..7cae578ad2b 100644 --- a/src/devices/machine/e0516.cpp +++ b/src/devices/machine/e0516.cpp @@ -111,7 +111,7 @@ TIMER_CALLBACK_MEMBER(e0516_device::timer_tick) // cs_w - chip select input //------------------------------------------------- -WRITE_LINE_MEMBER( e0516_device::cs_w ) +void e0516_device::cs_w(int state) { if (m_cs != state) { @@ -143,7 +143,7 @@ WRITE_LINE_MEMBER( e0516_device::cs_w ) // clk_w - serial clock input //------------------------------------------------- -WRITE_LINE_MEMBER( e0516_device::clk_w ) +void e0516_device::clk_w(int state) { if (m_cs) return; if (m_clk == state) return; @@ -302,7 +302,7 @@ WRITE_LINE_MEMBER( e0516_device::clk_w ) // dio_w - serial data input //------------------------------------------------- -WRITE_LINE_MEMBER( e0516_device::dio_w ) +void e0516_device::dio_w(int state) { LOG("E05-16 '%s' DIO %u\n", tag(), state); @@ -317,7 +317,7 @@ WRITE_LINE_MEMBER( e0516_device::dio_w ) // do_r - serial data output //------------------------------------------------- -READ_LINE_MEMBER( e0516_device::dio_r ) +int e0516_device::dio_r() { if (m_cs || (m_state == STATE_HI_Z)) { @@ -333,7 +333,7 @@ READ_LINE_MEMBER( e0516_device::dio_r ) // reset_w - reset input //------------------------------------------------- -WRITE_LINE_MEMBER( e0516_device::reset_w ) +void e0516_device::reset_w(int state) { LOG("E05-16 '%s' RESET %u\n", tag(), state); diff --git a/src/devices/machine/e0516.h b/src/devices/machine/e0516.h index 2168060f535..0e1bff9759d 100644 --- a/src/devices/machine/e0516.h +++ b/src/devices/machine/e0516.h @@ -36,11 +36,11 @@ public: auto hrs_wr_cb() { return m_write_hrs.bind(); } auto day_wr_cb() { return m_write_day.bind(); } - DECLARE_WRITE_LINE_MEMBER( cs_w ); - DECLARE_WRITE_LINE_MEMBER( clk_w ); - DECLARE_WRITE_LINE_MEMBER( dio_w ); - DECLARE_READ_LINE_MEMBER( dio_r ); - DECLARE_WRITE_LINE_MEMBER( reset_w ); + void cs_w(int state); + void clk_w(int state); + void dio_w(int state); + int dio_r(); + void reset_w(int state); protected: // device-level overrides diff --git a/src/devices/machine/e05a03.cpp b/src/devices/machine/e05a03.cpp index 66a2a6785cc..cd01df5c7b2 100644 --- a/src/devices/machine/e05a03.cpp +++ b/src/devices/machine/e05a03.cpp @@ -155,25 +155,25 @@ uint8_t e05a03_device::read(offs_t offset) } /* home position signal */ -WRITE_LINE_MEMBER( e05a03_device::home_w ) +void e05a03_device::home_w(int state) { } /* printhead solenoids trigger */ -WRITE_LINE_MEMBER( e05a03_device::fire_w ) +void e05a03_device::fire_w(int state) { } -WRITE_LINE_MEMBER( e05a03_device::strobe_w ) +void e05a03_device::strobe_w(int state) { } -READ_LINE_MEMBER( e05a03_device::busy_r ) +int e05a03_device::busy_r() { return 1; } -WRITE_LINE_MEMBER( e05a03_device::resi_w ) +void e05a03_device::resi_w(int state) { if (!state) { @@ -182,7 +182,7 @@ WRITE_LINE_MEMBER( e05a03_device::resi_w ) } } -WRITE_LINE_MEMBER( e05a03_device::init_w ) +void e05a03_device::init_w(int state) { resi_w(state); } diff --git a/src/devices/machine/e05a03.h b/src/devices/machine/e05a03.h index 4748bb3a84b..4193e218a38 100644 --- a/src/devices/machine/e05a03.h +++ b/src/devices/machine/e05a03.h @@ -29,12 +29,12 @@ public: void write(offs_t offset, uint8_t data); uint8_t read(offs_t offset); - WRITE_LINE_MEMBER( home_w ); /* home position signal */ - WRITE_LINE_MEMBER( fire_w ); /* printhead solenoids trigger */ - WRITE_LINE_MEMBER( strobe_w ); - READ_LINE_MEMBER( busy_r ); - WRITE_LINE_MEMBER( resi_w ); /* reset input */ - WRITE_LINE_MEMBER( init_w ); /* centronics init */ + void home_w(int state); /* home position signal */ + void fire_w(int state); /* printhead solenoids trigger */ + void strobe_w(int state); + int busy_r(); + void resi_w(int state); /* reset input */ + void init_w(int state); /* centronics init */ protected: // device-level overrides diff --git a/src/devices/machine/e05a30.cpp b/src/devices/machine/e05a30.cpp index 44d90904644..eece1540855 100644 --- a/src/devices/machine/e05a30.cpp +++ b/src/devices/machine/e05a30.cpp @@ -150,7 +150,7 @@ void e05a30_device::update_cr_stepper(uint8_t data) Centronics ***************************************************************************/ -WRITE_LINE_MEMBER( e05a30_device::centronics_input_strobe ) +void e05a30_device::centronics_input_strobe(int state) { if (m_centronics_strobe == true && state == false && !m_centronics_busy) { m_centronics_data_latch = m_centronics_data; @@ -165,7 +165,7 @@ WRITE_LINE_MEMBER( e05a30_device::centronics_input_strobe ) } -WRITE_LINE_MEMBER( e05a30_device::centronics_input_init ) +void e05a30_device::centronics_input_init(int state) { if (m_centronics_init == 1 && state == 0) // when init goes low, do a reset cycle { diff --git a/src/devices/machine/e05a30.h b/src/devices/machine/e05a30.h index 41bd94d999d..943502a808f 100644 --- a/src/devices/machine/e05a30.h +++ b/src/devices/machine/e05a30.h @@ -31,16 +31,16 @@ public: uint8_t read(offs_t offset); /* Centronics stuff */ - DECLARE_WRITE_LINE_MEMBER( centronics_input_init ); - DECLARE_WRITE_LINE_MEMBER( centronics_input_strobe ); - DECLARE_WRITE_LINE_MEMBER( centronics_input_data0 ) { if (state) m_centronics_data |= 0x01; else m_centronics_data &= ~0x01; } - DECLARE_WRITE_LINE_MEMBER( centronics_input_data1 ) { if (state) m_centronics_data |= 0x02; else m_centronics_data &= ~0x02; } - DECLARE_WRITE_LINE_MEMBER( centronics_input_data2 ) { if (state) m_centronics_data |= 0x04; else m_centronics_data &= ~0x04; } - DECLARE_WRITE_LINE_MEMBER( centronics_input_data3 ) { if (state) m_centronics_data |= 0x08; else m_centronics_data &= ~0x08; } - DECLARE_WRITE_LINE_MEMBER( centronics_input_data4 ) { if (state) m_centronics_data |= 0x10; else m_centronics_data &= ~0x10; } - DECLARE_WRITE_LINE_MEMBER( centronics_input_data5 ) { if (state) m_centronics_data |= 0x20; else m_centronics_data &= ~0x20; } - DECLARE_WRITE_LINE_MEMBER( centronics_input_data6 ) { if (state) m_centronics_data |= 0x40; else m_centronics_data &= ~0x40; } - DECLARE_WRITE_LINE_MEMBER( centronics_input_data7 ) { if (state) m_centronics_data |= 0x80; else m_centronics_data &= ~0x80; } + void centronics_input_init(int state); + void centronics_input_strobe(int state); + void centronics_input_data0(int state) { if (state) m_centronics_data |= 0x01; else m_centronics_data &= ~0x01; } + void centronics_input_data1(int state) { if (state) m_centronics_data |= 0x02; else m_centronics_data &= ~0x02; } + void centronics_input_data2(int state) { if (state) m_centronics_data |= 0x04; else m_centronics_data &= ~0x04; } + void centronics_input_data3(int state) { if (state) m_centronics_data |= 0x08; else m_centronics_data &= ~0x08; } + void centronics_input_data4(int state) { if (state) m_centronics_data |= 0x10; else m_centronics_data &= ~0x10; } + void centronics_input_data5(int state) { if (state) m_centronics_data |= 0x20; else m_centronics_data &= ~0x20; } + void centronics_input_data6(int state) { if (state) m_centronics_data |= 0x40; else m_centronics_data &= ~0x40; } + void centronics_input_data7(int state) { if (state) m_centronics_data |= 0x80; else m_centronics_data &= ~0x80; } int get_ready_led() { return !m_centronics_busy; } diff --git a/src/devices/machine/eeprompar.cpp b/src/devices/machine/eeprompar.cpp index 3393ae91a2c..be99c359532 100644 --- a/src/devices/machine/eeprompar.cpp +++ b/src/devices/machine/eeprompar.cpp @@ -180,7 +180,7 @@ uint8_t eeprom_parallel_28xx_device::read(address_space &space, offs_t offset) // oe_w - direct write to /OE (true line state) //------------------------------------------------- -WRITE_LINE_MEMBER(eeprom_parallel_28xx_device::oe_w) +void eeprom_parallel_28xx_device::oe_w(int state) { LOG("%s: EEPROM %s for writing\n", machine().describe_context(), state ? "unlocked" : "locked"); m_oe = state ? 1 : 0; diff --git a/src/devices/machine/eeprompar.h b/src/devices/machine/eeprompar.h index 9399e32a349..07f3e37e059 100644 --- a/src/devices/machine/eeprompar.h +++ b/src/devices/machine/eeprompar.h @@ -37,7 +37,7 @@ public: uint8_t read(address_space &space, offs_t offset); // control lines - DECLARE_WRITE_LINE_MEMBER(oe_w); + void oe_w(int state); void unlock_write8(uint8_t data); void unlock_write16(uint16_t data); void unlock_write32(uint32_t data); diff --git a/src/devices/machine/eepromser.cpp b/src/devices/machine/eepromser.cpp index dfb3f37cfae..5667a575371 100644 --- a/src/devices/machine/eepromser.cpp +++ b/src/devices/machine/eepromser.cpp @@ -656,16 +656,16 @@ void eeprom_serial_93cxx_device::parse_command_and_address() // do_read - read handlers //------------------------------------------------- -READ_LINE_MEMBER(eeprom_serial_93cxx_device::do_read) { return base_do_read() & ((m_state == STATE_WAIT_FOR_START_BIT) ? base_ready_read() : 1); } +int eeprom_serial_93cxx_device::do_read() { return base_do_read() & ((m_state == STATE_WAIT_FOR_START_BIT) ? base_ready_read() : 1); } //------------------------------------------------- // cs_write/clk_write/di_write - write handlers //------------------------------------------------- -WRITE_LINE_MEMBER(eeprom_serial_93cxx_device::cs_write) { base_cs_write(state); } -WRITE_LINE_MEMBER(eeprom_serial_93cxx_device::clk_write) { base_clk_write(state); } -WRITE_LINE_MEMBER(eeprom_serial_93cxx_device::di_write) { base_di_write(state); } +void eeprom_serial_93cxx_device::cs_write(int state) { base_cs_write(state); } +void eeprom_serial_93cxx_device::clk_write(int state) { base_clk_write(state); } +void eeprom_serial_93cxx_device::di_write(int state) { base_di_write(state); } @@ -713,17 +713,17 @@ void eeprom_serial_er5911_device::parse_command_and_address() // do_read/ready_read - read handlers //------------------------------------------------- -READ_LINE_MEMBER(eeprom_serial_er5911_device::do_read) { return base_do_read(); } -READ_LINE_MEMBER(eeprom_serial_er5911_device::ready_read) { return base_ready_read(); } +int eeprom_serial_er5911_device::do_read() { return base_do_read(); } +int eeprom_serial_er5911_device::ready_read() { return base_ready_read(); } //------------------------------------------------- // cs_write/clk_write/di_write - write handlers //------------------------------------------------- -WRITE_LINE_MEMBER(eeprom_serial_er5911_device::cs_write) { base_cs_write(state); } -WRITE_LINE_MEMBER(eeprom_serial_er5911_device::clk_write) { base_clk_write(state); } -WRITE_LINE_MEMBER(eeprom_serial_er5911_device::di_write) { base_di_write(state); } +void eeprom_serial_er5911_device::cs_write(int state) { base_cs_write(state); } +void eeprom_serial_er5911_device::clk_write(int state) { base_clk_write(state); } +void eeprom_serial_er5911_device::di_write(int state) { base_di_write(state); } @@ -1064,16 +1064,16 @@ void eeprom_serial_x24c44_device::parse_command_and_address_2_bit() // do_read/ready_read - read handlers //------------------------------------------------- -READ_LINE_MEMBER(eeprom_serial_x24c44_device::do_read) { return base_do_read(); } +int eeprom_serial_x24c44_device::do_read() { return base_do_read(); } //------------------------------------------------- // cs_write/clk_write/di_write - write handlers //------------------------------------------------- -WRITE_LINE_MEMBER(eeprom_serial_x24c44_device::cs_write) { base_cs_write(state); } -WRITE_LINE_MEMBER(eeprom_serial_x24c44_device::clk_write) { base_clk_write(state); } -WRITE_LINE_MEMBER(eeprom_serial_x24c44_device::di_write) { base_di_write(state); } +void eeprom_serial_x24c44_device::cs_write(int state) { base_cs_write(state); } +void eeprom_serial_x24c44_device::clk_write(int state) { base_clk_write(state); } +void eeprom_serial_x24c44_device::di_write(int state) { base_di_write(state); } //************************************************************************** diff --git a/src/devices/machine/eepromser.h b/src/devices/machine/eepromser.h index d3d33db19d6..4e5361e5e2f 100644 --- a/src/devices/machine/eepromser.h +++ b/src/devices/machine/eepromser.h @@ -122,12 +122,12 @@ class eeprom_serial_93cxx_device : public eeprom_serial_base_device { public: // read handlers - DECLARE_READ_LINE_MEMBER(do_read); // combined DO+READY/BUSY + int do_read(); // combined DO+READY/BUSY // write handlers - DECLARE_WRITE_LINE_MEMBER(cs_write); // CS signal (active high) - DECLARE_WRITE_LINE_MEMBER(clk_write); // CLK signal (active high) - DECLARE_WRITE_LINE_MEMBER(di_write); // DI + void cs_write(int state); // CS signal (active high) + void clk_write(int state); // CLK signal (active high) + void di_write(int state); // DI protected: // construction/destruction @@ -154,13 +154,13 @@ class eeprom_serial_er5911_device : public eeprom_serial_base_device { public: // read handlers - DECLARE_READ_LINE_MEMBER(do_read); // DO - DECLARE_READ_LINE_MEMBER(ready_read); // READY/BUSY only + int do_read(); // DO + int ready_read(); // READY/BUSY only // write handlers - DECLARE_WRITE_LINE_MEMBER(cs_write); // CS signal (active high) - DECLARE_WRITE_LINE_MEMBER(clk_write); // CLK signal (active high) - DECLARE_WRITE_LINE_MEMBER(di_write); // DI + void cs_write(int state); // CS signal (active high) + void clk_write(int state); // CLK signal (active high) + void di_write(int state); // DI protected: // construction/destruction @@ -179,12 +179,12 @@ class eeprom_serial_x24c44_device : public eeprom_serial_base_device //async store not implemented public: // read handlers - DECLARE_READ_LINE_MEMBER(do_read); // DO + int do_read(); // DO // write handlers - DECLARE_WRITE_LINE_MEMBER(cs_write); // CS signal (active high) - DECLARE_WRITE_LINE_MEMBER(clk_write); // CLK signal (active high) - DECLARE_WRITE_LINE_MEMBER(di_write); // DI + void cs_write(int state); // CS signal (active high) + void clk_write(int state); // CLK signal (active high) + void di_write(int state); // DI protected: // construction/destruction diff --git a/src/devices/machine/er1400.cpp b/src/devices/machine/er1400.cpp index 7a49272fe5c..ef589ba71d9 100644 --- a/src/devices/machine/er1400.cpp +++ b/src/devices/machine/er1400.cpp @@ -245,7 +245,7 @@ void er1400_device::erase_data() // data_w - write data input line //------------------------------------------------- -WRITE_LINE_MEMBER(er1400_device::data_w) +void er1400_device::data_w(int state) { m_data_input = bool(state); } @@ -255,7 +255,7 @@ WRITE_LINE_MEMBER(er1400_device::data_w) // c1_w - write to first control line //------------------------------------------------- -WRITE_LINE_MEMBER(er1400_device::c1_w) +void er1400_device::c1_w(int state) { if (bool(state) == BIT(m_code_input, 2)) return; @@ -270,7 +270,7 @@ WRITE_LINE_MEMBER(er1400_device::c1_w) // c2_w - write to second control line //------------------------------------------------- -WRITE_LINE_MEMBER(er1400_device::c2_w) +void er1400_device::c2_w(int state) { if (bool(state) == BIT(m_code_input, 1)) return; @@ -285,7 +285,7 @@ WRITE_LINE_MEMBER(er1400_device::c2_w) // c3_w - write to third control line //------------------------------------------------- -WRITE_LINE_MEMBER(er1400_device::c3_w) +void er1400_device::c3_w(int state) { if (bool(state) == BIT(m_code_input, 0)) return; @@ -316,7 +316,7 @@ TIMER_CALLBACK_MEMBER(er1400_device::propagate_data) // clock_w - write to clock line //------------------------------------------------- -WRITE_LINE_MEMBER(er1400_device::clock_w) +void er1400_device::clock_w(int state) { if (m_clock_input == bool(state)) return; @@ -396,7 +396,7 @@ WRITE_LINE_MEMBER(er1400_device::clock_w) // data_r - read data line //------------------------------------------------- -READ_LINE_MEMBER(er1400_device::data_r) +int er1400_device::data_r() { return m_data_input & m_data_output; } diff --git a/src/devices/machine/er1400.h b/src/devices/machine/er1400.h index 9988edd6744..045fd7a0ef8 100644 --- a/src/devices/machine/er1400.h +++ b/src/devices/machine/er1400.h @@ -35,12 +35,12 @@ public: er1400_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock = 0); // line handlers - DECLARE_WRITE_LINE_MEMBER(data_w); - DECLARE_WRITE_LINE_MEMBER(c1_w); - DECLARE_WRITE_LINE_MEMBER(c2_w); - DECLARE_WRITE_LINE_MEMBER(c3_w); - DECLARE_WRITE_LINE_MEMBER(clock_w); - DECLARE_READ_LINE_MEMBER(data_r); + void data_w(int state); + void c1_w(int state); + void c2_w(int state); + void c3_w(int state); + void clock_w(int state); + int data_r(); protected: // device-level overrides diff --git a/src/devices/machine/er2055.cpp b/src/devices/machine/er2055.cpp index 678c044122a..18bcf102593 100644 --- a/src/devices/machine/er2055.cpp +++ b/src/devices/machine/er2055.cpp @@ -163,7 +163,7 @@ void er2055_device::update_state() // successive write or erase operations //------------------------------------------------- -WRITE_LINE_MEMBER(er2055_device::set_clk) +void er2055_device::set_clk(int state) { uint8_t oldstate = m_control_state; if (state) diff --git a/src/devices/machine/er2055.h b/src/devices/machine/er2055.h index 95517abc542..449ffde2bb2 100644 --- a/src/devices/machine/er2055.h +++ b/src/devices/machine/er2055.h @@ -50,7 +50,7 @@ public: // control lines -- all lines are specified as active-high (even CS2) void set_control(uint8_t cs1, uint8_t cs2, uint8_t c1, uint8_t c2); - DECLARE_WRITE_LINE_MEMBER(set_clk); + void set_clk(int state); protected: // device-level overrides diff --git a/src/devices/machine/exorterm.cpp b/src/devices/machine/exorterm.cpp index 17e0f98a662..c5be4b2c547 100644 --- a/src/devices/machine/exorterm.cpp +++ b/src/devices/machine/exorterm.cpp @@ -304,7 +304,7 @@ void exorterm155_device::pia_kbd_pb_w(u8 data) // if the firmware uses these? } -WRITE_LINE_MEMBER(exorterm155_device::pia_cfg_cb2_w) +void exorterm155_device::pia_cfg_cb2_w(int state) { m_beeper->set_state(!state); } @@ -453,7 +453,7 @@ GFXDECODE_END // MACHINE EMULATION //************************************************************************** -WRITE_LINE_MEMBER(exorterm155_device::sys_timer_w) +void exorterm155_device::sys_timer_w(int state) { // 3.4ms m_pia_disp->cb1_w(state); @@ -473,7 +473,7 @@ WRITE_LINE_MEMBER(exorterm155_device::sys_timer_w) } } -WRITE_LINE_MEMBER(exorterm155_device::write_f1_clock) +void exorterm155_device::write_f1_clock(int state) { if (BIT(m_rs232_baud->read(), 0)) { @@ -482,7 +482,7 @@ WRITE_LINE_MEMBER(exorterm155_device::write_f1_clock) } } -WRITE_LINE_MEMBER(exorterm155_device::write_f3_clock) +void exorterm155_device::write_f3_clock(int state) { if (BIT(m_rs232_baud->read(), 1)) { @@ -491,7 +491,7 @@ WRITE_LINE_MEMBER(exorterm155_device::write_f3_clock) } } -WRITE_LINE_MEMBER(exorterm155_device::write_f5_clock) +void exorterm155_device::write_f5_clock(int state) { if (BIT(m_rs232_baud->read(), 2)) { @@ -500,7 +500,7 @@ WRITE_LINE_MEMBER(exorterm155_device::write_f5_clock) } } -WRITE_LINE_MEMBER(exorterm155_device::write_f6_clock) +void exorterm155_device::write_f6_clock(int state) { if (BIT(m_rs232_baud->read(), 3)) { @@ -509,7 +509,7 @@ WRITE_LINE_MEMBER(exorterm155_device::write_f6_clock) } } -WRITE_LINE_MEMBER(exorterm155_device::write_f7_clock) +void exorterm155_device::write_f7_clock(int state) { if (BIT(m_rs232_baud->read(), 4)) { @@ -518,7 +518,7 @@ WRITE_LINE_MEMBER(exorterm155_device::write_f7_clock) } } -WRITE_LINE_MEMBER(exorterm155_device::write_f8_clock) +void exorterm155_device::write_f8_clock(int state) { if (BIT(m_rs232_baud->read(), 5)) { @@ -527,7 +527,7 @@ WRITE_LINE_MEMBER(exorterm155_device::write_f8_clock) } } -WRITE_LINE_MEMBER(exorterm155_device::write_f9_clock) +void exorterm155_device::write_f9_clock(int state) { if (BIT(m_rs232_baud->read(), 6)) { @@ -536,7 +536,7 @@ WRITE_LINE_MEMBER(exorterm155_device::write_f9_clock) } } -WRITE_LINE_MEMBER(exorterm155_device::write_f11_clock) +void exorterm155_device::write_f11_clock(int state) { if (BIT(m_rs232_baud->read(), 7)) { @@ -545,7 +545,7 @@ WRITE_LINE_MEMBER(exorterm155_device::write_f11_clock) } } -WRITE_LINE_MEMBER(exorterm155_device::write_f13_clock) +void exorterm155_device::write_f13_clock(int state) { if (BIT(m_rs232_baud->read(), 8)) { @@ -554,38 +554,38 @@ WRITE_LINE_MEMBER(exorterm155_device::write_f13_clock) } } -WRITE_LINE_MEMBER(exorterm155_device::acia_txd_w) +void exorterm155_device::acia_txd_w(int state) { m_rs232_conn_txd_handler(state); } -WRITE_LINE_MEMBER(exorterm155_device::acia_rts_w) +void exorterm155_device::acia_rts_w(int state) { m_rs232_conn_rts_handler(state); } -WRITE_LINE_MEMBER(exorterm155_device::rs232_conn_dcd_w) +void exorterm155_device::rs232_conn_dcd_w(int state) { m_acia->write_dcd(state); } -WRITE_LINE_MEMBER(exorterm155_device::rs232_conn_dsr_w) +void exorterm155_device::rs232_conn_dsr_w(int state) { // Input of Display PIA PB5, pulled high. m_dsr = state; } -WRITE_LINE_MEMBER(exorterm155_device::rs232_conn_ri_w) +void exorterm155_device::rs232_conn_ri_w(int state) { m_pia_disp->ca2_w(state); } -WRITE_LINE_MEMBER(exorterm155_device::rs232_conn_cts_w) +void exorterm155_device::rs232_conn_cts_w(int state) { m_acia->write_cts(state); } -WRITE_LINE_MEMBER(exorterm155_device::rs232_conn_rxd_w) +void exorterm155_device::rs232_conn_rxd_w(int state) { m_acia->write_rxd(state); } diff --git a/src/devices/machine/exorterm.h b/src/devices/machine/exorterm.h index 07944bff805..52a63d7aaf7 100644 --- a/src/devices/machine/exorterm.h +++ b/src/devices/machine/exorterm.h @@ -36,11 +36,11 @@ public: auto rs232_conn_txd_handler() { return m_rs232_conn_txd_handler.bind(); } auto rs232_conn_dtr_handler() { return m_rs232_conn_dtr_handler.bind(); } auto rs232_conn_rts_handler() { return m_rs232_conn_rts_handler.bind(); } - DECLARE_WRITE_LINE_MEMBER(rs232_conn_dcd_w); - DECLARE_WRITE_LINE_MEMBER(rs232_conn_dsr_w); - DECLARE_WRITE_LINE_MEMBER(rs232_conn_ri_w); - DECLARE_WRITE_LINE_MEMBER(rs232_conn_cts_w); - DECLARE_WRITE_LINE_MEMBER(rs232_conn_rxd_w); + void rs232_conn_dcd_w(int state); + void rs232_conn_dsr_w(int state); + void rs232_conn_ri_w(int state); + void rs232_conn_cts_w(int state); + void rs232_conn_rxd_w(int state); protected: exorterm155_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock); @@ -77,19 +77,19 @@ private: void mem_map(address_map &map); - DECLARE_WRITE_LINE_MEMBER(acia_txd_w); - DECLARE_WRITE_LINE_MEMBER(acia_rts_w); + void acia_txd_w(int state); + void acia_rts_w(int state); // Clocks - DECLARE_WRITE_LINE_MEMBER(write_f1_clock); - DECLARE_WRITE_LINE_MEMBER(write_f3_clock); - DECLARE_WRITE_LINE_MEMBER(write_f5_clock); - DECLARE_WRITE_LINE_MEMBER(write_f6_clock); - DECLARE_WRITE_LINE_MEMBER(write_f7_clock); - DECLARE_WRITE_LINE_MEMBER(write_f8_clock); - DECLARE_WRITE_LINE_MEMBER(write_f9_clock); - DECLARE_WRITE_LINE_MEMBER(write_f11_clock); - DECLARE_WRITE_LINE_MEMBER(write_f13_clock); + void write_f1_clock(int state); + void write_f3_clock(int state); + void write_f5_clock(int state); + void write_f6_clock(int state); + void write_f7_clock(int state); + void write_f8_clock(int state); + void write_f9_clock(int state); + void write_f11_clock(int state); + void write_f13_clock(int state); u8 m_dsr; @@ -103,10 +103,10 @@ private: u8 m_inv_video; u8 m_special_char_disp; - DECLARE_WRITE_LINE_MEMBER(sys_timer_w); + void sys_timer_w(int state); u8 m_sys_timer_count; - DECLARE_WRITE_LINE_MEMBER(pia_cfg_cb2_w); + void pia_cfg_cb2_w(int state); u8 pia_kbd_pa_r(); u8 pia_kbd_pb_r(); diff --git a/src/devices/machine/f3853.cpp b/src/devices/machine/f3853.cpp index dbea3f30533..9df44f557bb 100644 --- a/src/devices/machine/f3853.cpp +++ b/src/devices/machine/f3853.cpp @@ -207,7 +207,7 @@ TIMER_CALLBACK_MEMBER(f3853_device::timer_callback) } -WRITE_LINE_MEMBER(f3853_device::ext_int_w) +void f3853_device::ext_int_w(int state) { if (!m_external_interrupt_line && state && m_external_int_enable) { @@ -217,7 +217,7 @@ WRITE_LINE_MEMBER(f3853_device::ext_int_w) set_interrupt_request_line(); } -WRITE_LINE_MEMBER(f3853_device::pri_in_w) +void f3853_device::pri_in_w(int state) { m_priority_line = bool(state); set_interrupt_request_line(); diff --git a/src/devices/machine/f3853.h b/src/devices/machine/f3853.h index f7d6adb3b5c..3b1ed5cab44 100644 --- a/src/devices/machine/f3853.h +++ b/src/devices/machine/f3853.h @@ -76,8 +76,8 @@ public: virtual uint8_t read(offs_t offset); virtual void write(offs_t offset, uint8_t data); - DECLARE_WRITE_LINE_MEMBER(ext_int_w); - DECLARE_WRITE_LINE_MEMBER(pri_in_w); + void ext_int_w(int state); + void pri_in_w(int state); virtual TIMER_CALLBACK_MEMBER(timer_callback); diff --git a/src/devices/machine/f4702.cpp b/src/devices/machine/f4702.cpp index 2a6bf7218c8..0beb7941057 100644 --- a/src/devices/machine/f4702.cpp +++ b/src/devices/machine/f4702.cpp @@ -149,7 +149,7 @@ void f4702_device::reset_counters() // im_w - set external rate input //------------------------------------------------- -WRITE_LINE_MEMBER(f4702_device::im_w) +void f4702_device::im_w(int state) { m_im = state; } diff --git a/src/devices/machine/f4702.h b/src/devices/machine/f4702.h index c48601b1e3c..9d2ff0f16c7 100644 --- a/src/devices/machine/f4702.h +++ b/src/devices/machine/f4702.h @@ -35,7 +35,7 @@ public: auto z_callback() { return m_z_callback.bind(); } // external rate input - DECLARE_WRITE_LINE_MEMBER(im_w); + void im_w(int state); // reset control (optional) void reset_counters(); diff --git a/src/devices/machine/fdc37c665gt.cpp b/src/devices/machine/fdc37c665gt.cpp index c14e6437d3e..7dc6916f11b 100644 --- a/src/devices/machine/fdc37c665gt.cpp +++ b/src/devices/machine/fdc37c665gt.cpp @@ -322,7 +322,7 @@ void fdc37c665gt_device::write_configuration_register(int index, int data) } } -WRITE_LINE_MEMBER(fdc37c665gt_device::irq_floppy_w) +void fdc37c665gt_device::irq_floppy_w(int state) { if (!enabled_logical[LogicalDevice::FDC]) { return; @@ -331,7 +331,7 @@ WRITE_LINE_MEMBER(fdc37c665gt_device::irq_floppy_w) m_fintr_callback(state); } -WRITE_LINE_MEMBER(fdc37c665gt_device::irq_parallel_w) +void fdc37c665gt_device::irq_parallel_w(int state) { if (!enabled_logical[LogicalDevice::Parallel]) { return; @@ -340,7 +340,7 @@ WRITE_LINE_MEMBER(fdc37c665gt_device::irq_parallel_w) m_pintr1_callback(state); } -WRITE_LINE_MEMBER(fdc37c665gt_device::irq_serial1_w) +void fdc37c665gt_device::irq_serial1_w(int state) { if (!enabled_logical[LogicalDevice::Serial1]) { return; @@ -349,7 +349,7 @@ WRITE_LINE_MEMBER(fdc37c665gt_device::irq_serial1_w) m_irq4_callback(state); } -WRITE_LINE_MEMBER(fdc37c665gt_device::txd_serial1_w) +void fdc37c665gt_device::txd_serial1_w(int state) { if (!enabled_logical[LogicalDevice::Serial1]) { return; @@ -358,7 +358,7 @@ WRITE_LINE_MEMBER(fdc37c665gt_device::txd_serial1_w) m_txd1_callback(state); } -WRITE_LINE_MEMBER(fdc37c665gt_device::dtr_serial1_w) +void fdc37c665gt_device::dtr_serial1_w(int state) { if (!enabled_logical[LogicalDevice::Serial1]) { return; @@ -367,7 +367,7 @@ WRITE_LINE_MEMBER(fdc37c665gt_device::dtr_serial1_w) m_ndtr1_callback(state); } -WRITE_LINE_MEMBER(fdc37c665gt_device::rts_serial1_w) +void fdc37c665gt_device::rts_serial1_w(int state) { if (!enabled_logical[LogicalDevice::Serial1]) { return; @@ -376,7 +376,7 @@ WRITE_LINE_MEMBER(fdc37c665gt_device::rts_serial1_w) m_nrts1_callback(state); } -WRITE_LINE_MEMBER(fdc37c665gt_device::irq_serial2_w) +void fdc37c665gt_device::irq_serial2_w(int state) { if (!enabled_logical[LogicalDevice::Serial2]) { return; @@ -385,7 +385,7 @@ WRITE_LINE_MEMBER(fdc37c665gt_device::irq_serial2_w) m_irq3_callback(state); } -WRITE_LINE_MEMBER(fdc37c665gt_device::txd_serial2_w) +void fdc37c665gt_device::txd_serial2_w(int state) { if (!enabled_logical[LogicalDevice::Serial2]) { return; @@ -394,7 +394,7 @@ WRITE_LINE_MEMBER(fdc37c665gt_device::txd_serial2_w) m_txd2_callback(state); } -WRITE_LINE_MEMBER(fdc37c665gt_device::dtr_serial2_w) +void fdc37c665gt_device::dtr_serial2_w(int state) { if (!enabled_logical[LogicalDevice::Serial2]) { return; @@ -403,7 +403,7 @@ WRITE_LINE_MEMBER(fdc37c665gt_device::dtr_serial2_w) m_ndtr2_callback(state); } -WRITE_LINE_MEMBER(fdc37c665gt_device::rts_serial2_w) +void fdc37c665gt_device::rts_serial2_w(int state) { if (!enabled_logical[LogicalDevice::Serial2]) { return; @@ -412,52 +412,52 @@ WRITE_LINE_MEMBER(fdc37c665gt_device::rts_serial2_w) m_nrts2_callback(state); } -WRITE_LINE_MEMBER(fdc37c665gt_device::rxd1_w) +void fdc37c665gt_device::rxd1_w(int state) { m_serial[0]->rx_w(state); } -WRITE_LINE_MEMBER(fdc37c665gt_device::ndcd1_w) +void fdc37c665gt_device::ndcd1_w(int state) { m_serial[0]->dcd_w(state); } -WRITE_LINE_MEMBER(fdc37c665gt_device::ndsr1_w) +void fdc37c665gt_device::ndsr1_w(int state) { m_serial[0]->dsr_w(state); } -WRITE_LINE_MEMBER(fdc37c665gt_device::nri1_w) +void fdc37c665gt_device::nri1_w(int state) { m_serial[0]->ri_w(state); } -WRITE_LINE_MEMBER(fdc37c665gt_device::ncts1_w) +void fdc37c665gt_device::ncts1_w(int state) { m_serial[0]->cts_w(state); } -WRITE_LINE_MEMBER(fdc37c665gt_device::rxd2_w) +void fdc37c665gt_device::rxd2_w(int state) { m_serial[1]->rx_w(state); } -WRITE_LINE_MEMBER(fdc37c665gt_device::ndcd2_w) +void fdc37c665gt_device::ndcd2_w(int state) { m_serial[1]->dcd_w(state); } -WRITE_LINE_MEMBER(fdc37c665gt_device::ndsr2_w) +void fdc37c665gt_device::ndsr2_w(int state) { m_serial[1]->dsr_w(state); } -WRITE_LINE_MEMBER(fdc37c665gt_device::nri2_w) +void fdc37c665gt_device::nri2_w(int state) { m_serial[1]->ri_w(state); } -WRITE_LINE_MEMBER(fdc37c665gt_device::ncts2_w) +void fdc37c665gt_device::ncts2_w(int state) { m_serial[1]->cts_w(state); } diff --git a/src/devices/machine/fdc37c665gt.h b/src/devices/machine/fdc37c665gt.h index 6b90fc8341e..7317a6d6af0 100644 --- a/src/devices/machine/fdc37c665gt.h +++ b/src/devices/machine/fdc37c665gt.h @@ -48,36 +48,36 @@ public: auto nrts2() { return m_nrts2_callback.bind(); } // chip pins for uarts - DECLARE_WRITE_LINE_MEMBER(rxd1_w); - DECLARE_WRITE_LINE_MEMBER(ndcd1_w); - DECLARE_WRITE_LINE_MEMBER(ndsr1_w); - DECLARE_WRITE_LINE_MEMBER(nri1_w); - DECLARE_WRITE_LINE_MEMBER(ncts1_w); - DECLARE_WRITE_LINE_MEMBER(rxd2_w); - DECLARE_WRITE_LINE_MEMBER(ndcd2_w); - DECLARE_WRITE_LINE_MEMBER(ndsr2_w); - DECLARE_WRITE_LINE_MEMBER(nri2_w); - DECLARE_WRITE_LINE_MEMBER(ncts2_w); + void rxd1_w(int state); + void ndcd1_w(int state); + void ndsr1_w(int state); + void nri1_w(int state); + void ncts1_w(int state); + void rxd2_w(int state); + void ndcd2_w(int state); + void ndsr2_w(int state); + void nri2_w(int state); + void ncts2_w(int state); protected: // device-level overrides virtual void device_start() override; // for the internal floppy controller - DECLARE_WRITE_LINE_MEMBER(irq_floppy_w); + void irq_floppy_w(int state); // for the internal parallel port - DECLARE_WRITE_LINE_MEMBER(irq_parallel_w); + void irq_parallel_w(int state); // for the internal uarts - DECLARE_WRITE_LINE_MEMBER(irq_serial1_w); - DECLARE_WRITE_LINE_MEMBER(txd_serial1_w); - DECLARE_WRITE_LINE_MEMBER(dtr_serial1_w); - DECLARE_WRITE_LINE_MEMBER(rts_serial1_w); - DECLARE_WRITE_LINE_MEMBER(irq_serial2_w); - DECLARE_WRITE_LINE_MEMBER(txd_serial2_w); - DECLARE_WRITE_LINE_MEMBER(dtr_serial2_w); - DECLARE_WRITE_LINE_MEMBER(rts_serial2_w); + void irq_serial1_w(int state); + void txd_serial1_w(int state); + void dtr_serial1_w(int state); + void rts_serial1_w(int state); + void irq_serial2_w(int state); + void txd_serial2_w(int state); + void dtr_serial2_w(int state); + void rts_serial2_w(int state); private: // put your private members here diff --git a/src/devices/machine/fdc37c93x.cpp b/src/devices/machine/fdc37c93x.cpp index fecea5aac9f..d1866c8ea7c 100644 --- a/src/devices/machine/fdc37c93x.cpp +++ b/src/devices/machine/fdc37c93x.cpp @@ -290,162 +290,162 @@ void fdc37c93x_device::device_add_mconfig(machine_config &config) m_kbdc->gate_a20_callback().set(FUNC(fdc37c93x_device::kbdp21_gp25_gatea20_w)); } -WRITE_LINE_MEMBER(fdc37c93x_device::irq_floppy_w) +void fdc37c93x_device::irq_floppy_w(int state) { if (enabled_logical[LogicalDevice::FDC] == false) return; request_irq(configuration_registers[LogicalDevice::FDC][0x70], state ? ASSERT_LINE : CLEAR_LINE); } -WRITE_LINE_MEMBER(fdc37c93x_device::drq_floppy_w) +void fdc37c93x_device::drq_floppy_w(int state) { if (enabled_logical[LogicalDevice::FDC] == false) return; request_dma(configuration_registers[LogicalDevice::FDC][0x74], state ? ASSERT_LINE : CLEAR_LINE); } -WRITE_LINE_MEMBER(fdc37c93x_device::irq_parallel_w) +void fdc37c93x_device::irq_parallel_w(int state) { if (enabled_logical[LogicalDevice::Parallel] == false) return; request_irq(configuration_registers[LogicalDevice::Parallel][0x70], state ? ASSERT_LINE : CLEAR_LINE); } -WRITE_LINE_MEMBER(fdc37c93x_device::irq_serial1_w) +void fdc37c93x_device::irq_serial1_w(int state) { if (enabled_logical[LogicalDevice::Serial1] == false) return; request_irq(configuration_registers[LogicalDevice::Serial1][0x70], state ? ASSERT_LINE : CLEAR_LINE); } -WRITE_LINE_MEMBER(fdc37c93x_device::txd_serial1_w) +void fdc37c93x_device::txd_serial1_w(int state) { if (enabled_logical[LogicalDevice::Serial1] == false) return; m_txd1_callback(state); } -WRITE_LINE_MEMBER(fdc37c93x_device::dtr_serial1_w) +void fdc37c93x_device::dtr_serial1_w(int state) { if (enabled_logical[LogicalDevice::Serial1] == false) return; m_ndtr1_callback(state); } -WRITE_LINE_MEMBER(fdc37c93x_device::rts_serial1_w) +void fdc37c93x_device::rts_serial1_w(int state) { if (enabled_logical[LogicalDevice::Serial1] == false) return; m_nrts1_callback(state); } -WRITE_LINE_MEMBER(fdc37c93x_device::irq_serial2_w) +void fdc37c93x_device::irq_serial2_w(int state) { if (enabled_logical[LogicalDevice::Serial2] == false) return; request_irq(configuration_registers[LogicalDevice::Serial2][0x70], state ? ASSERT_LINE : CLEAR_LINE); } -WRITE_LINE_MEMBER(fdc37c93x_device::txd_serial2_w) +void fdc37c93x_device::txd_serial2_w(int state) { if (enabled_logical[LogicalDevice::Serial2] == false) return; m_txd2_callback(state); } -WRITE_LINE_MEMBER(fdc37c93x_device::dtr_serial2_w) +void fdc37c93x_device::dtr_serial2_w(int state) { if (enabled_logical[LogicalDevice::Serial2] == false) return; m_ndtr2_callback(state); } -WRITE_LINE_MEMBER(fdc37c93x_device::rts_serial2_w) +void fdc37c93x_device::rts_serial2_w(int state) { if (enabled_logical[LogicalDevice::Serial2] == false) return; m_nrts2_callback(state); } -WRITE_LINE_MEMBER(fdc37c93x_device::rxd1_w) +void fdc37c93x_device::rxd1_w(int state) { pc_serial1_comdev->rx_w(state); } -WRITE_LINE_MEMBER(fdc37c93x_device::ndcd1_w) +void fdc37c93x_device::ndcd1_w(int state) { pc_serial1_comdev->dcd_w(state); } -WRITE_LINE_MEMBER(fdc37c93x_device::ndsr1_w) +void fdc37c93x_device::ndsr1_w(int state) { pc_serial1_comdev->dsr_w(state); } -WRITE_LINE_MEMBER(fdc37c93x_device::nri1_w) +void fdc37c93x_device::nri1_w(int state) { pc_serial1_comdev->ri_w(state); } -WRITE_LINE_MEMBER(fdc37c93x_device::ncts1_w) +void fdc37c93x_device::ncts1_w(int state) { pc_serial1_comdev->cts_w(state); } -WRITE_LINE_MEMBER(fdc37c93x_device::rxd2_w) +void fdc37c93x_device::rxd2_w(int state) { pc_serial2_comdev->rx_w(state); } -WRITE_LINE_MEMBER(fdc37c93x_device::ndcd2_w) +void fdc37c93x_device::ndcd2_w(int state) { pc_serial2_comdev->dcd_w(state); } -WRITE_LINE_MEMBER(fdc37c93x_device::ndsr2_w) +void fdc37c93x_device::ndsr2_w(int state) { pc_serial2_comdev->dsr_w(state); } -WRITE_LINE_MEMBER(fdc37c93x_device::nri2_w) +void fdc37c93x_device::nri2_w(int state) { pc_serial2_comdev->ri_w(state); } -WRITE_LINE_MEMBER(fdc37c93x_device::ncts2_w) +void fdc37c93x_device::ncts2_w(int state) { pc_serial2_comdev->cts_w(state); } -WRITE_LINE_MEMBER(fdc37c93x_device::irq_rtc_w) +void fdc37c93x_device::irq_rtc_w(int state) { if (enabled_logical[LogicalDevice::RTC] == false) return; request_irq(configuration_registers[LogicalDevice::RTC][0x70], state ? ASSERT_LINE : CLEAR_LINE); } -WRITE_LINE_MEMBER(fdc37c93x_device::irq_keyboard_w) +void fdc37c93x_device::irq_keyboard_w(int state) { if (enabled_logical[LogicalDevice::Keyboard] == false) return; request_irq(configuration_registers[LogicalDevice::Keyboard][0x70], state ? ASSERT_LINE : CLEAR_LINE); } -WRITE_LINE_MEMBER(fdc37c93x_device::irq_mouse_w) +void fdc37c93x_device::irq_mouse_w(int state) { if (enabled_logical[LogicalDevice::Keyboard] == false) return; request_irq(configuration_registers[LogicalDevice::Keyboard][0x72], state ? ASSERT_LINE : CLEAR_LINE); } -WRITE_LINE_MEMBER(fdc37c93x_device::kbdp21_gp25_gatea20_w) +void fdc37c93x_device::kbdp21_gp25_gatea20_w(int state) { if (enabled_logical[LogicalDevice::Keyboard] == false) return; m_gp25_gatea20_callback(state); } -WRITE_LINE_MEMBER(fdc37c93x_device::kbdp20_gp20_reset_w) +void fdc37c93x_device::kbdp20_gp20_reset_w(int state) { if (enabled_logical[LogicalDevice::Keyboard] == false) return; diff --git a/src/devices/machine/fdc37c93x.h b/src/devices/machine/fdc37c93x.h index 8fc517f899f..7ec1922498f 100644 --- a/src/devices/machine/fdc37c93x.h +++ b/src/devices/machine/fdc37c93x.h @@ -46,37 +46,37 @@ public: void remap(int space_id, offs_t start, offs_t end) override; // for the internal floppy controller - DECLARE_WRITE_LINE_MEMBER(irq_floppy_w); - DECLARE_WRITE_LINE_MEMBER(drq_floppy_w); + void irq_floppy_w(int state); + void drq_floppy_w(int state); // for the internal parallel port - DECLARE_WRITE_LINE_MEMBER(irq_parallel_w); + void irq_parallel_w(int state); // for the internal uarts - DECLARE_WRITE_LINE_MEMBER(irq_serial1_w); - DECLARE_WRITE_LINE_MEMBER(txd_serial1_w); - DECLARE_WRITE_LINE_MEMBER(dtr_serial1_w); - DECLARE_WRITE_LINE_MEMBER(rts_serial1_w); - DECLARE_WRITE_LINE_MEMBER(irq_serial2_w); - DECLARE_WRITE_LINE_MEMBER(txd_serial2_w); - DECLARE_WRITE_LINE_MEMBER(dtr_serial2_w); - DECLARE_WRITE_LINE_MEMBER(rts_serial2_w); + void irq_serial1_w(int state); + void txd_serial1_w(int state); + void dtr_serial1_w(int state); + void rts_serial1_w(int state); + void irq_serial2_w(int state); + void txd_serial2_w(int state); + void dtr_serial2_w(int state); + void rts_serial2_w(int state); // chip pins for uarts - DECLARE_WRITE_LINE_MEMBER(rxd1_w); - DECLARE_WRITE_LINE_MEMBER(ndcd1_w); - DECLARE_WRITE_LINE_MEMBER(ndsr1_w); - DECLARE_WRITE_LINE_MEMBER(nri1_w); - DECLARE_WRITE_LINE_MEMBER(ncts1_w); - DECLARE_WRITE_LINE_MEMBER(rxd2_w); - DECLARE_WRITE_LINE_MEMBER(ndcd2_w); - DECLARE_WRITE_LINE_MEMBER(ndsr2_w); - DECLARE_WRITE_LINE_MEMBER(nri2_w); - DECLARE_WRITE_LINE_MEMBER(ncts2_w); + void rxd1_w(int state); + void ndcd1_w(int state); + void ndsr1_w(int state); + void nri1_w(int state); + void ncts1_w(int state); + void rxd2_w(int state); + void ndcd2_w(int state); + void ndsr2_w(int state); + void nri2_w(int state); + void ncts2_w(int state); // rtc - DECLARE_WRITE_LINE_MEMBER(irq_rtc_w); + void irq_rtc_w(int state); // keyboard - DECLARE_WRITE_LINE_MEMBER(irq_keyboard_w); - DECLARE_WRITE_LINE_MEMBER(irq_mouse_w); - DECLARE_WRITE_LINE_MEMBER(kbdp21_gp25_gatea20_w); - DECLARE_WRITE_LINE_MEMBER(kbdp20_gp20_reset_w); + void irq_keyboard_w(int state); + void irq_mouse_w(int state); + void kbdp21_gp25_gatea20_w(int state); + void kbdp20_gp20_reset_w(int state); void unmap_fdc(address_map &map); void map_lpt(address_map &map); diff --git a/src/devices/machine/fga002.cpp b/src/devices/machine/fga002.cpp index da8795ca5da..d39ec5cdd6c 100644 --- a/src/devices/machine/fga002.cpp +++ b/src/devices/machine/fga002.cpp @@ -591,14 +591,14 @@ void fga002_device::lirq_w(int status, int vector, int control, int state) } } -WRITE_LINE_MEMBER (fga002_device::lirq0_w) { LOGINT("%s\n", FUNCNAME); lirq_w( FGA_ISLOCAL0, INT_LOCAL0, FGA_ICRLOCAL0, state ); } -WRITE_LINE_MEMBER (fga002_device::lirq1_w) { LOGINT("%s\n", FUNCNAME); lirq_w( FGA_ISLOCAL1, INT_LOCAL1, FGA_ICRLOCAL1, state ); } -WRITE_LINE_MEMBER (fga002_device::lirq2_w) { LOGINT("%s\n", FUNCNAME); lirq_w( FGA_ISLOCAL2, INT_LOCAL2, FGA_ICRLOCAL2, state ); } -WRITE_LINE_MEMBER (fga002_device::lirq3_w) { LOGINT("%s\n", FUNCNAME); lirq_w( FGA_ISLOCAL3, INT_LOCAL3, FGA_ICRLOCAL3, state ); } -WRITE_LINE_MEMBER (fga002_device::lirq4_w) { LOGINT("%s\n", FUNCNAME); lirq_w( FGA_ISLOCAL4, INT_LOCAL4, FGA_ICRLOCAL4, state ); } -WRITE_LINE_MEMBER (fga002_device::lirq5_w) { LOGINT("%s\n", FUNCNAME); lirq_w( FGA_ISLOCAL5, INT_LOCAL5, FGA_ICRLOCAL5, state ); } -WRITE_LINE_MEMBER (fga002_device::lirq6_w) { LOGINT("%s\n", FUNCNAME); lirq_w( FGA_ISLOCAL6, INT_LOCAL6, FGA_ICRLOCAL6, state ); } -WRITE_LINE_MEMBER (fga002_device::lirq7_w) { LOGINT("%s\n", FUNCNAME); lirq_w( FGA_ISLOCAL7, INT_LOCAL7, FGA_ICRLOCAL7, state ); } +void fga002_device::lirq0_w(int state) { LOGINT("%s\n", FUNCNAME); lirq_w( FGA_ISLOCAL0, INT_LOCAL0, FGA_ICRLOCAL0, state ); } +void fga002_device::lirq1_w(int state) { LOGINT("%s\n", FUNCNAME); lirq_w( FGA_ISLOCAL1, INT_LOCAL1, FGA_ICRLOCAL1, state ); } +void fga002_device::lirq2_w(int state) { LOGINT("%s\n", FUNCNAME); lirq_w( FGA_ISLOCAL2, INT_LOCAL2, FGA_ICRLOCAL2, state ); } +void fga002_device::lirq3_w(int state) { LOGINT("%s\n", FUNCNAME); lirq_w( FGA_ISLOCAL3, INT_LOCAL3, FGA_ICRLOCAL3, state ); } +void fga002_device::lirq4_w(int state) { LOGINT("%s\n", FUNCNAME); lirq_w( FGA_ISLOCAL4, INT_LOCAL4, FGA_ICRLOCAL4, state ); } +void fga002_device::lirq5_w(int state) { LOGINT("%s\n", FUNCNAME); lirq_w( FGA_ISLOCAL5, INT_LOCAL5, FGA_ICRLOCAL5, state ); } +void fga002_device::lirq6_w(int state) { LOGINT("%s\n", FUNCNAME); lirq_w( FGA_ISLOCAL6, INT_LOCAL6, FGA_ICRLOCAL6, state ); } +void fga002_device::lirq7_w(int state) { LOGINT("%s\n", FUNCNAME); lirq_w( FGA_ISLOCAL7, INT_LOCAL7, FGA_ICRLOCAL7, state ); } void fga002_device::write(offs_t offset, uint8_t data){ LOG("%s[%04x] <- %02x - ", FUNCNAME, offset, data); diff --git a/src/devices/machine/fga002.h b/src/devices/machine/fga002.h index 35785189421..f28a82f16e5 100644 --- a/src/devices/machine/fga002.h +++ b/src/devices/machine/fga002.h @@ -16,14 +16,14 @@ class fga002_device : public device_t uint8_t read(offs_t offset); void lirq_w(int status, int vector, int control, int state); - DECLARE_WRITE_LINE_MEMBER( lirq0_w ); - DECLARE_WRITE_LINE_MEMBER( lirq1_w ); - DECLARE_WRITE_LINE_MEMBER( lirq2_w ); - DECLARE_WRITE_LINE_MEMBER( lirq3_w ); - DECLARE_WRITE_LINE_MEMBER( lirq4_w ); - DECLARE_WRITE_LINE_MEMBER( lirq5_w ); - DECLARE_WRITE_LINE_MEMBER( lirq6_w ); - DECLARE_WRITE_LINE_MEMBER( lirq7_w ); + void lirq0_w(int state); + void lirq1_w(int state); + void lirq2_w(int state); + void lirq3_w(int state); + void lirq4_w(int state); + void lirq5_w(int state); + void lirq6_w(int state); + void lirq7_w(int state); u16 iack(); int acknowledge(); diff --git a/src/devices/machine/gayle.cpp b/src/devices/machine/gayle.cpp index f6409d7f3ec..25639bda6c2 100644 --- a/src/devices/machine/gayle.cpp +++ b/src/devices/machine/gayle.cpp @@ -360,7 +360,7 @@ void gayle_device::ide_cs_w(offs_t offset, uint16_t data, uint16_t mem_mask) m_ide_cs_w_cb[N]((offset >> 1) & 0x07, data, mem_mask); } -WRITE_LINE_MEMBER( gayle_device::ide_interrupt_w ) +void gayle_device::ide_interrupt_w(int state) { LOGMASKED(LOG_IDE, "ide_interrupt_w: %d\n", state); line_change(7, state, 2); @@ -371,25 +371,25 @@ WRITE_LINE_MEMBER( gayle_device::ide_interrupt_w ) // CREDIT CARD //************************************************************************** -WRITE_LINE_MEMBER( gayle_device::cc_cd_w ) +void gayle_device::cc_cd_w(int state) { LOGMASKED(LOG_CC, "cc_cd_w: %d\n", state); line_change(LINE_CC_DET, state, 6); } -WRITE_LINE_MEMBER( gayle_device::cc_bvd1_w ) +void gayle_device::cc_bvd1_w(int state) { LOGMASKED(LOG_CC, "cc_bvd1_w: %d\n", state); line_change(LINE_CC_BVD1_SC, state, BIT(m_gayle_reg[REG_INT], 1) ? 6 : 2); } -WRITE_LINE_MEMBER( gayle_device::cc_bvd2_w ) +void gayle_device::cc_bvd2_w(int state) { LOGMASKED(LOG_CC, "cc_bvd2_w: %d\n", state); line_change(LINE_CC_BVD2_DA, state, BIT(m_gayle_reg[REG_INT], 1) ? 6 : 2); } -WRITE_LINE_MEMBER( gayle_device::cc_wp_w ) +void gayle_device::cc_wp_w(int state) { LOGMASKED(LOG_CC, "cc_wp_w: %d\n", state); line_change(LINE_CC_WP, state, 2); diff --git a/src/devices/machine/gayle.h b/src/devices/machine/gayle.h index 5701c7f0783..b4c6bbf2b41 100644 --- a/src/devices/machine/gayle.h +++ b/src/devices/machine/gayle.h @@ -79,13 +79,13 @@ public: template auto ide_cs_w_cb() { return m_ide_cs_w_cb[N].bind(); } // interface - DECLARE_WRITE_LINE_MEMBER( ide_interrupt_w ); + void ide_interrupt_w(int state); // credit card signals - DECLARE_WRITE_LINE_MEMBER( cc_cd_w ); - DECLARE_WRITE_LINE_MEMBER( cc_bvd1_w ); - DECLARE_WRITE_LINE_MEMBER( cc_bvd2_w ); - DECLARE_WRITE_LINE_MEMBER( cc_wp_w ); + void cc_cd_w(int state); + void cc_bvd1_w(int state); + void cc_bvd2_w(int state); + void cc_wp_w(int state); void register_map(address_map &map); uint16_t gayle_id_r(offs_t offset, uint16_t mem_mask = ~0); diff --git a/src/devices/machine/gen_latch.cpp b/src/devices/machine/gen_latch.cpp index 04eebd35038..a133f6cbdbd 100644 --- a/src/devices/machine/gen_latch.cpp +++ b/src/devices/machine/gen_latch.cpp @@ -75,7 +75,7 @@ void generic_latch_base_device::device_reset() // to be read //------------------------------------------------- -READ_LINE_MEMBER(generic_latch_base_device::pending_r) +int generic_latch_base_device::pending_r() { return m_latch_written ? 1 : 0; } @@ -138,12 +138,12 @@ void generic_latch_8_device::clear_w(u8 data) m_latched_value = 0x00; } -WRITE_LINE_MEMBER( generic_latch_8_device::preset ) +void generic_latch_8_device::preset(int state) { m_latched_value = 0xff; } -WRITE_LINE_MEMBER( generic_latch_8_device::clear ) +void generic_latch_8_device::clear(int state) { m_latched_value = 0x00; } @@ -209,12 +209,12 @@ void generic_latch_16_device::clear_w(u16 data) m_latched_value = 0x0000; } -WRITE_LINE_MEMBER( generic_latch_16_device::preset ) +void generic_latch_16_device::preset(int state) { m_latched_value = 0xffff; } -WRITE_LINE_MEMBER( generic_latch_16_device::clear ) +void generic_latch_16_device::clear(int state) { m_latched_value = 0x0000; } diff --git a/src/devices/machine/gen_latch.h b/src/devices/machine/gen_latch.h index fc217410d06..946ac5c380c 100644 --- a/src/devices/machine/gen_latch.h +++ b/src/devices/machine/gen_latch.h @@ -34,7 +34,7 @@ public: auto data_pending_callback() { return m_data_pending_cb.bind(); } void set_separate_acknowledge(bool ack) { m_separate_acknowledge = ack; } - DECLARE_READ_LINE_MEMBER(pending_r); + int pending_r(); u8 acknowledge_r(address_space &space); void acknowledge_w(u8 data = 0); @@ -72,8 +72,8 @@ public: void preset_w(u8 data = 0xff); void clear_w(u8 data = 0); - DECLARE_WRITE_LINE_MEMBER( preset ); - DECLARE_WRITE_LINE_MEMBER( clear ); + void preset(int state); + void clear(int state); protected: virtual void device_start() override; @@ -98,8 +98,8 @@ public: void preset_w(u16 data = 0xffff); void clear_w(u16 data = 0); - DECLARE_WRITE_LINE_MEMBER( preset ); - DECLARE_WRITE_LINE_MEMBER( clear ); + void preset(int state); + void clear(int state); protected: virtual void device_start() override; diff --git a/src/devices/machine/generalplus_gpl16250soc.cpp b/src/devices/machine/generalplus_gpl16250soc.cpp index 7718c586d43..43e4fcf3940 100644 --- a/src/devices/machine/generalplus_gpl16250soc.cpp +++ b/src/devices/machine/generalplus_gpl16250soc.cpp @@ -1795,12 +1795,12 @@ TIMER_CALLBACK_MEMBER(sunplus_gcm394_base_device::unknown_tick) } -WRITE_LINE_MEMBER(sunplus_gcm394_base_device::audioirq_w) +void sunplus_gcm394_base_device::audioirq_w(int state) { //set_state_unsynced(UNSP_IRQ5_LINE, state); } -WRITE_LINE_MEMBER(sunplus_gcm394_base_device::videoirq_w) +void sunplus_gcm394_base_device::videoirq_w(int state) { set_state_unsynced(UNSP_IRQ5_LINE, state); } diff --git a/src/devices/machine/generalplus_gpl16250soc.h b/src/devices/machine/generalplus_gpl16250soc.h index 214cc7e8ace..6fe6c2825da 100644 --- a/src/devices/machine/generalplus_gpl16250soc.h +++ b/src/devices/machine/generalplus_gpl16250soc.h @@ -71,7 +71,7 @@ public: auto nand_read_callback() { return m_nand_read_cb.bind(); } - DECLARE_WRITE_LINE_MEMBER(vblank) { m_spg_video->vblank(state); } + void vblank(int state) { m_spg_video->vblank(state); } virtual void device_add_mconfig(machine_config& config) override; @@ -347,8 +347,8 @@ private: void unkarea_7961_w(uint16_t data); - DECLARE_WRITE_LINE_MEMBER(videoirq_w); - DECLARE_WRITE_LINE_MEMBER(audioirq_w); + void videoirq_w(int state); + void audioirq_w(int state); uint16_t system_7a35_r(); uint16_t system_7a37_r(); diff --git a/src/devices/machine/generalplus_gpl16250soc_video.cpp b/src/devices/machine/generalplus_gpl16250soc_video.cpp index 7d2b7f68385..4f971d1ba08 100644 --- a/src/devices/machine/generalplus_gpl16250soc_video.cpp +++ b/src/devices/machine/generalplus_gpl16250soc_video.cpp @@ -1112,7 +1112,7 @@ void gcm394_base_video_device::check_video_irq() m_video_irq_cb((m_video_irq_status & m_video_irq_enable) ? ASSERT_LINE : CLEAR_LINE); } -WRITE_LINE_MEMBER(gcm394_base_video_device::vblank) +void gcm394_base_video_device::vblank(int state) { if (!state) { diff --git a/src/devices/machine/generalplus_gpl16250soc_video.h b/src/devices/machine/generalplus_gpl16250soc_video.h index 22b4275a990..e68169898ed 100644 --- a/src/devices/machine/generalplus_gpl16250soc_video.h +++ b/src/devices/machine/generalplus_gpl16250soc_video.h @@ -22,7 +22,7 @@ public: gcm394_base_video_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(vblank); + void vblank(int state); auto space_read_callback() { return m_space_read_cb.bind(); } diff --git a/src/devices/machine/generic_spi_flash.h b/src/devices/machine/generic_spi_flash.h index a7f549603bf..4c6559fb479 100644 --- a/src/devices/machine/generic_spi_flash.h +++ b/src/devices/machine/generic_spi_flash.h @@ -24,7 +24,7 @@ public: m_spi_state = READY_FOR_COMMAND; } - DECLARE_WRITE_LINE_MEMBER(dir_w) + void dir_w(int state) { m_spidir = state; } diff --git a/src/devices/machine/genpc.cpp b/src/devices/machine/genpc.cpp index 5c5d19cdbb3..fcb6e5e6349 100644 --- a/src/devices/machine/genpc.cpp +++ b/src/devices/machine/genpc.cpp @@ -55,7 +55,7 @@ void ibm5160_mb_device::pc_page_w(offs_t offset, uint8_t data) } -WRITE_LINE_MEMBER( ibm5160_mb_device::pc_dma_hrq_changed ) +void ibm5160_mb_device::pc_dma_hrq_changed(int state) { m_maincpu->set_input_line(INPUT_LINE_HALT, state ? ASSERT_LINE : CLEAR_LINE); @@ -126,7 +126,7 @@ void ibm5160_mb_device::pc_dma8237_0_dack_w(uint8_t data) } -WRITE_LINE_MEMBER( ibm5160_mb_device::pc_dma8237_out_eop ) +void ibm5160_mb_device::pc_dma8237_out_eop(int state) { m_cur_eop = state == ASSERT_LINE; if(m_dma_channel != -1) @@ -149,10 +149,10 @@ void ibm5160_mb_device::pc_select_dma_channel(int channel, bool state) } } -WRITE_LINE_MEMBER( ibm5160_mb_device::pc_dack0_w ) { pc_select_dma_channel(0, state); } -WRITE_LINE_MEMBER( ibm5160_mb_device::pc_dack1_w ) { pc_select_dma_channel(1, state); } -WRITE_LINE_MEMBER( ibm5160_mb_device::pc_dack2_w ) { pc_select_dma_channel(2, state); } -WRITE_LINE_MEMBER( ibm5160_mb_device::pc_dack3_w ) { pc_select_dma_channel(3, state); } +void ibm5160_mb_device::pc_dack0_w(int state) { pc_select_dma_channel(0, state); } +void ibm5160_mb_device::pc_dack1_w(int state) { pc_select_dma_channel(1, state); } +void ibm5160_mb_device::pc_dack2_w(int state) { pc_select_dma_channel(2, state); } +void ibm5160_mb_device::pc_dack3_w(int state) { pc_select_dma_channel(3, state); } /************************************************************* * @@ -160,13 +160,13 @@ WRITE_LINE_MEMBER( ibm5160_mb_device::pc_dack3_w ) { pc_select_dma_channel(3, st * *************************************************************/ -WRITE_LINE_MEMBER(ibm5160_mb_device::pc_speaker_set_spkrdata) +void ibm5160_mb_device::pc_speaker_set_spkrdata(int state) { m_pc_spkrdata = state ? 1 : 0; m_speaker->level_w(m_pc_spkrdata & m_pit_out2); } -WRITE_LINE_MEMBER(ibm5160_mb_device::pic_int_w) +void ibm5160_mb_device::pic_int_w(int state) { m_int_callback(state); } @@ -178,7 +178,7 @@ WRITE_LINE_MEMBER(ibm5160_mb_device::pic_int_w) * *************************************************************/ -WRITE_LINE_MEMBER( ibm5160_mb_device::pc_pit8253_out1_changed ) +void ibm5160_mb_device::pc_pit8253_out1_changed(int state) { /* Trigger DMA channel #0 */ if ( m_out1 == 0 && state == 1 && m_u73_q2 == 0 ) @@ -190,13 +190,13 @@ WRITE_LINE_MEMBER( ibm5160_mb_device::pc_pit8253_out1_changed ) } -WRITE_LINE_MEMBER( ibm5160_mb_device::pc_pit8253_out2_changed ) +void ibm5160_mb_device::pc_pit8253_out2_changed(int state) { m_pit_out2 = state ? 1 : 0; m_speaker->level_w(m_pc_spkrdata & m_pit_out2); } -WRITE_LINE_MEMBER( ibm5150_mb_device::pc_pit8253_out2_changed ) +void ibm5150_mb_device::pc_pit8253_out2_changed(int state) { ibm5160_mb_device::pc_pit8253_out2_changed(state); m_cassette->output(m_pit_out2 ? 1.0 : -1.0); @@ -258,7 +258,7 @@ WRITE_LINE_MEMBER( ibm5150_mb_device::pc_pit8253_out2_changed ) * ON ON - one disk drive * **********************************************************/ -WRITE_LINE_MEMBER( ibm5150_mb_device::keyboard_clock_w ) +void ibm5150_mb_device::keyboard_clock_w(int state) { if (!m_ppi_keyboard_clear && !state && !m_ppi_shift_enable) { @@ -272,7 +272,7 @@ WRITE_LINE_MEMBER( ibm5150_mb_device::keyboard_clock_w ) } } -WRITE_LINE_MEMBER( ec1841_mb_device::keyboard_clock_w ) +void ec1841_mb_device::keyboard_clock_w(int state) { if (!m_ppi_keyboard_clear && !state && !m_ppi_shift_enable) { @@ -286,7 +286,7 @@ WRITE_LINE_MEMBER( ec1841_mb_device::keyboard_clock_w ) } } -WRITE_LINE_MEMBER( ibm5160_mb_device::keyboard_clock_w ) +void ibm5160_mb_device::keyboard_clock_w(int state) { if (!m_ppi_keyboard_clear && !state && !m_ppi_shift_enable) { @@ -301,7 +301,7 @@ WRITE_LINE_MEMBER( ibm5160_mb_device::keyboard_clock_w ) } -WRITE_LINE_MEMBER( ibm5160_mb_device::keyboard_data_w ) +void ibm5160_mb_device::keyboard_data_w(int state) { m_ppi_data_signal = state; } @@ -399,7 +399,7 @@ void ibm5160_mb_device::nmi_enable_w(uint8_t data) m_nmi_callback(CLEAR_LINE); } -WRITE_LINE_MEMBER( ibm5160_mb_device::iochck_w ) +void ibm5160_mb_device::iochck_w(int state) { if (m_nmi_enabled && !state) m_nmi_callback(ASSERT_LINE); diff --git a/src/devices/machine/genpc.h b/src/devices/machine/genpc.h index 8e836aae807..f7b5631b830 100644 --- a/src/devices/machine/genpc.h +++ b/src/devices/machine/genpc.h @@ -49,16 +49,16 @@ public: void pc_page_w(offs_t offset, uint8_t data); void nmi_enable_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER( pc_speaker_set_spkrdata ); + void pc_speaker_set_spkrdata(int state); - DECLARE_WRITE_LINE_MEMBER( pc_pit8253_out1_changed ); - virtual DECLARE_WRITE_LINE_MEMBER( pc_pit8253_out2_changed ); + void pc_pit8253_out1_changed(int state); + virtual void pc_pit8253_out2_changed(int state); - DECLARE_WRITE_LINE_MEMBER( pic_int_w ); + void pic_int_w(int state); // interface to the keyboard - DECLARE_WRITE_LINE_MEMBER( keyboard_clock_w ); - DECLARE_WRITE_LINE_MEMBER( keyboard_data_w ); + void keyboard_clock_w(int state); + void keyboard_data_w(int state); protected: ibm5160_mb_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); @@ -113,8 +113,8 @@ protected: uint8_t pc_ppi_portc_r(); void pc_ppi_portb_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER( pc_dma_hrq_changed ); - DECLARE_WRITE_LINE_MEMBER( pc_dma8237_out_eop ); + void pc_dma_hrq_changed(int state); + void pc_dma8237_out_eop(int state); uint8_t pc_dma_read_byte(offs_t offset); void pc_dma_write_byte(offs_t offset, uint8_t data); uint8_t pc_dma8237_1_dack_r(); @@ -124,11 +124,11 @@ protected: void pc_dma8237_2_dack_w(uint8_t data); void pc_dma8237_3_dack_w(uint8_t data); void pc_dma8237_0_dack_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER( pc_dack0_w ); - DECLARE_WRITE_LINE_MEMBER( pc_dack1_w ); - DECLARE_WRITE_LINE_MEMBER( pc_dack2_w ); - DECLARE_WRITE_LINE_MEMBER( pc_dack3_w ); - DECLARE_WRITE_LINE_MEMBER( iochck_w ); + void pc_dack0_w(int state); + void pc_dack1_w(int state); + void pc_dack2_w(int state); + void pc_dack3_w(int state); + void iochck_w(int state); void pc_select_dma_channel(int channel, bool state); }; @@ -145,9 +145,9 @@ public: // construction/destruction ibm5150_mb_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = 0); - DECLARE_WRITE_LINE_MEMBER( keyboard_clock_w ); + void keyboard_clock_w(int state); - virtual DECLARE_WRITE_LINE_MEMBER( pc_pit8253_out2_changed ) override; + virtual void pc_pit8253_out2_changed(int state) override; protected: ibm5150_mb_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); @@ -175,7 +175,7 @@ public: // construction/destruction ec1841_mb_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = 0); - DECLARE_WRITE_LINE_MEMBER( keyboard_clock_w ); + void keyboard_clock_w(int state); protected: ec1841_mb_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); diff --git a/src/devices/machine/gt64xxx.cpp b/src/devices/machine/gt64xxx.cpp index ce7ddf2d40f..c00f9c63464 100644 --- a/src/devices/machine/gt64xxx.cpp +++ b/src/devices/machine/gt64xxx.cpp @@ -466,7 +466,7 @@ void gt64xxx_device::reset_all_mappings() } // PCI Stalling -WRITE_LINE_MEMBER(gt64xxx_device::pci_stall) +void gt64xxx_device::pci_stall(int state) { // Reset the retry count once unstalled if (state==0 && m_pci_stall_state==1) { diff --git a/src/devices/machine/gt64xxx.h b/src/devices/machine/gt64xxx.h index 644d101c72e..9efa29e9dd2 100644 --- a/src/devices/machine/gt64xxx.h +++ b/src/devices/machine/gt64xxx.h @@ -33,7 +33,7 @@ public: void set_simm0_size(int size) { m_simm_size[0] = size; } void set_simm1_size(int size) { m_simm_size[1] = size; } - DECLARE_WRITE_LINE_MEMBER(pci_stall); + void pci_stall(int state); // pci bus uint32_t pci_config_r(offs_t offset, uint32_t mem_mask = ~0); diff --git a/src/devices/machine/hd63450.cpp b/src/devices/machine/hd63450.cpp index 5006729badf..8afa091fe0d 100644 --- a/src/devices/machine/hd63450.cpp +++ b/src/devices/machine/hd63450.cpp @@ -525,7 +525,7 @@ void hd63450_device::set_error(int channel, uint8_t code) set_irq(channel); } -WRITE_LINE_MEMBER(hd63450_device::drq0_w) +void hd63450_device::drq0_w(int state) { bool ostate = m_drq_state[0]; m_drq_state[0] = state; @@ -540,7 +540,7 @@ WRITE_LINE_MEMBER(hd63450_device::drq0_w) m_timer[0]->adjust(attotime::never); } -WRITE_LINE_MEMBER(hd63450_device::drq1_w) +void hd63450_device::drq1_w(int state) { bool ostate = m_drq_state[1]; m_drq_state[1] = state; @@ -554,7 +554,7 @@ WRITE_LINE_MEMBER(hd63450_device::drq1_w) m_timer[1]->adjust(attotime::never); } -WRITE_LINE_MEMBER(hd63450_device::drq2_w) +void hd63450_device::drq2_w(int state) { bool ostate = m_drq_state[2]; m_drq_state[2] = state; @@ -568,7 +568,7 @@ WRITE_LINE_MEMBER(hd63450_device::drq2_w) m_timer[2]->adjust(attotime::never); } -WRITE_LINE_MEMBER(hd63450_device::drq3_w) +void hd63450_device::drq3_w(int state) { bool ostate = m_drq_state[3]; m_drq_state[3] = state; diff --git a/src/devices/machine/hd63450.h b/src/devices/machine/hd63450.h index 33ffd8b1097..50e6409c703 100644 --- a/src/devices/machine/hd63450.h +++ b/src/devices/machine/hd63450.h @@ -43,10 +43,10 @@ public: uint16_t read(offs_t offset); void write(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); - DECLARE_WRITE_LINE_MEMBER(drq0_w); - DECLARE_WRITE_LINE_MEMBER(drq1_w); - DECLARE_WRITE_LINE_MEMBER(drq2_w); - DECLARE_WRITE_LINE_MEMBER(drq3_w); + void drq0_w(int state); + void drq1_w(int state); + void drq2_w(int state); + void drq3_w(int state); uint8_t iack(); enum { diff --git a/src/devices/machine/hdc92x4.cpp b/src/devices/machine/hdc92x4.cpp index 8c26b3a8663..88530e95966 100644 --- a/src/devices/machine/hdc92x4.cpp +++ b/src/devices/machine/hdc92x4.cpp @@ -4712,7 +4712,7 @@ void hdc92x4_device::set_interrupt(line_state intr) /* DMA acknowledge line. */ -WRITE_LINE_MEMBER( hdc92x4_device::dmaack ) +void hdc92x4_device::dmaack(int state) { if (state==ASSERT_LINE) { @@ -4776,7 +4776,7 @@ TIMER_CALLBACK_MEMBER(hdc92x4_device::com_timer_expired) /* Reset the controller. Negative logic, but we use ASSERT_LINE. */ -WRITE_LINE_MEMBER( hdc92x4_device::reset ) +void hdc92x4_device::reset(int state) { if (state == ASSERT_LINE) { diff --git a/src/devices/machine/hdc92x4.h b/src/devices/machine/hdc92x4.h index 4527efc6c91..0a2ef365d7e 100644 --- a/src/devices/machine/hdc92x4.h +++ b/src/devices/machine/hdc92x4.h @@ -47,8 +47,8 @@ public: // Accessors from the CPU side uint8_t read(offs_t offset); void write(offs_t offset, uint8_t data); - DECLARE_WRITE_LINE_MEMBER( reset ); - DECLARE_WRITE_LINE_MEMBER( dmaack ); + void reset(int state); + void dmaack(int state); // Callbacks auto intrq_cb() { return m_out_intrq.bind(); } diff --git a/src/devices/machine/hp_taco.cpp b/src/devices/machine/hp_taco.cpp index 8896edf0fc2..b07cbe01e59 100644 --- a/src/devices/machine/hp_taco.cpp +++ b/src/devices/machine/hp_taco.cpp @@ -363,17 +363,17 @@ uint16_t hp_taco_device::reg_r(offs_t offset) return res; } -READ_LINE_MEMBER(hp_taco_device::flg_r) +int hp_taco_device::flg_r() { return m_flg; } -READ_LINE_MEMBER(hp_taco_device::sts_r) +int hp_taco_device::sts_r() { return m_sts; } -WRITE_LINE_MEMBER(hp_taco_device::cart_out_w) +void hp_taco_device::cart_out_w(int state) { LOG_DBG("cart_out_w %d\n", state); set_tape_present(!state); @@ -383,7 +383,7 @@ WRITE_LINE_MEMBER(hp_taco_device::cart_out_w) } } -WRITE_LINE_MEMBER(hp_taco_device::hole_w) +void hp_taco_device::hole_w(int state) { if (state) { LOG_DBG("hole_w\n"); @@ -395,7 +395,7 @@ WRITE_LINE_MEMBER(hp_taco_device::hole_w) } } -WRITE_LINE_MEMBER(hp_taco_device::tacho_tick_w) +void hp_taco_device::tacho_tick_w(int state) { if (state) { LOG_DBG("tacho_tick_w\n"); @@ -451,14 +451,14 @@ WRITE_LINE_MEMBER(hp_taco_device::tacho_tick_w) } } -WRITE_LINE_MEMBER(hp_taco_device::motion_w) +void hp_taco_device::motion_w(int state) { if (state) { cmd_fsm(); } } -WRITE_LINE_MEMBER(hp_taco_device::rd_bit_w) +void hp_taco_device::rd_bit_w(int state) { LOG_RW("RD bit %d (st=%d,w=%04x,i=%u)\n", state, m_cmd_state, m_working_reg, m_bit_idx); if (m_cmd_state != CMD_IDLE) { @@ -516,7 +516,7 @@ WRITE_LINE_MEMBER(hp_taco_device::rd_bit_w) } } -READ_LINE_MEMBER(hp_taco_device::wr_bit_r) +int hp_taco_device::wr_bit_r() { bool bit = false; if (is_cmd_wr(m_cmd_reg) && m_cmd_state == CMD_PH2) { diff --git a/src/devices/machine/hp_taco.h b/src/devices/machine/hp_taco.h index f409946a988..7c92a33618c 100644 --- a/src/devices/machine/hp_taco.h +++ b/src/devices/machine/hp_taco.h @@ -35,15 +35,15 @@ public: uint16_t reg_r(offs_t offset); // Flag & status read - DECLARE_READ_LINE_MEMBER(flg_r); - DECLARE_READ_LINE_MEMBER(sts_r); - - DECLARE_WRITE_LINE_MEMBER(cart_out_w); - DECLARE_WRITE_LINE_MEMBER(hole_w); - DECLARE_WRITE_LINE_MEMBER(tacho_tick_w); - DECLARE_WRITE_LINE_MEMBER(motion_w); - DECLARE_WRITE_LINE_MEMBER(rd_bit_w); - DECLARE_READ_LINE_MEMBER(wr_bit_r); + int flg_r(); + int sts_r(); + + void cart_out_w(int state); + void hole_w(int state); + void tacho_tick_w(int state); + void motion_w(int state); + void rd_bit_w(int state); + int wr_bit_r(); protected: hp_taco_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); diff --git a/src/devices/machine/i2cmem.cpp b/src/devices/machine/i2cmem.cpp index 2db16de0899..b1d1d0d372c 100644 --- a/src/devices/machine/i2cmem.cpp +++ b/src/devices/machine/i2cmem.cpp @@ -276,7 +276,7 @@ bool i2cmem_device::nvram_write( util::write_stream &file ) // READ/WRITE HANDLERS //************************************************************************** -WRITE_LINE_MEMBER( i2cmem_device::write_e0 ) +void i2cmem_device::write_e0(int state) { state &= 1; if( m_e0 != state ) @@ -287,7 +287,7 @@ WRITE_LINE_MEMBER( i2cmem_device::write_e0 ) } -WRITE_LINE_MEMBER( i2cmem_device::write_e1 ) +void i2cmem_device::write_e1(int state) { state &= 1; if( m_e1 != state ) @@ -298,7 +298,7 @@ WRITE_LINE_MEMBER( i2cmem_device::write_e1 ) } -WRITE_LINE_MEMBER( i2cmem_device::write_e2 ) +void i2cmem_device::write_e2(int state) { state &= 1; if( m_e2 != state ) @@ -309,7 +309,7 @@ WRITE_LINE_MEMBER( i2cmem_device::write_e2 ) } -WRITE_LINE_MEMBER( i2cmem_device::write_sda ) +void i2cmem_device::write_sda(int state) { state &= 1; if( m_sdaw != state ) @@ -346,7 +346,7 @@ WRITE_LINE_MEMBER( i2cmem_device::write_sda ) } } -WRITE_LINE_MEMBER( i2cmem_device::write_scl ) +void i2cmem_device::write_scl(int state) { if( m_scl != state ) { @@ -551,7 +551,7 @@ WRITE_LINE_MEMBER( i2cmem_device::write_scl ) } -WRITE_LINE_MEMBER( i2cmem_device::write_wc ) +void i2cmem_device::write_wc(int state) { state &= 1; if( m_wc != state ) @@ -562,7 +562,7 @@ WRITE_LINE_MEMBER( i2cmem_device::write_wc ) } -READ_LINE_MEMBER( i2cmem_device::read_sda ) +int i2cmem_device::read_sda() { int res = m_sdar & 1; verboselog( this, 2, "read sda %d\n", res ); diff --git a/src/devices/machine/i2cmem.h b/src/devices/machine/i2cmem.h index 9ea431faab2..07aebfa78ab 100644 --- a/src/devices/machine/i2cmem.h +++ b/src/devices/machine/i2cmem.h @@ -40,13 +40,13 @@ public: i2cmem_device & set_wc(int wc) { m_wc = wc; return *this; } // I/O operations - DECLARE_WRITE_LINE_MEMBER( write_e0 ); - DECLARE_WRITE_LINE_MEMBER( write_e1 ); - DECLARE_WRITE_LINE_MEMBER( write_e2 ); - DECLARE_WRITE_LINE_MEMBER( write_sda ); - DECLARE_WRITE_LINE_MEMBER( write_scl ); - DECLARE_WRITE_LINE_MEMBER( write_wc ); - DECLARE_READ_LINE_MEMBER( read_sda ); + void write_e0(int state); + void write_e1(int state); + void write_e2(int state); + void write_sda(int state); + void write_scl(int state); + void write_wc(int state); + int read_sda(); protected: // construction/destruction diff --git a/src/devices/machine/i3001.cpp b/src/devices/machine/i3001.cpp index b9d0db1fee3..e6207805d43 100644 --- a/src/devices/machine/i3001.cpp +++ b/src/devices/machine/i3001.cpp @@ -52,7 +52,7 @@ void i3001_device::fc_w(uint8_t fc) } } -WRITE_LINE_MEMBER(i3001_device::clk_w) +void i3001_device::clk_w(int state) { update(); } diff --git a/src/devices/machine/i3001.h b/src/devices/machine/i3001.h index 1bb5462c541..fa3368c05ce 100644 --- a/src/devices/machine/i3001.h +++ b/src/devices/machine/i3001.h @@ -61,20 +61,20 @@ public: void fc_w(uint8_t fc); // Write Flag Input - DECLARE_WRITE_LINE_MEMBER(fi_w) { m_fi = state; } + void fi_w(int state) { m_fi = state; } // Read Flag Output - DECLARE_READ_LINE_MEMBER(fo_r) { return m_fo; } + int fo_r() { return m_fo; } // Read carry/zero flags - DECLARE_READ_LINE_MEMBER(carry_r) { return m_carry; } - DECLARE_READ_LINE_MEMBER(zero_r) { return m_zero; } + int carry_r() { return m_carry; } + int zero_r() { return m_zero; } // Load address (in real hw address is loaded through PX/SX buses) void addr_w(uint16_t addr) { m_addr = addr & ADDR_MASK; } // Clock pulse - DECLARE_WRITE_LINE_MEMBER(clk_w); + void clk_w(int state); protected: virtual void device_start() override; diff --git a/src/devices/machine/i3002.cpp b/src/devices/machine/i3002.cpp index 3cdf27b9136..d0ef79794f0 100644 --- a/src/devices/machine/i3002.cpp +++ b/src/devices/machine/i3002.cpp @@ -108,7 +108,7 @@ void i3002_device::fc_kbus_w(uint8_t fc , uint8_t k) m_kbus = k & WORD_MASK; } -WRITE_LINE_MEMBER(i3002_device::clk_w) +void i3002_device::clk_w(int state) { if (state) { update(); diff --git a/src/devices/machine/i3002.h b/src/devices/machine/i3002.h index 8fea81bad3c..338908e3a7b 100644 --- a/src/devices/machine/i3002.h +++ b/src/devices/machine/i3002.h @@ -76,23 +76,23 @@ public: void fc_kbus_w(uint8_t fc , uint8_t k); // Write Carry Input - DECLARE_WRITE_LINE_MEMBER(ci_w) { m_ci = state; } + void ci_w(int state) { m_ci = state; } // Write Left Input - DECLARE_WRITE_LINE_MEMBER(li_w) { m_li = state; } + void li_w(int state) { m_li = state; } // Read Carry Output - DECLARE_READ_LINE_MEMBER(co_r) const { return m_co; } + int co_r() const { return m_co; } // Read Right Output - DECLARE_READ_LINE_MEMBER(ro_r) const { return m_ro; } + int ro_r() const { return m_ro; } // Read output buses uint8_t abus_r() const { return m_reg[ REG_MAR ]; } uint8_t dbus_r() const { return m_reg[ REG_AC ]; } // Clock pulse - DECLARE_WRITE_LINE_MEMBER(clk_w); + void clk_w(int state); // Compute RO if FC is the code of right-shift op (and return true) // Return false in all other cases diff --git a/src/devices/machine/i80130.h b/src/devices/machine/i80130.h index 0b5958ad875..e2e0d34fe90 100644 --- a/src/devices/machine/i80130.h +++ b/src/devices/machine/i80130.h @@ -32,14 +32,14 @@ public: uint8_t inta_r() { return m_pic->acknowledge(); } - DECLARE_WRITE_LINE_MEMBER( ir0_w ) { m_pic->ir0_w(state); } - DECLARE_WRITE_LINE_MEMBER( ir1_w ) { m_pic->ir1_w(state); } - DECLARE_WRITE_LINE_MEMBER( ir2_w ) { m_pic->ir2_w(state); } - DECLARE_WRITE_LINE_MEMBER( ir3_w ) { m_pic->ir3_w(state); } - DECLARE_WRITE_LINE_MEMBER( ir4_w ) { m_pic->ir4_w(state); } - DECLARE_WRITE_LINE_MEMBER( ir5_w ) { m_pic->ir5_w(state); } - DECLARE_WRITE_LINE_MEMBER( ir6_w ) { m_pic->ir6_w(state); } - DECLARE_WRITE_LINE_MEMBER( ir7_w ) { m_pic->ir7_w(state); } + void ir0_w(int state) { m_pic->ir0_w(state); } + void ir1_w(int state) { m_pic->ir1_w(state); } + void ir2_w(int state) { m_pic->ir2_w(state); } + void ir3_w(int state) { m_pic->ir3_w(state); } + void ir4_w(int state) { m_pic->ir4_w(state); } + void ir5_w(int state) { m_pic->ir5_w(state); } + void ir6_w(int state) { m_pic->ir6_w(state); } + void ir7_w(int state) { m_pic->ir7_w(state); } protected: // device-level overrides @@ -60,10 +60,10 @@ private: devcb_write_line m_write_delay; devcb_write_line m_write_baud; - DECLARE_WRITE_LINE_MEMBER( irq_w ) { m_write_irq(state); } - DECLARE_WRITE_LINE_MEMBER( systick_w ) { m_write_systick(state); } - DECLARE_WRITE_LINE_MEMBER( delay_w ) { m_write_delay(state); } - DECLARE_WRITE_LINE_MEMBER( baud_w ) { m_write_baud(state); } + void irq_w(int state) { m_write_irq(state); } + void systick_w(int state) { m_write_systick(state); } + void delay_w(int state) { m_write_delay(state); } + void baud_w(int state) { m_write_baud(state); } uint16_t io_r(offs_t offset, uint16_t mem_mask = ~0); void io_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); diff --git a/src/devices/machine/i8212.cpp b/src/devices/machine/i8212.cpp index c6cf46eafe5..38b12d39c2a 100644 --- a/src/devices/machine/i8212.cpp +++ b/src/devices/machine/i8212.cpp @@ -188,7 +188,7 @@ void i8212_device::strobe(uint8_t data) // stb_w - data strobe write //------------------------------------------------- -WRITE_LINE_MEMBER(i8212_device::stb_w) +void i8212_device::stb_w(int state) { // active on falling edge if (m_stb && !state) diff --git a/src/devices/machine/i8212.h b/src/devices/machine/i8212.h index efd84d11813..b8992e5842e 100644 --- a/src/devices/machine/i8212.h +++ b/src/devices/machine/i8212.h @@ -52,7 +52,7 @@ public: void strobe(uint8_t data); // line write handlers - DECLARE_WRITE_LINE_MEMBER(stb_w); + void stb_w(int state); protected: // device-level overrides diff --git a/src/devices/machine/i82357.cpp b/src/devices/machine/i82357.cpp index a86ad363115..f26790a8cf5 100644 --- a/src/devices/machine/i82357.cpp +++ b/src/devices/machine/i82357.cpp @@ -265,7 +265,7 @@ void i82357_device::nmi_ext_w(u8 data) m_nmi_check->adjust(attotime::zero); } -WRITE_LINE_MEMBER(i82357_device::in_iochk) +void i82357_device::in_iochk(int state) { if (!state && !(m_nmi_reg & NMI_PARITY_DISABLE)) { @@ -277,7 +277,7 @@ WRITE_LINE_MEMBER(i82357_device::in_iochk) m_nmi_reg &= ~NMI_IOCHK; } -WRITE_LINE_MEMBER(i82357_device::in_parity) +void i82357_device::in_parity(int state) { if (!state && !(m_nmi_reg & NMI_IOCHK_DISABLE)) { diff --git a/src/devices/machine/i82357.h b/src/devices/machine/i82357.h index 3c5a7756061..8df66abdd8e 100644 --- a/src/devices/machine/i82357.h +++ b/src/devices/machine/i82357.h @@ -22,8 +22,8 @@ public: u32 eisa_irq_ack() { return m_pic[0]->acknowledge(); } - DECLARE_WRITE_LINE_MEMBER(in_iochk); - DECLARE_WRITE_LINE_MEMBER(in_parity); + void in_iochk(int state); + void in_parity(int state); void map(address_map &map); diff --git a/src/devices/machine/i82371sb.cpp b/src/devices/machine/i82371sb.cpp index b7b350d4a4e..ac45c713996 100644 --- a/src/devices/machine/i82371sb.cpp +++ b/src/devices/machine/i82371sb.cpp @@ -560,19 +560,19 @@ void i82371sb_isa_device::at_speaker_set_spkrdata(uint8_t data) m_speaker->level_w(m_at_spkrdata & m_pit_out2); } -WRITE_LINE_MEMBER(i82371sb_isa_device::at_pit8254_out0_changed) +void i82371sb_isa_device::at_pit8254_out0_changed(int state) { if (m_pic8259_master) m_pic8259_master->ir0_w(state); } -WRITE_LINE_MEMBER(i82371sb_isa_device::at_pit8254_out1_changed) +void i82371sb_isa_device::at_pit8254_out1_changed(int state) { if (state) m_refresh = !m_refresh; } -WRITE_LINE_MEMBER(i82371sb_isa_device::at_pit8254_out2_changed) +void i82371sb_isa_device::at_pit8254_out2_changed(int state) { m_pit_out2 = state ? 1 : 0; m_speaker->level_w(m_at_spkrdata & m_pit_out2); @@ -624,7 +624,7 @@ void i82371sb_isa_device::at_page8_w(offs_t offset, uint8_t data) } } -WRITE_LINE_MEMBER(i82371sb_isa_device::pc_dma_hrq_changed) +void i82371sb_isa_device::pc_dma_hrq_changed(int state) { m_maincpu->set_input_line(INPUT_LINE_HALT, state ? ASSERT_LINE : CLEAR_LINE); @@ -694,7 +694,7 @@ void i82371sb_isa_device::pc_dma8237_5_dack_w(uint8_t data) { m_isabus->dack_w(5 void i82371sb_isa_device::pc_dma8237_6_dack_w(uint8_t data) { m_isabus->dack_w(6, data); } void i82371sb_isa_device::pc_dma8237_7_dack_w(uint8_t data) { m_isabus->dack_w(7, data); } -WRITE_LINE_MEMBER(i82371sb_isa_device::at_dma8237_out_eop) +void i82371sb_isa_device::at_dma8237_out_eop(int state) { m_cur_eop = state == ASSERT_LINE; if (m_dma_channel != -1) @@ -719,14 +719,14 @@ void i82371sb_isa_device::pc_select_dma_channel(int channel, bool state) } } -WRITE_LINE_MEMBER(i82371sb_isa_device::pc_dack0_w) { pc_select_dma_channel(0, state); } -WRITE_LINE_MEMBER(i82371sb_isa_device::pc_dack1_w) { pc_select_dma_channel(1, state); } -WRITE_LINE_MEMBER(i82371sb_isa_device::pc_dack2_w) { pc_select_dma_channel(2, state); } -WRITE_LINE_MEMBER(i82371sb_isa_device::pc_dack3_w) { pc_select_dma_channel(3, state); } -WRITE_LINE_MEMBER(i82371sb_isa_device::pc_dack4_w) { m_dma8237_1->hack_w(state ? 0 : 1); } // it's inverted -WRITE_LINE_MEMBER(i82371sb_isa_device::pc_dack5_w) { pc_select_dma_channel(5, state); } -WRITE_LINE_MEMBER(i82371sb_isa_device::pc_dack6_w) { pc_select_dma_channel(6, state); } -WRITE_LINE_MEMBER(i82371sb_isa_device::pc_dack7_w) { pc_select_dma_channel(7, state); } +void i82371sb_isa_device::pc_dack0_w(int state) { pc_select_dma_channel(0, state); } +void i82371sb_isa_device::pc_dack1_w(int state) { pc_select_dma_channel(1, state); } +void i82371sb_isa_device::pc_dack2_w(int state) { pc_select_dma_channel(2, state); } +void i82371sb_isa_device::pc_dack3_w(int state) { pc_select_dma_channel(3, state); } +void i82371sb_isa_device::pc_dack4_w(int state) { m_dma8237_1->hack_w( state ? 0 : 1); } // it's inverted +void i82371sb_isa_device::pc_dack5_w(int state) { pc_select_dma_channel(5, state); } +void i82371sb_isa_device::pc_dack6_w(int state) { pc_select_dma_channel(6, state); } +void i82371sb_isa_device::pc_dack7_w(int state) { pc_select_dma_channel(7, state); } void i82371sb_isa_device::redirect_irq(int irq, int state) { @@ -774,7 +774,7 @@ void i82371sb_isa_device::redirect_irq(int irq, int state) } } -WRITE_LINE_MEMBER(i82371sb_isa_device::pc_pirqa_w) +void i82371sb_isa_device::pc_pirqa_w(int state) { int irq = pirqrc[0] & 15; @@ -783,7 +783,7 @@ WRITE_LINE_MEMBER(i82371sb_isa_device::pc_pirqa_w) redirect_irq(irq, state); } -WRITE_LINE_MEMBER(i82371sb_isa_device::pc_pirqb_w) +void i82371sb_isa_device::pc_pirqb_w(int state) { int irq = pirqrc[1] & 15; @@ -792,7 +792,7 @@ WRITE_LINE_MEMBER(i82371sb_isa_device::pc_pirqb_w) redirect_irq(irq, state); } -WRITE_LINE_MEMBER(i82371sb_isa_device::pc_pirqc_w) +void i82371sb_isa_device::pc_pirqc_w(int state) { int irq = pirqrc[2] & 15; @@ -801,7 +801,7 @@ WRITE_LINE_MEMBER(i82371sb_isa_device::pc_pirqc_w) redirect_irq(irq, state); } -WRITE_LINE_MEMBER(i82371sb_isa_device::pc_pirqd_w) +void i82371sb_isa_device::pc_pirqd_w(int state) { int irq = pirqrc[3] & 15; @@ -810,7 +810,7 @@ WRITE_LINE_MEMBER(i82371sb_isa_device::pc_pirqd_w) redirect_irq(irq, state); } -WRITE_LINE_MEMBER(i82371sb_isa_device::pc_mirq0_w) +void i82371sb_isa_device::pc_mirq0_w(int state) { int irq = mbirq0 & 15; @@ -819,7 +819,7 @@ WRITE_LINE_MEMBER(i82371sb_isa_device::pc_mirq0_w) redirect_irq(irq, state); } -WRITE_LINE_MEMBER(i82371sb_isa_device::pc_mirq1_w) +void i82371sb_isa_device::pc_mirq1_w(int state) { int irq = mbirq1 & 15; @@ -828,30 +828,30 @@ WRITE_LINE_MEMBER(i82371sb_isa_device::pc_mirq1_w) redirect_irq(irq, state); } -WRITE_LINE_MEMBER(i82371sb_isa_device::pc_ferr_w) +void i82371sb_isa_device::pc_ferr_w(int state) { if (!(xbcs & 32)) return; m_pic8259_slave->ir5_w(state); } -WRITE_LINE_MEMBER(i82371sb_isa_device::pc_extsmi_w) +void i82371sb_isa_device::pc_extsmi_w(int state) { } -WRITE_LINE_MEMBER(i82371sb_isa_device::pc_irq1_w) { m_pic8259_master->ir1_w(state); } -WRITE_LINE_MEMBER(i82371sb_isa_device::pc_irq3_w) { m_pic8259_master->ir3_w(state); } -WRITE_LINE_MEMBER(i82371sb_isa_device::pc_irq4_w) { m_pic8259_master->ir4_w(state); } -WRITE_LINE_MEMBER(i82371sb_isa_device::pc_irq5_w) { m_pic8259_master->ir5_w(state); } -WRITE_LINE_MEMBER(i82371sb_isa_device::pc_irq6_w) { m_pic8259_master->ir6_w(state); } -WRITE_LINE_MEMBER(i82371sb_isa_device::pc_irq7_w) { m_pic8259_master->ir7_w(state); } -WRITE_LINE_MEMBER(i82371sb_isa_device::pc_irq8n_w) { m_pic8259_slave->ir0_w(state); } -WRITE_LINE_MEMBER(i82371sb_isa_device::pc_irq9_w) { m_pic8259_slave->ir1_w(state); } -WRITE_LINE_MEMBER(i82371sb_isa_device::pc_irq10_w) { m_pic8259_slave->ir2_w(state); } -WRITE_LINE_MEMBER(i82371sb_isa_device::pc_irq11_w) { m_pic8259_slave->ir3_w(state); } -WRITE_LINE_MEMBER(i82371sb_isa_device::pc_irq12m_w) { m_pic8259_slave->ir4_w(state); } -WRITE_LINE_MEMBER(i82371sb_isa_device::pc_irq14_w) { m_pic8259_slave->ir6_w(state); } -WRITE_LINE_MEMBER(i82371sb_isa_device::pc_irq15_w) { m_pic8259_slave->ir7_w(state); } +void i82371sb_isa_device::pc_irq1_w(int state) { m_pic8259_master->ir1_w(state); } +void i82371sb_isa_device::pc_irq3_w(int state) { m_pic8259_master->ir3_w(state); } +void i82371sb_isa_device::pc_irq4_w(int state) { m_pic8259_master->ir4_w(state); } +void i82371sb_isa_device::pc_irq5_w(int state) { m_pic8259_master->ir5_w(state); } +void i82371sb_isa_device::pc_irq6_w(int state) { m_pic8259_master->ir6_w(state); } +void i82371sb_isa_device::pc_irq7_w(int state) { m_pic8259_master->ir7_w(state); } +void i82371sb_isa_device::pc_irq8n_w(int state) { m_pic8259_slave->ir0_w(state); } +void i82371sb_isa_device::pc_irq9_w(int state) { m_pic8259_slave->ir1_w(state); } +void i82371sb_isa_device::pc_irq10_w(int state) { m_pic8259_slave->ir2_w(state); } +void i82371sb_isa_device::pc_irq11_w(int state) { m_pic8259_slave->ir3_w(state); } +void i82371sb_isa_device::pc_irq12m_w(int state) { m_pic8259_slave->ir4_w(state); } +void i82371sb_isa_device::pc_irq14_w(int state) { m_pic8259_slave->ir6_w(state); } +void i82371sb_isa_device::pc_irq15_w(int state) { m_pic8259_slave->ir7_w(state); } uint8_t i82371sb_isa_device::at_portb_r() { @@ -878,7 +878,7 @@ void i82371sb_isa_device::at_portb_w(uint8_t data) m_maincpu->set_input_line(INPUT_LINE_NMI, CLEAR_LINE); } -WRITE_LINE_MEMBER(i82371sb_isa_device::iochck_w) +void i82371sb_isa_device::iochck_w(int state) { if (!state && !m_channel_check && m_nmi_enabled) m_maincpu->set_input_line(INPUT_LINE_NMI, ASSERT_LINE); @@ -1058,12 +1058,12 @@ void i82371sb_ide_device::map_extra( } } -WRITE_LINE_MEMBER(i82371sb_ide_device::primary_int) +void i82371sb_ide_device::primary_int(int state) { m_irq_pri_callback(state); } -WRITE_LINE_MEMBER(i82371sb_ide_device::secondary_int) +void i82371sb_ide_device::secondary_int(int state) { m_irq_sec_callback(state); } diff --git a/src/devices/machine/i82371sb.h b/src/devices/machine/i82371sb.h index c8f239ff321..53700449017 100644 --- a/src/devices/machine/i82371sb.h +++ b/src/devices/machine/i82371sb.h @@ -43,28 +43,28 @@ public: template void set_cpu_tag(T &&tag) { m_maincpu.set_tag(std::forward(tag)); } - DECLARE_WRITE_LINE_MEMBER(pc_pirqa_w); - DECLARE_WRITE_LINE_MEMBER(pc_pirqb_w); - DECLARE_WRITE_LINE_MEMBER(pc_pirqc_w); - DECLARE_WRITE_LINE_MEMBER(pc_pirqd_w); - DECLARE_WRITE_LINE_MEMBER(pc_mirq0_w); - DECLARE_WRITE_LINE_MEMBER(pc_mirq1_w); - DECLARE_WRITE_LINE_MEMBER(pc_ferr_w); - DECLARE_WRITE_LINE_MEMBER(pc_extsmi_w); - - DECLARE_WRITE_LINE_MEMBER(pc_irq1_w); - DECLARE_WRITE_LINE_MEMBER(pc_irq3_w); - DECLARE_WRITE_LINE_MEMBER(pc_irq4_w); - DECLARE_WRITE_LINE_MEMBER(pc_irq5_w); - DECLARE_WRITE_LINE_MEMBER(pc_irq6_w); - DECLARE_WRITE_LINE_MEMBER(pc_irq7_w); - DECLARE_WRITE_LINE_MEMBER(pc_irq8n_w); - DECLARE_WRITE_LINE_MEMBER(pc_irq9_w); - DECLARE_WRITE_LINE_MEMBER(pc_irq10_w); - DECLARE_WRITE_LINE_MEMBER(pc_irq11_w); - DECLARE_WRITE_LINE_MEMBER(pc_irq12m_w); - DECLARE_WRITE_LINE_MEMBER(pc_irq14_w); - DECLARE_WRITE_LINE_MEMBER(pc_irq15_w); + void pc_pirqa_w(int state); + void pc_pirqb_w(int state); + void pc_pirqc_w(int state); + void pc_pirqd_w(int state); + void pc_mirq0_w(int state); + void pc_mirq1_w(int state); + void pc_ferr_w(int state); + void pc_extsmi_w(int state); + + void pc_irq1_w(int state); + void pc_irq3_w(int state); + void pc_irq4_w(int state); + void pc_irq5_w(int state); + void pc_irq6_w(int state); + void pc_irq7_w(int state); + void pc_irq8n_w(int state); + void pc_irq9_w(int state); + void pc_irq10_w(int state); + void pc_irq11_w(int state); + void pc_irq12m_w(int state); + void pc_irq14_w(int state); + void pc_irq15_w(int state); protected: i82371sb_isa_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); @@ -83,9 +83,9 @@ protected: virtual void config_map(address_map &map) override; private: - DECLARE_WRITE_LINE_MEMBER(at_pit8254_out0_changed); - DECLARE_WRITE_LINE_MEMBER(at_pit8254_out1_changed); - DECLARE_WRITE_LINE_MEMBER(at_pit8254_out2_changed); + void at_pit8254_out0_changed(int state); + void at_pit8254_out1_changed(int state); + void at_pit8254_out2_changed(int state); uint8_t pc_dma8237_0_dack_r(); uint8_t pc_dma8237_1_dack_r(); uint8_t pc_dma8237_2_dack_r(); @@ -100,16 +100,16 @@ private: void pc_dma8237_5_dack_w(uint8_t data); void pc_dma8237_6_dack_w(uint8_t data); void pc_dma8237_7_dack_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(pc_dack0_w); - DECLARE_WRITE_LINE_MEMBER(pc_dack1_w); - DECLARE_WRITE_LINE_MEMBER(pc_dack2_w); - DECLARE_WRITE_LINE_MEMBER(pc_dack3_w); - DECLARE_WRITE_LINE_MEMBER(pc_dack4_w); - DECLARE_WRITE_LINE_MEMBER(pc_dack5_w); - DECLARE_WRITE_LINE_MEMBER(pc_dack6_w); - DECLARE_WRITE_LINE_MEMBER(pc_dack7_w); - DECLARE_WRITE_LINE_MEMBER(at_dma8237_out_eop); - DECLARE_WRITE_LINE_MEMBER(pc_dma_hrq_changed); + void pc_dack0_w(int state); + void pc_dack1_w(int state); + void pc_dack2_w(int state); + void pc_dack3_w(int state); + void pc_dack4_w(int state); + void pc_dack5_w(int state); + void pc_dack6_w(int state); + void pc_dack7_w(int state); + void at_dma8237_out_eop(int state); + void pc_dma_hrq_changed(int state); uint8_t pc_dma_read_byte(offs_t offset); void pc_dma_write_byte(offs_t offset, uint8_t data); uint8_t pc_dma_read_word(offs_t offset); @@ -162,7 +162,7 @@ private: void at_page8_w(offs_t offset, uint8_t data); uint8_t at_portb_r(); void at_portb_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(iochck_w); + void iochck_w(int state); uint8_t at_dma8237_2_r(offs_t offset); void at_dma8237_2_w(offs_t offset, uint8_t data); uint8_t eisa_irq_read(offs_t offset); @@ -251,8 +251,8 @@ protected: virtual void config_map(address_map &map) override; - DECLARE_WRITE_LINE_MEMBER(primary_int); - DECLARE_WRITE_LINE_MEMBER(secondary_int); + void primary_int(int state); + void secondary_int(int state); private: void status_w(offs_t offset, uint16_t data, uint16_t mem_mask); diff --git a/src/devices/machine/i8243.cpp b/src/devices/machine/i8243.cpp index 5c6c0bfe385..bdf49bb9791 100644 --- a/src/devices/machine/i8243.cpp +++ b/src/devices/machine/i8243.cpp @@ -88,7 +88,7 @@ void i8243_device::output_update(int which) // state //------------------------------------------------- -WRITE_LINE_MEMBER(i8243_device::prog_w) +void i8243_device::prog_w(int state) { /* on high->low transition state, latch opcode/port */ if (m_prog && !state && !m_cs) @@ -144,7 +144,7 @@ WRITE_LINE_MEMBER(i8243_device::prog_w) // cs_w - handle chip select line (active low) //------------------------------------------------- -WRITE_LINE_MEMBER(i8243_device::cs_w) +void i8243_device::cs_w(int state) { m_cs = state; if (m_cs) diff --git a/src/devices/machine/i8243.h b/src/devices/machine/i8243.h index 53c46358567..9547abb14cb 100644 --- a/src/devices/machine/i8243.h +++ b/src/devices/machine/i8243.h @@ -47,8 +47,8 @@ public: uint8_t p2_r(); void p2_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(prog_w); - DECLARE_WRITE_LINE_MEMBER(cs_w); + void prog_w(int state); + void cs_w(int state); protected: // device-level overrides diff --git a/src/devices/machine/i82439hx.cpp b/src/devices/machine/i82439hx.cpp index c1f3686bc77..2a8e1a12714 100644 --- a/src/devices/machine/i82439hx.cpp +++ b/src/devices/machine/i82439hx.cpp @@ -399,7 +399,7 @@ uint8_t i82439hx_host_device::errsyn_r() return errsyn; } -WRITE_LINE_MEMBER(i82439hx_host_device::smi_act_w) +void i82439hx_host_device::smi_act_w(int state) { // state is 0 when smm is not active // but smiact_n reflects the state of the SMIACT# pin diff --git a/src/devices/machine/i82439hx.h b/src/devices/machine/i82439hx.h index 79911b04132..3356b44b12f 100644 --- a/src/devices/machine/i82439hx.h +++ b/src/devices/machine/i82439hx.h @@ -23,7 +23,7 @@ public: template void set_cpu_tag(T &&tag) { cpu.set_tag(std::forward(tag)); } void set_ram_size(int ram_size); - DECLARE_WRITE_LINE_MEMBER(smi_act_w); + void smi_act_w(int state); protected: i82439hx_host_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); diff --git a/src/devices/machine/i8251.cpp b/src/devices/machine/i8251.cpp index b1a04cba1f6..502704429b6 100644 --- a/src/devices/machine/i8251.cpp +++ b/src/devices/machine/i8251.cpp @@ -826,14 +826,14 @@ void i8251_device::write(offs_t offset, uint8_t data) } -WRITE_LINE_MEMBER(i8251_device::write_rxd) +void i8251_device::write_rxd(int state) { m_rxd = state; LOGBITS("8251: Presented a %d\n", m_rxd); // device_serial_interface::rx_w(state); } -WRITE_LINE_MEMBER(i8251_device::write_cts) +void i8251_device::write_cts(int state) { m_cts = state; @@ -845,12 +845,12 @@ WRITE_LINE_MEMBER(i8251_device::write_cts) } } -WRITE_LINE_MEMBER(i8251_device::write_dsr) +void i8251_device::write_dsr(int state) { m_dsr = !state; } -WRITE_LINE_MEMBER(i8251_device::write_rxc) +void i8251_device::write_rxc(int state) { if (!m_rxc && state) { @@ -866,7 +866,7 @@ WRITE_LINE_MEMBER(i8251_device::write_rxc) m_rxc = state; } -WRITE_LINE_MEMBER(i8251_device::write_txc) +void i8251_device::write_txc(int state) { if (m_txc != state) { @@ -878,7 +878,7 @@ WRITE_LINE_MEMBER(i8251_device::write_txc) } // forcibly kill hunt mode -WRITE_LINE_MEMBER(i8251_device::write_syn) +void i8251_device::write_syn(int state) { if (m_syndet_pin && state) // must be set as input { @@ -888,7 +888,7 @@ WRITE_LINE_MEMBER(i8251_device::write_syn) } } -READ_LINE_MEMBER(i8251_device::txrdy_r) +int i8251_device::txrdy_r() { return is_tx_enabled() && (m_status & I8251_STATUS_TX_READY) != 0; } diff --git a/src/devices/machine/i8251.h b/src/devices/machine/i8251.h index 0cf1a7c911d..8a6d9517928 100644 --- a/src/devices/machine/i8251.h +++ b/src/devices/machine/i8251.h @@ -39,14 +39,14 @@ public: virtual uint8_t read(offs_t offset); virtual void write(offs_t offset, uint8_t data); - DECLARE_WRITE_LINE_MEMBER( write_rxd ); - DECLARE_WRITE_LINE_MEMBER( write_cts ); - DECLARE_WRITE_LINE_MEMBER( write_dsr ); - DECLARE_WRITE_LINE_MEMBER( write_txc ); - DECLARE_WRITE_LINE_MEMBER( write_rxc ); - DECLARE_WRITE_LINE_MEMBER( write_syn ); - - DECLARE_READ_LINE_MEMBER(txrdy_r); + void write_rxd(int state); + void write_cts(int state); + void write_dsr(int state); + void write_txc(int state); + void write_rxc(int state); + void write_syn(int state); + + int txrdy_r(); protected: enum diff --git a/src/devices/machine/i8255.cpp b/src/devices/machine/i8255.cpp index b1bae643ee9..c1db0ed3d03 100644 --- a/src/devices/machine/i8255.cpp +++ b/src/devices/machine/i8255.cpp @@ -877,7 +877,7 @@ uint8_t i8255_device::ackb_r() } -WRITE_LINE_MEMBER( i8255_device::pc2_w ) +void i8255_device::pc2_w(int state) { if (group_mode(GROUP_B) == 1) { @@ -910,7 +910,7 @@ WRITE_LINE_MEMBER( i8255_device::pc2_w ) } -WRITE_LINE_MEMBER( i8255_device::pc4_w ) +void i8255_device::pc4_w(int state) { if ((group_mode(GROUP_A) == 2) || ((group_mode(GROUP_A) == 1) && (port_mode(PORT_A) == MODE_INPUT))) { @@ -929,7 +929,7 @@ WRITE_LINE_MEMBER( i8255_device::pc4_w ) } -WRITE_LINE_MEMBER( i8255_device::pc6_w ) +void i8255_device::pc6_w(int state) { if ((group_mode(GROUP_A) == 2) || ((group_mode(GROUP_A) == 1) && (port_mode(PORT_A) == MODE_OUTPUT))) { diff --git a/src/devices/machine/i8255.h b/src/devices/machine/i8255.h index bd74fe2eb6e..2ab0b6c868c 100644 --- a/src/devices/machine/i8255.h +++ b/src/devices/machine/i8255.h @@ -68,9 +68,9 @@ public: uint8_t pb_r(); uint8_t ackb_r(); - DECLARE_WRITE_LINE_MEMBER( pc2_w ); - DECLARE_WRITE_LINE_MEMBER( pc4_w ); - DECLARE_WRITE_LINE_MEMBER( pc6_w ); + void pc2_w(int state); + void pc4_w(int state); + void pc6_w(int state); protected: i8255_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock, bool is_ams40489); diff --git a/src/devices/machine/i82586.cpp b/src/devices/machine/i82586.cpp index a4022231e69..f73c9a15755 100644 --- a/src/devices/machine/i82586.cpp +++ b/src/devices/machine/i82586.cpp @@ -213,7 +213,7 @@ device_memory_interface::space_config_vector i82586_base_device::memory_space_co }; } -WRITE_LINE_MEMBER(i82586_base_device::ca) +void i82586_base_device::ca(int state) { LOG("channel attention %s (%s)\n", state ? "asserted" : "cleared", machine().describe_context()); @@ -227,7 +227,7 @@ WRITE_LINE_MEMBER(i82586_base_device::ca) } } -WRITE_LINE_MEMBER(i82586_base_device::reset_w) +void i82586_base_device::reset_w(int state) { LOG("reset %s (%s)\n", state ? "asserted" : "cleared", machine().describe_context()); diff --git a/src/devices/machine/i82586.h b/src/devices/machine/i82586.h index 82f48163620..9fce2c70b6d 100644 --- a/src/devices/machine/i82586.h +++ b/src/devices/machine/i82586.h @@ -159,8 +159,8 @@ public: // callback configuration auto out_irq_cb() { return m_out_irq.bind(); } - DECLARE_WRITE_LINE_MEMBER(ca); - DECLARE_WRITE_LINE_MEMBER(reset_w); + void ca(int state); + void reset_w(int state); protected: i82586_base_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock, endianness_t endian, u8 datawidth, u8 addrwidth); diff --git a/src/devices/machine/ie15.cpp b/src/devices/machine/ie15.cpp index b9d337c8f42..613c0c8e56b 100644 --- a/src/devices/machine/ie15.cpp +++ b/src/devices/machine/ie15.cpp @@ -245,7 +245,7 @@ TIMER_CALLBACK_MEMBER(ie15_device::hblank_onoff_tick) /* serial port */ -WRITE_LINE_MEMBER(ie15_device::rs232_conn_rxd_w) +void ie15_device::rs232_conn_rxd_w(int state) { device_serial_interface::rx_w(state); } @@ -301,7 +301,7 @@ void ie15_device::serial_speed_w(uint8_t data) return; } -WRITE_LINE_MEMBER(ie15_device::update_serial) +void ie15_device::update_serial(int state) { int startbits = 1; int databits = m_rs232_databits->read(); @@ -465,7 +465,7 @@ void ie15_device::kbd_put(uint16_t data) } } -WRITE_LINE_MEMBER( ie15_device::kbd_sdv ) +void ie15_device::kbd_sdv(int state) { m_kbd_sdv = state; } diff --git a/src/devices/machine/ie15.h b/src/devices/machine/ie15.h index 89eaf0cfd8b..0d0e3808b6d 100644 --- a/src/devices/machine/ie15.h +++ b/src/devices/machine/ie15.h @@ -42,13 +42,13 @@ public: auto rs232_conn_txd_handler() { return m_rs232_conn_txd_handler.bind(); } auto rs232_conn_dtr_handler() { return m_rs232_conn_dtr_handler.bind(); } auto rs232_conn_rts_handler() { return m_rs232_conn_rts_handler.bind(); } - DECLARE_WRITE_LINE_MEMBER(rs232_conn_dcd_w); - DECLARE_WRITE_LINE_MEMBER(rs232_conn_dsr_w); - DECLARE_WRITE_LINE_MEMBER(rs232_conn_ri_w); - DECLARE_WRITE_LINE_MEMBER(rs232_conn_cts_w); - DECLARE_WRITE_LINE_MEMBER(rs232_conn_rxd_w); + void rs232_conn_dcd_w(int state); + void rs232_conn_dsr_w(int state); + void rs232_conn_ri_w(int state); + void rs232_conn_cts_w(int state); + void rs232_conn_rxd_w(int state); - DECLARE_WRITE_LINE_MEMBER(update_serial); + void update_serial(int state); protected: ie15_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); @@ -76,7 +76,7 @@ private: void ie15core(machine_config &config); void kbd_put(uint16_t data); - DECLARE_WRITE_LINE_MEMBER(kbd_sdv); + void kbd_sdv(int state); void mem_w(uint8_t data); uint8_t mem_r(); void mem_addr_lo_w(uint8_t data); diff --git a/src/devices/machine/input_merger.h b/src/devices/machine/input_merger.h index aacffeab4ee..073072d0d4b 100644 --- a/src/devices/machine/input_merger.h +++ b/src/devices/machine/input_merger.h @@ -23,7 +23,7 @@ public: auto output_handler() { return m_output_handler.bind(); } // input lines - template DECLARE_WRITE_LINE_MEMBER(in_w) { static_assert(Bit < 32, "invalid bit"); machine().scheduler().synchronize(timer_expired_delegate(FUNC(input_merger_device::update_state), this), (Bit << 1) | (state ? 1U : 0U)); } + template void in_w(int state) { static_assert(Bit < 32, "invalid bit"); machine().scheduler().synchronize(timer_expired_delegate(FUNC(input_merger_device::update_state), this), (Bit << 1) | (state ? 1U : 0U)); } template void in_set(u8 data = 0) { in_w(1); } template void in_clear(u8 data = 0) { in_w(0); } diff --git a/src/devices/machine/ins8250.cpp b/src/devices/machine/ins8250.cpp index 63a68550e2d..831c3201561 100644 --- a/src/devices/machine/ins8250.cpp +++ b/src/devices/machine/ins8250.cpp @@ -241,7 +241,7 @@ void ins8250_uart_device::clear_int(int flag) update_interrupt(); } -READ_LINE_MEMBER(ins8250_uart_device::intrpt_r) +int ins8250_uart_device::intrpt_r() { return !BIT(m_regs.iir, 0); } @@ -603,31 +603,31 @@ void ins8250_uart_device::update_msr() trigger_int(COM_INT_PENDING_MODEM_STATUS_REGISTER); } -WRITE_LINE_MEMBER(ins8250_uart_device::dcd_w) +void ins8250_uart_device::dcd_w(int state) { m_dcd = state; update_msr(); } -WRITE_LINE_MEMBER(ins8250_uart_device::dsr_w) +void ins8250_uart_device::dsr_w(int state) { m_dsr = state; update_msr(); } -WRITE_LINE_MEMBER(ins8250_uart_device::ri_w) +void ins8250_uart_device::ri_w(int state) { m_ri = state; update_msr(); } -WRITE_LINE_MEMBER(ins8250_uart_device::cts_w) +void ins8250_uart_device::cts_w(int state) { m_cts = state; update_msr(); } -WRITE_LINE_MEMBER(ins8250_uart_device::rx_w) +void ins8250_uart_device::rx_w(int state) { m_rxd = state; diff --git a/src/devices/machine/ins8250.h b/src/devices/machine/ins8250.h index f79715decc3..8cfff435ae8 100644 --- a/src/devices/machine/ins8250.h +++ b/src/devices/machine/ins8250.h @@ -30,12 +30,12 @@ public: void ins8250_w(offs_t offset, u8 data); u8 ins8250_r(offs_t offset); - DECLARE_WRITE_LINE_MEMBER(dcd_w); - DECLARE_WRITE_LINE_MEMBER(dsr_w); - DECLARE_WRITE_LINE_MEMBER(ri_w); - DECLARE_WRITE_LINE_MEMBER(cts_w); - DECLARE_WRITE_LINE_MEMBER(rx_w); - DECLARE_READ_LINE_MEMBER(intrpt_r); + void dcd_w(int state); + void dsr_w(int state); + void ri_w(int state); + void cts_w(int state); + void rx_w(int state); + int intrpt_r(); protected: enum class dev_type { diff --git a/src/devices/machine/k033906.cpp b/src/devices/machine/k033906.cpp index 2ce9992ea7a..0ced32fd8f0 100644 --- a/src/devices/machine/k033906.cpp +++ b/src/devices/machine/k033906.cpp @@ -47,7 +47,7 @@ void k033906_device::device_start() } -WRITE_LINE_MEMBER(k033906_device::set_reg) +void k033906_device::set_reg(int state) { m_reg_set = state & 1; } diff --git a/src/devices/machine/k033906.h b/src/devices/machine/k033906.h index 7bc9fb3b9aa..68b1e171ece 100644 --- a/src/devices/machine/k033906.h +++ b/src/devices/machine/k033906.h @@ -30,7 +30,7 @@ public: u32 read(offs_t offset); void write(offs_t offset, u32 data); - DECLARE_WRITE_LINE_MEMBER(set_reg); + void set_reg(int state); protected: // device-level overrides diff --git a/src/devices/machine/keytronic_l2207.cpp b/src/devices/machine/keytronic_l2207.cpp index 75e4fd9a063..993a72fa7bf 100644 --- a/src/devices/machine/keytronic_l2207.cpp +++ b/src/devices/machine/keytronic_l2207.cpp @@ -100,7 +100,7 @@ void keytronic_l2207_device::device_start() save_item(NAME(m_beeper_latch)); } -WRITE_LINE_MEMBER(keytronic_l2207_device::ser_in_w) +void keytronic_l2207_device::ser_in_w(int state) { m_mcu->set_input_line(MCS48_INPUT_IRQ, state ? CLEAR_LINE : ASSERT_LINE); } diff --git a/src/devices/machine/keytronic_l2207.h b/src/devices/machine/keytronic_l2207.h index d01d9faf128..bad5c635fc6 100644 --- a/src/devices/machine/keytronic_l2207.h +++ b/src/devices/machine/keytronic_l2207.h @@ -33,7 +33,7 @@ public: auto ser_out_callback() { return m_ser_out_callback.bind(); } // serial line input - DECLARE_WRITE_LINE_MEMBER(ser_in_w); + void ser_in_w(int state); protected: // device-level overrides diff --git a/src/devices/machine/latch8.h b/src/devices/machine/latch8.h index 0609d3949ff..ece626422ae 100644 --- a/src/devices/machine/latch8.h +++ b/src/devices/machine/latch8.h @@ -48,25 +48,25 @@ public: // read bit x // FIXME: does not honour read callbacks or XOR mask - DECLARE_READ_LINE_MEMBER( bit0_r ) { return BIT(m_value, 0); } - DECLARE_READ_LINE_MEMBER( bit1_r ) { return BIT(m_value, 1); } - DECLARE_READ_LINE_MEMBER( bit2_r ) { return BIT(m_value, 2); } - DECLARE_READ_LINE_MEMBER( bit3_r ) { return BIT(m_value, 3); } - DECLARE_READ_LINE_MEMBER( bit4_r ) { return BIT(m_value, 4); } - DECLARE_READ_LINE_MEMBER( bit5_r ) { return BIT(m_value, 5); } - DECLARE_READ_LINE_MEMBER( bit6_r ) { return BIT(m_value, 6); } - DECLARE_READ_LINE_MEMBER( bit7_r ) { return BIT(m_value, 7); } + int bit0_r() { return BIT(m_value, 0); } + int bit1_r() { return BIT(m_value, 1); } + int bit2_r() { return BIT(m_value, 2); } + int bit3_r() { return BIT(m_value, 3); } + int bit4_r() { return BIT(m_value, 4); } + int bit5_r() { return BIT(m_value, 5); } + int bit6_r() { return BIT(m_value, 6); } + int bit7_r() { return BIT(m_value, 7); } // read inverted bit // FIXME: does not honour read callbacks or XOR mask - DECLARE_READ_LINE_MEMBER( bit0_q_r ) { return BIT(~m_value, 0); } - DECLARE_READ_LINE_MEMBER( bit1_q_r ) { return BIT(~m_value, 1); } - DECLARE_READ_LINE_MEMBER( bit2_q_r ) { return BIT(~m_value, 2); } - DECLARE_READ_LINE_MEMBER( bit3_q_r ) { return BIT(~m_value, 3); } - DECLARE_READ_LINE_MEMBER( bit4_q_r ) { return BIT(~m_value, 4); } - DECLARE_READ_LINE_MEMBER( bit5_q_r ) { return BIT(~m_value, 5); } - DECLARE_READ_LINE_MEMBER( bit6_q_r ) { return BIT(~m_value, 6); } - DECLARE_READ_LINE_MEMBER( bit7_q_r ) { return BIT(~m_value, 7); } + int bit0_q_r() { return BIT(~m_value, 0); } + int bit1_q_r() { return BIT(~m_value, 1); } + int bit2_q_r() { return BIT(~m_value, 2); } + int bit3_q_r() { return BIT(~m_value, 3); } + int bit4_q_r() { return BIT(~m_value, 4); } + int bit5_q_r() { return BIT(~m_value, 5); } + int bit6_q_r() { return BIT(~m_value, 6); } + int bit7_q_r() { return BIT(~m_value, 7); } // write bit x from data into bit determined by offset // latch = (latch & ~(1<> x) & 0x01) << offset) diff --git a/src/devices/machine/m3002.h b/src/devices/machine/m3002.h index b02d13429eb..802064b07c8 100644 --- a/src/devices/machine/m3002.h +++ b/src/devices/machine/m3002.h @@ -44,8 +44,8 @@ public: void write(u8 data); // status output polling - DECLARE_READ_LINE_MEMBER(busy_r) { return internal_busy() ? 0 : 1; } - DECLARE_READ_LINE_MEMBER(irq_r) { return m_irq_active ? 0 : 1; } + int busy_r() { return internal_busy() ? 0 : 1; } + int irq_r() { return m_irq_active ? 0 : 1; } protected: m3002_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock); diff --git a/src/devices/machine/m68sfdc.cpp b/src/devices/machine/m68sfdc.cpp index 99a0b3b4580..d5ac30c4518 100644 --- a/src/devices/machine/m68sfdc.cpp +++ b/src/devices/machine/m68sfdc.cpp @@ -138,12 +138,12 @@ void m68sfdc_device::set_floppies_4(floppy_connector *f0, floppy_connector *f1, } } -WRITE_LINE_MEMBER(m68sfdc_device::handle_irq) +void m68sfdc_device::handle_irq(int state) { m_irq_handler(state); } -WRITE_LINE_MEMBER(m68sfdc_device::handle_nmi) +void m68sfdc_device::handle_nmi(int state) { m_nmi_handler(state); } diff --git a/src/devices/machine/m68sfdc.h b/src/devices/machine/m68sfdc.h index 605ac628583..6270e42bc9b 100644 --- a/src/devices/machine/m68sfdc.h +++ b/src/devices/machine/m68sfdc.h @@ -44,8 +44,8 @@ private: devcb_write_line m_irq_handler; devcb_write_line m_nmi_handler; - DECLARE_WRITE_LINE_MEMBER(handle_irq); - DECLARE_WRITE_LINE_MEMBER(handle_nmi); + void handle_irq(int state); + void handle_nmi(int state); uint8_t flip_bits(uint8_t data); uint8_t pia_pa_r(); diff --git a/src/devices/machine/m6m80011ap.cpp b/src/devices/machine/m6m80011ap.cpp index 937f9e815e1..43638d11224 100644 --- a/src/devices/machine/m6m80011ap.cpp +++ b/src/devices/machine/m6m80011ap.cpp @@ -99,17 +99,17 @@ bool m6m80011ap_device::nvram_write(util::write_stream &file) //************************************************************************** -READ_LINE_MEMBER( m6m80011ap_device::read_bit ) +int m6m80011ap_device::read_bit() { return m_read_latch; } -READ_LINE_MEMBER( m6m80011ap_device::ready_line ) +int m6m80011ap_device::ready_line() { return 1; // TODO } -WRITE_LINE_MEMBER( m6m80011ap_device::set_cs_line ) +void m6m80011ap_device::set_cs_line(int state) { m_reset_line = state; @@ -122,12 +122,12 @@ WRITE_LINE_MEMBER( m6m80011ap_device::set_cs_line ) } -WRITE_LINE_MEMBER( m6m80011ap_device::write_bit ) +void m6m80011ap_device::write_bit(int state) { m_latch = state; } -WRITE_LINE_MEMBER( m6m80011ap_device::set_clock_line ) +void m6m80011ap_device::set_clock_line(int state) { if (m_reset_line == CLEAR_LINE) { diff --git a/src/devices/machine/m6m80011ap.h b/src/devices/machine/m6m80011ap.h index c288b9da633..0e628c2662c 100644 --- a/src/devices/machine/m6m80011ap.h +++ b/src/devices/machine/m6m80011ap.h @@ -13,11 +13,11 @@ public: m6m80011ap_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = 32'768); /* TODO: frequency */ // I/O operations - DECLARE_READ_LINE_MEMBER( read_bit ); - DECLARE_READ_LINE_MEMBER( ready_line ); - DECLARE_WRITE_LINE_MEMBER( set_cs_line ); - DECLARE_WRITE_LINE_MEMBER( set_clock_line ); - DECLARE_WRITE_LINE_MEMBER( write_bit ); + int read_bit(); + int ready_line(); + void set_cs_line(int state); + void set_clock_line(int state); + void write_bit(int state); protected: // device-level overrides diff --git a/src/devices/machine/mb3773.cpp b/src/devices/machine/mb3773.cpp index e5ce23e13e6..50ea4ed4e39 100644 --- a/src/devices/machine/mb3773.cpp +++ b/src/devices/machine/mb3773.cpp @@ -72,7 +72,7 @@ void mb3773_device::reset_timer() m_watchdog_timer->adjust( attotime::from_seconds( 5 ) ); } -WRITE_LINE_MEMBER( mb3773_device::write_line_ck ) +void mb3773_device::write_line_ck(int state) { if( state == 0 && m_ck != 0 ) { diff --git a/src/devices/machine/mb3773.h b/src/devices/machine/mb3773.h index 5955c1fa372..fd25d83e599 100644 --- a/src/devices/machine/mb3773.h +++ b/src/devices/machine/mb3773.h @@ -20,7 +20,7 @@ public: mb3773_device( const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = 0); // I/O operations - WRITE_LINE_MEMBER( write_line_ck ); + void write_line_ck(int state); protected: // device-level overrides diff --git a/src/devices/machine/mb8421.h b/src/devices/machine/mb8421.h index f112f1e1484..9d30252538e 100644 --- a/src/devices/machine/mb8421.h +++ b/src/devices/machine/mb8421.h @@ -147,7 +147,7 @@ public: return m_ram[offset]; } - DECLARE_READ_LINE_MEMBER(busy_r) { return 0; } // _BUSY pin - not emulated + int busy_r() { return 0; } // _BUSY pin - not emulated protected: dual_port_mailbox_ram_base(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock) diff --git a/src/devices/machine/mc68328.cpp b/src/devices/machine/mc68328.cpp index 92315f308ac..e8b86833ace 100644 --- a/src/devices/machine/mc68328.cpp +++ b/src/devices/machine/mc68328.cpp @@ -1299,7 +1299,7 @@ u32 mc68328_device::get_irq_mask_for_level(int level) return 0; } -WRITE_LINE_MEMBER(mc68328_base_device::irq5_w) +void mc68328_base_device::irq5_w(int state) { set_interrupt_line(INT_IRQ5, state); } diff --git a/src/devices/machine/mc68328.h b/src/devices/machine/mc68328.h index a4ec381afd7..f53f9961414 100644 --- a/src/devices/machine/mc68328.h +++ b/src/devices/machine/mc68328.h @@ -122,7 +122,7 @@ public: auto out_lsclk() { return m_out_lsclk_cb.bind(); } auto out_ld() { return m_out_ld_cb.bind(); } - DECLARE_WRITE_LINE_MEMBER(irq5_w); + void irq5_w(int state); template void set_lcd_info_changed(T &&... args) diff --git a/src/devices/machine/mc6844.h b/src/devices/machine/mc6844.h index 242528454a6..10a0454b9a0 100644 --- a/src/devices/machine/mc6844.h +++ b/src/devices/machine/mc6844.h @@ -63,9 +63,9 @@ public: template auto in_ior_callback() { return m_in_ior_cb[CH].bind(); } template auto out_iow_callback() { return m_out_iow_cb[CH].bind(); } - template DECLARE_WRITE_LINE_MEMBER( dreq_w ) { dma_request(CH, state); } + template void dreq_w(int state) { dma_request(CH, state); } - DECLARE_WRITE_LINE_MEMBER( dgrnt_w ){ m_dgrnt = state; trigger(1); } + void dgrnt_w(int state) { m_dgrnt = state; trigger(1); } protected: // device-level overrides diff --git a/src/devices/machine/mc6852.h b/src/devices/machine/mc6852.h index 27e7ec9f962..6fb6cc512c7 100644 --- a/src/devices/machine/mc6852.h +++ b/src/devices/machine/mc6852.h @@ -55,14 +55,14 @@ public: uint8_t read(offs_t offset); void write(offs_t offset, uint8_t data); - DECLARE_WRITE_LINE_MEMBER( rx_data_w ) { device_serial_interface::rx_w(state); } - DECLARE_WRITE_LINE_MEMBER( rx_clk_w ) { rx_clock_w(state); } - DECLARE_WRITE_LINE_MEMBER( tx_clk_w ) { tx_clock_w(state); } - DECLARE_WRITE_LINE_MEMBER( cts_w ) { m_cts = state; } - DECLARE_WRITE_LINE_MEMBER( dcd_w ) { m_dcd = state; } - - DECLARE_READ_LINE_MEMBER( sm_dtr_r ) { return m_sm_dtr; } - DECLARE_READ_LINE_MEMBER( tuf_r ) { return m_tuf; } + void rx_data_w(int state) { device_serial_interface::rx_w(state); } + void rx_clk_w(int state) { rx_clock_w(state); } + void tx_clk_w(int state) { tx_clock_w(state); } + void cts_w(int state) { m_cts = state; } + void dcd_w(int state) { m_dcd = state; } + + int sm_dtr_r() { return m_sm_dtr; } + int tuf_r() { return m_tuf; } // These are to allow integration of this driver with code // controlling floppy disks. diff --git a/src/devices/machine/mc6854.cpp b/src/devices/machine/mc6854.cpp index 12af625152d..930326e34f8 100644 --- a/src/devices/machine/mc6854.cpp +++ b/src/devices/machine/mc6854.cpp @@ -583,7 +583,7 @@ uint8_t mc6854_device::rfifo_pop( ) } -WRITE_LINE_MEMBER( mc6854_device::set_rx ) +void mc6854_device::set_rx(int state) { m_rxd = state; } @@ -638,7 +638,7 @@ int mc6854_device::send_frame( uint8_t* data, int len ) -WRITE_LINE_MEMBER( mc6854_device::set_cts ) +void mc6854_device::set_cts(int state) { if ( ! m_cts && state ) m_sr1 |= CTS; @@ -653,7 +653,7 @@ WRITE_LINE_MEMBER( mc6854_device::set_cts ) -WRITE_LINE_MEMBER( mc6854_device::set_dcd ) +void mc6854_device::set_dcd(int state) { if ( ! m_dcd && state ) { @@ -917,7 +917,7 @@ inline bool mc6854_device::receive_allowed() const } /* MC6854 makes fields from bits */ -WRITE_LINE_MEMBER( mc6854_device::rxc_w ) +void mc6854_device::rxc_w(int state) { if (receive_allowed() && state && !m_rxc) { @@ -989,7 +989,7 @@ WRITE_LINE_MEMBER( mc6854_device::rxc_w ) m_rxc = state; } -WRITE_LINE_MEMBER( mc6854_device::txc_w ) +void mc6854_device::txc_w(int state) { // TODO } diff --git a/src/devices/machine/mc6854.h b/src/devices/machine/mc6854.h index 2e2fe6fa663..81be8766816 100644 --- a/src/devices/machine/mc6854.h +++ b/src/devices/machine/mc6854.h @@ -38,18 +38,18 @@ public: uint8_t dma_r(){ return read(2); } /* low-level, bit-based interface */ - DECLARE_WRITE_LINE_MEMBER( set_rx ); + void set_rx(int state); /* high-level, frame-based interface */ int send_frame( uint8_t* data, int length ); /* ret -1 if busy */ /* control lines */ - DECLARE_WRITE_LINE_MEMBER( set_cts ); /* 1 = clear-to-send, 0 = busy */ - DECLARE_WRITE_LINE_MEMBER( set_dcd ); /* 1 = carrier, 0 = no carrier */ + void set_cts(int state); /* 1 = clear-to-send, 0 = busy */ + void set_dcd(int state); /* 1 = carrier, 0 = no carrier */ /* clock */ - DECLARE_WRITE_LINE_MEMBER( rxc_w ); - DECLARE_WRITE_LINE_MEMBER( txc_w ); + void rxc_w(int state); + void txc_w(int state); protected: // device-level overrides diff --git a/src/devices/machine/mc68681.cpp b/src/devices/machine/mc68681.cpp index 8e647f4c2ab..454239d0876 100644 --- a/src/devices/machine/mc68681.cpp +++ b/src/devices/machine/mc68681.cpp @@ -889,7 +889,7 @@ void duart_base_device::write(offs_t offset, uint8_t data) } } -WRITE_LINE_MEMBER(duart_base_device::ip0_w) +void duart_base_device::ip0_w(int state) { uint8_t newIP = (IP_last_state & ~0x01) | ((state == ASSERT_LINE) ? 1 : 0); @@ -906,7 +906,7 @@ WRITE_LINE_MEMBER(duart_base_device::ip0_w) IP_last_state = newIP; } -WRITE_LINE_MEMBER(duart_base_device::ip1_w) +void duart_base_device::ip1_w(int state) { uint8_t newIP = (IP_last_state & ~0x02) | ((state == ASSERT_LINE) ? 2 : 0); @@ -923,7 +923,7 @@ WRITE_LINE_MEMBER(duart_base_device::ip1_w) IP_last_state = newIP; } -WRITE_LINE_MEMBER(duart_base_device::ip2_w) +void duart_base_device::ip2_w(int state) { uint8_t newIP = (IP_last_state & ~0x04) | ((state == ASSERT_LINE) ? 4 : 0); @@ -940,7 +940,7 @@ WRITE_LINE_MEMBER(duart_base_device::ip2_w) IP_last_state = newIP; } -WRITE_LINE_MEMBER(duart_base_device::ip3_w) +void duart_base_device::ip3_w(int state) { uint8_t newIP = (IP_last_state & ~0x08) | ((state == ASSERT_LINE) ? 8 : 0); @@ -957,21 +957,21 @@ WRITE_LINE_MEMBER(duart_base_device::ip3_w) IP_last_state = newIP; } -WRITE_LINE_MEMBER(duart_base_device::ip4_w) +void duart_base_device::ip4_w(int state) { uint8_t newIP = (IP_last_state & ~0x10) | ((state == ASSERT_LINE) ? 0x10 : 0); // TODO: special mode for ip4 (Ch. A Rx clock) IP_last_state = newIP; } -WRITE_LINE_MEMBER(duart_base_device::ip5_w) +void duart_base_device::ip5_w(int state) { uint8_t newIP = (IP_last_state & ~0x20) | ((state == ASSERT_LINE) ? 0x20 : 0); // TODO: special mode for ip5 (Ch. B Tx clock) IP_last_state = newIP; } -WRITE_LINE_MEMBER(duart_base_device::ip6_w) +void duart_base_device::ip6_w(int state) { uint8_t newIP = (IP_last_state & ~0x40) | ((state == ASSERT_LINE) ? 0x40 : 0); // TODO: special mode for ip6 (Ch. B Rx clock) diff --git a/src/devices/machine/mc68681.h b/src/devices/machine/mc68681.h index b47e7276cd8..bcd688ce2fe 100644 --- a/src/devices/machine/mc68681.h +++ b/src/devices/machine/mc68681.h @@ -107,8 +107,8 @@ public: virtual uint8_t read(offs_t offset); virtual void write(offs_t offset, uint8_t data); - DECLARE_WRITE_LINE_MEMBER(rx_a_w) { m_chanA->device_serial_interface::rx_w((uint8_t)state); } - DECLARE_WRITE_LINE_MEMBER(rx_b_w) { m_chanB->device_serial_interface::rx_w((uint8_t)state); } + void rx_a_w(int state) { m_chanA->device_serial_interface::rx_w((uint8_t)state); } + void rx_b_w(int state) { m_chanB->device_serial_interface::rx_w((uint8_t)state); } auto irq_cb() { return write_irq.bind(); } auto a_tx_cb() { return write_a_tx.bind(); } @@ -117,13 +117,13 @@ public: auto outport_cb() { return write_outport.bind(); } // new-style push handlers for input port bits - DECLARE_WRITE_LINE_MEMBER(ip0_w); - DECLARE_WRITE_LINE_MEMBER(ip1_w); - DECLARE_WRITE_LINE_MEMBER(ip2_w); - DECLARE_WRITE_LINE_MEMBER(ip3_w); - DECLARE_WRITE_LINE_MEMBER(ip4_w); - DECLARE_WRITE_LINE_MEMBER(ip5_w); - DECLARE_WRITE_LINE_MEMBER(ip6_w); + void ip0_w(int state); + void ip1_w(int state); + void ip2_w(int state); + void ip3_w(int state); + void ip4_w(int state); + void ip5_w(int state); + void ip6_w(int state); bool irq_pending() const { return (ISR & IMR) != 0; } @@ -230,8 +230,8 @@ public: auto c_tx_cb() { return write_c_tx.bind(); } auto d_tx_cb() { return write_d_tx.bind(); } - DECLARE_WRITE_LINE_MEMBER(rx_c_w) { m_chanC->device_serial_interface::rx_w((uint8_t)state); } - DECLARE_WRITE_LINE_MEMBER(rx_d_w) { m_chanD->device_serial_interface::rx_w((uint8_t)state); } + void rx_c_w(int state) { m_chanC->device_serial_interface::rx_w((uint8_t)state); } + void rx_d_w(int state) { m_chanD->device_serial_interface::rx_w((uint8_t)state); } virtual uint8_t read(offs_t offset) override; virtual void write(offs_t offset, uint8_t data) override; diff --git a/src/devices/machine/mc68901.cpp b/src/devices/machine/mc68901.cpp index 233df22cff6..830c614e96e 100644 --- a/src/devices/machine/mc68901.cpp +++ b/src/devices/machine/mc68901.cpp @@ -1057,23 +1057,23 @@ u8 mc68901_device::get_vector() return 0x18; // Spurious irq } -WRITE_LINE_MEMBER( mc68901_device::i0_w ) { gpio_input(0, state); } -WRITE_LINE_MEMBER( mc68901_device::i1_w ) { gpio_input(1, state); } -WRITE_LINE_MEMBER( mc68901_device::i2_w ) { gpio_input(2, state); } -WRITE_LINE_MEMBER( mc68901_device::i3_w ) { gpio_input(3, state); } -WRITE_LINE_MEMBER( mc68901_device::i4_w ) { gpio_input(4, state); } -WRITE_LINE_MEMBER( mc68901_device::i5_w ) { gpio_input(5, state); } -WRITE_LINE_MEMBER( mc68901_device::i6_w ) { gpio_input(6, state); } -WRITE_LINE_MEMBER( mc68901_device::i7_w ) { gpio_input(7, state); } +void mc68901_device::i0_w(int state) { gpio_input(0, state); } +void mc68901_device::i1_w(int state) { gpio_input(1, state); } +void mc68901_device::i2_w(int state) { gpio_input(2, state); } +void mc68901_device::i3_w(int state) { gpio_input(3, state); } +void mc68901_device::i4_w(int state) { gpio_input(4, state); } +void mc68901_device::i5_w(int state) { gpio_input(5, state); } +void mc68901_device::i6_w(int state) { gpio_input(6, state); } +void mc68901_device::i7_w(int state) { gpio_input(7, state); } -WRITE_LINE_MEMBER( mc68901_device::tai_w ) +void mc68901_device::tai_w(int state) { timer_input(TIMER_A, state); } -WRITE_LINE_MEMBER( mc68901_device::tbi_w ) +void mc68901_device::tbi_w(int state) { timer_input(TIMER_B, state); } @@ -1086,7 +1086,7 @@ WRITE_LINE_MEMBER( mc68901_device::tbi_w ) // si_w - serial data input for receiver //------------------------------------------------- -WRITE_LINE_MEMBER(mc68901_device::si_w) +void mc68901_device::si_w(int state) { m_si = state; } @@ -1095,7 +1095,7 @@ WRITE_LINE_MEMBER(mc68901_device::si_w) // rc_w - receiver clock input //------------------------------------------------- -WRITE_LINE_MEMBER(mc68901_device::rc_w) +void mc68901_device::rc_w(int state) { if (state != m_rc) { @@ -1110,7 +1110,7 @@ WRITE_LINE_MEMBER(mc68901_device::rc_w) // tc_w - transmitter clock input //------------------------------------------------- -WRITE_LINE_MEMBER(mc68901_device::tc_w) +void mc68901_device::tc_w(int state) { if (state != m_tc) { diff --git a/src/devices/machine/mc68901.h b/src/devices/machine/mc68901.h index 0e992c78941..35712dbb8a2 100644 --- a/src/devices/machine/mc68901.h +++ b/src/devices/machine/mc68901.h @@ -71,21 +71,21 @@ public: u8 get_vector(); - DECLARE_WRITE_LINE_MEMBER( i0_w ); - DECLARE_WRITE_LINE_MEMBER( i1_w ); - DECLARE_WRITE_LINE_MEMBER( i2_w ); - DECLARE_WRITE_LINE_MEMBER( i3_w ); - DECLARE_WRITE_LINE_MEMBER( i4_w ); - DECLARE_WRITE_LINE_MEMBER( i5_w ); - DECLARE_WRITE_LINE_MEMBER( i6_w ); - DECLARE_WRITE_LINE_MEMBER( i7_w ); - - DECLARE_WRITE_LINE_MEMBER( tai_w ); - DECLARE_WRITE_LINE_MEMBER( tbi_w ); - - DECLARE_WRITE_LINE_MEMBER( si_w ); - DECLARE_WRITE_LINE_MEMBER( rc_w ); - DECLARE_WRITE_LINE_MEMBER( tc_w ); + void i0_w(int state); + void i1_w(int state); + void i2_w(int state); + void i3_w(int state); + void i4_w(int state); + void i5_w(int state); + void i6_w(int state); + void i7_w(int state); + + void tai_w(int state); + void tbi_w(int state); + + void si_w(int state); + void rc_w(int state); + void tc_w(int state); protected: // device-level overrides diff --git a/src/devices/machine/mc88200.h b/src/devices/machine/mc88200.h index e439d0e9096..813bce64e13 100644 --- a/src/devices/machine/mc88200.h +++ b/src/devices/machine/mc88200.h @@ -18,7 +18,7 @@ public: template std::optional read(u32 virtual_address, bool supervisor); template bool write(u32 virtual_address, T data, bool supervisor); - WRITE_LINE_MEMBER(bus_error_w) { if (!machine().side_effects_disabled()) m_bus_error = true; } + void bus_error_w(int state) { if (!machine().side_effects_disabled()) m_bus_error = true; } protected: virtual void device_start() override; diff --git a/src/devices/machine/mccs1850.cpp b/src/devices/machine/mccs1850.cpp index 367b58af135..553b69da808 100644 --- a/src/devices/machine/mccs1850.cpp +++ b/src/devices/machine/mccs1850.cpp @@ -402,7 +402,7 @@ bool mccs1850_device::nvram_write(util::write_stream &file) // ce_w - chip enable write //------------------------------------------------- -WRITE_LINE_MEMBER( mccs1850_device::ce_w ) +void mccs1850_device::ce_w(int state) { m_ce = state; @@ -418,7 +418,7 @@ WRITE_LINE_MEMBER( mccs1850_device::ce_w ) // sck_w - serial clock write //------------------------------------------------- -WRITE_LINE_MEMBER( mccs1850_device::sck_w ) +void mccs1850_device::sck_w(int state) { if (!m_ce) return; @@ -498,7 +498,7 @@ WRITE_LINE_MEMBER( mccs1850_device::sck_w ) // sdo_r - serial data out read //------------------------------------------------- -READ_LINE_MEMBER( mccs1850_device::sdo_r ) +int mccs1850_device::sdo_r() { if (!m_ce || BIT(m_address, 7)) { @@ -516,7 +516,7 @@ READ_LINE_MEMBER( mccs1850_device::sdo_r ) // sdi_w - serial data in write //------------------------------------------------- -WRITE_LINE_MEMBER( mccs1850_device::sdi_w ) +void mccs1850_device::sdi_w(int state) { m_sdi = state; } @@ -526,7 +526,7 @@ WRITE_LINE_MEMBER( mccs1850_device::sdi_w ) // pwrsw_w - power switch write //------------------------------------------------- -WRITE_LINE_MEMBER( mccs1850_device::pwrsw_w ) +void mccs1850_device::pwrsw_w(int state) { if (!state) { @@ -546,7 +546,7 @@ WRITE_LINE_MEMBER( mccs1850_device::pwrsw_w ) // por_w - power on reset write //------------------------------------------------- -WRITE_LINE_MEMBER( mccs1850_device::por_w ) +void mccs1850_device::por_w(int state) { if (!state) { @@ -559,7 +559,7 @@ WRITE_LINE_MEMBER( mccs1850_device::por_w ) // test_w - test mode write //------------------------------------------------- -WRITE_LINE_MEMBER( mccs1850_device::test_w ) +void mccs1850_device::test_w(int state) { if (state) { diff --git a/src/devices/machine/mccs1850.h b/src/devices/machine/mccs1850.h index cdd3b2853bc..3dd6b0173e6 100644 --- a/src/devices/machine/mccs1850.h +++ b/src/devices/machine/mccs1850.h @@ -43,13 +43,13 @@ public: auto pse_wr_callback() { return pse_cb.bind(); } auto nuc_wr_callback() { return nuc_cb.bind(); } - DECLARE_WRITE_LINE_MEMBER( ce_w ); - DECLARE_WRITE_LINE_MEMBER( sck_w ); - DECLARE_READ_LINE_MEMBER( sdo_r ); - DECLARE_WRITE_LINE_MEMBER( sdi_w ); - DECLARE_WRITE_LINE_MEMBER( pwrsw_w ); - DECLARE_WRITE_LINE_MEMBER( por_w ); - DECLARE_WRITE_LINE_MEMBER( test_w ); + void ce_w(int state); + void sck_w(int state); + int sdo_r(); + void sdi_w(int state); + void pwrsw_w(int state); + void por_w(int state); + void test_w(int state); protected: // device-level overrides diff --git a/src/devices/machine/mdcr.cpp b/src/devices/machine/mdcr.cpp index 637c0db6ae9..a767ccf203f 100644 --- a/src/devices/machine/mdcr.cpp +++ b/src/devices/machine/mdcr.cpp @@ -12,7 +12,7 @@ DEFINE_DEVICE_TYPE(MDCR, mdcr_device, "mdcr", "Philips Mini-DCR") -READ_LINE_MEMBER(mdcr_device::rdc) +int mdcr_device::rdc() { // According to mdcr spec there is cross talk on the wires when writing, // hence the clock signal is always false when writing. @@ -22,27 +22,27 @@ READ_LINE_MEMBER(mdcr_device::rdc) return m_fwd ? m_rdc : m_rda; } -READ_LINE_MEMBER(mdcr_device::rda) +int mdcr_device::rda() { return m_fwd ? m_rda : m_rdc; } -READ_LINE_MEMBER(mdcr_device::bet) +int mdcr_device::bet() { return tape_start_or_end(); } -READ_LINE_MEMBER(mdcr_device::cip) +int mdcr_device::cip() { return m_cassette->get_image() != nullptr; } -READ_LINE_MEMBER(mdcr_device::wen) +int mdcr_device::wen() { return m_cassette->get_image() != nullptr && m_cassette->is_writeable(); } -WRITE_LINE_MEMBER(mdcr_device::rev) +void mdcr_device::rev(int state) { m_rev = state; if (m_rev) @@ -56,7 +56,7 @@ WRITE_LINE_MEMBER(mdcr_device::rev) } } -WRITE_LINE_MEMBER(mdcr_device::fwd) +void mdcr_device::fwd(int state) { m_fwd = state; if (m_fwd) @@ -70,12 +70,12 @@ WRITE_LINE_MEMBER(mdcr_device::fwd) } } -WRITE_LINE_MEMBER(mdcr_device::wda) +void mdcr_device::wda(int state) { m_wda = state; } -WRITE_LINE_MEMBER(mdcr_device::wdc) +void mdcr_device::wdc(int state) { if (state) { diff --git a/src/devices/machine/mdcr.h b/src/devices/machine/mdcr.h index b224366bcd5..64053454a34 100644 --- a/src/devices/machine/mdcr.h +++ b/src/devices/machine/mdcr.h @@ -44,32 +44,32 @@ public: /// the rom and system diagnostics. /// /// Note that rdc & rda are flipped when the tape is moving in reverse. - DECLARE_READ_LINE_MEMBER(rdc); + int rdc(); /// The current active data bit. - DECLARE_READ_LINE_MEMBER(rda); + int rda(); /// False indicates we have reached end/beginning of tape - DECLARE_READ_LINE_MEMBER(bet); + int bet(); /// False if a cassette is in place. - DECLARE_READ_LINE_MEMBER(cip); + int cip(); /// False when the cassette is write enabled. - DECLARE_READ_LINE_MEMBER(wen); + int wen(); /// True if we should activate the reverse motor. - DECLARE_WRITE_LINE_MEMBER(rev); + void rev(int state); /// True if we should activate the forward motor. /// Note: A quick pulse (<20usec) will reset the phase decoder. - DECLARE_WRITE_LINE_MEMBER(fwd); + void fwd(int state); /// The bit to write to tape. Make sure to set wda after wdc. - DECLARE_WRITE_LINE_MEMBER(wda); + void wda(int state); /// True if the current wda should be written to tape. - DECLARE_WRITE_LINE_MEMBER(wdc); + void wdc(int state); auto rdc_cb() { return m_rdc_cb.bind(); } diff --git a/src/devices/machine/micomxe1a.cpp b/src/devices/machine/micomxe1a.cpp index 138a64e231b..ccbbe85774f 100644 --- a/src/devices/machine/micomxe1a.cpp +++ b/src/devices/machine/micomxe1a.cpp @@ -252,7 +252,7 @@ u8 micom_xe_1a_device::out_r() } -WRITE_LINE_MEMBER(micom_xe_1a_device::req_w) +void micom_xe_1a_device::req_w(int state) { u8 const req = state ? 1 : 0; if (req != m_req) @@ -289,7 +289,7 @@ WRITE_LINE_MEMBER(micom_xe_1a_device::req_w) } -WRITE_LINE_MEMBER(micom_xe_1a_device::mode_w) +void micom_xe_1a_device::mode_w(int state) { u8 const mode = state ? 1 : 0; if (mode != m_mode) @@ -309,7 +309,7 @@ WRITE_LINE_MEMBER(micom_xe_1a_device::mode_w) } -WRITE_LINE_MEMBER(micom_xe_1a_device::interface_w) +void micom_xe_1a_device::interface_w(int state) { m_interface = state ? 1 : 0; } diff --git a/src/devices/machine/micomxe1a.h b/src/devices/machine/micomxe1a.h index e8b55e7f488..e581f4f7cb4 100644 --- a/src/devices/machine/micomxe1a.h +++ b/src/devices/machine/micomxe1a.h @@ -21,9 +21,9 @@ public: u8 out_r(); - DECLARE_WRITE_LINE_MEMBER(req_w); - DECLARE_WRITE_LINE_MEMBER(mode_w); // 0 = digital, 1 = analog - DECLARE_WRITE_LINE_MEMBER(interface_w); // 0 = PC, 1 = MD + void req_w(int state); + void mode_w(int state); // 0 = digital, 1 = analog + void interface_w(int state); // 0 = PC, 1 = MD protected: virtual void device_start() override ATTR_COLD; diff --git a/src/devices/machine/microtch.h b/src/devices/machine/microtch.h index b7242f4cca3..5aea58ed4f8 100644 --- a/src/devices/machine/microtch.h +++ b/src/devices/machine/microtch.h @@ -17,7 +17,7 @@ public: microtouch_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); auto stx() { return m_out_stx_func.bind(); } - DECLARE_WRITE_LINE_MEMBER(rx) { device_serial_interface::rx_w(state); } + void rx(int state) { device_serial_interface::rx_w(state); } DECLARE_INPUT_CHANGED_MEMBER(touch); template void set_touch_callback(T &&... args) { m_out_touch_cb.set(std::forward(args)...); } diff --git a/src/devices/machine/mm74c922.h b/src/devices/machine/mm74c922.h index 43c958bb4b7..c3547c792fe 100644 --- a/src/devices/machine/mm74c922.h +++ b/src/devices/machine/mm74c922.h @@ -60,7 +60,7 @@ public: uint8_t read(); - DECLARE_READ_LINE_MEMBER(da_r) { return m_da; } + int da_r() { return m_da; } protected: mm74c922_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock, int max_y); diff --git a/src/devices/machine/mos6526.cpp b/src/devices/machine/mos6526.cpp index a35d9a9c573..dc2f57a77be 100644 --- a/src/devices/machine/mos6526.cpp +++ b/src/devices/machine/mos6526.cpp @@ -1122,7 +1122,7 @@ void mos8520_device::write(offs_t offset, uint8_t data) // sp_w - serial port write //------------------------------------------------- -WRITE_LINE_MEMBER( mos6526_device::sp_w ) +void mos6526_device::sp_w(int state) { m_sp = state; } @@ -1132,7 +1132,7 @@ WRITE_LINE_MEMBER( mos6526_device::sp_w ) // cnt_w - serial counter write //------------------------------------------------- -WRITE_LINE_MEMBER( mos6526_device::cnt_w ) +void mos6526_device::cnt_w(int state) { if (CRA_SPMODE) return; @@ -1155,7 +1155,7 @@ WRITE_LINE_MEMBER( mos6526_device::cnt_w ) // flag_w - flag write //------------------------------------------------- -WRITE_LINE_MEMBER( mos6526_device::flag_w ) +void mos6526_device::flag_w(int state) { if (m_flag && !state) { @@ -1170,7 +1170,7 @@ WRITE_LINE_MEMBER( mos6526_device::flag_w ) // tod_w - time-of-day clock write //------------------------------------------------- -WRITE_LINE_MEMBER( mos6526_device::tod_w ) +void mos6526_device::tod_w(int state) { if (state && !m_tod_stopped) { diff --git a/src/devices/machine/mos6526.h b/src/devices/machine/mos6526.h index 1f515271537..637124cc733 100644 --- a/src/devices/machine/mos6526.h +++ b/src/devices/machine/mos6526.h @@ -91,13 +91,13 @@ public: uint8_t pa_r() { return m_pa; } uint8_t pb_r() { return m_pb; } - DECLARE_READ_LINE_MEMBER( sp_r ) { return m_sp; } - DECLARE_WRITE_LINE_MEMBER( sp_w ); - DECLARE_READ_LINE_MEMBER( cnt_r ) { return m_cnt; } - DECLARE_WRITE_LINE_MEMBER( cnt_w ); - DECLARE_WRITE_LINE_MEMBER( flag_w ); - DECLARE_READ_LINE_MEMBER( irq_r ) { return m_irq; } - DECLARE_WRITE_LINE_MEMBER( tod_w ); + int sp_r() { return m_sp; } + void sp_w(int state); + int cnt_r() { return m_cnt; } + void cnt_w(int state); + void flag_w(int state); + int irq_r() { return m_irq; } + void tod_w(int state); protected: enum diff --git a/src/devices/machine/mos6530n.h b/src/devices/machine/mos6530n.h index 164a07031b0..9c32e62daf1 100644 --- a/src/devices/machine/mos6530n.h +++ b/src/devices/machine/mos6530n.h @@ -76,23 +76,23 @@ public: template auto pb_rd_callback() { return m_in_pb_cb[N].bind(); } template auto pb_wr_callback() { return m_out_pb_cb[N].bind(); } - DECLARE_WRITE_LINE_MEMBER( pa0_w ) { pa_w(0, state); } - DECLARE_WRITE_LINE_MEMBER( pa1_w ) { pa_w(1, state); } - DECLARE_WRITE_LINE_MEMBER( pa2_w ) { pa_w(2, state); } - DECLARE_WRITE_LINE_MEMBER( pa3_w ) { pa_w(3, state); } - DECLARE_WRITE_LINE_MEMBER( pa4_w ) { pa_w(4, state); } - DECLARE_WRITE_LINE_MEMBER( pa5_w ) { pa_w(5, state); } - DECLARE_WRITE_LINE_MEMBER( pa6_w ) { pa_w(6, state); } - DECLARE_WRITE_LINE_MEMBER( pa7_w ) { pa_w(7, state); } - - DECLARE_WRITE_LINE_MEMBER( pb0_w ) { pb_w(0, state); } - DECLARE_WRITE_LINE_MEMBER( pb1_w ) { pb_w(1, state); } - DECLARE_WRITE_LINE_MEMBER( pb2_w ) { pb_w(2, state); } - DECLARE_WRITE_LINE_MEMBER( pb3_w ) { pb_w(3, state); } - DECLARE_WRITE_LINE_MEMBER( pb4_w ) { pb_w(4, state); } - DECLARE_WRITE_LINE_MEMBER( pb5_w ) { pb_w(5, state); } - DECLARE_WRITE_LINE_MEMBER( pb6_w ) { pb_w(6, state); } - DECLARE_WRITE_LINE_MEMBER( pb7_w ) { pb_w(7, state); } + void pa0_w(int state) { pa_w(0, state); } + void pa1_w(int state) { pa_w(1, state); } + void pa2_w(int state) { pa_w(2, state); } + void pa3_w(int state) { pa_w(3, state); } + void pa4_w(int state) { pa_w(4, state); } + void pa5_w(int state) { pa_w(5, state); } + void pa6_w(int state) { pa_w(6, state); } + void pa7_w(int state) { pa_w(7, state); } + + void pb0_w(int state) { pb_w(0, state); } + void pb1_w(int state) { pb_w(1, state); } + void pb2_w(int state) { pb_w(2, state); } + void pb3_w(int state) { pb_w(3, state); } + void pb4_w(int state) { pb_w(4, state); } + void pb5_w(int state) { pb_w(5, state); } + void pb6_w(int state) { pb_w(6, state); } + void pb7_w(int state) { pb_w(7, state); } protected: // construction/destruction diff --git a/src/devices/machine/mos6551.cpp b/src/devices/machine/mos6551.cpp index 56302c75050..4880c157ee2 100644 --- a/src/devices/machine/mos6551.cpp +++ b/src/devices/machine/mos6551.cpp @@ -449,7 +449,7 @@ void mos6551_device::set_xtal(uint32_t xtal) } } -WRITE_LINE_MEMBER( mos6551_device::internal_clock ) +void mos6551_device::internal_clock(int state) { if (m_tx_internal_clock) { @@ -457,7 +457,7 @@ WRITE_LINE_MEMBER( mos6551_device::internal_clock ) } } -WRITE_LINE_MEMBER(mos6551_device::write_xtal1) +void mos6551_device::write_xtal1(int state) { if (!m_tx_internal_clock) { @@ -465,12 +465,12 @@ WRITE_LINE_MEMBER(mos6551_device::write_xtal1) } } -WRITE_LINE_MEMBER( mos6551_device::write_rxd ) +void mos6551_device::write_rxd(int state) { m_rxd = state; } -WRITE_LINE_MEMBER( mos6551_device::write_rxc ) +void mos6551_device::write_rxc(int state) { if (!m_rx_internal_clock) { @@ -478,7 +478,7 @@ WRITE_LINE_MEMBER( mos6551_device::write_rxc ) } } -WRITE_LINE_MEMBER( mos6551_device::write_cts ) +void mos6551_device::write_cts(int state) { if (m_cts != state) { @@ -495,7 +495,7 @@ WRITE_LINE_MEMBER( mos6551_device::write_cts ) } } -WRITE_LINE_MEMBER( mos6551_device::write_dsr ) +void mos6551_device::write_dsr(int state) { if (m_dsr != state) { @@ -503,7 +503,7 @@ WRITE_LINE_MEMBER( mos6551_device::write_dsr ) } } -WRITE_LINE_MEMBER( mos6551_device::write_dcd ) +void mos6551_device::write_dcd(int state) { if (m_dcd != state) { @@ -511,7 +511,7 @@ WRITE_LINE_MEMBER( mos6551_device::write_dcd ) } } -WRITE_LINE_MEMBER(mos6551_device::receiver_clock) +void mos6551_device::receiver_clock(int state) { if (m_rx_clock != state) { @@ -663,7 +663,7 @@ WRITE_LINE_MEMBER(mos6551_device::receiver_clock) } } -WRITE_LINE_MEMBER(mos6551_device::transmitter_clock) +void mos6551_device::transmitter_clock(int state) { if (m_rx_internal_clock) { diff --git a/src/devices/machine/mos6551.h b/src/devices/machine/mos6551.h index b7afabfa603..5e40ea6f2c9 100644 --- a/src/devices/machine/mos6551.h +++ b/src/devices/machine/mos6551.h @@ -44,12 +44,12 @@ public: uint8_t read(offs_t offset); void write(offs_t offset, uint8_t data); - DECLARE_WRITE_LINE_MEMBER(write_xtal1); // txc - DECLARE_WRITE_LINE_MEMBER(write_rxd); - DECLARE_WRITE_LINE_MEMBER(write_rxc); - DECLARE_WRITE_LINE_MEMBER(write_cts); - DECLARE_WRITE_LINE_MEMBER(write_dsr); - DECLARE_WRITE_LINE_MEMBER(write_dcd); + void write_xtal1(int state); // txc + void write_rxd(int state); + void write_rxc(int state); + void write_cts(int state); + void write_dsr(int state); + void write_dcd(int state); void set_xtal(uint32_t clock); void set_xtal(const XTAL &clock) { set_xtal(clock.value()); } @@ -125,9 +125,9 @@ private: int stoplength(); - DECLARE_WRITE_LINE_MEMBER(internal_clock); - DECLARE_WRITE_LINE_MEMBER(receiver_clock); - DECLARE_WRITE_LINE_MEMBER(transmitter_clock); + void internal_clock(int state); + void receiver_clock(int state); + void transmitter_clock(int state); static const int internal_divider[16]; static const int transmitter_controls[4][3]; diff --git a/src/devices/machine/mos8722.cpp b/src/devices/machine/mos8722.cpp index 0364460b63e..a8386e293f7 100644 --- a/src/devices/machine/mos8722.cpp +++ b/src/devices/machine/mos8722.cpp @@ -252,7 +252,7 @@ void mos8722_device::write(offs_t offset, uint8_t data) // fsdir_r - fast serial direction read //------------------------------------------------- -READ_LINE_MEMBER( mos8722_device::fsdir_r ) +int mos8722_device::fsdir_r() { return MCR_FSDIR; } diff --git a/src/devices/machine/mos8722.h b/src/devices/machine/mos8722.h index 2b80aa846c2..5c86facc49b 100644 --- a/src/devices/machine/mos8722.h +++ b/src/devices/machine/mos8722.h @@ -59,7 +59,7 @@ public: uint8_t read(offs_t offset, uint8_t data); void write(offs_t offset, uint8_t data); - DECLARE_READ_LINE_MEMBER( fsdir_r ); + int fsdir_r(); offs_t ta_r(offs_t offset, int aec, int *ms0, int *ms1, int *ms2, int *ms3, int *cas0, int *cas1); diff --git a/src/devices/machine/mos8726.cpp b/src/devices/machine/mos8726.cpp index e1f167d70d3..c701239f6df 100644 --- a/src/devices/machine/mos8726.cpp +++ b/src/devices/machine/mos8726.cpp @@ -111,7 +111,7 @@ void mos8726_device::write(offs_t offset, uint8_t data) // bs_w - bank select write //------------------------------------------------- -WRITE_LINE_MEMBER( mos8726_device::bs_w ) +void mos8726_device::bs_w(int state) { m_bs = state; } diff --git a/src/devices/machine/mos8726.h b/src/devices/machine/mos8726.h index 90b78ec8412..720f348c728 100644 --- a/src/devices/machine/mos8726.h +++ b/src/devices/machine/mos8726.h @@ -63,7 +63,7 @@ public: uint8_t read(offs_t offset); void write(offs_t offset, uint8_t data); - DECLARE_WRITE_LINE_MEMBER( bs_w ); + void bs_w(int state); int romsel_r(int roml, int romh); diff --git a/src/devices/machine/msm5832.cpp b/src/devices/machine/msm5832.cpp index 65db2dda469..0d1310f8d91 100644 --- a/src/devices/machine/msm5832.cpp +++ b/src/devices/machine/msm5832.cpp @@ -212,7 +212,7 @@ void msm5832_device::address_w(uint8_t data) // adj_w - //------------------------------------------------- -WRITE_LINE_MEMBER( msm5832_device::adj_w ) +void msm5832_device::adj_w(int state) { LOG("MSM5832 30 ADJ: %u\n", state); @@ -227,7 +227,7 @@ WRITE_LINE_MEMBER( msm5832_device::adj_w ) // test_w - //------------------------------------------------- -WRITE_LINE_MEMBER( msm5832_device::test_w ) +void msm5832_device::test_w(int state) { LOG("MSM5832 TEST: %u\n", state); } @@ -237,7 +237,7 @@ WRITE_LINE_MEMBER( msm5832_device::test_w ) // hold_w - //------------------------------------------------- -WRITE_LINE_MEMBER( msm5832_device::hold_w ) +void msm5832_device::hold_w(int state) { LOG("MSM5832 HOLD: %u\n", state); @@ -249,7 +249,7 @@ WRITE_LINE_MEMBER( msm5832_device::hold_w ) // read_w - //------------------------------------------------- -WRITE_LINE_MEMBER( msm5832_device::read_w ) +void msm5832_device::read_w(int state) { LOG("MSM5832 READ: %u\n", state); @@ -261,7 +261,7 @@ WRITE_LINE_MEMBER( msm5832_device::read_w ) // write_w - //------------------------------------------------- -WRITE_LINE_MEMBER( msm5832_device::write_w ) +void msm5832_device::write_w(int state) { if (m_write == state) return; @@ -291,7 +291,7 @@ WRITE_LINE_MEMBER( msm5832_device::write_w ) // cs_w - //------------------------------------------------- -WRITE_LINE_MEMBER( msm5832_device::cs_w ) +void msm5832_device::cs_w(int state) { LOG("MSM5832 CS: %u\n", state); diff --git a/src/devices/machine/msm5832.h b/src/devices/machine/msm5832.h index 2e55dc21b97..9e0d98bdaee 100644 --- a/src/devices/machine/msm5832.h +++ b/src/devices/machine/msm5832.h @@ -45,13 +45,13 @@ public: void address_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER( adj_w ); - DECLARE_WRITE_LINE_MEMBER( test_w ); - DECLARE_WRITE_LINE_MEMBER( hold_w ); + void adj_w(int state); + void test_w(int state); + void hold_w(int state); - DECLARE_WRITE_LINE_MEMBER( read_w ); - DECLARE_WRITE_LINE_MEMBER( write_w ); - DECLARE_WRITE_LINE_MEMBER( cs_w ); + void read_w(int state); + void write_w(int state); + void cs_w(int state); protected: // device-level overrides diff --git a/src/devices/machine/msm58321.cpp b/src/devices/machine/msm58321.cpp index 72aa2b09d33..288bce2e4a1 100644 --- a/src/devices/machine/msm58321.cpp +++ b/src/devices/machine/msm58321.cpp @@ -515,7 +515,7 @@ void msm58321_device::update_input() // cs2_w - //------------------------------------------------- -WRITE_LINE_MEMBER( msm58321_device::cs2_w ) +void msm58321_device::cs2_w(int state) { if (m_cs2 != state) { @@ -532,7 +532,7 @@ WRITE_LINE_MEMBER( msm58321_device::cs2_w ) // write_w - //------------------------------------------------- -WRITE_LINE_MEMBER( msm58321_device::write_w ) +void msm58321_device::write_w(int state) { if (m_write != state) { @@ -549,7 +549,7 @@ WRITE_LINE_MEMBER( msm58321_device::write_w ) // read_w - //------------------------------------------------- -WRITE_LINE_MEMBER( msm58321_device::read_w ) +void msm58321_device::read_w(int state) { if (m_read != state) { @@ -567,7 +567,7 @@ WRITE_LINE_MEMBER( msm58321_device::read_w ) // d0_w - //------------------------------------------------- -WRITE_LINE_MEMBER( msm58321_device::d0_w ) +void msm58321_device::d0_w(int state) { if (m_d0_in != state) { @@ -582,7 +582,7 @@ WRITE_LINE_MEMBER( msm58321_device::d0_w ) // d1_w - //------------------------------------------------- -WRITE_LINE_MEMBER( msm58321_device::d1_w ) +void msm58321_device::d1_w(int state) { if (m_d1_in != state) { @@ -597,7 +597,7 @@ WRITE_LINE_MEMBER( msm58321_device::d1_w ) // d2_w - //------------------------------------------------- -WRITE_LINE_MEMBER( msm58321_device::d2_w ) +void msm58321_device::d2_w(int state) { if (m_d2_in != state) { @@ -612,7 +612,7 @@ WRITE_LINE_MEMBER( msm58321_device::d2_w ) // d3_w - //------------------------------------------------- -WRITE_LINE_MEMBER( msm58321_device::d3_w ) +void msm58321_device::d3_w(int state) { if (m_d3_in != state) { @@ -627,7 +627,7 @@ WRITE_LINE_MEMBER( msm58321_device::d3_w ) // address_write_w - //------------------------------------------------- -WRITE_LINE_MEMBER( msm58321_device::address_write_w ) +void msm58321_device::address_write_w(int state) { if (m_address_write != state) { @@ -644,7 +644,7 @@ WRITE_LINE_MEMBER( msm58321_device::address_write_w ) // stop_w - //------------------------------------------------- -WRITE_LINE_MEMBER( msm58321_device::stop_w ) +void msm58321_device::stop_w(int state) { if (m_stop != state) { @@ -659,7 +659,7 @@ WRITE_LINE_MEMBER( msm58321_device::stop_w ) // test_w - //------------------------------------------------- -WRITE_LINE_MEMBER( msm58321_device::test_w ) +void msm58321_device::test_w(int state) { if (m_test != state) { @@ -675,7 +675,7 @@ WRITE_LINE_MEMBER( msm58321_device::test_w ) // cs1_w - //------------------------------------------------- -WRITE_LINE_MEMBER( msm58321_device::cs1_w ) +void msm58321_device::cs1_w(int state) { if (m_cs1 != state) { diff --git a/src/devices/machine/msm58321.h b/src/devices/machine/msm58321.h index 6f28b05eecf..e04e3136854 100644 --- a/src/devices/machine/msm58321.h +++ b/src/devices/machine/msm58321.h @@ -58,17 +58,17 @@ public: void set_year0(int year0) { m_year0 = year0; } void set_default_24h(bool default_24h) { m_default_24h = default_24h; } - DECLARE_WRITE_LINE_MEMBER( cs2_w ); - DECLARE_WRITE_LINE_MEMBER( write_w ); - DECLARE_WRITE_LINE_MEMBER( read_w ); - DECLARE_WRITE_LINE_MEMBER( d0_w ); - DECLARE_WRITE_LINE_MEMBER( d1_w ); - DECLARE_WRITE_LINE_MEMBER( d2_w ); - DECLARE_WRITE_LINE_MEMBER( d3_w ); - DECLARE_WRITE_LINE_MEMBER( address_write_w ); - DECLARE_WRITE_LINE_MEMBER( stop_w ); - DECLARE_WRITE_LINE_MEMBER( test_w ); - DECLARE_WRITE_LINE_MEMBER( cs1_w ); + void cs2_w(int state); + void write_w(int state); + void read_w(int state); + void d0_w(int state); + void d1_w(int state); + void d2_w(int state); + void d3_w(int state); + void address_write_w(int state); + void stop_w(int state); + void test_w(int state); + void cs1_w(int state); protected: // device-level overrides diff --git a/src/devices/machine/mv_sonora.h b/src/devices/machine/mv_sonora.h index 5d3e2c87cb9..127cd921edc 100644 --- a/src/devices/machine/mv_sonora.h +++ b/src/devices/machine/mv_sonora.h @@ -25,8 +25,8 @@ public: uint8_t dac_r(offs_t offset); void dac_w(offs_t offset, uint8_t data); - DECLARE_READ_LINE_MEMBER(vblank) const { return m_screen->vblank(); } - DECLARE_READ_LINE_MEMBER(hblank) const { return m_screen->hblank(); } + int vblank() const { return m_screen->vblank(); } + int hblank() const { return m_screen->hblank(); } auto screen_vblank() { return m_screen_vblank.bind(); } diff --git a/src/devices/machine/netlist.h b/src/devices/machine/netlist.h index ff9adf7d332..d9153f96cd2 100644 --- a/src/devices/machine/netlist.h +++ b/src/devices/machine/netlist.h @@ -391,7 +391,7 @@ public: else write(newval); } - inline DECLARE_WRITE_LINE_MEMBER(write_line) { write(state); } + inline void write_line(int state) { write(state); } inline void write8(uint8_t data) { write(data); } inline void write16(uint16_t data) { write(data); } inline void write32(uint32_t data) { write(data); } @@ -492,7 +492,7 @@ public: void write(const uint32_t val); inline DECLARE_INPUT_CHANGED_MEMBER(input_changed) { write(newval); } - DECLARE_WRITE_LINE_MEMBER(write_line) { write(state); } + void write_line(int state) { write(state); } void write8(uint8_t data) { write(data); } void write16(uint16_t data) { write(data); } void write32(uint32_t data) { write(data); } @@ -534,7 +534,7 @@ public: void write(const uint32_t val); inline DECLARE_INPUT_CHANGED_MEMBER(input_changed) { write(newval); } - DECLARE_WRITE_LINE_MEMBER(write_line) { write(state); } + void write_line(int state) { write(state); } void write8(uint8_t data) { write(data); } void write16(uint16_t data) { write(data); } void write32(uint32_t data) { write(data); } diff --git a/src/devices/machine/nmc9306.cpp b/src/devices/machine/nmc9306.cpp index e7e3df4a8a5..5ed22ff3160 100644 --- a/src/devices/machine/nmc9306.cpp +++ b/src/devices/machine/nmc9306.cpp @@ -186,7 +186,7 @@ bool nmc9306_device::nvram_write(util::write_stream &file) // cs_w - chip select input //------------------------------------------------- -WRITE_LINE_MEMBER( nmc9306_device::cs_w ) +void nmc9306_device::cs_w(int state) { if (m_cs != state) { @@ -254,7 +254,7 @@ WRITE_LINE_MEMBER( nmc9306_device::cs_w ) // ck_w - serial clock input //------------------------------------------------- -WRITE_LINE_MEMBER( nmc9306_device::sk_w ) +void nmc9306_device::sk_w(int state) { if (!m_cs) return; if (m_sk == state) return; @@ -408,7 +408,7 @@ WRITE_LINE_MEMBER( nmc9306_device::sk_w ) // di_w - serial data input //------------------------------------------------- -WRITE_LINE_MEMBER( nmc9306_device::di_w ) +void nmc9306_device::di_w(int state) { m_di = state; } @@ -418,7 +418,7 @@ WRITE_LINE_MEMBER( nmc9306_device::di_w ) // do_r - serial data output //------------------------------------------------- -READ_LINE_MEMBER( nmc9306_device::do_r ) +int nmc9306_device::do_r() { return m_do; } diff --git a/src/devices/machine/nmc9306.h b/src/devices/machine/nmc9306.h index af2ecb17523..141a7bb62b0 100644 --- a/src/devices/machine/nmc9306.h +++ b/src/devices/machine/nmc9306.h @@ -33,10 +33,10 @@ public: // construction/destruction nmc9306_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - DECLARE_WRITE_LINE_MEMBER( cs_w ); - DECLARE_WRITE_LINE_MEMBER( sk_w ); - DECLARE_WRITE_LINE_MEMBER( di_w ); - DECLARE_READ_LINE_MEMBER( do_r ); + void cs_w(int state); + void sk_w(int state); + void di_w(int state); + int do_r(); protected: // device-level overrides diff --git a/src/devices/machine/pccard.h b/src/devices/machine/pccard.h index 3b94db0a720..be60e8465b6 100644 --- a/src/devices/machine/pccard.h +++ b/src/devices/machine/pccard.h @@ -46,10 +46,10 @@ public: auto write_protect_cb() { return m_write_protect_cb.bind(); } // called from card device - DECLARE_WRITE_LINE_MEMBER( card_detect_w ) { m_card_detect_cb(state); } - DECLARE_WRITE_LINE_MEMBER( battery_voltage_1_w ) { m_battery_voltage_1_cb(state); } - DECLARE_WRITE_LINE_MEMBER( battery_voltage_2_w ) { m_battery_voltage_2_cb(state); } - DECLARE_WRITE_LINE_MEMBER( write_protect_w ) { m_write_protect_cb(state); } + void card_detect_w(int state) { m_card_detect_cb(state); } + void battery_voltage_1_w(int state) { m_battery_voltage_1_cb(state); } + void battery_voltage_2_w(int state) { m_battery_voltage_2_cb(state); } + void write_protect_w(int state) { m_write_protect_cb(state); } // 16-bit access uint16_t read_memory(offs_t offset, uint16_t mem_mask = ~0); diff --git a/src/devices/machine/pcf8573.cpp b/src/devices/machine/pcf8573.cpp index e4bc4d7bc23..b1ac55cfb44 100644 --- a/src/devices/machine/pcf8573.cpp +++ b/src/devices/machine/pcf8573.cpp @@ -123,7 +123,7 @@ void pcf8573_device::rtc_clock_updated(int year, int month, int day, int day_of_ // READ/WRITE HANDLERS //************************************************************************** -WRITE_LINE_MEMBER(pcf8573_device::a0_w) +void pcf8573_device::a0_w(int state) { state &= 1; if (BIT(m_slave_address, 1) != state) @@ -133,7 +133,7 @@ WRITE_LINE_MEMBER(pcf8573_device::a0_w) } } -WRITE_LINE_MEMBER(pcf8573_device::a1_w) +void pcf8573_device::a1_w(int state) { state &= 1; if (BIT(m_slave_address, 2) != state) @@ -143,7 +143,7 @@ WRITE_LINE_MEMBER(pcf8573_device::a1_w) } } -WRITE_LINE_MEMBER(pcf8573_device::scl_w) +void pcf8573_device::scl_w(int state) { if (m_scl != state) { @@ -323,7 +323,7 @@ WRITE_LINE_MEMBER(pcf8573_device::scl_w) } } -WRITE_LINE_MEMBER(pcf8573_device::sda_w) +void pcf8573_device::sda_w(int state) { state &= 1; if (m_sdaw != state) @@ -350,7 +350,7 @@ WRITE_LINE_MEMBER(pcf8573_device::sda_w) } } -READ_LINE_MEMBER(pcf8573_device::sda_r) +int pcf8573_device::sda_r() { int res = m_sdar & 1; diff --git a/src/devices/machine/pcf8573.h b/src/devices/machine/pcf8573.h index a6b31e83ed7..91916ebef12 100644 --- a/src/devices/machine/pcf8573.h +++ b/src/devices/machine/pcf8573.h @@ -55,11 +55,11 @@ public: void set_a0(int a0) { m_slave_address = (m_slave_address & 0xfd) | (a0 << 1); } void set_a1(int a1) { m_slave_address = (m_slave_address & 0xfb) | (a1 << 2); } - DECLARE_WRITE_LINE_MEMBER(a0_w); - DECLARE_WRITE_LINE_MEMBER(a1_w); - DECLARE_WRITE_LINE_MEMBER(scl_w); - DECLARE_WRITE_LINE_MEMBER(sda_w); - DECLARE_READ_LINE_MEMBER(sda_r); + void a0_w(int state); + void a1_w(int state); + void scl_w(int state); + void sda_w(int state); + int sda_r(); protected: // device-level overrides diff --git a/src/devices/machine/pcf8583.cpp b/src/devices/machine/pcf8583.cpp index f15145d95fe..9fd4e08e3c8 100644 --- a/src/devices/machine/pcf8583.cpp +++ b/src/devices/machine/pcf8583.cpp @@ -203,7 +203,7 @@ bool pcf8583_device::nvram_write(util::write_stream &file) // READ/WRITE HANDLERS //************************************************************************** -WRITE_LINE_MEMBER(pcf8583_device::a0_w) +void pcf8583_device::a0_w(int state) { state &= 1; if (BIT(m_slave_address, 1) != state) @@ -213,7 +213,7 @@ WRITE_LINE_MEMBER(pcf8583_device::a0_w) } } -WRITE_LINE_MEMBER(pcf8583_device::scl_w) +void pcf8583_device::scl_w(int state) { if (m_scl != state) { @@ -385,7 +385,7 @@ WRITE_LINE_MEMBER(pcf8583_device::scl_w) } } -WRITE_LINE_MEMBER(pcf8583_device::sda_w) +void pcf8583_device::sda_w(int state) { state &= 1; if (m_sdaw != state) @@ -412,7 +412,7 @@ WRITE_LINE_MEMBER(pcf8583_device::sda_w) } } -READ_LINE_MEMBER(pcf8583_device::sda_r) +int pcf8583_device::sda_r() { int res = m_sdar & 1; diff --git a/src/devices/machine/pcf8583.h b/src/devices/machine/pcf8583.h index d5018160788..2086eeef6bf 100644 --- a/src/devices/machine/pcf8583.h +++ b/src/devices/machine/pcf8583.h @@ -80,10 +80,10 @@ public: void set_a0(int a0) { m_slave_address = (m_slave_address & 0xfd) | (a0 << 1); } - DECLARE_WRITE_LINE_MEMBER(a0_w); - DECLARE_WRITE_LINE_MEMBER(scl_w); - DECLARE_WRITE_LINE_MEMBER(sda_w); - DECLARE_READ_LINE_MEMBER(sda_r); + void a0_w(int state); + void scl_w(int state); + void sda_w(int state); + int sda_r(); protected: // device-level overrides diff --git a/src/devices/machine/pcf8593.cpp b/src/devices/machine/pcf8593.cpp index f06b178a011..5aa9807c05e 100644 --- a/src/devices/machine/pcf8593.cpp +++ b/src/devices/machine/pcf8593.cpp @@ -156,7 +156,7 @@ bool pcf8593_device::nvram_write(util::write_stream &file) pcf8593_pin_scl -------------------------------------------------*/ -WRITE_LINE_MEMBER(pcf8593_device::scl_w) +void pcf8593_device::scl_w(int state) { // send bit // FIXME: Processing on the rising edge of the clock causes sda output to @@ -238,7 +238,7 @@ WRITE_LINE_MEMBER(pcf8593_device::scl_w) pcf8593_pin_sda_w -------------------------------------------------*/ -WRITE_LINE_MEMBER(pcf8593_device::sda_w) +void pcf8593_device::sda_w(int state) { // clock is high if (m_pin_scl) @@ -272,7 +272,7 @@ WRITE_LINE_MEMBER(pcf8593_device::sda_w) pcf8593_pin_sda_r -------------------------------------------------*/ -READ_LINE_MEMBER(pcf8593_device::sda_r) +int pcf8593_device::sda_r() { return m_inp; } diff --git a/src/devices/machine/pcf8593.h b/src/devices/machine/pcf8593.h index 3720ac1bb53..27f112f68c5 100644 --- a/src/devices/machine/pcf8593.h +++ b/src/devices/machine/pcf8593.h @@ -24,9 +24,9 @@ class pcf8593_device : public device_t, public: pcf8593_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = 0); - DECLARE_WRITE_LINE_MEMBER(scl_w); - DECLARE_WRITE_LINE_MEMBER(sda_w); - DECLARE_READ_LINE_MEMBER(sda_r); + void scl_w(int state); + void sda_w(int state); + int sda_r(); protected: // device-level overrides diff --git a/src/devices/machine/pci-ide.cpp b/src/devices/machine/pci-ide.cpp index b24a944eb3b..b7680d6b641 100644 --- a/src/devices/machine/pci-ide.cpp +++ b/src/devices/machine/pci-ide.cpp @@ -144,7 +144,7 @@ void ide_pci_device::ide2_write_cs1(offs_t offset, uint32_t data, uint32_t mem_m m_ide2->write_cs1(1, data, mem_mask); } -WRITE_LINE_MEMBER(ide_pci_device::ide_interrupt) +void ide_pci_device::ide_interrupt(int state) { // Call the callback m_irq_handler(state); diff --git a/src/devices/machine/pci-ide.h b/src/devices/machine/pci-ide.h index af3d7ae0a4d..d258f8b288e 100644 --- a/src/devices/machine/pci-ide.h +++ b/src/devices/machine/pci-ide.h @@ -48,7 +48,7 @@ protected: virtual void config_map(address_map &map) override; private: - DECLARE_WRITE_LINE_MEMBER(ide_interrupt); + void ide_interrupt(int state); void prog_if_w(uint8_t data); uint32_t pcictrl_r(offs_t offset); void pcictrl_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0); diff --git a/src/devices/machine/phi.cpp b/src/devices/machine/phi.cpp index 7659a0359a1..02491c87617 100644 --- a/src/devices/machine/phi.cpp +++ b/src/devices/machine/phi.cpp @@ -203,42 +203,42 @@ phi_device::phi_device(const machine_config &mconfig, const char *tag, device_t { } -WRITE_LINE_MEMBER(phi_device::eoi_w) +void phi_device::eoi_w(int state) { set_ext_signal(PHI_488_EOI, state); } -WRITE_LINE_MEMBER(phi_device::dav_w) +void phi_device::dav_w(int state) { set_ext_signal(PHI_488_DAV, state); } -WRITE_LINE_MEMBER(phi_device::nrfd_w) +void phi_device::nrfd_w(int state) { set_ext_signal(PHI_488_NRFD, state); } -WRITE_LINE_MEMBER(phi_device::ndac_w) +void phi_device::ndac_w(int state) { set_ext_signal(PHI_488_NDAC, state); } -WRITE_LINE_MEMBER(phi_device::ifc_w) +void phi_device::ifc_w(int state) { set_ext_signal(PHI_488_IFC, state); } -WRITE_LINE_MEMBER(phi_device::srq_w) +void phi_device::srq_w(int state) { set_ext_signal(PHI_488_SRQ, state); } -WRITE_LINE_MEMBER(phi_device::atn_w) +void phi_device::atn_w(int state) { set_ext_signal(PHI_488_ATN, state); } -WRITE_LINE_MEMBER(phi_device::ren_w) +void phi_device::ren_w(int state) { set_ext_signal(PHI_488_REN, state); } diff --git a/src/devices/machine/phi.h b/src/devices/machine/phi.h index 4eb74b6bbca..292c5d45f9b 100644 --- a/src/devices/machine/phi.h +++ b/src/devices/machine/phi.h @@ -51,14 +51,14 @@ public: // Set read callback for SYS_CNTRL signal auto sys_cntrl_read_cb() { return m_sys_cntrl_read_func.bind(); } - DECLARE_WRITE_LINE_MEMBER(eoi_w); - DECLARE_WRITE_LINE_MEMBER(dav_w); - DECLARE_WRITE_LINE_MEMBER(nrfd_w); - DECLARE_WRITE_LINE_MEMBER(ndac_w); - DECLARE_WRITE_LINE_MEMBER(ifc_w); - DECLARE_WRITE_LINE_MEMBER(srq_w); - DECLARE_WRITE_LINE_MEMBER(atn_w); - DECLARE_WRITE_LINE_MEMBER(ren_w); + void eoi_w(int state); + void dav_w(int state); + void nrfd_w(int state); + void ndac_w(int state); + void ifc_w(int state); + void srq_w(int state); + void atn_w(int state); + void ren_w(int state); void bus_dio_w(uint8_t data); diff --git a/src/devices/machine/pic8259.h b/src/devices/machine/pic8259.h index 333cadced09..7c840b78a4e 100644 --- a/src/devices/machine/pic8259.h +++ b/src/devices/machine/pic8259.h @@ -41,14 +41,14 @@ public: void write(offs_t offset, uint8_t data); uint8_t acknowledge(); - DECLARE_WRITE_LINE_MEMBER( ir0_w ) { set_irq_line(0, state); } - DECLARE_WRITE_LINE_MEMBER( ir1_w ) { set_irq_line(1, state); } - DECLARE_WRITE_LINE_MEMBER( ir2_w ) { set_irq_line(2, state); } - DECLARE_WRITE_LINE_MEMBER( ir3_w ) { set_irq_line(3, state); } - DECLARE_WRITE_LINE_MEMBER( ir4_w ) { set_irq_line(4, state); } - DECLARE_WRITE_LINE_MEMBER( ir5_w ) { set_irq_line(5, state); } - DECLARE_WRITE_LINE_MEMBER( ir6_w ) { set_irq_line(6, state); } - DECLARE_WRITE_LINE_MEMBER( ir7_w ) { set_irq_line(7, state); } + void ir0_w(int state) { set_irq_line(0, state); } + void ir1_w(int state) { set_irq_line(1, state); } + void ir2_w(int state) { set_irq_line(2, state); } + void ir3_w(int state) { set_irq_line(3, state); } + void ir4_w(int state) { set_irq_line(4, state); } + void ir5_w(int state) { set_irq_line(5, state); } + void ir6_w(int state) { set_irq_line(6, state); } + void ir7_w(int state) { set_irq_line(7, state); } IRQ_CALLBACK_MEMBER(inta_cb); diff --git a/src/devices/machine/pit8253.h b/src/devices/machine/pit8253.h index 0c069a217d8..b9f67a30c02 100644 --- a/src/devices/machine/pit8253.h +++ b/src/devices/machine/pit8253.h @@ -119,9 +119,9 @@ public: uint8_t read(offs_t offset); void write(offs_t offset, uint8_t data); - WRITE_LINE_MEMBER(write_gate0) { m_counter[0]->gate_w(state); } - WRITE_LINE_MEMBER(write_gate1) { m_counter[1]->gate_w(state); } - WRITE_LINE_MEMBER(write_gate2) { m_counter[2]->gate_w(state); } + void write_gate0(int state) { m_counter[0]->gate_w(state); } + void write_gate1(int state) { m_counter[1]->gate_w(state); } + void write_gate2(int state) { m_counter[2]->gate_w(state); } /* In the 8253/8254 the CLKx input lines can be attached to a regular clock signal. Another option is to use the output from one timer as the input @@ -133,9 +133,9 @@ public: to 0 with pit8253_set_clockin and call pit8253_clkX_w to change the state of the input CLKx signal. */ - WRITE_LINE_MEMBER(write_clk0) { m_counter[0]->set_clock_signal(state); } - WRITE_LINE_MEMBER(write_clk1) { m_counter[1]->set_clock_signal(state); } - WRITE_LINE_MEMBER(write_clk2) { m_counter[2]->set_clock_signal(state); } + void write_clk0(int state) { m_counter[0]->set_clock_signal(state); } + void write_clk1(int state) { m_counter[1]->set_clock_signal(state); } + void write_clk2(int state) { m_counter[2]->set_clock_signal(state); } void set_clockin(int timer, double new_clockin) { m_counter[timer]->set_clockin(new_clockin); } diff --git a/src/devices/machine/psion_asic1.cpp b/src/devices/machine/psion_asic1.cpp index f04f8504af8..6fc2aeca782 100644 --- a/src/devices/machine/psion_asic1.cpp +++ b/src/devices/machine/psion_asic1.cpp @@ -160,7 +160,7 @@ TIMER_CALLBACK_MEMBER(psion_asic1_device::watchdog) } } -WRITE_LINE_MEMBER(psion_asic1_device::eint1_w) +void psion_asic1_device::eint1_w(int state) { if (state) m_a1_interrupt_status |= 0x04; // ExpIntRightB @@ -170,7 +170,7 @@ WRITE_LINE_MEMBER(psion_asic1_device::eint1_w) update_interrupts(); } -WRITE_LINE_MEMBER(psion_asic1_device::eint2_w) +void psion_asic1_device::eint2_w(int state) { if (state) m_a1_interrupt_status |= 0x08; // ExpIntLeftA @@ -180,7 +180,7 @@ WRITE_LINE_MEMBER(psion_asic1_device::eint2_w) update_interrupts(); } -WRITE_LINE_MEMBER(psion_asic1_device::eint3_w) +void psion_asic1_device::eint3_w(int state) { if (state) m_a1_interrupt_status |= 0x10; // Asic2Int @@ -190,7 +190,7 @@ WRITE_LINE_MEMBER(psion_asic1_device::eint3_w) update_interrupts(); } -WRITE_LINE_MEMBER(psion_asic1_device::enmi_w) +void psion_asic1_device::enmi_w(int state) { if (state) m_a1_status |= 0x0200; // ExternalNmi diff --git a/src/devices/machine/psion_asic1.h b/src/devices/machine/psion_asic1.h index 6318a8f19f4..fea231c6902 100644 --- a/src/devices/machine/psion_asic1.h +++ b/src/devices/machine/psion_asic1.h @@ -40,10 +40,10 @@ public: IRQ_CALLBACK_MEMBER(inta_cb); - DECLARE_WRITE_LINE_MEMBER(eint1_w); - DECLARE_WRITE_LINE_MEMBER(eint2_w); - DECLARE_WRITE_LINE_MEMBER(eint3_w); - DECLARE_WRITE_LINE_MEMBER(enmi_w); + void eint1_w(int state); + void eint2_w(int state); + void eint3_w(int state); + void enmi_w(int state); uint32_t screen_update_single(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_dual(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); diff --git a/src/devices/machine/psion_asic2.cpp b/src/devices/machine/psion_asic2.cpp index 3fd8c4a9b6a..895aca6943f 100644 --- a/src/devices/machine/psion_asic2.cpp +++ b/src/devices/machine/psion_asic2.cpp @@ -96,7 +96,7 @@ void psion_asic2_device::device_reset() } -WRITE_LINE_MEMBER(psion_asic2_device::on_clr_w) +void psion_asic2_device::on_clr_w(int state) { if (state) m_a2_status |= 0x01; // A1OnKey @@ -106,7 +106,7 @@ WRITE_LINE_MEMBER(psion_asic2_device::on_clr_w) update_interrupts(); } -WRITE_LINE_MEMBER(psion_asic2_device::dnmi_w) +void psion_asic2_device::dnmi_w(int state) { if (state) m_a2_interrupt_status |= 0x01; // DNMI @@ -116,7 +116,7 @@ WRITE_LINE_MEMBER(psion_asic2_device::dnmi_w) update_interrupts(); } -WRITE_LINE_MEMBER(psion_asic2_device::frcovl_w) +void psion_asic2_device::frcovl_w(int state) { if (BIT(m_a2_control2, 4)) { @@ -124,7 +124,7 @@ WRITE_LINE_MEMBER(psion_asic2_device::frcovl_w) } } -WRITE_LINE_MEMBER(psion_asic2_device::reset_w) +void psion_asic2_device::reset_w(int state) { if (!state) m_a2_status |= 0x04; // A1ResetFlag diff --git a/src/devices/machine/psion_asic2.h b/src/devices/machine/psion_asic2.h index 7045d5b043d..25dd8c2de81 100644 --- a/src/devices/machine/psion_asic2.h +++ b/src/devices/machine/psion_asic2.h @@ -39,10 +39,10 @@ public: uint8_t io_r(offs_t offset); void io_w(offs_t offset, uint8_t data); - DECLARE_WRITE_LINE_MEMBER(on_clr_w); - DECLARE_WRITE_LINE_MEMBER(dnmi_w); - DECLARE_WRITE_LINE_MEMBER(frcovl_w); - DECLARE_WRITE_LINE_MEMBER(reset_w); + void on_clr_w(int state); + void dnmi_w(int state); + void frcovl_w(int state); + void reset_w(int state); protected: virtual void device_resolve_objects() override; diff --git a/src/devices/machine/psion_asic9.cpp b/src/devices/machine/psion_asic9.cpp index d1ddc141880..6ce5f1eed55 100644 --- a/src/devices/machine/psion_asic9.cpp +++ b/src/devices/machine/psion_asic9.cpp @@ -288,7 +288,7 @@ TIMER_CALLBACK_MEMBER(psion_asic9_device::rtc) m_rtc++; } -WRITE_LINE_MEMBER(psion_asic9_device::eint0_w) +void psion_asic9_device::eint0_w(int state) { if (state) m_a9_interrupt_status |= 0x08; // A9MExpIntC @@ -298,7 +298,7 @@ WRITE_LINE_MEMBER(psion_asic9_device::eint0_w) update_interrupts(); } -WRITE_LINE_MEMBER(psion_asic9_device::eint1_w) +void psion_asic9_device::eint1_w(int state) { if (state) m_a9_interrupt_status |= 0x10; // A9MExpIntA @@ -308,7 +308,7 @@ WRITE_LINE_MEMBER(psion_asic9_device::eint1_w) update_interrupts(); } -WRITE_LINE_MEMBER(psion_asic9_device::eint2_w) +void psion_asic9_device::eint2_w(int state) { if (state) m_a9_interrupt_status |= 0x20; // A9MExpIntB @@ -319,7 +319,7 @@ WRITE_LINE_MEMBER(psion_asic9_device::eint2_w) } -WRITE_LINE_MEMBER(psion_asic9_device::medchng_w) +void psion_asic9_device::medchng_w(int state) { if (state) m_a9_status |= 0x04; // A9MDoorNMI diff --git a/src/devices/machine/psion_asic9.h b/src/devices/machine/psion_asic9.h index 8e1adb943be..b721e0c09d4 100644 --- a/src/devices/machine/psion_asic9.h +++ b/src/devices/machine/psion_asic9.h @@ -47,10 +47,10 @@ public: IRQ_CALLBACK_MEMBER(inta_cb); - DECLARE_WRITE_LINE_MEMBER(eint0_w); - DECLARE_WRITE_LINE_MEMBER(eint1_w); - DECLARE_WRITE_LINE_MEMBER(eint2_w); - DECLARE_WRITE_LINE_MEMBER(medchng_w); + void eint0_w(int state); + void eint1_w(int state); + void eint2_w(int state); + void medchng_w(int state); uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); diff --git a/src/devices/machine/ripple_counter.cpp b/src/devices/machine/ripple_counter.cpp index 25639eb6bb3..6f3fde41f94 100644 --- a/src/devices/machine/ripple_counter.cpp +++ b/src/devices/machine/ripple_counter.cpp @@ -144,7 +144,7 @@ void ripple_counter_device::set_count(u32 count) // clock_w - handle falling-edge clock input //------------------------------------------------- -WRITE_LINE_MEMBER(ripple_counter_device::clock_w) +void ripple_counter_device::clock_w(int state) { if (m_clk != bool(state)) { @@ -159,7 +159,7 @@ WRITE_LINE_MEMBER(ripple_counter_device::clock_w) // reset_w - handle active-high reset input //------------------------------------------------- -WRITE_LINE_MEMBER(ripple_counter_device::reset_w) +void ripple_counter_device::reset_w(int state) { if (m_reset != bool(state)) { diff --git a/src/devices/machine/ripple_counter.h b/src/devices/machine/ripple_counter.h index fb7648334e3..c77d37657c9 100644 --- a/src/devices/machine/ripple_counter.h +++ b/src/devices/machine/ripple_counter.h @@ -31,8 +31,8 @@ public: auto rom_out_cb() { return m_rom_out_cb.bind(); } // control line handlers - DECLARE_WRITE_LINE_MEMBER(clock_w); - DECLARE_WRITE_LINE_MEMBER(reset_w); + void clock_w(int state); + void reset_w(int state); // getters u32 count() const { return m_count; } diff --git a/src/devices/machine/roc10937.cpp b/src/devices/machine/roc10937.cpp index f7d50007d53..9e64e5ce4fb 100644 --- a/src/devices/machine/roc10937.cpp +++ b/src/devices/machine/roc10937.cpp @@ -200,12 +200,12 @@ void rocvfd_device::update_display() (*m_brightness)[0] = m_duty; } -WRITE_LINE_MEMBER( rocvfd_device::sclk ) +void rocvfd_device::sclk(int state) { shift_clock(state); } -WRITE_LINE_MEMBER( rocvfd_device::data ) +void rocvfd_device::data(int state) { if (state) { @@ -217,7 +217,7 @@ WRITE_LINE_MEMBER( rocvfd_device::data ) } } -WRITE_LINE_MEMBER( rocvfd_device::por ) +void rocvfd_device::por(int state) { //If line goes low, reset mode is engaged, until such a time as it goes high again. if (!state) diff --git a/src/devices/machine/roc10937.h b/src/devices/machine/roc10937.h index 75ac8130112..1095d78ccfb 100644 --- a/src/devices/machine/roc10937.h +++ b/src/devices/machine/roc10937.h @@ -21,9 +21,9 @@ public: virtual void update_display(); void shift_clock(int data); void write_char(int data); - DECLARE_WRITE_LINE_MEMBER( sclk ); - DECLARE_WRITE_LINE_MEMBER( data ); - DECLARE_WRITE_LINE_MEMBER( por ); + void sclk(int state); + void data(int state); + void por(int state); protected: diff --git a/src/devices/machine/rp5h01.cpp b/src/devices/machine/rp5h01.cpp index 655ffd5f841..348a4d8a780 100644 --- a/src/devices/machine/rp5h01.cpp +++ b/src/devices/machine/rp5h01.cpp @@ -80,7 +80,7 @@ void rp5h01_device::device_reset() enable_w -------------------------------------------------*/ -WRITE_LINE_MEMBER( rp5h01_device::enable_w ) +void rp5h01_device::enable_w(int state) { /* process the /CE signal and enable/disable the IC */ m_enabled = state ? 0 : 1; @@ -90,7 +90,7 @@ WRITE_LINE_MEMBER( rp5h01_device::enable_w ) reset_w -------------------------------------------------*/ -WRITE_LINE_MEMBER( rp5h01_device::reset_w ) +void rp5h01_device::reset_w(int state) { /* if it's not enabled, ignore */ if (!m_enabled) @@ -111,7 +111,7 @@ WRITE_LINE_MEMBER( rp5h01_device::reset_w ) cs_w -------------------------------------------------*/ -WRITE_LINE_MEMBER( rp5h01_device::cs_w ) +void rp5h01_device::cs_w(int state) { /* if it's not enabled, ignore */ if (!m_enabled) @@ -128,7 +128,7 @@ WRITE_LINE_MEMBER( rp5h01_device::cs_w ) clock_w -------------------------------------------------*/ -WRITE_LINE_MEMBER( rp5h01_device::clock_w ) +void rp5h01_device::clock_w(int state) { /* if it's not enabled, ignore */ if (!m_enabled) @@ -149,7 +149,7 @@ WRITE_LINE_MEMBER( rp5h01_device::clock_w ) test_w -------------------------------------------------*/ -WRITE_LINE_MEMBER( rp5h01_device::test_w ) +void rp5h01_device::test_w(int state) { /* if it's not enabled, ignore */ if (!m_enabled) @@ -163,7 +163,7 @@ WRITE_LINE_MEMBER( rp5h01_device::test_w ) counter_r -------------------------------------------------*/ -READ_LINE_MEMBER( rp5h01_device::counter_r ) +int rp5h01_device::counter_r() { /* if it's not enabled, ignore */ if (!m_enabled) @@ -177,7 +177,7 @@ READ_LINE_MEMBER( rp5h01_device::counter_r ) data_r -------------------------------------------------*/ -READ_LINE_MEMBER( rp5h01_device::data_r ) +int rp5h01_device::data_r() { /* if it's not enabled, ignore */ if (!m_enabled) diff --git a/src/devices/machine/rp5h01.h b/src/devices/machine/rp5h01.h index 686367c694e..53b301831d7 100644 --- a/src/devices/machine/rp5h01.h +++ b/src/devices/machine/rp5h01.h @@ -33,13 +33,13 @@ class rp5h01_device : public device_t public: rp5h01_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - DECLARE_WRITE_LINE_MEMBER( enable_w ); /* /CE */ - DECLARE_WRITE_LINE_MEMBER( reset_w ); /* RESET */ - DECLARE_WRITE_LINE_MEMBER( cs_w ); /* CS */ - DECLARE_WRITE_LINE_MEMBER( clock_w ); /* DATA CLOCK (active low) */ - DECLARE_WRITE_LINE_MEMBER( test_w ); /* TEST */ - DECLARE_READ_LINE_MEMBER( counter_r ); /* COUNTER OUT */ - DECLARE_READ_LINE_MEMBER( data_r ); /* DATA */ + void enable_w(int state); // /CE + void reset_w(int state); // RESET + void cs_w(int state); // CS + void clock_w(int state); // DATA CLOCK (active low) + void test_w(int state); // TEST + int counter_r(); // COUNTER OUT + int data_r(); // DATA protected: // device-level overrides diff --git a/src/devices/machine/rstbuf.h b/src/devices/machine/rstbuf.h index 718a96f4861..0ba54b2054a 100644 --- a/src/devices/machine/rstbuf.h +++ b/src/devices/machine/rstbuf.h @@ -57,13 +57,13 @@ public: rst_pos_buffer_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock = 0); // set RST 1/RST 08H request line (modifies bit 3 of vector) - DECLARE_WRITE_LINE_MEMBER(rst1_w) { sync_input(state, 0x08); } + void rst1_w(int state) { sync_input(state, 0x08); } // set RST 2/RST 10H request line (modifies bit 4 of vector) - DECLARE_WRITE_LINE_MEMBER(rst2_w) { sync_input(state, 0x10); } + void rst2_w(int state) { sync_input(state, 0x10); } // set RST 3/RST 20H request line (modifies bit 5 of vector) - DECLARE_WRITE_LINE_MEMBER(rst4_w) { sync_input(state, 0x20); } + void rst4_w(int state) { sync_input(state, 0x20); } protected: // getter (required override) @@ -79,13 +79,13 @@ public: rst_neg_buffer_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock = 0); // set RST 30H request line (modifies bit 3 of vector) - DECLARE_WRITE_LINE_MEMBER(rst30_w) { sync_input(state, 0x08); } + void rst30_w(int state) { sync_input(state, 0x08); } // set RST 28H request line (modifies bit 4 of vector) - DECLARE_WRITE_LINE_MEMBER(rst28_w) { sync_input(state, 0x10); } + void rst28_w(int state) { sync_input(state, 0x10); } // set RST 18H request line (modifies bit 5 of vector) - DECLARE_WRITE_LINE_MEMBER(rst18_w) { sync_input(state, 0x20); } + void rst18_w(int state) { sync_input(state, 0x20); } protected: // getter (required override) diff --git a/src/devices/machine/rtc4543.cpp b/src/devices/machine/rtc4543.cpp index 773724a4170..671780538c4 100644 --- a/src/devices/machine/rtc4543.cpp +++ b/src/devices/machine/rtc4543.cpp @@ -132,7 +132,7 @@ void rtc4543_device::rtc_clock_updated(int year, int month, int day, int day_of_ // ce_w - chip enable write //------------------------------------------------- -WRITE_LINE_MEMBER( rtc4543_device::ce_w ) +void rtc4543_device::ce_w(int state) { if (!state && m_ce) // complete transfer { @@ -175,7 +175,7 @@ void rtc4543_device::ce_falling() // wr_w - data direction line write //------------------------------------------------- -WRITE_LINE_MEMBER( rtc4543_device::wr_w ) +void rtc4543_device::wr_w(int state) { if (state != m_wr) LOG("WR: %u\n", state); @@ -188,7 +188,7 @@ WRITE_LINE_MEMBER( rtc4543_device::wr_w ) // clk_w - serial clock write //------------------------------------------------- -WRITE_LINE_MEMBER( rtc4543_device::clk_w ) +void rtc4543_device::clk_w(int state) { if (m_ce) { @@ -246,7 +246,7 @@ void rtc4543_device::clk_falling() // data_w - I/O write //------------------------------------------------- -WRITE_LINE_MEMBER( rtc4543_device::data_w ) +void rtc4543_device::data_w(int state) { m_data = state & 1; } @@ -256,7 +256,7 @@ WRITE_LINE_MEMBER( rtc4543_device::data_w ) // data_r - I/O read //------------------------------------------------- -READ_LINE_MEMBER( rtc4543_device::data_r ) +int rtc4543_device::data_r() { return m_data; } diff --git a/src/devices/machine/rtc4543.h b/src/devices/machine/rtc4543.h index a29cbb9ec30..21fd2914deb 100644 --- a/src/devices/machine/rtc4543.h +++ b/src/devices/machine/rtc4543.h @@ -30,11 +30,11 @@ public: // construction/destruction rtc4543_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - DECLARE_WRITE_LINE_MEMBER( ce_w ); - DECLARE_WRITE_LINE_MEMBER( wr_w ); - DECLARE_WRITE_LINE_MEMBER( clk_w ); - DECLARE_READ_LINE_MEMBER( data_r ); - DECLARE_WRITE_LINE_MEMBER( data_w ); + void ce_w(int state); + void wr_w(int state); + void clk_w(int state); + int data_r(); + void data_w(int state); auto data_cb() { return m_data_cb.bind(); } diff --git a/src/devices/machine/rtc65271.cpp b/src/devices/machine/rtc65271.cpp index 424c3e8ace4..a705c5d0901 100644 --- a/src/devices/machine/rtc65271.cpp +++ b/src/devices/machine/rtc65271.cpp @@ -475,7 +475,7 @@ void rtc65271_device::field_interrupts() } } -READ_LINE_MEMBER(rtc65271_device::intrq_r) +int rtc65271_device::intrq_r() { return (m_regs[reg_C] & reg_C_IRQF)? ASSERT_LINE : CLEAR_LINE; } diff --git a/src/devices/machine/rtc65271.h b/src/devices/machine/rtc65271.h index d19b6ee36f2..430af624c73 100644 --- a/src/devices/machine/rtc65271.h +++ b/src/devices/machine/rtc65271.h @@ -32,7 +32,7 @@ public: uint8_t read(int xramsel, offs_t offset); void write(int xramsel, offs_t offset, uint8_t data); - DECLARE_READ_LINE_MEMBER(intrq_r); + int intrq_r(); protected: // device-level overrides diff --git a/src/devices/machine/rtc9701.cpp b/src/devices/machine/rtc9701.cpp index 5731a7bb911..93ea8226eb1 100644 --- a/src/devices/machine/rtc9701.cpp +++ b/src/devices/machine/rtc9701.cpp @@ -228,13 +228,13 @@ inline void rtc9701_device::rtc_write(uint8_t offset,uint8_t data) // READ/WRITE HANDLERS //************************************************************************** -WRITE_LINE_MEMBER( rtc9701_device::write_bit ) +void rtc9701_device::write_bit(int state) { m_latch = state; } -READ_LINE_MEMBER( rtc9701_device::read_bit ) +int rtc9701_device::read_bit() { if (rtc_state == state_t::RTC_READ) { @@ -259,7 +259,7 @@ READ_LINE_MEMBER( rtc9701_device::read_bit ) } -WRITE_LINE_MEMBER( rtc9701_device::set_cs_line ) +void rtc9701_device::set_cs_line(int state) { //logerror("set reset line %d\n",state); m_reset_line = state; @@ -279,7 +279,7 @@ WRITE_LINE_MEMBER( rtc9701_device::set_cs_line ) -WRITE_LINE_MEMBER( rtc9701_device::set_clock_line ) +void rtc9701_device::set_clock_line(int state) { //logerror("set clock line %d\n",state); diff --git a/src/devices/machine/rtc9701.h b/src/devices/machine/rtc9701.h index b2cd1945660..8d25983fefb 100644 --- a/src/devices/machine/rtc9701.h +++ b/src/devices/machine/rtc9701.h @@ -33,10 +33,10 @@ public: // I/O operations - DECLARE_WRITE_LINE_MEMBER( write_bit ); - DECLARE_READ_LINE_MEMBER( read_bit ); - DECLARE_WRITE_LINE_MEMBER( set_cs_line ); - DECLARE_WRITE_LINE_MEMBER( set_clock_line ); + void write_bit(int state); + int read_bit(); + void set_cs_line(int state); + void set_clock_line(int state); TIMER_CALLBACK_MEMBER(timer_callback); protected: diff --git a/src/devices/machine/s3520cf.cpp b/src/devices/machine/s3520cf.cpp index 2466c1ee69f..8f256f24dfc 100644 --- a/src/devices/machine/s3520cf.cpp +++ b/src/devices/machine/s3520cf.cpp @@ -282,19 +282,19 @@ inline void s3520cf_device::rtc_write(u8 offset,u8 data) // READ/WRITE HANDLERS //************************************************************************** -READ_LINE_MEMBER( s3520cf_device::read_bit ) +int s3520cf_device::read_bit() { return m_read_latch; } -WRITE_LINE_MEMBER( s3520cf_device::set_dir_line ) +void s3520cf_device::set_dir_line(int state) { //printf("%d DIR LINE\n",state); m_dir = state; } -WRITE_LINE_MEMBER( s3520cf_device::set_cs_line ) +void s3520cf_device::set_cs_line(int state) { m_reset_line = state; @@ -308,13 +308,13 @@ WRITE_LINE_MEMBER( s3520cf_device::set_cs_line ) } } -WRITE_LINE_MEMBER( s3520cf_device::write_bit ) +void s3520cf_device::write_bit(int state) { m_latch = state; // printf("%d LATCH LINE\n",state); } -WRITE_LINE_MEMBER( s3520cf_device::set_clock_line ) +void s3520cf_device::set_clock_line(int state) { // NOTE: this device use 1-cycle (8 clocks) delayed data output if(state == 1 && m_reset_line == CLEAR_LINE) diff --git a/src/devices/machine/s3520cf.h b/src/devices/machine/s3520cf.h index a7343290c79..da4c1083fce 100644 --- a/src/devices/machine/s3520cf.h +++ b/src/devices/machine/s3520cf.h @@ -29,11 +29,11 @@ public: s3520cf_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock = 32'768); // I/O operations - DECLARE_READ_LINE_MEMBER( read_bit ); - DECLARE_WRITE_LINE_MEMBER( set_dir_line ); - DECLARE_WRITE_LINE_MEMBER( set_cs_line ); - DECLARE_WRITE_LINE_MEMBER( set_clock_line ); - DECLARE_WRITE_LINE_MEMBER( write_bit ); + int read_bit(); + void set_dir_line(int state); + void set_cs_line(int state); + void set_clock_line(int state); + void write_bit(int state); TIMER_CALLBACK_MEMBER(timer_callback); protected: diff --git a/src/devices/machine/s3c2410.cpp b/src/devices/machine/s3c2410.cpp index e630174b326..a6e02bde885 100644 --- a/src/devices/machine/s3c2410.cpp +++ b/src/devices/machine/s3c2410.cpp @@ -320,7 +320,7 @@ void s3c2410_device::s3c2410_touch_screen( int state) s3c24xx_touch_screen(state); } -WRITE_LINE_MEMBER( s3c2410_device::frnb_w ) +void s3c2410_device::frnb_w(int state) { s3c24xx_pin_frnb_w(state); } diff --git a/src/devices/machine/s3c2410.h b/src/devices/machine/s3c2410.h index 9146baa7e7f..d86193c365f 100644 --- a/src/devices/machine/s3c2410.h +++ b/src/devices/machine/s3c2410.h @@ -155,7 +155,7 @@ public: auto nand_data_w_callback() { return m_nand_data_w_cb.bind(); } void set_lcd_flags(int flags) { m_flags = flags; } - DECLARE_WRITE_LINE_MEMBER( frnb_w ); + void frnb_w(int state); uint32_t s3c24xx_lcd_r(offs_t offset, uint32_t mem_mask = ~0); @@ -335,7 +335,7 @@ protected: uint32_t s3c24xx_nand_r(offs_t offset, uint32_t mem_mask = ~0); void s3c24xx_nand_init_ecc(); void s3c24xx_nand_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0); - [[maybe_unused]] WRITE_LINE_MEMBER( s3c24xx_pin_frnb_w ); + [[maybe_unused]] void s3c24xx_pin_frnb_w(int state); void s3c24xx_nand_auto_boot(); void s3c24xx_device_reset(); void s3c24xx_device_start(); diff --git a/src/devices/machine/s3c2440.cpp b/src/devices/machine/s3c2440.cpp index 801c21dd01d..b43a191873a 100644 --- a/src/devices/machine/s3c2440.cpp +++ b/src/devices/machine/s3c2440.cpp @@ -350,7 +350,7 @@ void s3c2440_device::s3c2440_request_eint(uint32_t number) s3c24xx_request_eint( number); } -WRITE_LINE_MEMBER( s3c2440_device::frnb_w ) +void s3c2440_device::frnb_w(int state) { s3c24xx_pin_frnb_w(state); } diff --git a/src/devices/machine/s3c2440.h b/src/devices/machine/s3c2440.h index c4db773a475..0c3f71391d7 100644 --- a/src/devices/machine/s3c2440.h +++ b/src/devices/machine/s3c2440.h @@ -175,7 +175,7 @@ public: auto nand_data_w_callback() { return m_nand_data_w_cb.bind(); } void set_lcd_flags(int flags) { m_flags = flags; } - DECLARE_WRITE_LINE_MEMBER( frnb_w ); + void frnb_w(int state); uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); @@ -356,7 +356,7 @@ protected: uint32_t s3c24xx_nand_r(offs_t offset, uint32_t mem_mask = ~0); void s3c24xx_nand_init_ecc(); void s3c24xx_nand_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0); - [[maybe_unused]] WRITE_LINE_MEMBER( s3c24xx_pin_frnb_w ); + [[maybe_unused]] void s3c24xx_pin_frnb_w(int state); uint32_t s3c24xx_cam_r(offs_t offset, uint32_t mem_mask = ~0); void s3c24xx_cam_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0); uint32_t s3c24xx_ac97_r(offs_t offset, uint32_t mem_mask = ~0); diff --git a/src/devices/machine/s3c24xx.hxx b/src/devices/machine/s3c24xx.hxx index 08582806efb..be8ae0f56c0 100644 --- a/src/devices/machine/s3c24xx.hxx +++ b/src/devices/machine/s3c24xx.hxx @@ -3080,7 +3080,7 @@ void S3C24_CLASS_NAME::s3c24xx_nand_w(offs_t offset, uint32_t data, uint32_t mem } } -[[maybe_unused]] WRITE_LINE_MEMBER( S3C24_CLASS_NAME::s3c24xx_pin_frnb_w ) +[[maybe_unused]] void S3C24_CLASS_NAME::s3c24xx_pin_frnb_w(int state) { LOGMASKED(LOG_FLASH, "s3c24xx_pin_frnb_w (%d)\n", state); #if defined(DEVICE_S3C2440) diff --git a/src/devices/machine/sa1110.cpp b/src/devices/machine/sa1110.cpp index c6fcc4d3603..baa26160441 100644 --- a/src/devices/machine/sa1110.cpp +++ b/src/devices/machine/sa1110.cpp @@ -405,7 +405,7 @@ void sa1110_periphs_device::icp_w(offs_t offset, uint32_t data, uint32_t mem_mas */ -WRITE_LINE_MEMBER(sa1110_periphs_device::uart3_irq_callback) +void sa1110_periphs_device::uart3_irq_callback(int state) { set_irq_line(INT_UART3, state); } @@ -792,7 +792,7 @@ void sa1110_periphs_device::uart3_w(offs_t offset, uint32_t data, uint32_t mem_m */ -WRITE_LINE_MEMBER(sa1110_periphs_device::mcp_irq_callback) +void sa1110_periphs_device::mcp_irq_callback(int state) { set_irq_line(INT_MCP, state); } diff --git a/src/devices/machine/sa1110.h b/src/devices/machine/sa1110.h index 3ef8e79042b..7d3d1ade026 100644 --- a/src/devices/machine/sa1110.h +++ b/src/devices/machine/sa1110.h @@ -96,7 +96,7 @@ protected: void icp_uart_begin_of_break(); void icp_uart_end_of_break(); - DECLARE_WRITE_LINE_MEMBER(uart3_irq_callback); + void uart3_irq_callback(int state); void uart_recalculate_divisor(); void uart_update_eif_status(); void uart_write_receive_fifo(uint16_t data_and_flags); @@ -112,7 +112,7 @@ protected: void uart_set_receive_irq_enabled(bool enabled); void uart_set_transmit_irq_enabled(bool enabled); - DECLARE_WRITE_LINE_MEMBER(mcp_irq_callback); + void mcp_irq_callback(int state); TIMER_CALLBACK_MEMBER(mcp_audio_tx_callback); TIMER_CALLBACK_MEMBER(mcp_telecom_tx_callback); void mcp_update_sample_rate(); diff --git a/src/devices/machine/sa1111.cpp b/src/devices/machine/sa1111.cpp index 71cc6304552..d7f970f11c5 100644 --- a/src/devices/machine/sa1111.cpp +++ b/src/devices/machine/sa1111.cpp @@ -458,7 +458,7 @@ void sa1111_device::usb_int_test_w(offs_t offset, uint32_t data, uint32_t mem_ma */ -WRITE_LINE_MEMBER(sa1111_device::l3wd_in) +void sa1111_device::l3wd_in(int state) { if (state) m_audio_regs.sasr0 |= (1 << SASR0_L3WD_BIT); diff --git a/src/devices/machine/sa1111.h b/src/devices/machine/sa1111.h index 3804c06a30c..46cf6779179 100644 --- a/src/devices/machine/sa1111.h +++ b/src/devices/machine/sa1111.h @@ -44,7 +44,7 @@ public: auto l3_data_out() { return m_l3_data_out.bind(); } auto i2s_out() { return m_i2s_out.bind(); } - DECLARE_WRITE_LINE_MEMBER(l3wd_in); + void l3wd_in(int state); void map(address_map &map); diff --git a/src/devices/machine/saa7191.cpp b/src/devices/machine/saa7191.cpp index 568139201b3..1c8540d2ee3 100644 --- a/src/devices/machine/saa7191.cpp +++ b/src/devices/machine/saa7191.cpp @@ -120,13 +120,13 @@ uint8_t saa7191_device::i2c_data_r() return 0; } -WRITE_LINE_MEMBER(saa7191_device::i2c_stop_w) +void saa7191_device::i2c_stop_w(int state) { if (state) m_i2c_state = I2C_STATE_IDLE; } -WRITE_LINE_MEMBER(saa7191_device::iicsa_w) +void saa7191_device::iicsa_w(int state) { m_i2c_write_addr = state ? 0x8e : 0x8a; m_i2c_read_addr = m_i2c_write_addr | 1; diff --git a/src/devices/machine/saa7191.h b/src/devices/machine/saa7191.h index 907edfdc3b0..42c1182e1f2 100644 --- a/src/devices/machine/saa7191.h +++ b/src/devices/machine/saa7191.h @@ -23,9 +23,9 @@ public: void i2c_data_w(uint8_t data); uint8_t i2c_data_r(); - DECLARE_WRITE_LINE_MEMBER(i2c_stop_w); + void i2c_stop_w(int state); - DECLARE_WRITE_LINE_MEMBER(iicsa_w); + void iicsa_w(int state); auto chr_in() { return m_chr_in.bind(); } auto cvbs_in() { return m_cvbs_in.bind(); } diff --git a/src/devices/machine/scc68070.cpp b/src/devices/machine/scc68070.cpp index f10eb8de651..1ba24f46597 100644 --- a/src/devices/machine/scc68070.cpp +++ b/src/devices/machine/scc68070.cpp @@ -450,7 +450,7 @@ void scc68070_device::device_reset() set_timer_callback(0); } -WRITE_LINE_MEMBER(scc68070_device::reset_peripherals) +void scc68070_device::reset_peripherals(int state) { m_lir = 0; @@ -516,31 +516,31 @@ void scc68070_device::update_ipl() } } -WRITE_LINE_MEMBER(scc68070_device::in2_w) +void scc68070_device::in2_w(int state) { m_in2_line = state; update_ipl(); } -WRITE_LINE_MEMBER(scc68070_device::in4_w) +void scc68070_device::in4_w(int state) { m_in4_line = state; update_ipl(); } -WRITE_LINE_MEMBER(scc68070_device::in5_w) +void scc68070_device::in5_w(int state) { m_in5_line = state; update_ipl(); } -WRITE_LINE_MEMBER(scc68070_device::nmi_w) +void scc68070_device::nmi_w(int state) { m_nmi_line = state; update_ipl(); } -WRITE_LINE_MEMBER(scc68070_device::int1_w) +void scc68070_device::int1_w(int state) { if (m_int1_line != state) { @@ -554,7 +554,7 @@ WRITE_LINE_MEMBER(scc68070_device::int1_w) } } -WRITE_LINE_MEMBER(scc68070_device::int2_w) +void scc68070_device::int2_w(int state) { if (m_int2_line != state) { @@ -1236,7 +1236,7 @@ void scc68070_device::i2c_process_rising_scl() } } -WRITE_LINE_MEMBER(scc68070_device::write_scl) +void scc68070_device::write_scl(int state) { if (m_i2c.status_register & ISR_MST) { diff --git a/src/devices/machine/scc68070.h b/src/devices/machine/scc68070.h index 9fe0662345b..b954a3f2b79 100644 --- a/src/devices/machine/scc68070.h +++ b/src/devices/machine/scc68070.h @@ -58,14 +58,14 @@ public: auto i2c_sda_w() { return m_i2c_sdaw_callback.bind(); } auto i2c_sda_r() { return m_i2c_sdar_callback.bind(); } - DECLARE_WRITE_LINE_MEMBER(in2_w); - DECLARE_WRITE_LINE_MEMBER(in4_w); - DECLARE_WRITE_LINE_MEMBER(in5_w); - DECLARE_WRITE_LINE_MEMBER(nmi_w); - DECLARE_WRITE_LINE_MEMBER(int1_w); - DECLARE_WRITE_LINE_MEMBER(int2_w); + void in2_w(int state); + void in4_w(int state); + void in5_w(int state); + void nmi_w(int state); + void int1_w(int state); + void int2_w(int state); - DECLARE_WRITE_LINE_MEMBER(write_scl); + void write_scl(int state); TIMER_CALLBACK_MEMBER(timer0_callback); TIMER_CALLBACK_MEMBER(rx_callback); @@ -203,7 +203,7 @@ private: void internal_map(address_map &map); void cpu_space_map(address_map &map); - DECLARE_WRITE_LINE_MEMBER(reset_peripherals); + void reset_peripherals(int state); void update_ipl(); uint8_t iack_r(offs_t offset); diff --git a/src/devices/machine/scn_pci.cpp b/src/devices/machine/scn_pci.cpp index 428c2761a32..d21e45868ca 100644 --- a/src/devices/machine/scn_pci.cpp +++ b/src/devices/machine/scn_pci.cpp @@ -551,7 +551,7 @@ void scn_pci_device::rx_load_sync(u8 data, bool pe) // rxd_w - set serial data input for receiver //------------------------------------------------- -WRITE_LINE_MEMBER(scn_pci_device::rxd_w) +void scn_pci_device::rxd_w(int state) { m_rxd = state; } @@ -1096,7 +1096,7 @@ void scn_pci_device::set_rts(bool state) // or ring indicator input (active low) //------------------------------------------------- -WRITE_LINE_MEMBER(scn_pci_device::dsr_w) +void scn_pci_device::dsr_w(int state) { assert(!m_is_aci); @@ -1118,7 +1118,7 @@ WRITE_LINE_MEMBER(scn_pci_device::dsr_w) // enable receiver (active low) //------------------------------------------------- -WRITE_LINE_MEMBER(scn_pci_device::dcd_w) +void scn_pci_device::dcd_w(int state) { if (BIT(m_status, 6) == !state) return; @@ -1145,7 +1145,7 @@ WRITE_LINE_MEMBER(scn_pci_device::dcd_w) // transmitter (active low) //------------------------------------------------- -WRITE_LINE_MEMBER(scn_pci_device::cts_w) +void scn_pci_device::cts_w(int state) { m_cts = !state; } @@ -1477,7 +1477,7 @@ void scn_pci_device::write(offs_t offset, u8 data) // (or jam sync for EPCI receiver) //------------------------------------------------- -WRITE_LINE_MEMBER(scn_pci_device::txc_w) +void scn_pci_device::txc_w(int state) { if (state == m_txc_input) return; @@ -1512,7 +1512,7 @@ WRITE_LINE_MEMBER(scn_pci_device::txc_w) // rxc_w - external clock input for receiver //------------------------------------------------- -WRITE_LINE_MEMBER(scn_pci_device::rxc_w) +void scn_pci_device::rxc_w(int state) { if (state == m_rxc_input) return; diff --git a/src/devices/machine/scn_pci.h b/src/devices/machine/scn_pci.h index acb16e90f72..0eca08da6be 100644 --- a/src/devices/machine/scn_pci.h +++ b/src/devices/machine/scn_pci.h @@ -68,17 +68,17 @@ public: void write(offs_t offset, u8 data); // line write handlers - DECLARE_WRITE_LINE_MEMBER(rxd_w); - DECLARE_WRITE_LINE_MEMBER(dsr_w); - DECLARE_WRITE_LINE_MEMBER(dcd_w); - DECLARE_WRITE_LINE_MEMBER(cts_w); - DECLARE_WRITE_LINE_MEMBER(txc_w); - DECLARE_WRITE_LINE_MEMBER(rxc_w); + void rxd_w(int state); + void dsr_w(int state); + void dcd_w(int state); + void cts_w(int state); + void txc_w(int state); + void rxc_w(int state); // output polling - DECLARE_READ_LINE_MEMBER(txrdy_r) { assert(!m_is_aci); return BIT(m_status, 0) ? 0 : 1; } - DECLARE_READ_LINE_MEMBER(rxrdy_r) { assert(!m_is_aci); return BIT(m_status, 1) ? 0 : 1; } - DECLARE_READ_LINE_MEMBER(txemt_dschg_r) { assert(!m_is_aci); return BIT(m_status, 2) != 0 ? 0 : 1; } + int txrdy_r() { assert(!m_is_aci); return BIT(m_status, 0) ? 0 : 1; } + int rxrdy_r() { assert(!m_is_aci); return BIT(m_status, 1) ? 0 : 1; } + int txemt_dschg_r() { assert(!m_is_aci); return BIT(m_status, 2) != 0 ? 0 : 1; } protected: enum class rcvr_state : u8 { @@ -257,7 +257,7 @@ public: auto intr_handler() { return m_intr_callback.bind(); } // output polling - DECLARE_READ_LINE_MEMBER(intr_r) { return (m_status & 0x07) != 0 ? 0 : 1; } + int intr_r() { return (m_status & 0x07) != 0 ? 0 : 1; } protected: // device-level overrides diff --git a/src/devices/machine/sda2006.cpp b/src/devices/machine/sda2006.cpp index 815cb829d85..8e48cd19689 100644 --- a/src/devices/machine/sda2006.cpp +++ b/src/devices/machine/sda2006.cpp @@ -131,17 +131,17 @@ bool sda2006_device::nvram_write(util::write_stream &file) return !file.write(m_eeprom_data, EEPROM_CAPACITY, actual) && actual == EEPROM_CAPACITY; } -READ_LINE_MEMBER( sda2006_device::read_data ) +int sda2006_device::read_data() { return m_latch^1; } -WRITE_LINE_MEMBER( sda2006_device::write_data ) +void sda2006_device::write_data(int state) { m_latch = state; } -WRITE_LINE_MEMBER( sda2006_device::write_enable ) +void sda2006_device::write_enable(int state) { if( (m_write_state ^ state) && (!state)){ //falling edge m_is_end_o_stream = true; @@ -150,7 +150,7 @@ WRITE_LINE_MEMBER( sda2006_device::write_enable ) m_write_state = state; } -WRITE_LINE_MEMBER( sda2006_device::write_clock ) +void sda2006_device::write_clock(int state) { if( (m_clock_state ^ state) && (!state)) { // falling edge diff --git a/src/devices/machine/sda2006.h b/src/devices/machine/sda2006.h index 1ae1748f5c2..4d3ee1b98a0 100644 --- a/src/devices/machine/sda2006.h +++ b/src/devices/machine/sda2006.h @@ -17,10 +17,10 @@ public: sda2006_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = 0); // I/O operations - DECLARE_READ_LINE_MEMBER(read_data); - DECLARE_WRITE_LINE_MEMBER(write_data); - DECLARE_WRITE_LINE_MEMBER(write_clock); - DECLARE_WRITE_LINE_MEMBER(write_enable); + int read_data(); + void write_data(int state); + void write_clock(int state); + void write_enable(int state); protected: // device-level overrides diff --git a/src/devices/machine/sdlc.cpp b/src/devices/machine/sdlc.cpp index 040fa7f5045..a6d727f2e5f 100644 --- a/src/devices/machine/sdlc.cpp +++ b/src/devices/machine/sdlc.cpp @@ -139,7 +139,7 @@ sdlc_logger_device::sdlc_logger_device(machine_config const &mconfig, char const { } -WRITE_LINE_MEMBER(sdlc_logger_device::clock_w) +void sdlc_logger_device::clock_w(int state) { if (bool(state) != bool(m_current_clock)) { diff --git a/src/devices/machine/sdlc.h b/src/devices/machine/sdlc.h index 5dd7b177c3e..126dfed766e 100644 --- a/src/devices/machine/sdlc.h +++ b/src/devices/machine/sdlc.h @@ -57,12 +57,12 @@ public: sdlc_logger_device(machine_config const &mconfig, char const *tag, device_t *owner, std::uint32_t clock); // input signals - DECLARE_WRITE_LINE_MEMBER(data_w) { m_current_data = state ? 1U : 0U; } - DECLARE_WRITE_LINE_MEMBER(clock_w); + void data_w(int state) { m_current_data = state ? 1U : 0U; } + void clock_w(int state); // input format configuration - DECLARE_WRITE_LINE_MEMBER(data_nrzi) { m_data_nrzi = state ? 1U : 0U; } - DECLARE_WRITE_LINE_MEMBER(clock_active) { m_clock_active = state ? 1U : 0U; } + void data_nrzi(int state) { m_data_nrzi = state ? 1U : 0U; } + void clock_active(int state) { m_clock_active = state ? 1U : 0U; } protected: virtual void device_start() override; diff --git a/src/devices/machine/sega_scu.cpp b/src/devices/machine/sega_scu.cpp index c2e7191d7cb..57214053b36 100644 --- a/src/devices/machine/sega_scu.cpp +++ b/src/devices/machine/sega_scu.cpp @@ -688,7 +688,7 @@ void sega_scu_device::test_pending_irqs() } } -WRITE_LINE_MEMBER(sega_scu_device::vblank_out_w) +void sega_scu_device::vblank_out_w(int state) { if(!state) return; @@ -702,7 +702,7 @@ WRITE_LINE_MEMBER(sega_scu_device::vblank_out_w) m_ist |= (IRQ_VBLANK_OUT); } -WRITE_LINE_MEMBER(sega_scu_device::vblank_in_w) +void sega_scu_device::vblank_in_w(int state) { if(!state) return; @@ -716,7 +716,7 @@ WRITE_LINE_MEMBER(sega_scu_device::vblank_in_w) m_ist |= (IRQ_VBLANK_IN); } -WRITE_LINE_MEMBER(sega_scu_device::hblank_in_w) +void sega_scu_device::hblank_in_w(int state) { if(!state) return; @@ -730,7 +730,7 @@ WRITE_LINE_MEMBER(sega_scu_device::hblank_in_w) m_ist |= (IRQ_HBLANK_IN); } -WRITE_LINE_MEMBER(sega_scu_device::vdp1_end_w) +void sega_scu_device::vdp1_end_w(int state) { if(!state) return; @@ -744,7 +744,7 @@ WRITE_LINE_MEMBER(sega_scu_device::vdp1_end_w) m_ist |= (IRQ_VDP1_END); } -WRITE_LINE_MEMBER(sega_scu_device::sound_req_w) +void sega_scu_device::sound_req_w(int state) { if(!state) return; @@ -758,7 +758,7 @@ WRITE_LINE_MEMBER(sega_scu_device::sound_req_w) m_ist |= (IRQ_SOUND_REQ); } -WRITE_LINE_MEMBER(sega_scu_device::smpc_irq_w) +void sega_scu_device::smpc_irq_w(int state) { if(!state) return; @@ -769,7 +769,7 @@ WRITE_LINE_MEMBER(sega_scu_device::smpc_irq_w) m_ist |= (IRQ_SMPC); } -WRITE_LINE_MEMBER(sega_scu_device::scudsp_end_w) +void sega_scu_device::scudsp_end_w(int state) { if(!state) return; diff --git a/src/devices/machine/sega_scu.h b/src/devices/machine/sega_scu.h index 4ee8dd1f08d..23662bb898b 100644 --- a/src/devices/machine/sega_scu.h +++ b/src/devices/machine/sega_scu.h @@ -46,13 +46,13 @@ public: // I/O operations void regs_map(address_map &map); - DECLARE_WRITE_LINE_MEMBER(vblank_out_w); - DECLARE_WRITE_LINE_MEMBER(vblank_in_w); - DECLARE_WRITE_LINE_MEMBER(hblank_in_w); - DECLARE_WRITE_LINE_MEMBER(vdp1_end_w); + void vblank_out_w(int state); + void vblank_in_w(int state); + void hblank_in_w(int state); + void vdp1_end_w(int state); void check_scanline_timers(int scanline,int y_step); - DECLARE_WRITE_LINE_MEMBER(sound_req_w); - DECLARE_WRITE_LINE_MEMBER(smpc_irq_w); + void sound_req_w(int state); + void smpc_irq_w(int state); template void set_hostcpu(T &&tag) { m_hostcpu.set_tag(std::forward(tag)); } @@ -110,7 +110,7 @@ private: void dma_single_transfer(uint32_t src, uint32_t dst,uint8_t *src_shift); void dma_start_factor_ack(uint8_t event); - DECLARE_WRITE_LINE_MEMBER(scudsp_end_w); + void scudsp_end_w(int state); uint16_t scudsp_dma_r(offs_t offset, uint16_t mem_mask = ~0); void scudsp_dma_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); diff --git a/src/devices/machine/sis85c496.cpp b/src/devices/machine/sis85c496.cpp index 66bab2adbda..ce5aa46bec2 100644 --- a/src/devices/machine/sis85c496.cpp +++ b/src/devices/machine/sis85c496.cpp @@ -342,19 +342,19 @@ void sis85c496_host_device::at_speaker_set_spkrdata(uint8_t data) -WRITE_LINE_MEMBER( sis85c496_host_device::at_pit8254_out0_changed ) +void sis85c496_host_device::at_pit8254_out0_changed(int state) { if (m_pic8259_master) m_pic8259_master->ir0_w(state); } -WRITE_LINE_MEMBER( sis85c496_host_device::at_pit8254_out1_changed ) +void sis85c496_host_device::at_pit8254_out1_changed(int state) { if(state) m_refresh = !m_refresh; } -WRITE_LINE_MEMBER( sis85c496_host_device::at_pit8254_out2_changed ) +void sis85c496_host_device::at_pit8254_out2_changed(int state) { m_pit_out2 = state ? 1 : 0; m_speaker->level_w(m_at_spkrdata & m_pit_out2); @@ -408,7 +408,7 @@ void sis85c496_host_device::at_page8_w(offs_t offset, uint8_t data) } -WRITE_LINE_MEMBER( sis85c496_host_device::pc_dma_hrq_changed ) +void sis85c496_host_device::pc_dma_hrq_changed(int state) { m_maincpu->set_input_line(INPUT_LINE_HALT, state ? ASSERT_LINE : CLEAR_LINE); @@ -483,7 +483,7 @@ void sis85c496_host_device::pc_dma8237_5_dack_w(uint8_t data) { } //m_isabus->da void sis85c496_host_device::pc_dma8237_6_dack_w(uint8_t data) { } //m_isabus->dack_w(6, data); } void sis85c496_host_device::pc_dma8237_7_dack_w(uint8_t data) { } //m_isabus->dack_w(7, data); } -WRITE_LINE_MEMBER( sis85c496_host_device::at_dma8237_out_eop ) +void sis85c496_host_device::at_dma8237_out_eop(int state) { m_cur_eop = state == ASSERT_LINE; //if(m_dma_channel != -1) @@ -507,14 +507,14 @@ void sis85c496_host_device::pc_select_dma_channel(int channel, bool state) } -WRITE_LINE_MEMBER( sis85c496_host_device::pc_dack0_w ) { pc_select_dma_channel(0, state); } -WRITE_LINE_MEMBER( sis85c496_host_device::pc_dack1_w ) { pc_select_dma_channel(1, state); } -WRITE_LINE_MEMBER( sis85c496_host_device::pc_dack2_w ) { pc_select_dma_channel(2, state); } -WRITE_LINE_MEMBER( sis85c496_host_device::pc_dack3_w ) { pc_select_dma_channel(3, state); } -WRITE_LINE_MEMBER( sis85c496_host_device::pc_dack4_w ) { m_dma8237_1->hack_w( state ? 0 : 1); } // it's inverted -WRITE_LINE_MEMBER( sis85c496_host_device::pc_dack5_w ) { pc_select_dma_channel(5, state); } -WRITE_LINE_MEMBER( sis85c496_host_device::pc_dack6_w ) { pc_select_dma_channel(6, state); } -WRITE_LINE_MEMBER( sis85c496_host_device::pc_dack7_w ) { pc_select_dma_channel(7, state); } +void sis85c496_host_device::pc_dack0_w(int state) { pc_select_dma_channel(0, state); } +void sis85c496_host_device::pc_dack1_w(int state) { pc_select_dma_channel(1, state); } +void sis85c496_host_device::pc_dack2_w(int state) { pc_select_dma_channel(2, state); } +void sis85c496_host_device::pc_dack3_w(int state) { pc_select_dma_channel(3, state); } +void sis85c496_host_device::pc_dack4_w(int state) { m_dma8237_1->hack_w( state ? 0 : 1); } // it's inverted +void sis85c496_host_device::pc_dack5_w(int state) { pc_select_dma_channel(5, state); } +void sis85c496_host_device::pc_dack6_w(int state) { pc_select_dma_channel(6, state); } +void sis85c496_host_device::pc_dack7_w(int state) { pc_select_dma_channel(7, state); } uint8_t sis85c496_host_device::at_portb_r() { @@ -584,17 +584,17 @@ void sis85c496_host_device::write_rtc(offs_t offset, uint8_t data) } } -WRITE_LINE_MEMBER(sis85c496_host_device::cpu_int_w) +void sis85c496_host_device::cpu_int_w(int state) { m_maincpu->set_input_line(0, state); } -WRITE_LINE_MEMBER(sis85c496_host_device::cpu_a20_w) +void sis85c496_host_device::cpu_a20_w(int state) { m_maincpu->set_input_line(INPUT_LINE_A20, state); } -WRITE_LINE_MEMBER(sis85c496_host_device::cpu_reset_w) +void sis85c496_host_device::cpu_reset_w(int state) { m_maincpu->set_input_line(INPUT_LINE_RESET, state); } diff --git a/src/devices/machine/sis85c496.h b/src/devices/machine/sis85c496.h index 05bd11d5d56..b7c97ed34c5 100644 --- a/src/devices/machine/sis85c496.h +++ b/src/devices/machine/sis85c496.h @@ -106,10 +106,10 @@ private: uint8_t at_portb_r(); void at_portb_w(uint8_t data); uint8_t get_slave_ack(offs_t offset); - DECLARE_WRITE_LINE_MEMBER(at_pit8254_out0_changed); - DECLARE_WRITE_LINE_MEMBER(at_pit8254_out1_changed); - DECLARE_WRITE_LINE_MEMBER(at_pit8254_out2_changed); - DECLARE_WRITE_LINE_MEMBER(pc_dma_hrq_changed); + void at_pit8254_out0_changed(int state); + void at_pit8254_out1_changed(int state); + void at_pit8254_out2_changed(int state); + void pc_dma_hrq_changed(int state); uint8_t pc_dma8237_0_dack_r(); uint8_t pc_dma8237_1_dack_r(); uint8_t pc_dma8237_2_dack_r(); @@ -124,15 +124,15 @@ private: void pc_dma8237_5_dack_w(uint8_t data); void pc_dma8237_6_dack_w(uint8_t data); void pc_dma8237_7_dack_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(at_dma8237_out_eop); - DECLARE_WRITE_LINE_MEMBER(pc_dack0_w); - DECLARE_WRITE_LINE_MEMBER(pc_dack1_w); - DECLARE_WRITE_LINE_MEMBER(pc_dack2_w); - DECLARE_WRITE_LINE_MEMBER(pc_dack3_w); - DECLARE_WRITE_LINE_MEMBER(pc_dack4_w); - DECLARE_WRITE_LINE_MEMBER(pc_dack5_w); - DECLARE_WRITE_LINE_MEMBER(pc_dack6_w); - DECLARE_WRITE_LINE_MEMBER(pc_dack7_w); + void at_dma8237_out_eop(int state); + void pc_dack0_w(int state); + void pc_dack1_w(int state); + void pc_dack2_w(int state); + void pc_dack3_w(int state); + void pc_dack4_w(int state); + void pc_dack5_w(int state); + void pc_dack6_w(int state); + void pc_dack7_w(int state); uint8_t at_dma8237_2_r(offs_t offset); void at_dma8237_2_w(offs_t offset, uint8_t data); uint8_t at_keybc_r(offs_t offset); @@ -142,9 +142,9 @@ private: void pc_dma_write_byte(offs_t offset, uint8_t data); uint8_t pc_dma_read_word(offs_t offset); void pc_dma_write_word(offs_t offset, uint8_t data); - DECLARE_WRITE_LINE_MEMBER(cpu_int_w); - DECLARE_WRITE_LINE_MEMBER(cpu_a20_w); - DECLARE_WRITE_LINE_MEMBER(cpu_reset_w); + void cpu_int_w(int state); + void cpu_a20_w(int state); + void cpu_reset_w(int state); }; DECLARE_DEVICE_TYPE(SIS85C496, sis85c496_host_device) diff --git a/src/devices/machine/sis950_lpc.cpp b/src/devices/machine/sis950_lpc.cpp index a6f2a04b164..e4bf3a35fbe 100644 --- a/src/devices/machine/sis950_lpc.cpp +++ b/src/devices/machine/sis950_lpc.cpp @@ -102,7 +102,7 @@ void sis950_lpc_device::device_reset() remap_cb(); } -WRITE_LINE_MEMBER(sis950_lpc_device::cpu_a20_w) +void sis950_lpc_device::cpu_a20_w(int state) { // TODO: confirm "A20M# being always high" // if (BIT(m_init_reg, 1)) @@ -110,7 +110,7 @@ WRITE_LINE_MEMBER(sis950_lpc_device::cpu_a20_w) m_host_cpu->set_input_line(INPUT_LINE_A20, state); } -WRITE_LINE_MEMBER(sis950_lpc_device::cpu_reset_w) +void sis950_lpc_device::cpu_reset_w(int state) { // TODO: masked via INIT $46 bit 0 m_host_cpu->set_input_line(INPUT_LINE_RESET, state); @@ -569,18 +569,18 @@ void sis950_lpc_device::unmap_log_w(offs_t offset, u8 data) * Start of legacy handling, to be moved out */ -WRITE_LINE_MEMBER( sis950_lpc_device::pit_out0 ) +void sis950_lpc_device::pit_out0(int state) { m_pic_master->ir0_w(state); } -WRITE_LINE_MEMBER( sis950_lpc_device::pit_out1 ) +void sis950_lpc_device::pit_out1(int state) { if(state) m_refresh = !m_refresh; } -WRITE_LINE_MEMBER( sis950_lpc_device::pit_out2 ) +void sis950_lpc_device::pit_out2(int state) { m_pit_out2 = state ? 1 : 0; m_speaker->level_w(m_at_spkrdata & m_pit_out2); @@ -697,7 +697,7 @@ void sis950_lpc_device::at_page8_w(offs_t offset, uint8_t data) } } -WRITE_LINE_MEMBER( sis950_lpc_device::pc_dma_hrq_changed ) +void sis950_lpc_device::pc_dma_hrq_changed(int state) { m_host_cpu->set_input_line(INPUT_LINE_HALT, state ? ASSERT_LINE : CLEAR_LINE); @@ -706,7 +706,7 @@ WRITE_LINE_MEMBER( sis950_lpc_device::pc_dma_hrq_changed ) } #if 0 -WRITE_LINE_MEMBER( sis950_lpc_device::iochck_w ) +void sis950_lpc_device::iochck_w(int state) { // if (!state && !m_channel_check && m_nmi_enabled) if (!state && !m_channel_check) diff --git a/src/devices/machine/sis950_lpc.h b/src/devices/machine/sis950_lpc.h index a91f442a653..167a7342218 100644 --- a/src/devices/machine/sis950_lpc.h +++ b/src/devices/machine/sis950_lpc.h @@ -138,14 +138,14 @@ private: } m_lpc_legacy; // SB implementation, to be moved out - DECLARE_WRITE_LINE_MEMBER(pit_out0); - DECLARE_WRITE_LINE_MEMBER(pit_out1); - DECLARE_WRITE_LINE_MEMBER(pit_out2); + void pit_out0(int state); + void pit_out1(int state); + void pit_out2(int state); uint8_t pc_dma_read_byte(offs_t offset); void pc_dma_write_byte(offs_t offset, uint8_t data); uint8_t pc_dma_read_word(offs_t offset); void pc_dma_write_word(offs_t offset, uint8_t data); - DECLARE_WRITE_LINE_MEMBER(pc_dma_hrq_changed); + void pc_dma_hrq_changed(int state); void pc_select_dma_channel(int channel, bool state); uint8_t m_at_pages[0x10]{}; @@ -159,8 +159,8 @@ private: // bool m_cur_eop = false; uint16_t m_dma_high_byte = 0; - DECLARE_WRITE_LINE_MEMBER(cpu_a20_w); - DECLARE_WRITE_LINE_MEMBER(cpu_reset_w); + void cpu_a20_w(int state); + void cpu_reset_w(int state); uint8_t at_page8_r(offs_t offset); void at_page8_w(offs_t offset, uint8_t data); diff --git a/src/devices/machine/spg110.cpp b/src/devices/machine/spg110.cpp index b4dbb4e8de8..87dd77ad338 100644 --- a/src/devices/machine/spg110.cpp +++ b/src/devices/machine/spg110.cpp @@ -41,16 +41,16 @@ spg110_device::spg110_device(const machine_config &mconfig, const char *tag, dev { } -WRITE_LINE_MEMBER(spg110_device::videoirq_w) +void spg110_device::videoirq_w(int state) { set_state_unsynced(UNSP_IRQ0_LINE, state); } -WRITE_LINE_MEMBER(spg110_device::ffreq1_w) +void spg110_device::ffreq1_w(int state) { } -WRITE_LINE_MEMBER(spg110_device::ffreq2_w) +void spg110_device::ffreq2_w(int state) { } @@ -82,7 +82,7 @@ uint16_t spg110_device::space_r(offs_t offset) return cpuspace.read_word(offset); } -WRITE_LINE_MEMBER(spg110_device::audioirq_w) +void spg110_device::audioirq_w(int state) { set_state_unsynced(UNSP_FIQ_LINE, state); } diff --git a/src/devices/machine/spg110.h b/src/devices/machine/spg110.h index 8ecee9dea75..ec0368a9ecc 100644 --- a/src/devices/machine/spg110.h +++ b/src/devices/machine/spg110.h @@ -40,7 +40,7 @@ public: auto chip_select() { return m_chip_sel.bind(); } uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect) { return m_spg_video->screen_update(screen,bitmap,cliprect); } - DECLARE_WRITE_LINE_MEMBER(vblank) { m_spg_video->vblank(state); } + void vblank(int state) { m_spg_video->vblank(state); } protected: spg110_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock, address_map_constructor internal); @@ -60,7 +60,7 @@ private: required_device m_spg_audio; uint16_t space_r(offs_t offset); - DECLARE_WRITE_LINE_MEMBER(audioirq_w); + void audioirq_w(int state); devcb_write16 m_porta_out; devcb_write16 m_portb_out; @@ -80,15 +80,15 @@ private: void portb_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0) { m_portb_out(offset, data, mem_mask); } void portc_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0) { m_portc_out(offset, data, mem_mask); } - DECLARE_WRITE_LINE_MEMBER(ffreq1_w); - DECLARE_WRITE_LINE_MEMBER(ffreq2_w); + void ffreq1_w(int state); + void ffreq2_w(int state); template uint16_t adc_r() { return m_adc_in[Line](); } void cs_w(offs_t offset, uint8_t data, uint8_t mem_mask = ~0) { m_chip_sel(offset, data, mem_mask); } uint16_t get_pal_r() { return 0; /*m_pal_flag;*/ } void configure_spg_io(spg2xx_io_device* io); - DECLARE_WRITE_LINE_MEMBER(videoirq_w); + void videoirq_w(int state); bool m_is_spiderman; }; diff --git a/src/devices/machine/spg110_video.cpp b/src/devices/machine/spg110_video.cpp index e89bd5488ec..cf14b9dc215 100644 --- a/src/devices/machine/spg110_video.cpp +++ b/src/devices/machine/spg110_video.cpp @@ -756,7 +756,7 @@ uint32_t spg110_video_device::screen_update(screen_device &screen, bitmap_rgb32 return 0; } -WRITE_LINE_MEMBER(spg110_video_device::vblank) +void spg110_video_device::vblank(int state) { const int i = 0x0008; diff --git a/src/devices/machine/spg110_video.h b/src/devices/machine/spg110_video.h index 6f8e0db0b5c..c1bcc60395c 100644 --- a/src/devices/machine/spg110_video.h +++ b/src/devices/machine/spg110_video.h @@ -32,7 +32,7 @@ public: void map_video(address_map &map); uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(vblank); + void vblank(int state); void spg110_201c_w(uint16_t data); void spg110_2020_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); diff --git a/src/devices/machine/spg2xx.cpp b/src/devices/machine/spg2xx.cpp index 412b2d20a14..2edac0a8dcf 100644 --- a/src/devices/machine/spg2xx.cpp +++ b/src/devices/machine/spg2xx.cpp @@ -117,7 +117,7 @@ void spg2xx_device::fiq_vector_w(uint8_t data) m_fiq_vector = data; } -WRITE_LINE_MEMBER(spg2xx_device::videoirq_w) +void spg2xx_device::videoirq_w(int state) { if (m_fiq_vector == 0) { @@ -129,37 +129,37 @@ WRITE_LINE_MEMBER(spg2xx_device::videoirq_w) } } -WRITE_LINE_MEMBER(spg2xx_device::timerirq_w) +void spg2xx_device::timerirq_w(int state) { set_state_unsynced(UNSP_IRQ2_LINE, state); } -WRITE_LINE_MEMBER(spg2xx_device::uartirq_w) +void spg2xx_device::uartirq_w(int state) { set_state_unsynced(UNSP_IRQ3_LINE, state); } -WRITE_LINE_MEMBER(spg2xx_device::audioirq_w) +void spg2xx_device::audioirq_w(int state) { set_state_unsynced(UNSP_IRQ4_LINE, state); } -WRITE_LINE_MEMBER(spg2xx_device::audiochirq_w) +void spg2xx_device::audiochirq_w(int state) { set_state_unsynced(UNSP_FIQ_LINE, state); } -WRITE_LINE_MEMBER(spg2xx_device::extirq_w) +void spg2xx_device::extirq_w(int state) { set_state_unsynced(UNSP_IRQ5_LINE, state); } -WRITE_LINE_MEMBER(spg2xx_device::ffreq1_w) +void spg2xx_device::ffreq1_w(int state) { set_state_unsynced(UNSP_IRQ6_LINE, state); } -WRITE_LINE_MEMBER(spg2xx_device::ffreq2_w) +void spg2xx_device::ffreq2_w(int state) { set_state_unsynced(UNSP_IRQ7_LINE, state); } diff --git a/src/devices/machine/spg2xx.h b/src/devices/machine/spg2xx.h index 6b6bfd0d560..fab0da8a874 100644 --- a/src/devices/machine/spg2xx.h +++ b/src/devices/machine/spg2xx.h @@ -74,7 +74,7 @@ public: void uart_rx(uint8_t data) { m_spg_io->uart_rx(data); } void spi_rx(int state) { m_spg_io->spi_rx(state); } - DECLARE_WRITE_LINE_MEMBER(vblank) { m_spg_video->vblank(state); } + void vblank(int state) { m_spg_video->vblank(state); } uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect) { return m_spg_video->screen_update(screen, bitmap, cliprect); } protected: @@ -83,14 +83,14 @@ protected: void internal_map(address_map &map); void fiq_vector_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(videoirq_w); - DECLARE_WRITE_LINE_MEMBER(audioirq_w); - DECLARE_WRITE_LINE_MEMBER(audiochirq_w); - DECLARE_WRITE_LINE_MEMBER(timerirq_w); - DECLARE_WRITE_LINE_MEMBER(uartirq_w); - DECLARE_WRITE_LINE_MEMBER(extirq_w); - DECLARE_WRITE_LINE_MEMBER(ffreq1_w); - DECLARE_WRITE_LINE_MEMBER(ffreq2_w); + void videoirq_w(int state); + void audioirq_w(int state); + void audiochirq_w(int state); + void timerirq_w(int state); + void uartirq_w(int state); + void extirq_w(int state); + void ffreq1_w(int state); + void ffreq2_w(int state); uint16_t space_r(offs_t offset); @@ -143,7 +143,7 @@ protected: uint8_t eepromx_r() { return m_i2c_r(); } void uart_tx_w(offs_t offset, uint8_t data, uint8_t mem_mask = ~0) { m_uart_tx(offset, data, mem_mask); } - DECLARE_WRITE_LINE_MEMBER(spi_tx_w) { m_spi_tx(state); } + void spi_tx_w(int state) { m_spi_tx(state); } void cs_w(offs_t offset, uint8_t data, uint8_t mem_mask = ~0) { m_chip_sel(offset, data, mem_mask); } }; diff --git a/src/devices/machine/spg2xx_video.cpp b/src/devices/machine/spg2xx_video.cpp index 46ffd366068..dda101c9d03 100644 --- a/src/devices/machine/spg2xx_video.cpp +++ b/src/devices/machine/spg2xx_video.cpp @@ -439,7 +439,7 @@ void spg2xx_video_device::video_w(offs_t offset, uint16_t data) } } -WRITE_LINE_MEMBER(spg2xx_video_device::vblank) +void spg2xx_video_device::vblank(int state) { if (!state) { diff --git a/src/devices/machine/spg2xx_video.h b/src/devices/machine/spg2xx_video.h index b484c42d1af..69a96b449c3 100644 --- a/src/devices/machine/spg2xx_video.h +++ b/src/devices/machine/spg2xx_video.h @@ -25,7 +25,7 @@ public: uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(vblank); + void vblank(int state); uint16_t video_r(offs_t offset); void video_w(offs_t offset, uint16_t data); diff --git a/src/devices/machine/tdc1008.cpp b/src/devices/machine/tdc1008.cpp index 33966e08063..e3a814ec5e5 100644 --- a/src/devices/machine/tdc1008.cpp +++ b/src/devices/machine/tdc1008.cpp @@ -121,21 +121,21 @@ void tdc1008_device::y_w(uint8_t data) m_y_in = data; } -WRITE_LINE_MEMBER(tdc1008_device::tsx_w) +void tdc1008_device::tsx_w(int state) { m_tsx = (bool)state; if (m_prel && m_tsx) m_p_out.u = (m_p_out.u & 0x0ffff) | (m_xtp_in << 16); } -WRITE_LINE_MEMBER(tdc1008_device::tsm_w) +void tdc1008_device::tsm_w(int state) { m_tsm = (bool)state; if (m_prel && m_tsm) m_p_out.u = (m_p_out.u & 0x700ff) | (m_msp_in << 8); } -WRITE_LINE_MEMBER(tdc1008_device::tsl_w) +void tdc1008_device::tsl_w(int state) { m_tsl = (bool)state; if (m_prel && m_tsl) @@ -168,7 +168,7 @@ void tdc1008_device::output_w(uint32_t data) m_p_in = data; } -WRITE_LINE_MEMBER(tdc1008_device::clk_x_w) +void tdc1008_device::clk_x_w(int state) { bool old = m_clk_x; m_clk_x = (bool)state; @@ -179,7 +179,7 @@ WRITE_LINE_MEMBER(tdc1008_device::clk_x_w) } } -WRITE_LINE_MEMBER(tdc1008_device::clk_y_w) +void tdc1008_device::clk_y_w(int state) { bool old = m_clk_y; m_clk_y = (bool)state; @@ -190,7 +190,7 @@ WRITE_LINE_MEMBER(tdc1008_device::clk_y_w) } } -WRITE_LINE_MEMBER(tdc1008_device::clk_p_w) +void tdc1008_device::clk_p_w(int state) { bool old = m_clk_p; m_clk_p = (bool)state; @@ -245,7 +245,7 @@ WRITE_LINE_MEMBER(tdc1008_device::clk_p_w) } } -WRITE_LINE_MEMBER(tdc1008_device::prel_w) +void tdc1008_device::prel_w(int state) { m_prel = (bool)state; if (m_prel) @@ -259,22 +259,22 @@ WRITE_LINE_MEMBER(tdc1008_device::prel_w) } } -WRITE_LINE_MEMBER(tdc1008_device::rnd_w) +void tdc1008_device::rnd_w(int state) { m_rnd_in = (bool)state; } -WRITE_LINE_MEMBER(tdc1008_device::tc_w) +void tdc1008_device::tc_w(int state) { m_tc_in = (bool)state; } -WRITE_LINE_MEMBER(tdc1008_device::acc_w) +void tdc1008_device::acc_w(int state) { m_acc_in = (bool)state; } -WRITE_LINE_MEMBER(tdc1008_device::sub_w) +void tdc1008_device::sub_w(int state) { m_sub_in = (bool)state; } diff --git a/src/devices/machine/tdc1008.h b/src/devices/machine/tdc1008.h index dcb8d21c9d5..a9a98c420be 100644 --- a/src/devices/machine/tdc1008.h +++ b/src/devices/machine/tdc1008.h @@ -26,17 +26,17 @@ public: void x_w(uint8_t data); void y_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(tsx_w); - DECLARE_WRITE_LINE_MEMBER(tsm_w); - DECLARE_WRITE_LINE_MEMBER(tsl_w); - DECLARE_WRITE_LINE_MEMBER(clk_x_w); - DECLARE_WRITE_LINE_MEMBER(clk_y_w); - DECLARE_WRITE_LINE_MEMBER(clk_p_w); - DECLARE_WRITE_LINE_MEMBER(prel_w); - DECLARE_WRITE_LINE_MEMBER(rnd_w); - DECLARE_WRITE_LINE_MEMBER(tc_w); - DECLARE_WRITE_LINE_MEMBER(acc_w); - DECLARE_WRITE_LINE_MEMBER(sub_w); + void tsx_w(int state); + void tsm_w(int state); + void tsl_w(int state); + void clk_x_w(int state); + void clk_y_w(int state); + void clk_p_w(int state); + void prel_w(int state); + void rnd_w(int state); + void tc_w(int state); + void acc_w(int state); + void sub_w(int state); // Output preloads by group void xtp_w(uint8_t data); diff --git a/src/devices/machine/ticket.cpp b/src/devices/machine/ticket.cpp index cdc0385827d..e92340f51d7 100644 --- a/src/devices/machine/ticket.cpp +++ b/src/devices/machine/ticket.cpp @@ -85,7 +85,7 @@ ticket_dispenser_device::~ticket_dispenser_device() // line_r - read the status line //------------------------------------------------- -READ_LINE_MEMBER( ticket_dispenser_device::line_r ) +int ticket_dispenser_device::line_r() { return m_status ? 1 : 0; } @@ -95,7 +95,7 @@ READ_LINE_MEMBER( ticket_dispenser_device::line_r ) // motor_w - write the control line //------------------------------------------------- -WRITE_LINE_MEMBER( ticket_dispenser_device::motor_w ) +void ticket_dispenser_device::motor_w(int state) { // On an activate signal, start dispensing! if (bool(state) == m_motoron) diff --git a/src/devices/machine/ticket.h b/src/devices/machine/ticket.h index ac1cd01c029..797fac5bd4e 100644 --- a/src/devices/machine/ticket.h +++ b/src/devices/machine/ticket.h @@ -64,8 +64,8 @@ public: auto dispense_handler() { return m_dispense_handler.bind(); } // read/write handlers - DECLARE_READ_LINE_MEMBER( line_r ); - DECLARE_WRITE_LINE_MEMBER( motor_w ); + int line_r(); + void motor_w(int state); protected: ticket_dispenser_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock = 0); diff --git a/src/devices/machine/tmc0430.cpp b/src/devices/machine/tmc0430.cpp index e656a2aa4c6..78d354d2ddc 100644 --- a/src/devices/machine/tmc0430.cpp +++ b/src/devices/machine/tmc0430.cpp @@ -135,7 +135,7 @@ tmc0430_device::tmc0430_device(const machine_config &mconfig, const char *tag, d /* Direction. When ASSERTed, GROM is set to be read by CPU. */ -WRITE_LINE_MEMBER( tmc0430_device::m_line ) +void tmc0430_device::m_line(int state) { m_read_mode = (state==ASSERT_LINE); LOGMASKED(LOG_LINES, "GROM %d dir %s\n", m_ident>>13, m_read_mode? "READ" : "WRITE"); @@ -144,7 +144,7 @@ WRITE_LINE_MEMBER( tmc0430_device::m_line ) /* Mode. When ASSERTed, the address counter will be accessed (read or write). */ -WRITE_LINE_MEMBER( tmc0430_device::mo_line ) +void tmc0430_device::mo_line(int state) { m_address_mode = (state==ASSERT_LINE); LOGMASKED(LOG_LINES, "GROM %d mode %s\n", m_ident>>13, m_address_mode? "ADDR" : "DATA"); @@ -153,7 +153,7 @@ WRITE_LINE_MEMBER( tmc0430_device::mo_line ) /* Select. When ASSERTed, the read/write operation is started. */ -WRITE_LINE_MEMBER( tmc0430_device::gsq_line ) +void tmc0430_device::gsq_line(int state) { if (state==ASSERT_LINE && !m_selected) // check for edge { @@ -197,7 +197,7 @@ void tmc0430_device::set_lines(line_state mline, line_state moline, line_state g For the emulation we may assume that all GROMs at the same clock line raise their outputs synchronously. */ -WRITE_LINE_MEMBER( tmc0430_device::gclock_in ) +void tmc0430_device::gclock_in(int state) { int bank = 0; uint16_t baddr = 0; diff --git a/src/devices/machine/tmc0430.h b/src/devices/machine/tmc0430.h index 09800f2f514..2e8e58d506b 100644 --- a/src/devices/machine/tmc0430.h +++ b/src/devices/machine/tmc0430.h @@ -41,10 +41,10 @@ public: void write(uint8_t data); void set_lines(line_state mline, line_state moline, line_state gsq); - DECLARE_WRITE_LINE_MEMBER(m_line); - DECLARE_WRITE_LINE_MEMBER(mo_line); - DECLARE_WRITE_LINE_MEMBER(gsq_line); - DECLARE_WRITE_LINE_MEMBER(gclock_in); + void m_line(int state); + void mo_line(int state); + void gsq_line(int state); + void gclock_in(int state); void set_region_and_ident(const char *regionname, int offset, int ident) { diff --git a/src/devices/machine/tms9914.cpp b/src/devices/machine/tms9914.cpp index 14cfcb7b039..c699079de36 100644 --- a/src/devices/machine/tms9914.cpp +++ b/src/devices/machine/tms9914.cpp @@ -239,32 +239,32 @@ tms9914_device::tms9914_device(const machine_config &mconfig, const char *tag, d } // Signal inputs -WRITE_LINE_MEMBER(tms9914_device::eoi_w) +void tms9914_device::eoi_w(int state) { set_ext_signal(IEEE_488_EOI , state); } -WRITE_LINE_MEMBER(tms9914_device::dav_w) +void tms9914_device::dav_w(int state) { set_ext_signal(IEEE_488_DAV , state); } -WRITE_LINE_MEMBER(tms9914_device::nrfd_w) +void tms9914_device::nrfd_w(int state) { set_ext_signal(IEEE_488_NRFD , state); } -WRITE_LINE_MEMBER(tms9914_device::ndac_w) +void tms9914_device::ndac_w(int state) { set_ext_signal(IEEE_488_NDAC , state); } -WRITE_LINE_MEMBER(tms9914_device::ifc_w) +void tms9914_device::ifc_w(int state) { set_ext_signal(IEEE_488_IFC , state); } -WRITE_LINE_MEMBER(tms9914_device::srq_w) +void tms9914_device::srq_w(int state) { bool prev_srq = get_signal(IEEE_488_SRQ); set_ext_signal(IEEE_488_SRQ , state); @@ -273,12 +273,12 @@ WRITE_LINE_MEMBER(tms9914_device::srq_w) } } -WRITE_LINE_MEMBER(tms9914_device::atn_w) +void tms9914_device::atn_w(int state) { set_ext_signal(IEEE_488_ATN , state); } -WRITE_LINE_MEMBER(tms9914_device::ren_w) +void tms9914_device::ren_w(int state) { set_ext_signal(IEEE_488_REN , state); } @@ -467,7 +467,7 @@ uint8_t tms9914_device::read(offs_t offset) return res; } -READ_LINE_MEMBER(tms9914_device::cont_r) +int tms9914_device::cont_r() { return m_c_state != FSM_C_CIDS && m_c_state != FSM_C_CADS; } diff --git a/src/devices/machine/tms9914.h b/src/devices/machine/tms9914.h index d67b85de025..e5d1cb7a5ba 100644 --- a/src/devices/machine/tms9914.h +++ b/src/devices/machine/tms9914.h @@ -74,21 +74,21 @@ public: // Set write callback for ACCRQ signal auto accrq_write_cb() { return m_accrq_write_func.bind(); } - DECLARE_WRITE_LINE_MEMBER(eoi_w); - DECLARE_WRITE_LINE_MEMBER(dav_w); - DECLARE_WRITE_LINE_MEMBER(nrfd_w); - DECLARE_WRITE_LINE_MEMBER(ndac_w); - DECLARE_WRITE_LINE_MEMBER(ifc_w); - DECLARE_WRITE_LINE_MEMBER(srq_w); - DECLARE_WRITE_LINE_MEMBER(atn_w); - DECLARE_WRITE_LINE_MEMBER(ren_w); + void eoi_w(int state); + void dav_w(int state); + void nrfd_w(int state); + void ndac_w(int state); + void ifc_w(int state); + void srq_w(int state); + void atn_w(int state); + void ren_w(int state); // Register access void write(offs_t offset, uint8_t data); uint8_t read(offs_t offset); // CONT output: true when 9914 is current controller-in-charge - DECLARE_READ_LINE_MEMBER(cont_r); + int cont_r(); private: // device-level overrides diff --git a/src/devices/machine/tsb12lv01a.cpp b/src/devices/machine/tsb12lv01a.cpp index 06ef145c3a6..8a0b195fa88 100644 --- a/src/devices/machine/tsb12lv01a.cpp +++ b/src/devices/machine/tsb12lv01a.cpp @@ -69,7 +69,7 @@ void tsb12lv01a_device::device_reset() m_grf_status = 0x00000000; } -WRITE_LINE_MEMBER(tsb12lv01a_device::phy_reset_w) +void tsb12lv01a_device::phy_reset_w(int state) { if (state) { diff --git a/src/devices/machine/tsb12lv01a.h b/src/devices/machine/tsb12lv01a.h index 4f47fd31815..cec65a2c40c 100644 --- a/src/devices/machine/tsb12lv01a.h +++ b/src/devices/machine/tsb12lv01a.h @@ -26,7 +26,7 @@ public: auto phy_read() { return m_phy_read_cb.bind(); } auto phy_write() { return m_phy_write_cb.bind(); } - DECLARE_WRITE_LINE_MEMBER(phy_reset_w); + void phy_reset_w(int state); private: // device-level overrides diff --git a/src/devices/machine/upc82c710.cpp b/src/devices/machine/upc82c710.cpp index 4f9927b0b09..57c4eed6e6f 100644 --- a/src/devices/machine/upc82c710.cpp +++ b/src/devices/machine/upc82c710.cpp @@ -325,13 +325,13 @@ void upc82c710_device::dor_w(uint8_t data) m_fdc->reset_w(!BIT(dor, 2)); } -WRITE_LINE_MEMBER(upc82c710_device::fdc_irq_w) +void upc82c710_device::fdc_irq_w(int state) { fdc_irq = state; check_irq(); } -WRITE_LINE_MEMBER(upc82c710_device::fdc_drq_w) +void upc82c710_device::fdc_drq_w(int state) { fdc_drq = state; check_drq(); @@ -393,27 +393,27 @@ void upc82c710_device::write_cfg(int index, u8 data) } -WRITE_LINE_MEMBER(upc82c710_device::rxd_w) +void upc82c710_device::rxd_w(int state) { m_serial->rx_w(state); } -WRITE_LINE_MEMBER(upc82c710_device::dcd_w) +void upc82c710_device::dcd_w(int state) { m_serial->dcd_w(state); } -WRITE_LINE_MEMBER(upc82c710_device::dsr_w) +void upc82c710_device::dsr_w(int state) { m_serial->dsr_w(state); } -WRITE_LINE_MEMBER(upc82c710_device::ri_w) +void upc82c710_device::ri_w(int state) { m_serial->ri_w(state); } -WRITE_LINE_MEMBER(upc82c710_device::cts_w) +void upc82c710_device::cts_w(int state) { m_serial->cts_w(state); } diff --git a/src/devices/machine/upc82c710.h b/src/devices/machine/upc82c710.h index 7868fec6b2f..1c609678dab 100644 --- a/src/devices/machine/upc82c710.h +++ b/src/devices/machine/upc82c710.h @@ -44,11 +44,11 @@ public: auto rts() { return m_rts_callback.bind(); } // chip pins for uarts - DECLARE_WRITE_LINE_MEMBER(rxd_w); - DECLARE_WRITE_LINE_MEMBER(dcd_w); - DECLARE_WRITE_LINE_MEMBER(dsr_w); - DECLARE_WRITE_LINE_MEMBER(ri_w); - DECLARE_WRITE_LINE_MEMBER(cts_w); + void rxd_w(int state); + void dcd_w(int state); + void dsr_w(int state); + void ri_w(int state); + void cts_w(int state); protected: // device-level overrides @@ -63,8 +63,8 @@ private: required_device m_serial; void dor_w(u8 data); - DECLARE_WRITE_LINE_MEMBER(fdc_irq_w); - DECLARE_WRITE_LINE_MEMBER(fdc_drq_w); + void fdc_irq_w(int state); + void fdc_drq_w(int state); bool irq, drq, fdc_drq, fdc_irq; u8 dor; diff --git a/src/devices/machine/upc82c711.cpp b/src/devices/machine/upc82c711.cpp index 20eaa871053..ad1a4b6598e 100644 --- a/src/devices/machine/upc82c711.cpp +++ b/src/devices/machine/upc82c711.cpp @@ -327,13 +327,13 @@ void upc82c711_device::dor_w(uint8_t data) m_fdc->reset_w(!BIT(dor, 2)); } -WRITE_LINE_MEMBER(upc82c711_device::fdc_irq_w) +void upc82c711_device::fdc_irq_w(int state) { fdc_irq = state; check_irq(); } -WRITE_LINE_MEMBER(upc82c711_device::fdc_drq_w) +void upc82c711_device::fdc_drq_w(int state) { fdc_drq = state; check_drq(); @@ -427,52 +427,52 @@ void upc82c711_device::write_cfg(int index, u8 data) } -WRITE_LINE_MEMBER(upc82c711_device::rxd1_w) +void upc82c711_device::rxd1_w(int state) { m_serial[0]->rx_w(state); } -WRITE_LINE_MEMBER(upc82c711_device::dcd1_w) +void upc82c711_device::dcd1_w(int state) { m_serial[0]->dcd_w(state); } -WRITE_LINE_MEMBER(upc82c711_device::dsr1_w) +void upc82c711_device::dsr1_w(int state) { m_serial[0]->dsr_w(state); } -WRITE_LINE_MEMBER(upc82c711_device::ri1_w) +void upc82c711_device::ri1_w(int state) { m_serial[0]->ri_w(state); } -WRITE_LINE_MEMBER(upc82c711_device::cts1_w) +void upc82c711_device::cts1_w(int state) { m_serial[0]->cts_w(state); } -WRITE_LINE_MEMBER(upc82c711_device::rxd2_w) +void upc82c711_device::rxd2_w(int state) { m_serial[1]->rx_w(state); } -WRITE_LINE_MEMBER(upc82c711_device::dcd2_w) +void upc82c711_device::dcd2_w(int state) { m_serial[1]->dcd_w(state); } -WRITE_LINE_MEMBER(upc82c711_device::dsr2_w) +void upc82c711_device::dsr2_w(int state) { m_serial[1]->dsr_w(state); } -WRITE_LINE_MEMBER(upc82c711_device::ri2_w) +void upc82c711_device::ri2_w(int state) { m_serial[1]->ri_w(state); } -WRITE_LINE_MEMBER(upc82c711_device::cts2_w) +void upc82c711_device::cts2_w(int state) { m_serial[1]->cts_w(state); } diff --git a/src/devices/machine/upc82c711.h b/src/devices/machine/upc82c711.h index 543bb594337..9138b3b7cc5 100644 --- a/src/devices/machine/upc82c711.h +++ b/src/devices/machine/upc82c711.h @@ -51,16 +51,16 @@ public: auto rts2() { return m_rts2_callback.bind(); } // chip pins for uarts - DECLARE_WRITE_LINE_MEMBER(rxd1_w); - DECLARE_WRITE_LINE_MEMBER(dcd1_w); - DECLARE_WRITE_LINE_MEMBER(dsr1_w); - DECLARE_WRITE_LINE_MEMBER(ri1_w); - DECLARE_WRITE_LINE_MEMBER(cts1_w); - DECLARE_WRITE_LINE_MEMBER(rxd2_w); - DECLARE_WRITE_LINE_MEMBER(dcd2_w); - DECLARE_WRITE_LINE_MEMBER(dsr2_w); - DECLARE_WRITE_LINE_MEMBER(ri2_w); - DECLARE_WRITE_LINE_MEMBER(cts2_w); + void rxd1_w(int state); + void dcd1_w(int state); + void dsr1_w(int state); + void ri1_w(int state); + void cts1_w(int state); + void rxd2_w(int state); + void dcd2_w(int state); + void dsr2_w(int state); + void ri2_w(int state); + void cts2_w(int state); protected: // device-level overrides @@ -75,8 +75,8 @@ private: required_device_array m_serial; void dor_w(u8 data); - DECLARE_WRITE_LINE_MEMBER(fdc_irq_w); - DECLARE_WRITE_LINE_MEMBER(fdc_drq_w); + void fdc_irq_w(int state); + void fdc_drq_w(int state); bool irq, drq, fdc_drq, fdc_irq; u8 dor; diff --git a/src/devices/machine/upd1990a.cpp b/src/devices/machine/upd1990a.cpp index 191d2b634cb..49defc21fa2 100644 --- a/src/devices/machine/upd1990a.cpp +++ b/src/devices/machine/upd1990a.cpp @@ -187,7 +187,7 @@ TIMER_CALLBACK_MEMBER(upd1990a_device::test_tick) // stb_w - //------------------------------------------------- -WRITE_LINE_MEMBER( upd1990a_device::stb_w ) +void upd1990a_device::stb_w(int state) { if (!m_cs) return; @@ -373,7 +373,7 @@ WRITE_LINE_MEMBER( upd1990a_device::stb_w ) // clk_w - //------------------------------------------------- -WRITE_LINE_MEMBER( upd1990a_device::clk_w ) +void upd1990a_device::clk_w(int state) { if (!m_cs) return; @@ -420,14 +420,14 @@ WRITE_LINE_MEMBER( upd1990a_device::clk_w ) // misc input pins //------------------------------------------------- -WRITE_LINE_MEMBER( upd1990a_device::cs_w ) +void upd1990a_device::cs_w(int state) { // chip select LOG("uPD1990A CS %u\n", state); m_cs = state; } -WRITE_LINE_MEMBER( upd1990a_device::oe_w ) +void upd1990a_device::oe_w(int state) { // output enable LOG("uPD1990A OE %u\n", state); @@ -439,25 +439,25 @@ WRITE_LINE_MEMBER( upd1990a_device::oe_w ) m_write_data(get_data_out()); } -WRITE_LINE_MEMBER( upd1990a_device::c0_w ) +void upd1990a_device::c0_w(int state) { LOG("uPD1990A C0 %u\n", state); m_c_unlatched = (m_c_unlatched & 0x06) | state; } -WRITE_LINE_MEMBER( upd1990a_device::c1_w ) +void upd1990a_device::c1_w(int state) { LOG("uPD1990A C1 %u\n", state); m_c_unlatched = (m_c_unlatched & 0x05) | (state << 1); } -WRITE_LINE_MEMBER( upd1990a_device::c2_w ) +void upd1990a_device::c2_w(int state) { LOG("uPD1990A C2 %u\n", state); m_c_unlatched = (m_c_unlatched & 0x03) | (state << 2); } -WRITE_LINE_MEMBER( upd1990a_device::data_in_w ) +void upd1990a_device::data_in_w(int state) { // data input LOG("uPD1990A DATA IN %u\n", state); @@ -476,12 +476,12 @@ int upd1990a_device::get_data_out() } -READ_LINE_MEMBER( upd1990a_device::data_out_r ) +int upd1990a_device::data_out_r() { return get_data_out(); } -READ_LINE_MEMBER( upd1990a_device::tp_r ) +int upd1990a_device::tp_r() { return m_tp; } diff --git a/src/devices/machine/upd1990a.h b/src/devices/machine/upd1990a.h index 8a170a15021..ea12da708bb 100644 --- a/src/devices/machine/upd1990a.h +++ b/src/devices/machine/upd1990a.h @@ -39,16 +39,16 @@ public: auto data_callback() { return m_write_data.bind(); } auto tp_callback() { return m_write_tp.bind(); } - DECLARE_WRITE_LINE_MEMBER( oe_w ); - DECLARE_WRITE_LINE_MEMBER( cs_w ); - DECLARE_WRITE_LINE_MEMBER( stb_w ); - DECLARE_WRITE_LINE_MEMBER( clk_w ); - DECLARE_WRITE_LINE_MEMBER( c0_w ); - DECLARE_WRITE_LINE_MEMBER( c1_w ); - DECLARE_WRITE_LINE_MEMBER( c2_w ); - DECLARE_WRITE_LINE_MEMBER( data_in_w ); - DECLARE_READ_LINE_MEMBER( data_out_r ); - DECLARE_READ_LINE_MEMBER( tp_r ); + void oe_w(int state); + void cs_w(int state); + void stb_w(int state); + void clk_w(int state); + void c0_w(int state); + void c1_w(int state); + void c2_w(int state); + void data_in_w(int state); + int data_out_r(); + int tp_r(); protected: // device-level overrides diff --git a/src/devices/machine/upd4701.cpp b/src/devices/machine/upd4701.cpp index d840492073b..3ffe575fb42 100644 --- a/src/devices/machine/upd4701.cpp +++ b/src/devices/machine/upd4701.cpp @@ -77,7 +77,7 @@ void upd4701_device::device_start() // ul_w - write to counter select line //------------------------------------------------- -WRITE_LINE_MEMBER(upd4701_device::ul_w) +void upd4701_device::ul_w(int state) { m_ul = state; } @@ -86,7 +86,7 @@ WRITE_LINE_MEMBER(upd4701_device::ul_w) // xy_w - write to byte select line //------------------------------------------------- -WRITE_LINE_MEMBER(upd4701_device::xy_w) +void upd4701_device::xy_w(int state) { m_xy = state; } @@ -95,7 +95,7 @@ WRITE_LINE_MEMBER(upd4701_device::xy_w) // cs_w - write to chip select line //------------------------------------------------- -WRITE_LINE_MEMBER(upd4701_device::cs_w) +void upd4701_device::cs_w(int state) { if (m_cs != state) { @@ -124,7 +124,7 @@ WRITE_LINE_MEMBER(upd4701_device::cs_w) // resetx_w - write to X counter reset line //------------------------------------------------- -WRITE_LINE_MEMBER(upd4701_device::resetx_w) +void upd4701_device::resetx_w(int state) { if (m_resetx != state) { @@ -139,7 +139,7 @@ WRITE_LINE_MEMBER(upd4701_device::resetx_w) // resety_w - write to Y counter reset line //------------------------------------------------- -WRITE_LINE_MEMBER(upd4701_device::resety_w) +void upd4701_device::resety_w(int state) { if (m_resety != state) { @@ -313,7 +313,7 @@ void upd4701_device::switch_update(u8 mask, bool state) // left_w - update left switch state //------------------------------------------------- -WRITE_LINE_MEMBER(upd4701_device::left_w) +void upd4701_device::left_w(int state) { switch_update(4, state); } @@ -322,7 +322,7 @@ WRITE_LINE_MEMBER(upd4701_device::left_w) // right_w - update right switch state //------------------------------------------------- -WRITE_LINE_MEMBER(upd4701_device::right_w) +void upd4701_device::right_w(int state) { switch_update(2, state); } @@ -331,7 +331,7 @@ WRITE_LINE_MEMBER(upd4701_device::right_w) // middle_w - update middle switch state //------------------------------------------------- -WRITE_LINE_MEMBER(upd4701_device::middle_w) +void upd4701_device::middle_w(int state) { switch_update(1, state); } @@ -394,7 +394,7 @@ u8 upd4701_device::read_xy(offs_t offset) // sf_r - read switch flag //------------------------------------------------- -READ_LINE_MEMBER(upd4701_device::sf_r) +int upd4701_device::sf_r() { if (m_switches != 0) return 0; @@ -406,7 +406,7 @@ READ_LINE_MEMBER(upd4701_device::sf_r) // cf_r - read counter flag //------------------------------------------------- -READ_LINE_MEMBER(upd4701_device::cf_r) +int upd4701_device::cf_r() { return m_cf; } diff --git a/src/devices/machine/upd4701.h b/src/devices/machine/upd4701.h index 245ef7bf82c..cecc34c3984 100644 --- a/src/devices/machine/upd4701.h +++ b/src/devices/machine/upd4701.h @@ -42,11 +42,11 @@ public: void update(); void recalibrate(); - DECLARE_WRITE_LINE_MEMBER(cs_w); - DECLARE_WRITE_LINE_MEMBER(xy_w); - DECLARE_WRITE_LINE_MEMBER(ul_w); - DECLARE_WRITE_LINE_MEMBER(resetx_w); - DECLARE_WRITE_LINE_MEMBER(resety_w); + void cs_w(int state); + void xy_w(int state); + void ul_w(int state); + void resetx_w(int state); + void resety_w(int state); u8 reset_x_r(); void reset_x_w(u8 data); u8 reset_y_r(); @@ -59,12 +59,12 @@ public: u8 read_y(offs_t offset); u8 read_xy(offs_t offset); - DECLARE_WRITE_LINE_MEMBER(left_w); - DECLARE_WRITE_LINE_MEMBER(right_w); - DECLARE_WRITE_LINE_MEMBER(middle_w); + void left_w(int state); + void right_w(int state); + void middle_w(int state); - DECLARE_READ_LINE_MEMBER(cf_r); - DECLARE_READ_LINE_MEMBER(sf_r); + int cf_r(); + int sf_r(); protected: // device-level overrides diff --git a/src/devices/machine/upd7001.cpp b/src/devices/machine/upd7001.cpp index a6ae938b64c..949d3d1234b 100644 --- a/src/devices/machine/upd7001.cpp +++ b/src/devices/machine/upd7001.cpp @@ -105,7 +105,7 @@ void upd7001_device::device_start() // cs_w - active-low chip select //------------------------------------------------- -WRITE_LINE_MEMBER(upd7001_device::cs_w) +void upd7001_device::cs_w(int state) { if (!state && !m_cs_active) { @@ -166,7 +166,7 @@ TIMER_CALLBACK_MEMBER(upd7001_device::output_enabled) // sck_w - shift data out of and into register //------------------------------------------------- -WRITE_LINE_MEMBER(upd7001_device::sck_w) +void upd7001_device::sck_w(int state) { if (m_cs_active) { @@ -196,7 +196,7 @@ WRITE_LINE_MEMBER(upd7001_device::sck_w) // select input to convert //------------------------------------------------- -WRITE_LINE_MEMBER(upd7001_device::dl_w) +void upd7001_device::dl_w(int state) { if (state && !m_dl && m_cs_active) m_mpx = m_sr & 3; diff --git a/src/devices/machine/upd7001.h b/src/devices/machine/upd7001.h index afc4b632293..11345c47f10 100644 --- a/src/devices/machine/upd7001.h +++ b/src/devices/machine/upd7001.h @@ -53,13 +53,13 @@ public: void set_rc(double res, double cap) { assert(!configured()); m_res = res; m_cap = cap; } // serial interface - DECLARE_WRITE_LINE_MEMBER(cs_w); - DECLARE_WRITE_LINE_MEMBER(sck_w); - DECLARE_WRITE_LINE_MEMBER(si_w) { m_si = state; } - DECLARE_WRITE_LINE_MEMBER(dl_w); - DECLARE_READ_LINE_MEMBER(so_r) { return m_oe ? m_so : 1; } - DECLARE_READ_LINE_MEMBER(eoc_r) { return m_eoc_active ? 0 : 1; } - DECLARE_READ_LINE_MEMBER(eoc_so_r) { return eoc_r() && so_r(); } + void cs_w(int state); + void sck_w(int state); + void si_w(int state) { m_si = state; } + void dl_w(int state); + int so_r() { return m_oe ? m_so : 1; } + int eoc_r() { return m_eoc_active ? 0 : 1; } + int eoc_so_r() { return eoc_r() && so_r(); } protected: // device-level overrides diff --git a/src/devices/machine/upd7002.cpp b/src/devices/machine/upd7002.cpp index da1036d109d..b1aa3d7cba3 100644 --- a/src/devices/machine/upd7002.cpp +++ b/src/devices/machine/upd7002.cpp @@ -63,7 +63,7 @@ void upd7002_device::device_reset() *****************************************************************************/ -READ_LINE_MEMBER( upd7002_device::eoc_r ) +int upd7002_device::eoc_r() { return BIT(m_status, 7); } diff --git a/src/devices/machine/upd7002.h b/src/devices/machine/upd7002.h index 7069a68361d..aed7e0bd3f2 100644 --- a/src/devices/machine/upd7002.h +++ b/src/devices/machine/upd7002.h @@ -30,7 +30,7 @@ public: template void set_get_analogue_callback(T &&... args) { m_get_analogue_cb.set(std::forward(args)...); } template void set_eoc_callback(T &&... args) { m_eoc_cb.set(std::forward(args)...); } - DECLARE_READ_LINE_MEMBER(eoc_r); + int eoc_r(); uint8_t read(offs_t offset); void write(offs_t offset, uint8_t data); diff --git a/src/devices/machine/upd71071.cpp b/src/devices/machine/upd71071.cpp index 0bada0f3b37..33440f0c04b 100644 --- a/src/devices/machine/upd71071.cpp +++ b/src/devices/machine/upd71071.cpp @@ -474,7 +474,7 @@ void upd71071_device::write(offs_t offset, uint8_t data) } } -WRITE_LINE_MEMBER(upd71071_device::set_hreq) +void upd71071_device::set_hreq(int state) { if (m_hreq != state) { @@ -483,7 +483,7 @@ WRITE_LINE_MEMBER(upd71071_device::set_hreq) } } -WRITE_LINE_MEMBER(upd71071_device::set_eop) +void upd71071_device::set_eop(int state) { if (m_eop != state) { diff --git a/src/devices/machine/upd765.cpp b/src/devices/machine/upd765.cpp index 69864199aff..41b78776391 100644 --- a/src/devices/machine/upd765.cpp +++ b/src/devices/machine/upd765.cpp @@ -357,7 +357,7 @@ bool upd765_family_device::get_ready(int fid) return !external_ready; } -WRITE_LINE_MEMBER(upd765_family_device::reset_w) +void upd765_family_device::reset_w(int state) { // This implementation is not valid for devices with DOR and possibly other extra registers. // The working assumption is that no need to manipulate the RESET line directly when software can use DOR instead. diff --git a/src/devices/machine/upd765.h b/src/devices/machine/upd765.h index c08b2ac75fe..ebfdebc3536 100644 --- a/src/devices/machine/upd765.h +++ b/src/devices/machine/upd765.h @@ -48,8 +48,8 @@ public: void tc_w(bool val); void ready_w(bool val); - DECLARE_WRITE_LINE_MEMBER(tc_line_w) { tc_w(state == ASSERT_LINE); } - DECLARE_WRITE_LINE_MEMBER(reset_w); + void tc_line_w(int state) { tc_w(state == ASSERT_LINE); } + void reset_w(int state); void set_rate(int rate); // rate in bps, to be used when the fdc is externally frequency-controlled diff --git a/src/devices/machine/v3021.cpp b/src/devices/machine/v3021.cpp index 6d84109e2ec..88a49e89108 100644 --- a/src/devices/machine/v3021.cpp +++ b/src/devices/machine/v3021.cpp @@ -224,7 +224,7 @@ void v3021_device::write(u8 data) // cs_w - CS pin handler //------------------------------------------------- -WRITE_LINE_MEMBER(v3021_device::cs_w) +void v3021_device::cs_w(int state) { if (m_cs != state) { @@ -275,7 +275,7 @@ WRITE_LINE_MEMBER(v3021_device::cs_w) // io_w - I/O pin write handler //------------------------------------------------- -WRITE_LINE_MEMBER(v3021_device::io_w) +void v3021_device::io_w(int state) { m_io = state; } @@ -284,7 +284,7 @@ WRITE_LINE_MEMBER(v3021_device::io_w) // io_r - I/O pin read handler //------------------------------------------------- -READ_LINE_MEMBER(v3021_device::io_r) +int v3021_device::io_r() { return m_data & 1; } diff --git a/src/devices/machine/v3021.h b/src/devices/machine/v3021.h index cac5c6884d4..d66e6f29792 100644 --- a/src/devices/machine/v3021.h +++ b/src/devices/machine/v3021.h @@ -34,9 +34,9 @@ public: u8 read(); // serial interface - DECLARE_WRITE_LINE_MEMBER(cs_w); - DECLARE_WRITE_LINE_MEMBER(io_w); - DECLARE_READ_LINE_MEMBER(io_r); + void cs_w(int state); + void io_w(int state); + int io_r(); TIMER_CALLBACK_MEMBER(timer_callback); diff --git a/src/devices/machine/vic_pl192.h b/src/devices/machine/vic_pl192.h index 6ef01a3a935..cde78483337 100644 --- a/src/devices/machine/vic_pl192.h +++ b/src/devices/machine/vic_pl192.h @@ -15,7 +15,7 @@ public: auto out_fiq_cb() { return m_out_fiq_func.bind(); } template - DECLARE_WRITE_LINE_MEMBER(irq_w) { set_irq_line(IRQ, state); } + void irq_w(int state) { set_irq_line(IRQ, state); } void map(address_map &map); diff --git a/src/devices/machine/vrc5074.cpp b/src/devices/machine/vrc5074.cpp index 8f661fb0cb9..cfaa8a1e8e8 100644 --- a/src/devices/machine/vrc5074.cpp +++ b/src/devices/machine/vrc5074.cpp @@ -644,19 +644,19 @@ TIMER_CALLBACK_MEMBER (vrc5074_device::dma_transfer) * nile timers & interrupts * *************************************/ -WRITE_LINE_MEMBER(vrc5074_device::pci_intr_a) { +void vrc5074_device::pci_intr_a(int state) { update_pci_irq(0, state); } -WRITE_LINE_MEMBER(vrc5074_device::pci_intr_b) { +void vrc5074_device::pci_intr_b(int state) { update_pci_irq(1, state); } -WRITE_LINE_MEMBER(vrc5074_device::pci_intr_c) { +void vrc5074_device::pci_intr_c(int state) { update_pci_irq(2, state); } -WRITE_LINE_MEMBER(vrc5074_device::pci_intr_d) { +void vrc5074_device::pci_intr_d(int state) { update_pci_irq(3, state); } -WRITE_LINE_MEMBER(vrc5074_device::pci_intr_e) { +void vrc5074_device::pci_intr_e(int state) { update_pci_irq(4, state); } @@ -989,7 +989,7 @@ void vrc5074_device::cpu_reg_w(offs_t offset, uint32_t data, uint32_t mem_mask) LOGMASKED(LOG_NILE, "%s cpu_reg_w offset %03X = %08X & %08X\n", machine().describe_context(), offset * 4, data, mem_mask); } -WRITE_LINE_MEMBER(vrc5074_device::uart_irq_callback) +void vrc5074_device::uart_irq_callback(int state) { if (state ^ m_uart_irq) { m_uart_irq = state; diff --git a/src/devices/machine/vrc5074.h b/src/devices/machine/vrc5074.h index 749068b1ff8..1bcbf68ab2f 100644 --- a/src/devices/machine/vrc5074.h +++ b/src/devices/machine/vrc5074.h @@ -40,11 +40,11 @@ public: void sdram_addr_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0); // PCI interrupts - DECLARE_WRITE_LINE_MEMBER(pci_intr_a); - DECLARE_WRITE_LINE_MEMBER(pci_intr_b); - DECLARE_WRITE_LINE_MEMBER(pci_intr_c); - DECLARE_WRITE_LINE_MEMBER(pci_intr_d); - DECLARE_WRITE_LINE_MEMBER(pci_intr_e); + void pci_intr_a(int state); + void pci_intr_b(int state); + void pci_intr_c(int state); + void pci_intr_d(int state); + void pci_intr_e(int state); void update_pci_irq(const int index, const int state); //cpu bus registers @@ -65,7 +65,7 @@ public: void target1_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0); // Serial port - DECLARE_WRITE_LINE_MEMBER(uart_irq_callback); + void uart_irq_callback(int state); protected: address_space *m_cpu_space; diff --git a/src/devices/machine/vrender0.cpp b/src/devices/machine/vrender0.cpp index 0aae244da33..932f18a2cc4 100644 --- a/src/devices/machine/vrender0.cpp +++ b/src/devices/machine/vrender0.cpp @@ -324,7 +324,7 @@ uint8_t vrender0soc_device::irq_callback() } -WRITE_LINE_MEMBER(vrender0soc_device::soundirq_cb) +void vrender0soc_device::soundirq_cb(int state) { if (state) { @@ -708,7 +708,7 @@ uint32_t vrender0soc_device::screen_update(screen_device &screen, bitmap_ind16 & return 0; } -WRITE_LINE_MEMBER(vrender0soc_device::screen_vblank) +void vrender0soc_device::screen_vblank(int state) { // rising edge if (state) diff --git a/src/devices/machine/vrender0.h b/src/devices/machine/vrender0.h index b5c3774e425..10bb28e8aac 100644 --- a/src/devices/machine/vrender0.h +++ b/src/devices/machine/vrender0.h @@ -95,7 +95,7 @@ public: bool irq_pending() { return m_intst; } void write_line_tx(int port, uint8_t value); template auto tx_callback() { return write_tx[Port].bind(); } - template DECLARE_WRITE_LINE_MEMBER(rx_w) { m_uart[Port]->rx_w((uint8_t)state); } + template void rx_w(int state) { m_uart[Port]->rx_w((uint8_t)state); } protected: // device-level overrides @@ -135,7 +135,7 @@ private: uint32_t intst_r(); void intst_w(uint32_t data); - DECLARE_WRITE_LINE_MEMBER(soundirq_cb); + void soundirq_cb(int state); // Timer template void tmcon_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0); @@ -177,7 +177,7 @@ private: uint32_t cfgr_r(); uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(screen_vblank); + void screen_vblank(int state); uint16_t textureram_r(offs_t offset); void textureram_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); diff --git a/src/devices/machine/wd33c9x.cpp b/src/devices/machine/wd33c9x.cpp index 6b4ea0681de..934a8825b5c 100644 --- a/src/devices/machine/wd33c9x.cpp +++ b/src/devices/machine/wd33c9x.cpp @@ -670,7 +670,7 @@ void wd33c9x_base_device::indir_reg_w(uint8_t data) // reset - Host reset line handler //------------------------------------------------- -WRITE_LINE_MEMBER(wd33c9x_base_device::reset_w) +void wd33c9x_base_device::reset_w(int state) { if (state) { LOGMASKED(LOG_LINES, "Reset via MR line\n"); diff --git a/src/devices/machine/wd33c9x.h b/src/devices/machine/wd33c9x.h index 8fb9e8ea78a..012c4f5921f 100644 --- a/src/devices/machine/wd33c9x.h +++ b/src/devices/machine/wd33c9x.h @@ -32,7 +32,7 @@ public: void indir_reg_w(uint8_t data); // Master Reset (MR) Interface - DECLARE_WRITE_LINE_MEMBER(reset_w); + void reset_w(int state); // DMA Interface (for use with DRQ) uint8_t dma_r(); diff --git a/src/devices/machine/wd7600.cpp b/src/devices/machine/wd7600.cpp index e1f81e0282b..0d9494f4c8b 100644 --- a/src/devices/machine/wd7600.cpp +++ b/src/devices/machine/wd7600.cpp @@ -219,7 +219,7 @@ void wd7600_device::device_reset() } -WRITE_LINE_MEMBER( wd7600_device::iochck_w ) +void wd7600_device::iochck_w(int state) { if (BIT(m_portb, 3) == 0) { @@ -275,13 +275,13 @@ uint8_t wd7600_device::pic1_slave_ack_r(offs_t offset) } // Timer outputs -WRITE_LINE_MEMBER( wd7600_device::ctc_out1_w ) +void wd7600_device::ctc_out1_w(int state) { m_refresh_toggle ^= state; m_portb = (m_portb & 0xef) | (m_refresh_toggle << 4); } -WRITE_LINE_MEMBER( wd7600_device::ctc_out2_w ) +void wd7600_device::ctc_out2_w(int state) { m_write_spkr(!(state)); m_portb = (m_portb & 0xdf) | (state << 5); @@ -387,12 +387,12 @@ void wd7600_device::dma_write_word(offs_t offset, uint8_t data) m_space->write_word((page_offset() & 0xfe0000) | (offset << 1), (m_dma_high_byte << 8) | data); } -WRITE_LINE_MEMBER( wd7600_device::dma2_dack0_w ) +void wd7600_device::dma2_dack0_w(int state) { m_dma1->hack_w(state ? 0 : 1); // inverted? } -WRITE_LINE_MEMBER( wd7600_device::dma1_eop_w ) +void wd7600_device::dma1_eop_w(int state) { m_dma_eop = state; if (m_dma_channel != -1) @@ -420,12 +420,12 @@ void wd7600_device::set_dma_channel(int channel, bool state) } } -WRITE_LINE_MEMBER( wd7600_device::gatea20_w ) +void wd7600_device::gatea20_w(int state) { keyboard_gatea20(state); } -WRITE_LINE_MEMBER( wd7600_device::kbrst_w ) +void wd7600_device::kbrst_w(int state) { // convert to active low signal (gets inverted in at_keybc.c) state = (state == ASSERT_LINE ? 0 : 1); diff --git a/src/devices/machine/wd7600.h b/src/devices/machine/wd7600.h index 43ddb00b038..2db1718bb41 100644 --- a/src/devices/machine/wd7600.h +++ b/src/devices/machine/wd7600.h @@ -50,30 +50,30 @@ public: template void set_ramtag(T &&tag) { m_ram.set_tag(std::forward(tag)); } // input lines - DECLARE_WRITE_LINE_MEMBER( irq01_w ) { m_pic1->ir1_w(state); } - DECLARE_WRITE_LINE_MEMBER( irq03_w ) { m_pic1->ir3_w(state); } - DECLARE_WRITE_LINE_MEMBER( irq04_w ) { m_pic1->ir4_w(state); } - DECLARE_WRITE_LINE_MEMBER( irq05_w ) { m_pic1->ir5_w(state); } - DECLARE_WRITE_LINE_MEMBER( irq06_w ) { m_pic1->ir6_w(state); } - DECLARE_WRITE_LINE_MEMBER( irq07_w ) { m_pic1->ir7_w(state); } - DECLARE_WRITE_LINE_MEMBER( irq09_w ) { m_pic2->ir1_w(state); } - DECLARE_WRITE_LINE_MEMBER( irq10_w ) { m_pic2->ir2_w(state); } - DECLARE_WRITE_LINE_MEMBER( irq11_w ) { m_pic2->ir3_w(state); } - DECLARE_WRITE_LINE_MEMBER( irq12_w ) { m_pic2->ir4_w(state); } - DECLARE_WRITE_LINE_MEMBER( irq13_w ) { m_pic2->ir5_w(state); } // also FERR# - DECLARE_WRITE_LINE_MEMBER( irq14_w ) { m_pic2->ir6_w(state); } - DECLARE_WRITE_LINE_MEMBER( irq15_w ) { m_pic2->ir7_w(state); } - DECLARE_WRITE_LINE_MEMBER( dreq0_w ) { m_dma1->dreq0_w(state); } - DECLARE_WRITE_LINE_MEMBER( dreq1_w ) { m_dma1->dreq1_w(state); } - DECLARE_WRITE_LINE_MEMBER( dreq2_w ) { m_dma1->dreq2_w(state); } - DECLARE_WRITE_LINE_MEMBER( dreq3_w ) { m_dma1->dreq3_w(state); } - DECLARE_WRITE_LINE_MEMBER( dreq5_w ) { m_dma2->dreq1_w(state); } - DECLARE_WRITE_LINE_MEMBER( dreq6_w ) { m_dma2->dreq2_w(state); } - DECLARE_WRITE_LINE_MEMBER( dreq7_w ) { m_dma2->dreq3_w(state); } - DECLARE_WRITE_LINE_MEMBER( hlda_w ) { m_dma2->hack_w(state); } - DECLARE_WRITE_LINE_MEMBER( iochck_w ); - DECLARE_WRITE_LINE_MEMBER( gatea20_w ); - DECLARE_WRITE_LINE_MEMBER( kbrst_w ); + void irq01_w(int state) { m_pic1->ir1_w(state); } + void irq03_w(int state) { m_pic1->ir3_w(state); } + void irq04_w(int state) { m_pic1->ir4_w(state); } + void irq05_w(int state) { m_pic1->ir5_w(state); } + void irq06_w(int state) { m_pic1->ir6_w(state); } + void irq07_w(int state) { m_pic1->ir7_w(state); } + void irq09_w(int state) { m_pic2->ir1_w(state); } + void irq10_w(int state) { m_pic2->ir2_w(state); } + void irq11_w(int state) { m_pic2->ir3_w(state); } + void irq12_w(int state) { m_pic2->ir4_w(state); } + void irq13_w(int state) { m_pic2->ir5_w(state); } // also FERR# + void irq14_w(int state) { m_pic2->ir6_w(state); } + void irq15_w(int state) { m_pic2->ir7_w(state); } + void dreq0_w(int state) { m_dma1->dreq0_w(state); } + void dreq1_w(int state) { m_dma1->dreq1_w(state); } + void dreq2_w(int state) { m_dma1->dreq2_w(state); } + void dreq3_w(int state) { m_dma1->dreq3_w(state); } + void dreq5_w(int state) { m_dma2->dreq1_w(state); } + void dreq6_w(int state) { m_dma2->dreq2_w(state); } + void dreq7_w(int state) { m_dma2->dreq3_w(state); } + void hlda_w(int state) { m_dma2->hack_w(state); } + void iochck_w(int state); + void gatea20_w(int state); + void kbrst_w(int state); uint16_t refresh_r(); void refresh_w(uint16_t data); @@ -100,10 +100,10 @@ protected: virtual void device_add_mconfig(machine_config &config) override; private: - DECLARE_WRITE_LINE_MEMBER( pic1_int_w ) { m_write_intr(state); } + void pic1_int_w(int state) { m_write_intr(state); } uint8_t pic1_slave_ack_r(offs_t offset); - DECLARE_WRITE_LINE_MEMBER( ctc_out1_w ); - DECLARE_WRITE_LINE_MEMBER( ctc_out2_w ); + void ctc_out1_w(int state); + void ctc_out2_w(int state); void rtc_w(offs_t offset, uint8_t data); void keyb_cmd_w(uint8_t data); void keyb_data_w(uint8_t data); @@ -119,7 +119,7 @@ private: void dma_write_byte(offs_t offset, uint8_t data); uint8_t dma_read_word(offs_t offset); void dma_write_word(offs_t offset, uint8_t data); - DECLARE_WRITE_LINE_MEMBER( dma1_eop_w ); + void dma1_eop_w(int state); uint8_t dma1_ior0_r() { return m_read_ior(0); } uint8_t dma1_ior1_r() { return m_read_ior(1); } uint8_t dma1_ior2_r() { return m_read_ior(2); } @@ -134,15 +134,15 @@ private: void dma2_iow1_w(uint8_t data) { m_write_iow(5, (m_dma_high_byte << 8) | data, 0xffff); } void dma2_iow2_w(uint8_t data) { m_write_iow(6, (m_dma_high_byte << 8) | data, 0xffff); } void dma2_iow3_w(uint8_t data) { m_write_iow(7, (m_dma_high_byte << 8) | data, 0xffff); } - DECLARE_WRITE_LINE_MEMBER( dma1_dack0_w ) { set_dma_channel(0, state); } - DECLARE_WRITE_LINE_MEMBER( dma1_dack1_w ) { set_dma_channel(1, state); } - DECLARE_WRITE_LINE_MEMBER( dma1_dack2_w ) { set_dma_channel(2, state); } - DECLARE_WRITE_LINE_MEMBER( dma1_dack3_w ) { set_dma_channel(3, state); } - DECLARE_WRITE_LINE_MEMBER( dma2_dack0_w ); - DECLARE_WRITE_LINE_MEMBER( dma2_dack1_w ) { set_dma_channel(5, state); } - DECLARE_WRITE_LINE_MEMBER( dma2_dack2_w ) { set_dma_channel(6, state); } - DECLARE_WRITE_LINE_MEMBER( dma2_dack3_w ) { set_dma_channel(7, state); } - DECLARE_WRITE_LINE_MEMBER( dma2_hreq_w ) { m_write_hold(state); } + void dma1_dack0_w(int state) { set_dma_channel(0, state); } + void dma1_dack1_w(int state) { set_dma_channel(1, state); } + void dma1_dack2_w(int state) { set_dma_channel(2, state); } + void dma1_dack3_w(int state) { set_dma_channel(3, state); } + void dma2_dack0_w(int state); + void dma2_dack1_w(int state) { set_dma_channel(5, state); } + void dma2_dack2_w(int state) { set_dma_channel(6, state); } + void dma2_dack3_w(int state) { set_dma_channel(7, state); } + void dma2_hreq_w(int state) { m_write_hold(state); } devcb_read16 m_read_ior; devcb_write16 m_write_iow; diff --git a/src/devices/machine/wd_fdc.cpp b/src/devices/machine/wd_fdc.cpp index 1cfab7042d8..b6570b1da0d 100644 --- a/src/devices/machine/wd_fdc.cpp +++ b/src/devices/machine/wd_fdc.cpp @@ -236,7 +236,7 @@ void wd_fdc_device_base::soft_reset() } } -WRITE_LINE_MEMBER(wd_fdc_device_base::mr_w) +void wd_fdc_device_base::mr_w(int state) { if(mr && !state) { command = 0x03; @@ -314,7 +314,7 @@ void wd_fdc_device_base::set_floppy(floppy_image_device *_floppy) ready_callback(floppy, next_ready); } -WRITE_LINE_MEMBER(wd_fdc_device_base::dden_w) +void wd_fdc_device_base::dden_w(int state) { if(disable_mfm) { logerror("Error, this chip does not have a dden line\n"); @@ -1596,27 +1596,27 @@ void wd_fdc_device_base::index_callback(floppy_image_device *floppy, int state) general_continue(); } -READ_LINE_MEMBER(wd_fdc_device_base::intrq_r) +int wd_fdc_device_base::intrq_r() { return intrq; } -READ_LINE_MEMBER(wd_fdc_device_base::drq_r) +int wd_fdc_device_base::drq_r() { return drq; } -READ_LINE_MEMBER(wd_fdc_device_base::hld_r) +int wd_fdc_device_base::hld_r() { return hld; } -WRITE_LINE_MEMBER(wd_fdc_device_base::hlt_w) +void wd_fdc_device_base::hlt_w(int state) { hlt = bool(state); } -READ_LINE_MEMBER(wd_fdc_device_base::enp_r) +int wd_fdc_device_base::enp_r() { return enp; } diff --git a/src/devices/machine/wd_fdc.h b/src/devices/machine/wd_fdc.h index 96259138efc..d05456ed572 100644 --- a/src/devices/machine/wd_fdc.h +++ b/src/devices/machine/wd_fdc.h @@ -61,7 +61,7 @@ public: void soft_reset(); - DECLARE_WRITE_LINE_MEMBER(dden_w); + void dden_w(int state); void set_floppy(floppy_image_device *floppy); void set_force_ready(bool force_ready); void set_disable_motor_control(bool _disable_motor_control); @@ -81,15 +81,15 @@ public: void write(offs_t reg, uint8_t val); uint8_t read(offs_t reg); - DECLARE_READ_LINE_MEMBER(intrq_r); - DECLARE_READ_LINE_MEMBER(drq_r); + int intrq_r(); + int drq_r(); - DECLARE_READ_LINE_MEMBER(hld_r); - DECLARE_WRITE_LINE_MEMBER(hlt_w); + int hld_r(); + void hlt_w(int state); - DECLARE_READ_LINE_MEMBER(enp_r); + int enp_r(); - DECLARE_WRITE_LINE_MEMBER(mr_w); + void mr_w(int state); void index_callback(floppy_image_device *floppy, int state); protected: @@ -537,13 +537,13 @@ protected: class wd2791_device : public wd_fdc_analog_device_base { public: wd2791_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - DECLARE_WRITE_LINE_MEMBER(enmf_w) { enmf = state ? false : true; } + void enmf_w(int state) { enmf = state ? false : true; } }; class wd2793_device : public wd_fdc_analog_device_base { public: wd2793_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - DECLARE_WRITE_LINE_MEMBER(enmf_w) { enmf = state ? false : true; } + void enmf_w(int state) { enmf = state ? false : true; } }; class wd2795_device : public wd_fdc_analog_device_base { diff --git a/src/devices/machine/x2201.cpp b/src/devices/machine/x2201.cpp index 30ee78a8cfd..77007435e9b 100644 --- a/src/devices/machine/x2201.cpp +++ b/src/devices/machine/x2201.cpp @@ -152,7 +152,7 @@ void x2201_device::write(offs_t offset, u8 data) // cs_w - write to the CS line (active low) //------------------------------------------------- -WRITE_LINE_MEMBER(x2201_device::cs_w) +void x2201_device::cs_w(int state) { m_cs = !state; } @@ -163,7 +163,7 @@ WRITE_LINE_MEMBER(x2201_device::cs_w) // (active low) //------------------------------------------------- -WRITE_LINE_MEMBER(x2201_device::store_w) +void x2201_device::store_w(int state) { if (m_cs && !state && !m_store) std::copy_n(&m_ram[0], 1024 / 8, &m_eeprom[0]); @@ -177,7 +177,7 @@ WRITE_LINE_MEMBER(x2201_device::store_w) // into RAM (active low) //------------------------------------------------- -WRITE_LINE_MEMBER(x2201_device::array_recall_w) +void x2201_device::array_recall_w(int state) { if (m_cs && !state && !m_array_recall) std::copy_n(&m_eeprom[0], 1024 / 8, &m_ram[0]); diff --git a/src/devices/machine/x2201.h b/src/devices/machine/x2201.h index 1e23493fdb7..3d5e8dd981d 100644 --- a/src/devices/machine/x2201.h +++ b/src/devices/machine/x2201.h @@ -41,9 +41,9 @@ public: void write(offs_t offset, u8 data); // control lines - DECLARE_WRITE_LINE_MEMBER(cs_w); - DECLARE_WRITE_LINE_MEMBER(array_recall_w); - DECLARE_WRITE_LINE_MEMBER(store_w); + void cs_w(int state); + void array_recall_w(int state); + void store_w(int state); protected: // device-level overrides diff --git a/src/devices/machine/x76f041.cpp b/src/devices/machine/x76f041.cpp index 340cf224800..366c4f03569 100644 --- a/src/devices/machine/x76f041.cpp +++ b/src/devices/machine/x76f041.cpp @@ -101,7 +101,7 @@ void x76f041_device::device_reset() m_is_password_accepted = false; } -WRITE_LINE_MEMBER( x76f041_device::write_cs ) +void x76f041_device::write_cs(int state) { if( m_cs != state ) { @@ -125,7 +125,7 @@ WRITE_LINE_MEMBER( x76f041_device::write_cs ) m_cs = state; } -WRITE_LINE_MEMBER( x76f041_device::write_rst ) +void x76f041_device::write_rst(int state) { if( m_rst != state ) { @@ -316,7 +316,7 @@ int x76f041_device::data_offset() return ( block_offset & 0x180 ) | ( ( block_offset + m_byte ) & 0x7f ); } -WRITE_LINE_MEMBER( x76f041_device::write_scl ) +void x76f041_device::write_scl(int state) { if( m_scl != state ) { @@ -650,7 +650,7 @@ WRITE_LINE_MEMBER( x76f041_device::write_scl ) m_scl = state; } -WRITE_LINE_MEMBER( x76f041_device::write_sda ) +void x76f041_device::write_sda(int state) { if( m_sdaw != state ) { @@ -700,7 +700,7 @@ WRITE_LINE_MEMBER( x76f041_device::write_sda ) m_sdaw = state; } -READ_LINE_MEMBER( x76f041_device::read_sda ) +int x76f041_device::read_sda() { if( m_cs != 0 ) { diff --git a/src/devices/machine/x76f041.h b/src/devices/machine/x76f041.h index bd0a792cf9c..0948de185af 100644 --- a/src/devices/machine/x76f041.h +++ b/src/devices/machine/x76f041.h @@ -20,11 +20,11 @@ public: // construction/destruction x76f041_device( const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = 0); - DECLARE_WRITE_LINE_MEMBER( write_cs ); - DECLARE_WRITE_LINE_MEMBER( write_rst ); - DECLARE_WRITE_LINE_MEMBER( write_scl ); - DECLARE_WRITE_LINE_MEMBER( write_sda ); - DECLARE_READ_LINE_MEMBER( read_sda ); + void write_cs(int state); + void write_rst(int state); + void write_scl(int state); + void write_sda(int state); + int read_sda(); protected: // device-level overrides diff --git a/src/devices/machine/x76f100.cpp b/src/devices/machine/x76f100.cpp index 032020059d9..4385c5a4b0f 100644 --- a/src/devices/machine/x76f100.cpp +++ b/src/devices/machine/x76f100.cpp @@ -94,7 +94,7 @@ void x76f100_device::device_reset() m_is_password_accepted = false; } -WRITE_LINE_MEMBER( x76f100_device::write_cs ) +void x76f100_device::write_cs(int state) { if( m_cs != state ) { @@ -118,7 +118,7 @@ WRITE_LINE_MEMBER( x76f100_device::write_cs ) m_cs = state; } -WRITE_LINE_MEMBER( x76f100_device::write_rst ) +void x76f100_device::write_rst(int state) { if( m_rst != state ) { @@ -178,7 +178,7 @@ int x76f100_device::data_offset() return offset; } -WRITE_LINE_MEMBER( x76f100_device::write_scl ) +void x76f100_device::write_scl(int state) { if( m_scl != state ) { @@ -403,7 +403,7 @@ WRITE_LINE_MEMBER( x76f100_device::write_scl ) m_scl = state; } -WRITE_LINE_MEMBER( x76f100_device::write_sda ) +void x76f100_device::write_sda(int state) { if( m_sdaw != state ) { @@ -454,7 +454,7 @@ WRITE_LINE_MEMBER( x76f100_device::write_sda ) m_sdaw = state; } -READ_LINE_MEMBER( x76f100_device::read_sda ) +int x76f100_device::read_sda() { if( m_cs != 0 ) { diff --git a/src/devices/machine/x76f100.h b/src/devices/machine/x76f100.h index 38302f7caeb..9ede683723f 100644 --- a/src/devices/machine/x76f100.h +++ b/src/devices/machine/x76f100.h @@ -19,11 +19,11 @@ public: // construction/destruction x76f100_device( const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = 0); - DECLARE_WRITE_LINE_MEMBER( write_cs ); - DECLARE_WRITE_LINE_MEMBER( write_rst ); - DECLARE_WRITE_LINE_MEMBER( write_scl ); - DECLARE_WRITE_LINE_MEMBER( write_sda ); - DECLARE_READ_LINE_MEMBER( read_sda ); + void write_cs(int state); + void write_rst(int state); + void write_scl(int state); + void write_sda(int state); + int read_sda(); protected: // device-level overrides diff --git a/src/devices/machine/ym2148.cpp b/src/devices/machine/ym2148.cpp index 88f7db02b1e..46f83a80325 100644 --- a/src/devices/machine/ym2148.cpp +++ b/src/devices/machine/ym2148.cpp @@ -212,7 +212,7 @@ uint8_t ym2148_device::get_irq_vector() } -WRITE_LINE_MEMBER(ym2148_device::write_rxd) +void ym2148_device::write_rxd(int state) { m_rxd = state; } diff --git a/src/devices/machine/ym2148.h b/src/devices/machine/ym2148.h index 07cacfbc589..e0e75188123 100644 --- a/src/devices/machine/ym2148.h +++ b/src/devices/machine/ym2148.h @@ -34,7 +34,7 @@ public: uint8_t read(offs_t offset); void write(offs_t offset, uint8_t data); - DECLARE_WRITE_LINE_MEMBER(write_rxd); + void write_rxd(int state); uint8_t get_irq_vector(); protected: diff --git a/src/devices/machine/z8038.cpp b/src/devices/machine/z8038.cpp index 54057ac117c..11662b2464f 100644 --- a/src/devices/machine/z8038.cpp +++ b/src/devices/machine/z8038.cpp @@ -482,7 +482,7 @@ void z8038_device::message_out_w(u8 const port, u8 data) m_port[!port].interrupt_status[0] |= ISR0_MIP; } -WRITE_LINE_MEMBER(z8038_device::in_E) +void z8038_device::in_E(int state) { // check port 2 in i/o mode and pin 35 configured as input if ((m_port[0].control_0 & CR0_P2M_IO) && (m_control_3 & CR3_P2CLR)) @@ -498,7 +498,7 @@ WRITE_LINE_MEMBER(z8038_device::in_E) } } -WRITE_LINE_MEMBER(z8038_device::in_F) +void z8038_device::in_F(int state) { // check port 2 in i/o mode and pin 34 configured as input if ((m_port[0].control_0 & CR0_P2M_IO) && (m_control_3 & CR3_P2DIR)) @@ -520,7 +520,7 @@ WRITE_LINE_MEMBER(z8038_device::in_F) } } -WRITE_LINE_MEMBER(z8038_device::in_G) +void z8038_device::in_G(int state) { // check port 2 in i/o mode if (m_port[0].control_0 & CR0_P2M_IO) diff --git a/src/devices/machine/z8038.h b/src/devices/machine/z8038.h index 2e2201f10d6..d21408150e2 100644 --- a/src/devices/machine/z8038.h +++ b/src/devices/machine/z8038.h @@ -21,9 +21,9 @@ public: auto out_J() { return m_out_J_cb.bind(); } // port 2 input lines - DECLARE_WRITE_LINE_MEMBER(in_E); // CÌ…LÌ…EÌ…AÌ…RÌ… - DECLARE_WRITE_LINE_MEMBER(in_F); // Data Direction - DECLARE_WRITE_LINE_MEMBER(in_G); // IN0 + void in_E(int state); // CÌ…LÌ…EÌ…AÌ…RÌ… + void in_F(int state); // Data Direction + void in_G(int state); // IN0 // indirect register access template u8 reg_r() { return reg_r(Port - 1); } diff --git a/src/devices/machine/z80ctc.cpp b/src/devices/machine/z80ctc.cpp index 6a6e728d548..e88a78acb71 100644 --- a/src/devices/machine/z80ctc.cpp +++ b/src/devices/machine/z80ctc.cpp @@ -112,10 +112,10 @@ void z80ctc_device::write(offs_t offset, uint8_t data) // trigger //------------------------------------------------- -WRITE_LINE_MEMBER( z80ctc_device::trg0 ) { m_channel[0]->trigger(state != 0); } -WRITE_LINE_MEMBER( z80ctc_device::trg1 ) { m_channel[1]->trigger(state != 0); } -WRITE_LINE_MEMBER( z80ctc_device::trg2 ) { m_channel[2]->trigger(state != 0); } -WRITE_LINE_MEMBER( z80ctc_device::trg3 ) { m_channel[3]->trigger(state != 0); } +void z80ctc_device::trg0(int state) { m_channel[0]->trigger(state != 0); } +void z80ctc_device::trg1(int state) { m_channel[1]->trigger(state != 0); } +void z80ctc_device::trg2(int state) { m_channel[2]->trigger(state != 0); } +void z80ctc_device::trg3(int state) { m_channel[3]->trigger(state != 0); } //------------------------------------------------- diff --git a/src/devices/machine/z80ctc.h b/src/devices/machine/z80ctc.h index 2e61a80df1b..82aab7d230e 100644 --- a/src/devices/machine/z80ctc.h +++ b/src/devices/machine/z80ctc.h @@ -92,10 +92,10 @@ public: // read/write handlers uint8_t read(offs_t offset); void write(offs_t offset, uint8_t data); - DECLARE_WRITE_LINE_MEMBER( trg0 ); - DECLARE_WRITE_LINE_MEMBER( trg1 ); - DECLARE_WRITE_LINE_MEMBER( trg2 ); - DECLARE_WRITE_LINE_MEMBER( trg3 ); + void trg0(int state); + void trg1(int state); + void trg2(int state); + void trg3(int state); u16 get_channel_constant(int ch) const { return m_channel[ch]->m_tconst; } diff --git a/src/devices/machine/z80daisy_generic.cpp b/src/devices/machine/z80daisy_generic.cpp index 3a5b6562f30..f91af3e076a 100644 --- a/src/devices/machine/z80daisy_generic.cpp +++ b/src/devices/machine/z80daisy_generic.cpp @@ -94,13 +94,13 @@ void z80daisy_generic_device::update_interrupt() // INTERFACE //************************************************************************** -WRITE_LINE_MEMBER( z80daisy_generic_device::int_w ) +void z80daisy_generic_device::int_w(int state) { m_int = state; update_interrupt(); } -WRITE_LINE_MEMBER( z80daisy_generic_device::mask_w ) +void z80daisy_generic_device::mask_w(int state) { m_mask = state; update_interrupt(); diff --git a/src/devices/machine/z80daisy_generic.h b/src/devices/machine/z80daisy_generic.h index d26b50e6ee7..c8bfa92fce4 100644 --- a/src/devices/machine/z80daisy_generic.h +++ b/src/devices/machine/z80daisy_generic.h @@ -30,8 +30,8 @@ public: // configuration void set_vector(uint8_t vector) { m_vector = vector; } - DECLARE_WRITE_LINE_MEMBER(int_w); - DECLARE_WRITE_LINE_MEMBER(mask_w); + void int_w(int state); + void mask_w(int state); protected: // device-level overrides diff --git a/src/devices/machine/z80dma.cpp b/src/devices/machine/z80dma.cpp index 261545b2abb..4c31e52a567 100644 --- a/src/devices/machine/z80dma.cpp +++ b/src/devices/machine/z80dma.cpp @@ -859,7 +859,7 @@ TIMER_CALLBACK_MEMBER(z80dma_device::rdy_write_callback) // rdy_w - ready input //------------------------------------------------- -WRITE_LINE_MEMBER(z80dma_device::rdy_w) +void z80dma_device::rdy_w(int state) { LOG("Z80DMA RDY: %d Active High: %d\n", state, READY_ACTIVE_HIGH); machine().scheduler().synchronize(timer_expired_delegate(FUNC(z80dma_device::rdy_write_callback),this), state); @@ -870,7 +870,7 @@ WRITE_LINE_MEMBER(z80dma_device::rdy_w) // wait_w - wait input //------------------------------------------------- -WRITE_LINE_MEMBER(z80dma_device::wait_w) +void z80dma_device::wait_w(int state) { } @@ -879,6 +879,6 @@ WRITE_LINE_MEMBER(z80dma_device::wait_w) // bai_w - bus acknowledge input //------------------------------------------------- -WRITE_LINE_MEMBER(z80dma_device::bai_w) +void z80dma_device::bai_w(int state) { } diff --git a/src/devices/machine/z80dma.h b/src/devices/machine/z80dma.h index 5db9112fc30..88b162ed4a2 100644 --- a/src/devices/machine/z80dma.h +++ b/src/devices/machine/z80dma.h @@ -63,10 +63,10 @@ public: uint8_t read(); void write(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(iei_w) { m_iei = state; interrupt_check(); } - DECLARE_WRITE_LINE_MEMBER(rdy_w); - DECLARE_WRITE_LINE_MEMBER(wait_w); - DECLARE_WRITE_LINE_MEMBER(bai_w); + void iei_w(int state) { m_iei = state; interrupt_check(); } + void rdy_w(int state); + void wait_w(int state); + void bai_w(int state); private: // device-level overrides diff --git a/src/devices/machine/z80pio.h b/src/devices/machine/z80pio.h index a448fd9d502..ca638bb88f7 100644 --- a/src/devices/machine/z80pio.h +++ b/src/devices/machine/z80pio.h @@ -70,10 +70,10 @@ public: // I/O line access int rdy(int which) { return m_port[which].rdy(); } void strobe(int which, bool state) { m_port[which].strobe(state); } - DECLARE_READ_LINE_MEMBER( rdy_a ) { return rdy(PORT_A); } - DECLARE_READ_LINE_MEMBER( rdy_b ) { return rdy(PORT_B); } - DECLARE_WRITE_LINE_MEMBER( strobe_a ) { strobe(PORT_A, state); } - DECLARE_WRITE_LINE_MEMBER( strobe_b ) { strobe(PORT_B, state); } + int rdy_a() { return rdy(PORT_A); } + int rdy_b() { return rdy(PORT_B); } + void strobe_a(int state) { strobe(PORT_A, state); } + void strobe_b(int state) { strobe(PORT_B, state); } // control register I/O uint8_t control_read(); @@ -97,22 +97,22 @@ public: uint8_t port_b_read() { return port_read(PORT_B); } void port_a_write(uint8_t data) { port_write(PORT_A, data); } void port_b_write(uint8_t data) { port_write(PORT_B, data); } - DECLARE_WRITE_LINE_MEMBER( pa0_w ) { port_write(PORT_A, 0, state); } - DECLARE_WRITE_LINE_MEMBER( pa1_w ) { port_write(PORT_A, 1, state); } - DECLARE_WRITE_LINE_MEMBER( pa2_w ) { port_write(PORT_A, 2, state); } - DECLARE_WRITE_LINE_MEMBER( pa3_w ) { port_write(PORT_A, 3, state); } - DECLARE_WRITE_LINE_MEMBER( pa4_w ) { port_write(PORT_A, 4, state); } - DECLARE_WRITE_LINE_MEMBER( pa5_w ) { port_write(PORT_A, 5, state); } - DECLARE_WRITE_LINE_MEMBER( pa6_w ) { port_write(PORT_A, 6, state); } - DECLARE_WRITE_LINE_MEMBER( pa7_w ) { port_write(PORT_A, 7, state); } - DECLARE_WRITE_LINE_MEMBER( pb0_w ) { port_write(PORT_B, 0, state); } - DECLARE_WRITE_LINE_MEMBER( pb1_w ) { port_write(PORT_B, 1, state); } - DECLARE_WRITE_LINE_MEMBER( pb2_w ) { port_write(PORT_B, 2, state); } - DECLARE_WRITE_LINE_MEMBER( pb3_w ) { port_write(PORT_B, 3, state); } - DECLARE_WRITE_LINE_MEMBER( pb4_w ) { port_write(PORT_B, 4, state); } - DECLARE_WRITE_LINE_MEMBER( pb5_w ) { port_write(PORT_B, 5, state); } - DECLARE_WRITE_LINE_MEMBER( pb6_w ) { port_write(PORT_B, 6, state); } - DECLARE_WRITE_LINE_MEMBER( pb7_w ) { port_write(PORT_B, 7, state); } + void pa0_w(int state) { port_write(PORT_A, 0, state); } + void pa1_w(int state) { port_write(PORT_A, 1, state); } + void pa2_w(int state) { port_write(PORT_A, 2, state); } + void pa3_w(int state) { port_write(PORT_A, 3, state); } + void pa4_w(int state) { port_write(PORT_A, 4, state); } + void pa5_w(int state) { port_write(PORT_A, 5, state); } + void pa6_w(int state) { port_write(PORT_A, 6, state); } + void pa7_w(int state) { port_write(PORT_A, 7, state); } + void pb0_w(int state) { port_write(PORT_B, 0, state); } + void pb1_w(int state) { port_write(PORT_B, 1, state); } + void pb2_w(int state) { port_write(PORT_B, 2, state); } + void pb3_w(int state) { port_write(PORT_B, 3, state); } + void pb4_w(int state) { port_write(PORT_B, 4, state); } + void pb5_w(int state) { port_write(PORT_B, 5, state); } + void pb6_w(int state) { port_write(PORT_B, 6, state); } + void pb7_w(int state) { port_write(PORT_B, 7, state); } // standard read/write, with C/D in bit 1, B/A in bit 0 u8 read(offs_t offset); diff --git a/src/devices/machine/z80sio.cpp b/src/devices/machine/z80sio.cpp index 1cc00b784ab..6c2def0a5d5 100644 --- a/src/devices/machine/z80sio.cpp +++ b/src/devices/machine/z80sio.cpp @@ -2306,7 +2306,7 @@ void z80sio_channel::queue_received(uint16_t data, uint32_t error) //------------------------------------------------- // cts_w - clear to send handler //------------------------------------------------- -WRITE_LINE_MEMBER( z80sio_channel::cts_w ) +void z80sio_channel::cts_w(int state) { if (bool(m_cts) != bool(state)) { @@ -2324,7 +2324,7 @@ WRITE_LINE_MEMBER( z80sio_channel::cts_w ) //------------------------------------------------- // dcd_w - data carrier detected handler //------------------------------------------------- -WRITE_LINE_MEMBER( z80sio_channel::dcd_w ) +void z80sio_channel::dcd_w(int state) { if (bool(m_dcd) != bool(state)) { @@ -2344,7 +2344,7 @@ WRITE_LINE_MEMBER( z80sio_channel::dcd_w ) //------------------------------------------------- // sh_w - Sync Hunt handler //------------------------------------------------- -WRITE_LINE_MEMBER( z80sio_channel::sync_w ) +void z80sio_channel::sync_w(int state) { if (bool(m_sync) != bool(state)) { @@ -2362,7 +2362,7 @@ WRITE_LINE_MEMBER( z80sio_channel::sync_w ) //------------------------------------------------- // rxc_w - receive clock //------------------------------------------------- -WRITE_LINE_MEMBER( z80sio_channel::rxc_w ) +void z80sio_channel::rxc_w(int state) { //LOG("Z80SIO \"%s\" Channel %c : Receiver Clock Pulse\n", owner()->tag(), m_index + 'A'); //if ((receive_allowed() || m_rx_bit != 0) && state && !m_rx_clock) @@ -2487,7 +2487,7 @@ WRITE_LINE_MEMBER( z80sio_channel::rxc_w ) //------------------------------------------------- // txc_w - transmit clock //------------------------------------------------- -WRITE_LINE_MEMBER( z80sio_channel::txc_w ) +void z80sio_channel::txc_w(int state) { //LOG("Z80SIO \"%s\" Channel %c : Transmitter Clock Pulse\n", owner()->tag(), m_index + 'A'); if (!state && m_tx_clock) diff --git a/src/devices/machine/z80sio.h b/src/devices/machine/z80sio.h index f8fbc1522c9..b00336b047a 100644 --- a/src/devices/machine/z80sio.h +++ b/src/devices/machine/z80sio.h @@ -202,12 +202,12 @@ public: uint8_t data_read(); void data_write(uint8_t data); - DECLARE_WRITE_LINE_MEMBER( write_rx ) { m_rxd = state; } - DECLARE_WRITE_LINE_MEMBER( cts_w ); - DECLARE_WRITE_LINE_MEMBER( dcd_w ); - DECLARE_WRITE_LINE_MEMBER( rxc_w ); - DECLARE_WRITE_LINE_MEMBER( txc_w ); - DECLARE_WRITE_LINE_MEMBER( sync_w ); + void write_rx(int state) { m_rxd = state; } + void cts_w(int state); + void dcd_w(int state); + void rxc_w(int state); + void txc_w(int state); + void sync_w(int state); // Register state // read registers enum @@ -511,19 +511,19 @@ public: // interrupt acknowledge virtual int m1_r(); - DECLARE_WRITE_LINE_MEMBER( rxa_w ) { m_chanA->write_rx(state); } - DECLARE_WRITE_LINE_MEMBER( rxb_w ) { m_chanB->write_rx(state); } - DECLARE_WRITE_LINE_MEMBER( ctsa_w ) { m_chanA->cts_w(state); } - DECLARE_WRITE_LINE_MEMBER( ctsb_w ) { m_chanB->cts_w(state); } - DECLARE_WRITE_LINE_MEMBER( dcda_w ) { m_chanA->dcd_w(state); } - DECLARE_WRITE_LINE_MEMBER( dcdb_w ) { m_chanB->dcd_w(state); } - DECLARE_WRITE_LINE_MEMBER( rxca_w ) { m_chanA->rxc_w(state); } - DECLARE_WRITE_LINE_MEMBER( rxcb_w ) { m_chanB->rxc_w(state); } - DECLARE_WRITE_LINE_MEMBER( txca_w ) { m_chanA->txc_w(state); } - DECLARE_WRITE_LINE_MEMBER( txcb_w ) { m_chanB->txc_w(state); } - DECLARE_WRITE_LINE_MEMBER( rxtxcb_w ) { m_chanB->rxc_w(state); m_chanB->txc_w(state); } - DECLARE_WRITE_LINE_MEMBER( synca_w ) { m_chanA->sync_w(state); } - DECLARE_WRITE_LINE_MEMBER( syncb_w ) { m_chanB->sync_w(state); } + void rxa_w(int state) { m_chanA->write_rx(state); } + void rxb_w(int state) { m_chanB->write_rx(state); } + void ctsa_w(int state) { m_chanA->cts_w(state); } + void ctsb_w(int state) { m_chanB->cts_w(state); } + void dcda_w(int state) { m_chanA->dcd_w(state); } + void dcdb_w(int state) { m_chanB->dcd_w(state); } + void rxca_w(int state) { m_chanA->rxc_w(state); } + void rxcb_w(int state) { m_chanB->rxc_w(state); } + void txca_w(int state) { m_chanA->txc_w(state); } + void txcb_w(int state) { m_chanB->txc_w(state); } + void rxtxcb_w(int state) { m_chanB->rxc_w(state); m_chanB->txc_w(state); } + void synca_w(int state) { m_chanA->sync_w(state); } + void syncb_w(int state) { m_chanB->sync_w(state); } protected: z80sio_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); @@ -581,8 +581,8 @@ class z80dart_device : public z80sio_device public: z80dart_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - DECLARE_WRITE_LINE_MEMBER( ria_w ) { m_chanA->sync_w(state); } - DECLARE_WRITE_LINE_MEMBER( rib_w ) { m_chanB->sync_w(state); } + void ria_w(int state) { m_chanA->sync_w(state); } + void rib_w(int state) { m_chanB->sync_w(state); } protected: // device_t overrides diff --git a/src/devices/machine/z80sti.cpp b/src/devices/machine/z80sti.cpp index a72a370ec79..a77ead83c04 100644 --- a/src/devices/machine/z80sti.cpp +++ b/src/devices/machine/z80sti.cpp @@ -676,21 +676,21 @@ void z80sti_device::gpip_input(int bit, int state) m_gpip = (m_gpip & ~(1 << bit)) | (state << bit); } -WRITE_LINE_MEMBER( z80sti_device::i0_w ) { gpip_input(0, state); } -WRITE_LINE_MEMBER( z80sti_device::i1_w ) { gpip_input(1, state); } -WRITE_LINE_MEMBER( z80sti_device::i2_w ) { gpip_input(2, state); } -WRITE_LINE_MEMBER( z80sti_device::i3_w ) { gpip_input(3, state); } -WRITE_LINE_MEMBER( z80sti_device::i4_w ) { gpip_input(4, state); } -WRITE_LINE_MEMBER( z80sti_device::i5_w ) { gpip_input(5, state); } -WRITE_LINE_MEMBER( z80sti_device::i6_w ) { gpip_input(6, state); } -WRITE_LINE_MEMBER( z80sti_device::i7_w ) { gpip_input(7, state); } +void z80sti_device::i0_w(int state) { gpip_input(0, state); } +void z80sti_device::i1_w(int state) { gpip_input(1, state); } +void z80sti_device::i2_w(int state) { gpip_input(2, state); } +void z80sti_device::i3_w(int state) { gpip_input(3, state); } +void z80sti_device::i4_w(int state) { gpip_input(4, state); } +void z80sti_device::i5_w(int state) { gpip_input(5, state); } +void z80sti_device::i6_w(int state) { gpip_input(6, state); } +void z80sti_device::i7_w(int state) { gpip_input(7, state); } //------------------------------------------------- // rc_w - receiver clock //------------------------------------------------- -WRITE_LINE_MEMBER( z80sti_device::rc_w ) +void z80sti_device::rc_w(int state) { rx_clock_w(state); } @@ -700,7 +700,7 @@ WRITE_LINE_MEMBER( z80sti_device::rc_w ) // tc_w - transmitter clock //------------------------------------------------- -WRITE_LINE_MEMBER( z80sti_device::tc_w ) +void z80sti_device::tc_w(int state) { tx_clock_w(state); } diff --git a/src/devices/machine/z80sti.h b/src/devices/machine/z80sti.h index 9cd0ff40d59..864b3adecbe 100644 --- a/src/devices/machine/z80sti.h +++ b/src/devices/machine/z80sti.h @@ -67,17 +67,17 @@ public: uint8_t read(offs_t offset); void write(offs_t offset, uint8_t data); - DECLARE_WRITE_LINE_MEMBER( i0_w ); - DECLARE_WRITE_LINE_MEMBER( i1_w ); - DECLARE_WRITE_LINE_MEMBER( i2_w ); - DECLARE_WRITE_LINE_MEMBER( i3_w ); - DECLARE_WRITE_LINE_MEMBER( i4_w ); - DECLARE_WRITE_LINE_MEMBER( i5_w ); - DECLARE_WRITE_LINE_MEMBER( i6_w ); - DECLARE_WRITE_LINE_MEMBER( i7_w ); - - DECLARE_WRITE_LINE_MEMBER( tc_w ); - DECLARE_WRITE_LINE_MEMBER( rc_w ); + void i0_w(int state); + void i1_w(int state); + void i2_w(int state); + void i3_w(int state); + void i4_w(int state); + void i5_w(int state); + void i6_w(int state); + void i7_w(int state); + + void tc_w(int state); + void rc_w(int state); private: enum diff --git a/src/devices/machine/z8536.h b/src/devices/machine/z8536.h index 382649a15f9..7f046ad3f49 100644 --- a/src/devices/machine/z8536.h +++ b/src/devices/machine/z8536.h @@ -77,28 +77,28 @@ public: auto pc_rd_cb() { return m_read_pc.bind(); } auto pc_wr_cb() { return m_write_pc.bind(); } - DECLARE_WRITE_LINE_MEMBER( pa0_w ) { external_port_w(PORT_A, 0, state); } - DECLARE_WRITE_LINE_MEMBER( pa1_w ) { external_port_w(PORT_A, 1, state); } - DECLARE_WRITE_LINE_MEMBER( pa2_w ) { external_port_w(PORT_A, 2, state); } - DECLARE_WRITE_LINE_MEMBER( pa3_w ) { external_port_w(PORT_A, 3, state); } - DECLARE_WRITE_LINE_MEMBER( pa4_w ) { external_port_w(PORT_A, 4, state); } - DECLARE_WRITE_LINE_MEMBER( pa5_w ) { external_port_w(PORT_A, 5, state); } - DECLARE_WRITE_LINE_MEMBER( pa6_w ) { external_port_w(PORT_A, 6, state); } - DECLARE_WRITE_LINE_MEMBER( pa7_w ) { external_port_w(PORT_A, 7, state); } - - DECLARE_WRITE_LINE_MEMBER( pb0_w ) { external_port_w(PORT_B, 0, state); } - DECLARE_WRITE_LINE_MEMBER( pb1_w ) { external_port_w(PORT_B, 1, state); } - DECLARE_WRITE_LINE_MEMBER( pb2_w ) { external_port_w(PORT_B, 2, state); } - DECLARE_WRITE_LINE_MEMBER( pb3_w ) { external_port_w(PORT_B, 3, state); } - DECLARE_WRITE_LINE_MEMBER( pb4_w ) { external_port_w(PORT_B, 4, state); } - DECLARE_WRITE_LINE_MEMBER( pb5_w ) { external_port_w(PORT_B, 5, state); } - DECLARE_WRITE_LINE_MEMBER( pb6_w ) { external_port_w(PORT_B, 6, state); } - DECLARE_WRITE_LINE_MEMBER( pb7_w ) { external_port_w(PORT_B, 7, state); } - - DECLARE_WRITE_LINE_MEMBER( pc0_w ) { external_port_w(PORT_C, 0, state); } - DECLARE_WRITE_LINE_MEMBER( pc1_w ) { external_port_w(PORT_C, 1, state); } - DECLARE_WRITE_LINE_MEMBER( pc2_w ) { external_port_w(PORT_C, 2, state); } - DECLARE_WRITE_LINE_MEMBER( pc3_w ) { external_port_w(PORT_C, 3, state); } + void pa0_w(int state) { external_port_w(PORT_A, 0, state); } + void pa1_w(int state) { external_port_w(PORT_A, 1, state); } + void pa2_w(int state) { external_port_w(PORT_A, 2, state); } + void pa3_w(int state) { external_port_w(PORT_A, 3, state); } + void pa4_w(int state) { external_port_w(PORT_A, 4, state); } + void pa5_w(int state) { external_port_w(PORT_A, 5, state); } + void pa6_w(int state) { external_port_w(PORT_A, 6, state); } + void pa7_w(int state) { external_port_w(PORT_A, 7, state); } + + void pb0_w(int state) { external_port_w(PORT_B, 0, state); } + void pb1_w(int state) { external_port_w(PORT_B, 1, state); } + void pb2_w(int state) { external_port_w(PORT_B, 2, state); } + void pb3_w(int state) { external_port_w(PORT_B, 3, state); } + void pb4_w(int state) { external_port_w(PORT_B, 4, state); } + void pb5_w(int state) { external_port_w(PORT_B, 5, state); } + void pb6_w(int state) { external_port_w(PORT_B, 6, state); } + void pb7_w(int state) { external_port_w(PORT_B, 7, state); } + + void pc0_w(int state) { external_port_w(PORT_C, 0, state); } + void pc1_w(int state) { external_port_w(PORT_C, 1, state); } + void pc2_w(int state) { external_port_w(PORT_C, 2, state); } + void pc3_w(int state) { external_port_w(PORT_C, 3, state); } int intack_r(); diff --git a/src/devices/sound/beep.cpp b/src/devices/sound/beep.cpp index 93a02243878..14fadcf6b7d 100644 --- a/src/devices/sound/beep.cpp +++ b/src/devices/sound/beep.cpp @@ -93,7 +93,7 @@ void beep_device::sound_stream_update(sound_stream &stream, std::vector const &inputs, std::vector &outputs) override; public: - DECLARE_WRITE_LINE_MEMBER(set_state); // enable/disable sound output - void set_clock(uint32_t frequency); // output frequency + void set_state(int state); // enable/disable sound output + void set_clock(uint32_t frequency); // output frequency private: - sound_stream *m_stream; /* stream number */ - int m_enable; /* enable beep */ - int m_frequency; /* set frequency - this can be changed using the appropriate function */ - int m_incr; /* initial wave state */ - stream_buffer::sample_t m_signal; /* current signal */ + sound_stream *m_stream; // stream number + int m_enable; // enable beep + int m_frequency; // set frequency - this can be changed using the appropriate function + int m_incr; // initial wave state + stream_buffer::sample_t m_signal; // current signal }; DECLARE_DEVICE_TYPE(BEEP, beep_device) diff --git a/src/devices/sound/bsmt2000.cpp b/src/devices/sound/bsmt2000.cpp index 30b078b6da6..d48452ca136 100644 --- a/src/devices/sound/bsmt2000.cpp +++ b/src/devices/sound/bsmt2000.cpp @@ -331,7 +331,7 @@ void bsmt2000_device::tms_right_w(uint16_t data) // on the TMS32015 //------------------------------------------------- -READ_LINE_MEMBER( bsmt2000_device::tms_write_pending_r ) +int bsmt2000_device::tms_write_pending_r() { return m_write_pending ? 1 : 0; } diff --git a/src/devices/sound/bsmt2000.h b/src/devices/sound/bsmt2000.h index 771ad8f3c64..333e6d90e7c 100644 --- a/src/devices/sound/bsmt2000.h +++ b/src/devices/sound/bsmt2000.h @@ -89,7 +89,7 @@ private: emu_timer * m_deferred_reg_write; emu_timer * m_deferred_data_write; - DECLARE_READ_LINE_MEMBER( tms_write_pending_r ); + int tms_write_pending_r(); }; diff --git a/src/devices/sound/dac.h b/src/devices/sound/dac.h index cf05a539cea..158cbaa6967 100644 --- a/src/devices/sound/dac.h +++ b/src/devices/sound/dac.h @@ -51,7 +51,7 @@ stream_buffer::sample_t dac_mapper_ones_complement(u32 input, u8 bits); class dac_bit_interface { public: - virtual DECLARE_WRITE_LINE_MEMBER(write) = 0; + virtual void write(int state) = 0; virtual void data_w(u8 data) = 0; }; @@ -134,7 +134,7 @@ protected: } public: - virtual WRITE_LINE_MEMBER(write) override { this->set_value(state); } + virtual void write(int state) override { this->set_value(state); } virtual void data_w(u8 data) override { this->set_value(data); } }; diff --git a/src/devices/sound/dac76.h b/src/devices/sound/dac76.h index 7f3cd1a52fd..0e8a91d1fe5 100644 --- a/src/devices/sound/dac76.h +++ b/src/devices/sound/dac76.h @@ -37,18 +37,18 @@ public: dac76_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); // chord - DECLARE_WRITE_LINE_MEMBER(b1_w) { m_chord &= ~(1 << 2); m_chord |= (state << 2); } - DECLARE_WRITE_LINE_MEMBER(b2_w) { m_chord &= ~(1 << 1); m_chord |= (state << 1); } - DECLARE_WRITE_LINE_MEMBER(b3_w) { m_chord &= ~(1 << 0); m_chord |= (state << 0); } + void b1_w(int state) { m_chord &= ~(1 << 2); m_chord |= (state << 2); } + void b2_w(int state) { m_chord &= ~(1 << 1); m_chord |= (state << 1); } + void b3_w(int state) { m_chord &= ~(1 << 0); m_chord |= (state << 0); } // step - DECLARE_WRITE_LINE_MEMBER(b4_w) { m_step &= ~(1 << 3); m_step |= (state << 3); } - DECLARE_WRITE_LINE_MEMBER(b5_w) { m_step &= ~(1 << 2); m_step |= (state << 2); } - DECLARE_WRITE_LINE_MEMBER(b6_w) { m_step &= ~(1 << 1); m_step |= (state << 1); } - DECLARE_WRITE_LINE_MEMBER(b7_w) { m_step &= ~(1 << 0); m_step |= (state << 0); } + void b4_w(int state) { m_step &= ~(1 << 3); m_step |= (state << 3); } + void b5_w(int state) { m_step &= ~(1 << 2); m_step |= (state << 2); } + void b6_w(int state) { m_step &= ~(1 << 1); m_step |= (state << 1); } + void b7_w(int state) { m_step &= ~(1 << 0); m_step |= (state << 0); } // sign bit - DECLARE_WRITE_LINE_MEMBER(sb_w) { m_sb = bool(state); } + void sb_w(int state) { m_sb = bool(state); } void update() { m_stream->update(); } diff --git a/src/devices/sound/dave.cpp b/src/devices/sound/dave.cpp index 44719ab4584..90cbf7620c7 100644 --- a/src/devices/sound/dave.cpp +++ b/src/devices/sound/dave.cpp @@ -276,7 +276,7 @@ void dave_device::sound_stream_update(sound_stream &stream, std::vector - DECLARE_WRITE_LINE_MEMBER(write_line) + void write_line(int state) { write(DiscreteInput, state ? 1 : 0); } diff --git a/src/devices/sound/hc55516.cpp b/src/devices/sound/hc55516.cpp index ab4497a4a93..e2e43b2e3bd 100644 --- a/src/devices/sound/hc55516.cpp +++ b/src/devices/sound/hc55516.cpp @@ -88,7 +88,7 @@ void cvsd_device_base::device_reset() //m_stream->set_sample_rate(clock()); }*/ -READ_LINE_MEMBER( cvsd_device_base::clock_r ) +int cvsd_device_base::clock_r() { // prevent debugger from changing the internal state if (!machine().side_effects_disabled()) @@ -96,12 +96,12 @@ READ_LINE_MEMBER( cvsd_device_base::clock_r ) return clock_state_r(); } -WRITE_LINE_MEMBER( cvsd_device_base::mclock_w ) +void cvsd_device_base::mclock_w(int state) { clock_w(state); } -WRITE_LINE_MEMBER( cvsd_device_base::digin_w ) +void cvsd_device_base::digin_w(int state) { digit_w(state); } @@ -112,12 +112,12 @@ WRITE_LINE_MEMBER( cvsd_device_base::digin_w ) assert(0); }*/ -WRITE_LINE_MEMBER( cvsd_device_base::dec_encq_w ) +void cvsd_device_base::dec_encq_w(int state) { assert(0); } -READ_LINE_MEMBER( cvsd_device_base::digout_r ) +int cvsd_device_base::digout_r() { return 0; } @@ -269,12 +269,12 @@ void hc55516_device::device_reset() // device specific functions -WRITE_LINE_MEMBER( hc55516_device::fzq_w ) +void hc55516_device::fzq_w(int state) { m_buffered_fzq = state; } -READ_LINE_MEMBER( hc55516_device::agc_r ) +int hc55516_device::agc_r() { // prevent debugger from changing the internal state if (!machine().side_effects_disabled()) diff --git a/src/devices/sound/hc55516.h b/src/devices/sound/hc55516.h index 8f06ba55a28..e90e7b350ec 100644 --- a/src/devices/sound/hc55516.h +++ b/src/devices/sound/hc55516.h @@ -31,23 +31,23 @@ public: // which is a very bad design pattern and will cause synchronization/missed clock transition issues. // This function WILL ASSERT if it is called and the clock hz is NOT specified! // TODO: remove all use of this, and remove it. - READ_LINE_MEMBER( clock_r ); + int clock_r(); // Clock push; this function WILL ASSERT if it is called and the clock hz IS specified! - WRITE_LINE_MEMBER( mclock_w ); + void mclock_w(int state); // Digital in push to the pin, as a pseudo 'buffer' implemented within the cvsd device itself. // This is not technically accurate to hardware, and in the future should be deprecated in favor of // digin_cb once the latter is implemented. - WRITE_LINE_MEMBER( digin_w ); + void digin_w(int state); // DEC/ENC decode/encode select push. This is not implemented yet, and relies on an input audio stream. // TODO: implement this beyond a do-nothing stub - WRITE_LINE_MEMBER( dec_encq_w ); + void dec_encq_w(int state); // Digital out pull. TODO: this is not hooked up or implemented yet, although it is only really // relevant for devices which use the CVSD chips in encode mode. - READ_LINE_MEMBER( digout_r ); + int digout_r(); // Audio In pin, an analog value of the audio waveform being pushed to the chip. // TODO: this is not hooked up or implemented yet, and this should really be handled as an @@ -116,11 +116,11 @@ public: // AGC callback function, called to push the state if the AGC pin changes, ok to leave unconnected auto agc_cb() { return m_agc_push_cb.bind(); } - WRITE_LINE_MEMBER( fzq_w ); // /FZ (partial reset) push - READ_LINE_MEMBER( agc_r ); // AGC pull + void fzq_w(int state); // /FZ (partial reset) push + int agc_r(); // AGC pull // TODO: These are only relevant for encode mode, which isn't done yet! - //WRITE_LINE_MEMBER( aptq_w ); // /APT (silence encoder output) push - //WRITE_LINE_MEMBER( dec_encq_w ); // DEC/ENC decode/encode select push + //void aptq_w(int state); // /APT (silence encoder output) push + //void dec_encq_w(int state); // DEC/ENC decode/encode select push protected: // overridable type for subclass diff --git a/src/devices/sound/l7a1045_l6028_dsp_a.cpp b/src/devices/sound/l7a1045_l6028_dsp_a.cpp index e2e7287ed93..aeb87e47968 100644 --- a/src/devices/sound/l7a1045_l6028_dsp_a.cpp +++ b/src/devices/sound/l7a1045_l6028_dsp_a.cpp @@ -393,7 +393,7 @@ void l7a1045_sound_device::sound_status_w(uint16_t data) } // TODO: stub functions not really used -WRITE_LINE_MEMBER(l7a1045_sound_device::dma_hreq_cb) +void l7a1045_sound_device::dma_hreq_cb(int state) { // m_maincpu->hack_w(1); } diff --git a/src/devices/sound/l7a1045_l6028_dsp_a.h b/src/devices/sound/l7a1045_l6028_dsp_a.h index b1726ea366d..58877c0836c 100644 --- a/src/devices/sound/l7a1045_l6028_dsp_a.h +++ b/src/devices/sound/l7a1045_l6028_dsp_a.h @@ -26,7 +26,7 @@ public: void dma_w_cb(offs_t offset, uint8_t data); uint16_t dma_r16_cb() { m_voice[0].pos++; return 0; } void dma_w16_cb(uint16_t data) { m_voice[0].pos++; } - DECLARE_WRITE_LINE_MEMBER(dma_hreq_cb); + void dma_hreq_cb(int state); protected: // device-level overrides diff --git a/src/devices/sound/lc7535.cpp b/src/devices/sound/lc7535.cpp index 0f05bb14456..70afb5372d3 100644 --- a/src/devices/sound/lc7535.cpp +++ b/src/devices/sound/lc7535.cpp @@ -89,17 +89,17 @@ float lc7535_device::normalize(int attenuation) // INTERFACE //************************************************************************** -WRITE_LINE_MEMBER( lc7535_device::ce_w ) +void lc7535_device::ce_w(int state) { m_ce = state; } -WRITE_LINE_MEMBER( lc7535_device::di_w ) +void lc7535_device::di_w(int state) { m_di = state; } -WRITE_LINE_MEMBER( lc7535_device::clk_w ) +void lc7535_device::clk_w(int state) { if (m_clk == 0 && state == 1) { diff --git a/src/devices/sound/lc7535.h b/src/devices/sound/lc7535.h index 4fcf649abd9..cf496188651 100644 --- a/src/devices/sound/lc7535.h +++ b/src/devices/sound/lc7535.h @@ -45,9 +45,9 @@ public: template void set_volume_callback(T &&... args) { m_volume_cb.set(std::forward(args)...); } // serial interface - DECLARE_WRITE_LINE_MEMBER( ce_w ); - DECLARE_WRITE_LINE_MEMBER( di_w ); - DECLARE_WRITE_LINE_MEMBER( clk_w ); + void ce_w(int state); + void di_w(int state); + void clk_w(int state); float normalize(int attenuation); diff --git a/src/devices/sound/lc82310.cpp b/src/devices/sound/lc82310.cpp index 0693930e23c..3404a5c9629 100644 --- a/src/devices/sound/lc82310.cpp +++ b/src/devices/sound/lc82310.cpp @@ -72,12 +72,12 @@ void lc82310_device::reset_playback() m_frame_channels = 2; } -WRITE_LINE_MEMBER(lc82310_device::zcsctl_w) +void lc82310_device::zcsctl_w(int state) { m_csctl = state; } -WRITE_LINE_MEMBER(lc82310_device::ckctl_w) +void lc82310_device::ckctl_w(int state) { if (m_csctl == 0 && m_ckctl == 0 && state == 1) { @@ -115,17 +115,17 @@ WRITE_LINE_MEMBER(lc82310_device::ckctl_w) m_ckctl = state; } -WRITE_LINE_MEMBER(lc82310_device::dictl_w) +void lc82310_device::dictl_w(int state) { m_dictl = state; } -READ_LINE_MEMBER(lc82310_device::doctl_r) +int lc82310_device::doctl_r() { return m_doctl; } -READ_LINE_MEMBER(lc82310_device::demand_r) +int lc82310_device::demand_r() { return m_mp3data_count < mp3data.size(); } diff --git a/src/devices/sound/lc82310.h b/src/devices/sound/lc82310.h index c4305c45542..559972b564e 100644 --- a/src/devices/sound/lc82310.h +++ b/src/devices/sound/lc82310.h @@ -19,11 +19,11 @@ class lc82310_device : public device_t, public: lc82310_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = 0); - DECLARE_WRITE_LINE_MEMBER(zcsctl_w); - DECLARE_WRITE_LINE_MEMBER(ckctl_w); - DECLARE_WRITE_LINE_MEMBER(dictl_w); - DECLARE_READ_LINE_MEMBER(doctl_r); - DECLARE_READ_LINE_MEMBER(demand_r); + void zcsctl_w(int state); + void ckctl_w(int state); + void dictl_w(int state); + int doctl_r(); + int demand_r(); void dimpg_w(uint8_t data); diff --git a/src/devices/sound/lmc1992.cpp b/src/devices/sound/lmc1992.cpp index c3f2d6d3bf4..feaa0810226 100644 --- a/src/devices/sound/lmc1992.cpp +++ b/src/devices/sound/lmc1992.cpp @@ -185,7 +185,7 @@ void lmc1992_device::sound_stream_update(sound_stream &stream, std::vectorupdate(); @@ -1172,7 +1172,7 @@ READ_LINE_MEMBER( sp0256_device::lrq_r ) return m_lrq == 0x8000; } -READ_LINE_MEMBER( sp0256_device::sby_r ) +int sp0256_device::sby_r() { // TODO: force stream update?? diff --git a/src/devices/sound/sp0256.h b/src/devices/sound/sp0256.h index ae3c6fa501f..c6e1bd225c0 100644 --- a/src/devices/sound/sp0256.h +++ b/src/devices/sound/sp0256.h @@ -46,8 +46,8 @@ public: auto standby_callback() { return m_sby_cb.bind(); } void ald_w(uint8_t data); - DECLARE_READ_LINE_MEMBER(lrq_r); - DECLARE_READ_LINE_MEMBER(sby_r); + int lrq_r(); + int sby_r(); uint16_t spb640_r(offs_t offset); void spb640_w(offs_t offset, uint16_t data); diff --git a/src/devices/sound/t6721a.cpp b/src/devices/sound/t6721a.cpp index 2c29e31dc62..e011796cb9a 100644 --- a/src/devices/sound/t6721a.cpp +++ b/src/devices/sound/t6721a.cpp @@ -94,7 +94,7 @@ void t6721a_device::write(uint8_t data) // di_w - data input write //------------------------------------------------- -WRITE_LINE_MEMBER( t6721a_device::di_w ) +void t6721a_device::di_w(int state) { } @@ -103,7 +103,7 @@ WRITE_LINE_MEMBER( t6721a_device::di_w ) // eos_r - eos read //------------------------------------------------- -READ_LINE_MEMBER( t6721a_device::eos_r ) +int t6721a_device::eos_r() { return 1; } diff --git a/src/devices/sound/t6721a.h b/src/devices/sound/t6721a.h index 52a76393894..52f845f81fb 100644 --- a/src/devices/sound/t6721a.h +++ b/src/devices/sound/t6721a.h @@ -56,9 +56,9 @@ public: uint8_t read(); void write(uint8_t data); - DECLARE_WRITE_LINE_MEMBER( di_w ); + void di_w(int state); - DECLARE_READ_LINE_MEMBER( eos_r ); + int eos_r(); protected: // device-level overrides diff --git a/src/devices/sound/tms5220.cpp b/src/devices/sound/tms5220.cpp index 9e2f3c6b278..9e2fcf8fc7d 100644 --- a/src/devices/sound/tms5220.cpp +++ b/src/devices/sound/tms5220.cpp @@ -1775,7 +1775,7 @@ TIMER_CALLBACK_MEMBER(tms5220_device::set_io_ready) /* * /RS line write handler */ -WRITE_LINE_MEMBER( tms5220_device::rsq_w ) +void tms5220_device::rsq_w(int state) { m_true_timing = true; state &= 0x01; @@ -1822,7 +1822,7 @@ WRITE_LINE_MEMBER( tms5220_device::rsq_w ) /* * /WS line write handler */ -WRITE_LINE_MEMBER( tms5220_device::wsq_w ) +void tms5220_device::wsq_w(int state) { m_true_timing = true; state &= 0x01; @@ -2009,7 +2009,7 @@ uint8_t tms5220_device::status_r() ***********************************************************************************************/ -READ_LINE_MEMBER( tms5220_device::readyq_r ) +int tms5220_device::readyq_r() { // prevent debugger from changing the internal state if (!machine().side_effects_disabled()) @@ -2025,7 +2025,7 @@ READ_LINE_MEMBER( tms5220_device::readyq_r ) ***********************************************************************************************/ -READ_LINE_MEMBER( tms5220_device::intq_r ) +int tms5220_device::intq_r() { // prevent debugger from changing the internal state if (!machine().side_effects_disabled()) diff --git a/src/devices/sound/tms5220.h b/src/devices/sound/tms5220.h index 82a589c486d..061df7b0266 100644 --- a/src/devices/sound/tms5220.h +++ b/src/devices/sound/tms5220.h @@ -45,8 +45,8 @@ public: // all lines with suffix q are active low! - WRITE_LINE_MEMBER( rsq_w ); - WRITE_LINE_MEMBER( wsq_w ); + void rsq_w(int state); + void wsq_w(int state); void combined_rsq_wsq_w(u8 data); /* this combined_rsq_wsq_w hack is necessary for specific systems such as @@ -61,8 +61,8 @@ public: void data_w(uint8_t data); uint8_t status_r(); - READ_LINE_MEMBER( readyq_r ); - READ_LINE_MEMBER( intq_r ); + int readyq_r(); + int intq_r(); protected: tms5220_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock, int variant); diff --git a/src/devices/sound/upd7759.cpp b/src/devices/sound/upd7759.cpp index 426b1cdecd0..b108f6c3ebb 100644 --- a/src/devices/sound/upd7759.cpp +++ b/src/devices/sound/upd7759.cpp @@ -592,7 +592,7 @@ TIMER_CALLBACK_MEMBER(upd7759_device::drq_update) *************************************************************/ -WRITE_LINE_MEMBER( upd775x_device::reset_w ) +void upd775x_device::reset_w(int state) { machine().scheduler().synchronize(timer_expired_delegate(FUNC(upd775x_device::internal_reset_w), this), state); } @@ -609,7 +609,7 @@ TIMER_CALLBACK_MEMBER(upd775x_device::internal_reset_w) } -WRITE_LINE_MEMBER( upd775x_device::start_w ) +void upd775x_device::start_w(int state) { machine().scheduler().synchronize(timer_expired_delegate(FUNC(upd775x_device::internal_start_w), this), state); } @@ -643,7 +643,7 @@ TIMER_CALLBACK_MEMBER(upd775x_device::internal_port_w) } -WRITE_LINE_MEMBER(upd7759_device::md_w) +void upd7759_device::md_w(int state) { machine().scheduler().synchronize(timer_expired_delegate(FUNC(upd7759_device::internal_md_w), this), state); } @@ -673,7 +673,7 @@ TIMER_CALLBACK_MEMBER(upd7759_device::internal_md_w) } -READ_LINE_MEMBER( upd775x_device::busy_r ) +int upd775x_device::busy_r() { m_channel->update(); diff --git a/src/devices/sound/upd7759.h b/src/devices/sound/upd7759.h index af6035ae4ac..a1e42a49283 100644 --- a/src/devices/sound/upd7759.h +++ b/src/devices/sound/upd7759.h @@ -20,9 +20,9 @@ class upd775x_device : public device_t, public: enum : u32 { STANDARD_CLOCK = 640'000 }; - DECLARE_WRITE_LINE_MEMBER( reset_w ); - DECLARE_WRITE_LINE_MEMBER( start_w ); - DECLARE_READ_LINE_MEMBER( busy_r ); + void reset_w(int state); + void start_w(int state); + int busy_r(); virtual void port_w(u8 data); void set_start_delay(uint32_t data) { m_start_delay = data; } @@ -129,7 +129,7 @@ public: upd7759_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = STANDARD_CLOCK); - DECLARE_WRITE_LINE_MEMBER( md_w ); + void md_w(int state); protected: upd7759_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); diff --git a/src/devices/sound/vlm5030.cpp b/src/devices/sound/vlm5030.cpp index 15f302f307e..f2fb4c7864e 100644 --- a/src/devices/sound/vlm5030.cpp +++ b/src/devices/sound/vlm5030.cpp @@ -390,7 +390,7 @@ void vlm5030_device::restore_state() } /* get BSY pin level */ -READ_LINE_MEMBER( vlm5030_device::bsy ) +int vlm5030_device::bsy() { update(); return m_pin_BSY; @@ -403,7 +403,7 @@ void vlm5030_device::data_w(uint8_t data) } /* set RST pin level : reset / set table address A8-A15 */ -WRITE_LINE_MEMBER( vlm5030_device::rst ) +void vlm5030_device::rst(int state) { if( m_pin_RST ) { @@ -427,14 +427,14 @@ WRITE_LINE_MEMBER( vlm5030_device::rst ) } /* set VCU pin level : ?? unknown */ -WRITE_LINE_MEMBER( vlm5030_device::vcu ) +void vlm5030_device::vcu(int state) { /* direct mode / indirect mode */ m_pin_VCU = state; } /* set ST pin level : set table address A0-A7 / start speech */ -WRITE_LINE_MEMBER( vlm5030_device::st ) +void vlm5030_device::st(int state) { int table; diff --git a/src/devices/sound/vlm5030.h b/src/devices/sound/vlm5030.h index 1eddcdc45bf..74709145259 100644 --- a/src/devices/sound/vlm5030.h +++ b/src/devices/sound/vlm5030.h @@ -13,19 +13,19 @@ public: vlm5030_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); /* get BSY pin level */ - DECLARE_READ_LINE_MEMBER( bsy ); + int bsy(); /* latch contoll data */ void data_w(uint8_t data); /* set RST pin level : reset / set table address A8-A15 */ - DECLARE_WRITE_LINE_MEMBER( rst ); + void rst(int state); /* set VCU pin level : ?? unknown */ - DECLARE_WRITE_LINE_MEMBER( vcu ); + void vcu(int state); /* set ST pin level : set table address A0-A7 / start speech */ - DECLARE_WRITE_LINE_MEMBER( st ); + void st(int state); protected: // device-level overrides diff --git a/src/devices/sound/votrax.h b/src/devices/sound/votrax.h index 0ae30f3baed..2efc668a7eb 100644 --- a/src/devices/sound/votrax.h +++ b/src/devices/sound/votrax.h @@ -26,7 +26,7 @@ public: void write(uint8_t data); void inflection_w(uint8_t data); - DECLARE_READ_LINE_MEMBER(request) { m_stream->update(); return m_ar_state; } + int request() { m_stream->update(); return m_ar_state; } protected: // overridable type for subclass diff --git a/src/devices/sound/ymopm.cpp b/src/devices/sound/ymopm.cpp index a75da72b449..0e401287304 100644 --- a/src/devices/sound/ymopm.cpp +++ b/src/devices/sound/ymopm.cpp @@ -52,7 +52,7 @@ void ym2151_device::data_w(u8 data) // reset_w - reset line, active LOW //------------------------------------------------- -WRITE_LINE_MEMBER(ym2151_device::reset_w) +void ym2151_device::reset_w(int state) { if (state != m_reset_state) { diff --git a/src/devices/sound/ymopm.h b/src/devices/sound/ymopm.h index ce4a7c87f51..da4c46afa98 100644 --- a/src/devices/sound/ymopm.h +++ b/src/devices/sound/ymopm.h @@ -31,7 +31,7 @@ public: virtual void data_w(u8 data) override; // reset line, active LOW - DECLARE_WRITE_LINE_MEMBER(reset_w); + void reset_w(int state); protected: // internal state diff --git a/src/devices/video/avgdvg.cpp b/src/devices/video/avgdvg.cpp index ba3ddff0d11..7290ccb996b 100644 --- a/src/devices/video/avgdvg.cpp +++ b/src/devices/video/avgdvg.cpp @@ -1245,7 +1245,7 @@ TIMER_CALLBACK_MEMBER(avgdvg_device_base::run_state_machine) * ************************************/ -READ_LINE_MEMBER(avgdvg_device_base::done_r) +int avgdvg_device_base::done_r() { return m_sync_halt ? 1 : 0; } diff --git a/src/devices/video/avgdvg.h b/src/devices/video/avgdvg.h index e77dff1e9a2..b0c11ae68ce 100644 --- a/src/devices/video/avgdvg.h +++ b/src/devices/video/avgdvg.h @@ -22,7 +22,7 @@ public: m_membase = base; } - DECLARE_READ_LINE_MEMBER(done_r); + int done_r(); void go_w(u8 data = 0); void reset_w(u8 data = 0); diff --git a/src/devices/video/catseye.cpp b/src/devices/video/catseye.cpp index 46eeb917f37..ee11dbdecea 100644 --- a/src/devices/video/catseye.cpp +++ b/src/devices/video/catseye.cpp @@ -1259,7 +1259,7 @@ uint16_t catseye_device::ctrl_r(address_space &space, offs_t offset, uint16_t me return ret; } -WRITE_LINE_MEMBER(catseye_device::vblank_w) +void catseye_device::vblank_w(int state) { m_in_vblank = state ? m_plane_mask_h : 0; if (state && m_vblank_int_enable) diff --git a/src/devices/video/catseye.h b/src/devices/video/catseye.h index 8c66eb257c7..75dfb0af58a 100644 --- a/src/devices/video/catseye.h +++ b/src/devices/video/catseye.h @@ -16,7 +16,7 @@ public: void vram_w(offs_t offset, u16 data, u16 mem_mask = ~0); uint16_t ctrl_r(address_space &space, offs_t offset, uint16_t mem_mask = ~0); void ctrl_w(offs_t offset, u16 data, u16 mem_mask = ~0); - DECLARE_WRITE_LINE_MEMBER(vblank_w); + void vblank_w(int state); void set_fb_width(int width) { m_fb_width = width; } void set_fb_height(int height) { m_fb_height = height; } diff --git a/src/devices/video/dl1416.cpp b/src/devices/video/dl1416.cpp index 4321192e981..09111840fe2 100644 --- a/src/devices/video/dl1416.cpp +++ b/src/devices/video/dl1416.cpp @@ -271,7 +271,7 @@ void dl1414_device::device_reset() IMPLEMENTATION *****************************************************************************/ -WRITE_LINE_MEMBER( dl1414_device::wr_w ) +void dl1414_device::wr_w(int state) { if (bool(state) != m_wr_in) { @@ -281,7 +281,7 @@ WRITE_LINE_MEMBER( dl1414_device::wr_w ) } } -WRITE_LINE_MEMBER( dl1416_device::wr_w ) +void dl1416_device::wr_w(int state) { if (bool(state) != m_wr_in) { @@ -299,12 +299,12 @@ WRITE_LINE_MEMBER( dl1416_device::wr_w ) } } -WRITE_LINE_MEMBER( dl1416_device::ce_w ) +void dl1416_device::ce_w(int state) { m_ce_in = bool(state); } -WRITE_LINE_MEMBER( dl1416_device::cu_w ) +void dl1416_device::cu_w(int state) { m_cu_in = bool(state); } diff --git a/src/devices/video/dl1416.h b/src/devices/video/dl1416.h index ce1d61071f4..a0543f11565 100644 --- a/src/devices/video/dl1416.h +++ b/src/devices/video/dl1416.h @@ -36,7 +36,7 @@ public: auto update() { return m_update_cb.bind(); } // signal-level interface - virtual DECLARE_WRITE_LINE_MEMBER(wr_w); // write strobe (rising edge) + virtual void wr_w(int state); // write strobe (rising edge) void addr_w(u8 state); void data_w(u8 state); @@ -74,9 +74,9 @@ private: class dl1416_device : public dl1414_device { public: - virtual DECLARE_WRITE_LINE_MEMBER(wr_w) override; - DECLARE_WRITE_LINE_MEMBER(ce_w); // chip enable (active low) - DECLARE_WRITE_LINE_MEMBER(cu_w); // cursor enable (active low) + virtual void wr_w(int state) override; + void ce_w(int state); // chip enable (active low) + void cu_w(int state); // cursor enable (active low) protected: dl1416_device( diff --git a/src/devices/video/dm9368.h b/src/devices/video/dm9368.h index fb376541a07..3b1157c89d1 100644 --- a/src/devices/video/dm9368.h +++ b/src/devices/video/dm9368.h @@ -40,8 +40,8 @@ public: void a_w(u8 data); - DECLARE_WRITE_LINE_MEMBER( rbi_w ) { m_rbi = state; } - DECLARE_READ_LINE_MEMBER( rbo_r ) { return m_rbo; } + void rbi_w(int state) { m_rbi = state; } + int rbo_r() { return m_rbo; } protected: // device-level overrides diff --git a/src/devices/video/dp8350.cpp b/src/devices/video/dp8350.cpp index e93960b5662..4cfd886a822 100644 --- a/src/devices/video/dp8350.cpp +++ b/src/devices/video/dp8350.cpp @@ -329,7 +329,7 @@ void dp835x_device::reconfigure_screen() // field refresh rates (f1 = 60 Hz, f0 = 50 Hz) //------------------------------------------------- -WRITE_LINE_MEMBER(dp835x_device::refresh_control) +void dp835x_device::refresh_control(int state) { if (m_60hz_refresh != bool(state)) { @@ -349,7 +349,7 @@ WRITE_LINE_MEMBER(dp835x_device::refresh_control) // loaded on scan line 0 //------------------------------------------------- -WRITE_LINE_MEMBER(dp835x_device::character_generator_program) +void dp835x_device::character_generator_program(int state) { m_cgpi = bool(state); } @@ -404,7 +404,7 @@ void dp835x_device::register_load(u8 rs, u16 addr) // lrc_r - poll line rate clock state //------------------------------------------------- -READ_LINE_MEMBER(dp835x_device::lrc_r) +int dp835x_device::lrc_r() { if (m_hblank_start_timer->remaining() > m_hblank_near_end_timer->remaining()) return 0; @@ -418,7 +418,7 @@ READ_LINE_MEMBER(dp835x_device::lrc_r) // state //------------------------------------------------- -READ_LINE_MEMBER(dp835x_device::lbre_r) +int dp835x_device::lbre_r() { if (m_lc == (m_cgpi ? 0 : m_char_height - 1)) return 0; @@ -432,7 +432,7 @@ READ_LINE_MEMBER(dp835x_device::lbre_r) // hsync_r - poll horizontal sync state //------------------------------------------------- -READ_LINE_MEMBER(dp835x_device::hsync_r) +int dp835x_device::hsync_r() { if (m_hsync_on_timer->remaining() > m_hsync_off_timer->remaining()) return m_hsync_active; @@ -445,7 +445,7 @@ READ_LINE_MEMBER(dp835x_device::hsync_r) // vsync_r - poll vertical sync state //------------------------------------------------- -READ_LINE_MEMBER(dp835x_device::vsync_r) +int dp835x_device::vsync_r() { int vsync_begin = m_video_scan_lines + m_vsync_delay[m_60hz_refresh ? 1 : 0]; int vsync_end = vsync_begin + m_vsync_width[m_60hz_refresh ? 1 : 0]; @@ -457,7 +457,7 @@ READ_LINE_MEMBER(dp835x_device::vsync_r) // vblank_r - poll vertical blanking state //------------------------------------------------- -READ_LINE_MEMBER(dp835x_device::vblank_r) +int dp835x_device::vblank_r() { int vblank_end = m_video_scan_lines + m_vblank_interval[m_60hz_refresh ? 1 : 0] - m_vblank_stop; return (m_line >= m_video_scan_lines && m_line < vblank_end) ? m_vblank_active : !m_vblank_active; diff --git a/src/devices/video/dp8350.h b/src/devices/video/dp8350.h index 3a5c16bbf6a..c1707ba3a44 100644 --- a/src/devices/video/dp8350.h +++ b/src/devices/video/dp8350.h @@ -54,17 +54,17 @@ public: void set_half_shift(bool half_shift) { m_half_shift = half_shift; } // write handlers - DECLARE_WRITE_LINE_MEMBER(refresh_control); - DECLARE_WRITE_LINE_MEMBER(character_generator_program); + void refresh_control(int state); + void character_generator_program(int state); void register_load(u8 rs, u16 addr); // read handlers - DECLARE_READ_LINE_MEMBER(lrc_r); + int lrc_r(); u8 lc_r() { return m_lc; } - DECLARE_READ_LINE_MEMBER(lbre_r); - DECLARE_READ_LINE_MEMBER(hsync_r); - DECLARE_READ_LINE_MEMBER(vsync_r); - DECLARE_READ_LINE_MEMBER(vblank_r); + int lbre_r(); + int hsync_r(); + int vsync_r(); + int vblank_r(); // address getters (TODO: accurate character-by-character emulation) u16 top_of_page() const { return m_topr; } diff --git a/src/devices/video/dp8510.h b/src/devices/video/dp8510.h index 04a0c2b1676..0f1247599a1 100644 --- a/src/devices/video/dp8510.h +++ b/src/devices/video/dp8510.h @@ -14,12 +14,12 @@ public: static const char *const BITBLT_OP[]; static const int FIFO_SIZE = 16; - DECLARE_WRITE_LINE_MEMBER(line_drawing) { m_line_drawing = state; } - DECLARE_WRITE_LINE_MEMBER(barrel_input_select) { m_barrel_input_select = state; } - DECLARE_WRITE_LINE_MEMBER(pixel_data_input) { m_pixel_data_input = state; } - DECLARE_WRITE_LINE_MEMBER(data_output_select) { m_data_output_select = state; } - DECLARE_WRITE_LINE_MEMBER(left_mask_enable) { m_left_mask = state; } - DECLARE_WRITE_LINE_MEMBER(right_mask_enable) { m_right_mask = state; } + void line_drawing(int state) { m_line_drawing = state; } + void barrel_input_select(int state) { m_barrel_input_select = state; } + void pixel_data_input(int state) { m_pixel_data_input = state; } + void data_output_select(int state) { m_data_output_select = state; } + void left_mask_enable(int state) { m_left_mask = state; } + void right_mask_enable(int state) { m_right_mask = state; } enum control_mask : u16 { diff --git a/src/devices/video/hd44780.cpp b/src/devices/video/hd44780.cpp index 2852326a94f..813403977f2 100644 --- a/src/devices/video/hd44780.cpp +++ b/src/devices/video/hd44780.cpp @@ -427,17 +427,17 @@ void hd44780_device::db_w(u8 data) m_db_input = data; } -WRITE_LINE_MEMBER(hd44780_device::rs_w) +void hd44780_device::rs_w(int state) { m_rs_input = state; } -WRITE_LINE_MEMBER(hd44780_device::rw_w) +void hd44780_device::rw_w(int state) { m_rw_input = state; } -WRITE_LINE_MEMBER(hd44780_device::e_w) +void hd44780_device::e_w(int state) { if (m_data_len == 4 && state && !m_enabled && !machine().side_effects_disabled()) update_nibble(m_rs_input, m_rw_input); diff --git a/src/devices/video/hd44780.h b/src/devices/video/hd44780.h index f5f8d86121b..6914e5b624e 100644 --- a/src/devices/video/hd44780.h +++ b/src/devices/video/hd44780.h @@ -45,9 +45,9 @@ public: u8 db_r(); void db_w(u8 data); - DECLARE_WRITE_LINE_MEMBER(rs_w); - DECLARE_WRITE_LINE_MEMBER(rw_w); - DECLARE_WRITE_LINE_MEMBER(e_w); + void rs_w(int state); + void rw_w(int state); + void e_w(int state); const u8 *render(); virtual uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); diff --git a/src/devices/video/hlcd0488.cpp b/src/devices/video/hlcd0488.cpp index 7c5d7eb4c99..0c0189ccdcd 100644 --- a/src/devices/video/hlcd0488.cpp +++ b/src/devices/video/hlcd0488.cpp @@ -92,13 +92,13 @@ TIMER_CALLBACK_MEMBER(hlcd0488_device::sync_update) m_data_clk_prev = m_data_clk; } -WRITE_LINE_MEMBER(hlcd0488_device::latch_pulse_w) +void hlcd0488_device::latch_pulse_w(int state) { m_latch_pulse = state ? 1 : 0; m_sync_timer->adjust(attotime::zero); } -WRITE_LINE_MEMBER(hlcd0488_device::data_clk_w) +void hlcd0488_device::data_clk_w(int state) { m_data_clk = state ? 1 : 0; m_sync_timer->adjust(attotime::zero); diff --git a/src/devices/video/hlcd0488.h b/src/devices/video/hlcd0488.h index c2302fbc88b..4814d09f7e2 100644 --- a/src/devices/video/hlcd0488.h +++ b/src/devices/video/hlcd0488.h @@ -47,8 +47,8 @@ public: // configuration helpers auto write_cols() { return m_write_cols.bind(); } // COL pins in data, ROW pins in offset - DECLARE_WRITE_LINE_MEMBER(latch_pulse_w); - DECLARE_WRITE_LINE_MEMBER(data_clk_w); + void latch_pulse_w(int state); + void data_clk_w(int state); void data_w(u8 data); protected: diff --git a/src/devices/video/hlcd0515.cpp b/src/devices/video/hlcd0515.cpp index 7af99f99657..edccd8b147e 100644 --- a/src/devices/video/hlcd0515.cpp +++ b/src/devices/video/hlcd0515.cpp @@ -168,7 +168,7 @@ void hlcd0515_device::clock_data(int col) } -WRITE_LINE_MEMBER(hlcd0515_device::clock_w) +void hlcd0515_device::clock_w(int state) { state = (state) ? 1 : 0; @@ -194,7 +194,7 @@ WRITE_LINE_MEMBER(hlcd0515_device::clock_w) } -WRITE_LINE_MEMBER(hlcd0515_device::cs_w) +void hlcd0515_device::cs_w(int state) { state = (state) ? 1 : 0; diff --git a/src/devices/video/hlcd0515.h b/src/devices/video/hlcd0515.h index c6ef5e118bf..1e23f78a530 100644 --- a/src/devices/video/hlcd0515.h +++ b/src/devices/video/hlcd0515.h @@ -50,10 +50,10 @@ public: auto write_cols() { return m_write_cols.bind(); } // COL/ROW pins (offset for ROW) auto write_data() { return m_write_data.bind(); } // DATA OUT pin - DECLARE_WRITE_LINE_MEMBER(clock_w); - DECLARE_WRITE_LINE_MEMBER(cs_w); - DECLARE_WRITE_LINE_MEMBER(data_w) { m_data = (state) ? 1 : 0; } - DECLARE_READ_LINE_MEMBER(data_r) { return m_dataout; } + void clock_w(int state); + void cs_w(int state); + void data_w(int state) { m_data = (state) ? 1 : 0; } + int data_r() { return m_dataout; } protected: hlcd0515_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock, u8 colmax); diff --git a/src/devices/video/hlcd0538.cpp b/src/devices/video/hlcd0538.cpp index 314644bcfd4..f36f479d76f 100644 --- a/src/devices/video/hlcd0538.cpp +++ b/src/devices/video/hlcd0538.cpp @@ -78,7 +78,7 @@ TIMER_CALLBACK_MEMBER(hlcd0538_device::toggle_lcd) lcd_w(!m_lcd); } -WRITE_LINE_MEMBER(hlcd0538_device::clk_w) +void hlcd0538_device::clk_w(int state) { state = (state) ? 1 : 0; @@ -89,7 +89,7 @@ WRITE_LINE_MEMBER(hlcd0538_device::clk_w) m_clk = state; } -WRITE_LINE_MEMBER(hlcd0538_device::lcd_w) +void hlcd0538_device::lcd_w(int state) { state = (state) ? 1 : 0; diff --git a/src/devices/video/hlcd0538.h b/src/devices/video/hlcd0538.h index add8e0e3028..010991dcf58 100644 --- a/src/devices/video/hlcd0538.h +++ b/src/devices/video/hlcd0538.h @@ -49,9 +49,9 @@ public: auto write_cols() { return m_write_cols.bind(); } // C/R pins (0538: d0-d7 for rows) auto write_interrupt() { return m_write_interrupt.bind(); } // INTERRUPT pin - DECLARE_WRITE_LINE_MEMBER(clk_w); - DECLARE_WRITE_LINE_MEMBER(lcd_w); - DECLARE_WRITE_LINE_MEMBER(data_w) { m_data = (state) ? 1 : 0; } + void clk_w(int state); + void lcd_w(int state); + void data_w(int state) { m_data = (state) ? 1 : 0; } protected: hlcd0538_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock); diff --git a/src/devices/video/huc6202.cpp b/src/devices/video/huc6202.cpp index 42ffaafef14..b6e8fc442dd 100644 --- a/src/devices/video/huc6202.cpp +++ b/src/devices/video/huc6202.cpp @@ -161,14 +161,14 @@ u16 huc6202_device::time_until_next_event() } -WRITE_LINE_MEMBER( huc6202_device::vsync_changed ) +void huc6202_device::vsync_changed(int state) { m_vsync_changed_0_cb( state ); m_vsync_changed_1_cb( state ); } -WRITE_LINE_MEMBER( huc6202_device::hsync_changed ) +void huc6202_device::hsync_changed(int state) { m_hsync_changed_0_cb( state ); m_hsync_changed_1_cb( state ); diff --git a/src/devices/video/huc6202.h b/src/devices/video/huc6202.h index 5ef636626b0..40e4d089c2d 100644 --- a/src/devices/video/huc6202.h +++ b/src/devices/video/huc6202.h @@ -37,8 +37,8 @@ public: void io_write(offs_t offset, u8 data); u16 next_pixel(); u16 time_until_next_event(); - DECLARE_WRITE_LINE_MEMBER( vsync_changed ); - DECLARE_WRITE_LINE_MEMBER( hsync_changed ); + void vsync_changed(int state); + void hsync_changed(int state); protected: // device-level overrides diff --git a/src/devices/video/huc6270.cpp b/src/devices/video/huc6270.cpp index a0543307402..3e993bde8c6 100644 --- a/src/devices/video/huc6270.cpp +++ b/src/devices/video/huc6270.cpp @@ -484,7 +484,7 @@ u16 huc6270_device::next_pixel() //} -WRITE_LINE_MEMBER( huc6270_device::vsync_changed ) +void huc6270_device::vsync_changed(int state) { state &= 0x01; if ( m_vsync != state ) @@ -510,7 +510,7 @@ WRITE_LINE_MEMBER( huc6270_device::vsync_changed ) } -WRITE_LINE_MEMBER( huc6270_device::hsync_changed ) +void huc6270_device::hsync_changed(int state) { state &= 0x01; diff --git a/src/devices/video/huc6270.h b/src/devices/video/huc6270.h index c333e720bc7..bdac5b87259 100644 --- a/src/devices/video/huc6270.h +++ b/src/devices/video/huc6270.h @@ -29,8 +29,8 @@ public: return m_horz_to_go * 8 + m_horz_steps; } - DECLARE_WRITE_LINE_MEMBER( vsync_changed ); - DECLARE_WRITE_LINE_MEMBER( hsync_changed ); + void vsync_changed(int state); + void hsync_changed(int state); static const uint16_t HUC6270_SPRITE = 0x0100; // sprite colour information static const uint16_t HUC6270_BACKGROUND = 0x0000; // background colour information diff --git a/src/devices/video/i82730.cpp b/src/devices/video/i82730.cpp index 342d8830178..c771772d54d 100644 --- a/src/devices/video/i82730.cpp +++ b/src/devices/video/i82730.cpp @@ -783,7 +783,7 @@ void i82730_device::attention() m_ca_latch = false; } -WRITE_LINE_MEMBER( i82730_device::ca_w ) +void i82730_device::ca_w(int state) { // falling edge if (m_ca == 1 && state == 0) @@ -830,7 +830,7 @@ WRITE_LINE_MEMBER( i82730_device::ca_w ) } } -WRITE_LINE_MEMBER( i82730_device::irst_w ) +void i82730_device::irst_w(int state) { m_sint_handler(0); } diff --git a/src/devices/video/i82730.h b/src/devices/video/i82730.h index 27f82eb8d5c..3761c94abf4 100644 --- a/src/devices/video/i82730.h +++ b/src/devices/video/i82730.h @@ -44,8 +44,8 @@ public: uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(ca_w); - DECLARE_WRITE_LINE_MEMBER(irst_w); + void ca_w(int state); + void irst_w(int state); protected: virtual void device_start() override; diff --git a/src/devices/video/i8275.cpp b/src/devices/video/i8275.cpp index 1e080986e22..48700508527 100644 --- a/src/devices/video/i8275.cpp +++ b/src/devices/video/i8275.cpp @@ -676,7 +676,7 @@ void i8275_device::dack_w(uint8_t data) // lpen_w - //------------------------------------------------- -WRITE_LINE_MEMBER( i8275_device::lpen_w ) +void i8275_device::lpen_w(int state) { if (!m_lpen && state) { diff --git a/src/devices/video/i8275.h b/src/devices/video/i8275.h index 2b49dee6362..6853d92a678 100644 --- a/src/devices/video/i8275.h +++ b/src/devices/video/i8275.h @@ -75,7 +75,7 @@ public: void dack_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER( lpen_w ); + void lpen_w(int state); uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); diff --git a/src/devices/video/imagetek_i4100.cpp b/src/devices/video/imagetek_i4100.cpp index 844062d6230..27358440af1 100644 --- a/src/devices/video/imagetek_i4100.cpp +++ b/src/devices/video/imagetek_i4100.cpp @@ -1437,7 +1437,7 @@ u32 imagetek_i4100_device::screen_update(screen_device &screen, bitmap_rgb32 &bi return 0; } -WRITE_LINE_MEMBER(imagetek_i4100_device::screen_eof) +void imagetek_i4100_device::screen_eof(int state) { if (state) { diff --git a/src/devices/video/imagetek_i4100.h b/src/devices/video/imagetek_i4100.h index 8f11b055f12..c18122221de 100644 --- a/src/devices/video/imagetek_i4100.h +++ b/src/devices/video/imagetek_i4100.h @@ -61,7 +61,7 @@ public: u32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); void draw_foreground(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(screen_eof); + void screen_eof(int state); // TODO: privatize eventually u8 irq_enable() const { return m_irq_enable; } diff --git a/src/devices/video/lc7582.cpp b/src/devices/video/lc7582.cpp index f576d97ea20..ef167fdb0f7 100644 --- a/src/devices/video/lc7582.cpp +++ b/src/devices/video/lc7582.cpp @@ -69,7 +69,7 @@ void lc7582_device::refresh_output() m_write_segs(1, (m_blank || !m_duty) ? 0 : m_latch[1]); } -WRITE_LINE_MEMBER(lc7582_device::clk_w) +void lc7582_device::clk_w(int state) { state = (state) ? 1 : 0; @@ -80,7 +80,7 @@ WRITE_LINE_MEMBER(lc7582_device::clk_w) m_clk = state; } -WRITE_LINE_MEMBER(lc7582_device::ce_w) +void lc7582_device::ce_w(int state) { state = (state) ? 1 : 0; diff --git a/src/devices/video/lc7582.h b/src/devices/video/lc7582.h index 3f8dcc22bc6..25299c3dbaf 100644 --- a/src/devices/video/lc7582.h +++ b/src/devices/video/lc7582.h @@ -39,10 +39,10 @@ public: // configuration helpers auto write_segs() { return m_write_segs.bind(); } // S pins, COM1/COM2 in offset - DECLARE_WRITE_LINE_MEMBER(data_w) { m_data = (state) ? 1 : 0; } - DECLARE_WRITE_LINE_MEMBER(clk_w); - DECLARE_WRITE_LINE_MEMBER(ce_w); - DECLARE_WRITE_LINE_MEMBER(inh_w) { m_blank = bool(state); refresh_output(); } + void data_w(int state) { m_data = (state) ? 1 : 0; } + void clk_w(int state); + void ce_w(int state); + void inh_w(int state) { m_blank = bool(state); refresh_output(); } protected: // device-level overrides diff --git a/src/devices/video/m50458.cpp b/src/devices/video/m50458.cpp index e2404684700..0ccbec7eebe 100644 --- a/src/devices/video/m50458.cpp +++ b/src/devices/video/m50458.cpp @@ -266,12 +266,12 @@ void m50458_device::device_reset() // READ/WRITE HANDLERS //************************************************************************** -WRITE_LINE_MEMBER( m50458_device::write_bit ) +void m50458_device::write_bit(int state) { m_latch = state; } -WRITE_LINE_MEMBER( m50458_device::set_cs_line ) +void m50458_device::set_cs_line(int state) { m_reset_line = state; @@ -285,7 +285,7 @@ WRITE_LINE_MEMBER( m50458_device::set_cs_line ) } -WRITE_LINE_MEMBER( m50458_device::set_clock_line ) +void m50458_device::set_clock_line(int state) { (void)m_clock_line; diff --git a/src/devices/video/m50458.h b/src/devices/video/m50458.h index fd0eed36e22..e75520fb4b2 100644 --- a/src/devices/video/m50458.h +++ b/src/devices/video/m50458.h @@ -34,9 +34,9 @@ public: m50458_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); // I/O operations - DECLARE_WRITE_LINE_MEMBER( write_bit ); - DECLARE_WRITE_LINE_MEMBER( set_cs_line ); - DECLARE_WRITE_LINE_MEMBER( set_clock_line ); + void write_bit(int state); + void set_cs_line(int state); + void set_clock_line(int state); uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); diff --git a/src/devices/video/mc68328lcd.cpp b/src/devices/video/mc68328lcd.cpp index 1864fcab22c..ad0b721c41e 100644 --- a/src/devices/video/mc68328lcd.cpp +++ b/src/devices/video/mc68328lcd.cpp @@ -65,12 +65,12 @@ void mc68328_lcd_device::palette_init() } } -DECLARE_WRITE_LINE_MEMBER(mc68328_lcd_device::flm_w) +void mc68328_lcd_device::flm_w(int state) { m_lcd_first_line = state; } -DECLARE_WRITE_LINE_MEMBER(mc68328_lcd_device::llp_w) +void mc68328_lcd_device::llp_w(int state) { const int old = m_lcd_line_pulse; m_lcd_line_pulse = state; @@ -88,7 +88,7 @@ DECLARE_WRITE_LINE_MEMBER(mc68328_lcd_device::llp_w) } } -DECLARE_WRITE_LINE_MEMBER(mc68328_lcd_device::lsclk_w) +void mc68328_lcd_device::lsclk_w(int state) { const int old = m_lcd_shift_clk; m_lcd_shift_clk = state; diff --git a/src/devices/video/mc68328lcd.h b/src/devices/video/mc68328lcd.h index c9a644f65a1..4c45779074b 100644 --- a/src/devices/video/mc68328lcd.h +++ b/src/devices/video/mc68328lcd.h @@ -18,9 +18,9 @@ class mc68328_lcd_device : public device_t, public: mc68328_lcd_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); - DECLARE_WRITE_LINE_MEMBER(flm_w); - DECLARE_WRITE_LINE_MEMBER(llp_w); - DECLARE_WRITE_LINE_MEMBER(lsclk_w); + void flm_w(int state); + void llp_w(int state); + void lsclk_w(int state); void ld_w(u8 data); void lcd_info_changed(double refresh_hz, int width, int height, u8 bus_width, u8 bpp); diff --git a/src/devices/video/mc6845.cpp b/src/devices/video/mc6845.cpp index 233d10777ae..09efa3c22ca 100644 --- a/src/devices/video/mc6845.cpp +++ b/src/devices/video/mc6845.cpp @@ -380,25 +380,25 @@ void hd6345_device::register_w(uint8_t data) } -READ_LINE_MEMBER( mc6845_device::de_r ) +int mc6845_device::de_r() { return m_de; } -READ_LINE_MEMBER( mc6845_device::cursor_r ) +int mc6845_device::cursor_r() { return m_cur; } -READ_LINE_MEMBER( mc6845_device::hsync_r ) +int mc6845_device::hsync_r() { return m_hsync; } -READ_LINE_MEMBER( mc6845_device::vsync_r ) +int mc6845_device::vsync_r() { return m_vsync; } diff --git a/src/devices/video/mc6845.h b/src/devices/video/mc6845.h index cd690857277..43338ca1777 100644 --- a/src/devices/video/mc6845.h +++ b/src/devices/video/mc6845.h @@ -96,16 +96,16 @@ public: void register_w(uint8_t data); // read display enable line state - DECLARE_READ_LINE_MEMBER( de_r ); + int de_r(); // read cursor line state - DECLARE_READ_LINE_MEMBER( cursor_r ); + int cursor_r(); // read horizontal sync line state - DECLARE_READ_LINE_MEMBER( hsync_r ); + int hsync_r(); // read vertical sync line state - DECLARE_READ_LINE_MEMBER( vsync_r ); + int vsync_r(); /* return the current value on the MA0-MA13 pins */ uint16_t get_ma(); diff --git a/src/devices/video/mc6847.h b/src/devices/video/mc6847.h index d58f19fcd23..06cfacc4f57 100644 --- a/src/devices/video/mc6847.h +++ b/src/devices/video/mc6847.h @@ -512,14 +512,14 @@ public: uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); // mode changing operations - DECLARE_WRITE_LINE_MEMBER( ag_w ) { change_mode(MODE_AG, state); } - DECLARE_WRITE_LINE_MEMBER( gm2_w ) { change_mode(MODE_GM2, state); } - DECLARE_WRITE_LINE_MEMBER( gm1_w ) { change_mode(MODE_GM1, state); } - DECLARE_WRITE_LINE_MEMBER( gm0_w ) { change_mode(MODE_GM0, state); } - DECLARE_WRITE_LINE_MEMBER( as_w ) { change_mode(MODE_AS, state); } - DECLARE_WRITE_LINE_MEMBER( css_w ) { change_mode(MODE_CSS, state); } - DECLARE_WRITE_LINE_MEMBER( intext_w ) { change_mode(MODE_INTEXT, state); } - DECLARE_WRITE_LINE_MEMBER( inv_w ) { change_mode(MODE_INV, state); } + void ag_w(int state) { change_mode(MODE_AG, state); } + void gm2_w(int state) { change_mode(MODE_GM2, state); } + void gm1_w(int state) { change_mode(MODE_GM1, state); } + void gm0_w(int state) { change_mode(MODE_GM0, state); } + void as_w(int state) { change_mode(MODE_AS, state); } + void css_w(int state) { change_mode(MODE_CSS, state); } + void intext_w(int state) { change_mode(MODE_INTEXT, state); } + void inv_w(int state) { change_mode(MODE_INV, state); } protected: mc6847_base_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock, const uint8_t *fontdata, double tpfs); diff --git a/src/devices/video/md4330b.cpp b/src/devices/video/md4330b.cpp index f8f9ca2323a..eb76e46585c 100644 --- a/src/devices/video/md4330b.cpp +++ b/src/devices/video/md4330b.cpp @@ -80,7 +80,7 @@ void md4330b_device::update_output() m_write_q(0, out); } -WRITE_LINE_MEMBER(md4330b_device::clk_w) +void md4330b_device::clk_w(int state) { state = (state) ? 1 : 0; diff --git a/src/devices/video/md4330b.h b/src/devices/video/md4330b.h index 906c032424a..32d965635a9 100644 --- a/src/devices/video/md4330b.h +++ b/src/devices/video/md4330b.h @@ -48,11 +48,11 @@ public: auto write_q() { return m_write_q.bind(); } auto write_do() { return m_write_do.bind(); } - DECLARE_WRITE_LINE_MEMBER(clk_w); - DECLARE_WRITE_LINE_MEMBER(tc_w) { m_tc = (state) ? 1 : 0; update_output(); } - DECLARE_WRITE_LINE_MEMBER(di_w) { m_di = (state) ? 1 : 0; } - DECLARE_WRITE_LINE_MEMBER(rst_w) { m_rst = (state) ? 1 : 0; } - DECLARE_READ_LINE_MEMBER(do_r) { return m_do; } + void clk_w(int state); + void tc_w(int state) { m_tc = (state) ? 1 : 0; update_output(); } + void di_w(int state) { m_di = (state) ? 1 : 0; } + void rst_w(int state) { m_rst = (state) ? 1 : 0; } + int do_r() { return m_do; } protected: md4330b_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock, u8 qmax); diff --git a/src/devices/video/mm5445.cpp b/src/devices/video/mm5445.cpp index 6b857ed19b3..ea78da7fe1e 100644 --- a/src/devices/video/mm5445.cpp +++ b/src/devices/video/mm5445.cpp @@ -74,7 +74,7 @@ void mm5445_device::device_start() // handlers //------------------------------------------------- -WRITE_LINE_MEMBER(mm5445_device::clock_w) +void mm5445_device::clock_w(int state) { state = (state) ? 1 : 0; bool rise = state && !m_clk; diff --git a/src/devices/video/mm5445.h b/src/devices/video/mm5445.h index 7d16d4f2ee2..fa4a37c1848 100644 --- a/src/devices/video/mm5445.h +++ b/src/devices/video/mm5445.h @@ -50,9 +50,9 @@ public: // configuration helpers auto output_cb() { return m_write_output.bind(); } - DECLARE_WRITE_LINE_MEMBER(clock_w); - DECLARE_WRITE_LINE_MEMBER(enable_w) { m_enable = (state) ? 1 : 0; } // active low, unused on MM5447 and MM5448 - DECLARE_WRITE_LINE_MEMBER(data_w) { m_data = (state) ? 1 : 0; } + void clock_w(int state); + void enable_w(int state) { m_enable = (state) ? 1 : 0; } // active low, unused on MM5447 and MM5448 + void data_w(int state) { m_data = (state) ? 1 : 0; } protected: mm5445_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock, u8 outpins); diff --git a/src/devices/video/mos6566.cpp b/src/devices/video/mos6566.cpp index 80d8a7c01b6..82eb4356304 100644 --- a/src/devices/video/mos6566.cpp +++ b/src/devices/video/mos6566.cpp @@ -2780,7 +2780,7 @@ void mos6566_device::write(offs_t offset, uint8_t data) // lp_w - light pen strobe //------------------------------------------------- -WRITE_LINE_MEMBER( mos6566_device::lp_w ) +void mos6566_device::lp_w(int state) { if (m_lp && !state && !(m_reg[REGISTER_IRQ] & IRQ_LP)) { diff --git a/src/devices/video/mos6566.h b/src/devices/video/mos6566.h index a7147295196..e76cbe68dcc 100644 --- a/src/devices/video/mos6566.h +++ b/src/devices/video/mos6566.h @@ -202,11 +202,11 @@ public: uint8_t read(offs_t offset); void write(offs_t offset, uint8_t data); - DECLARE_WRITE_LINE_MEMBER( lp_w ); + void lp_w(int state); - DECLARE_READ_LINE_MEMBER( phi0_r ) { return m_phi0; } // phi 0 - DECLARE_READ_LINE_MEMBER( ba_r ) { return m_ba; } // bus available - DECLARE_READ_LINE_MEMBER( aec_r ) { return m_aec; } // address enable control + int phi0_r() { return m_phi0; } // phi 0 + int ba_r() { return m_ba; } // bus available + int aec_r() { return m_aec; } // address enable control uint8_t bus_r() { return m_last_data; } diff --git a/src/devices/video/pcd8544.cpp b/src/devices/video/pcd8544.cpp index b0592592509..bb64d561281 100644 --- a/src/devices/video/pcd8544.cpp +++ b/src/devices/video/pcd8544.cpp @@ -175,12 +175,12 @@ void pcd8544_device::write_data(uint8_t data) } } -WRITE_LINE_MEMBER(pcd8544_device::sdin_w) +void pcd8544_device::sdin_w(int state) { m_sdin = state; } -WRITE_LINE_MEMBER(pcd8544_device::sclk_w) +void pcd8544_device::sclk_w(int state) { if (!m_sclk && state) { @@ -201,7 +201,7 @@ WRITE_LINE_MEMBER(pcd8544_device::sclk_w) m_sclk = state; } -WRITE_LINE_MEMBER(pcd8544_device::dc_w) +void pcd8544_device::dc_w(int state) { m_dc = state; } diff --git a/src/devices/video/pcd8544.h b/src/devices/video/pcd8544.h index 6706097a4db..d91b5be98fe 100644 --- a/src/devices/video/pcd8544.h +++ b/src/devices/video/pcd8544.h @@ -31,9 +31,9 @@ public: template void set_screen_update_cb(T &&... args) { m_screen_update_cb.set(std::forward(args)...); } // device interface - DECLARE_WRITE_LINE_MEMBER(sdin_w); - DECLARE_WRITE_LINE_MEMBER(sclk_w); - DECLARE_WRITE_LINE_MEMBER(dc_w); + void sdin_w(int state); + void sclk_w(int state); + void dc_w(int state); uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); protected: diff --git a/src/devices/video/pcf2100.cpp b/src/devices/video/pcf2100.cpp index ae686b98b1a..e1999c6b813 100644 --- a/src/devices/video/pcf2100.cpp +++ b/src/devices/video/pcf2100.cpp @@ -94,7 +94,7 @@ TIMER_CALLBACK_MEMBER(pcf2100_device::update_output_latches) m_bpout = (m_bpout + 1) % m_bpmax; } -WRITE_LINE_MEMBER(pcf2100_device::clb_w) +void pcf2100_device::clb_w(int state) { state = (state) ? 1 : 0; bool rise = state && !m_clb; diff --git a/src/devices/video/pcf2100.h b/src/devices/video/pcf2100.h index 1d0963b2896..f5f8f7de607 100644 --- a/src/devices/video/pcf2100.h +++ b/src/devices/video/pcf2100.h @@ -38,9 +38,9 @@ public: // configuration helpers auto write_segs() { return m_write_segs.bind(); } - DECLARE_WRITE_LINE_MEMBER(clb_w); - DECLARE_WRITE_LINE_MEMBER(data_w) { m_data = (state) ? 1 : 0; } - DECLARE_WRITE_LINE_MEMBER(dlen_w) { m_dlen = (state) ? 1 : 0; } + void clb_w(int state); + void data_w(int state) { m_data = (state) ? 1 : 0; } + void dlen_w(int state) { m_dlen = (state) ? 1 : 0; } protected: pcf2100_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock, u8 bpmax, u8 smax); diff --git a/src/devices/video/saa5050.cpp b/src/devices/video/saa5050.cpp index 5dae957d699..75886f7af1c 100644 --- a/src/devices/video/saa5050.cpp +++ b/src/devices/video/saa5050.cpp @@ -512,7 +512,7 @@ void saa5050_device::get_character_data(uint8_t data) // crs_w - character rounding select //------------------------------------------------- -WRITE_LINE_MEMBER( saa5050_device::crs_w ) +void saa5050_device::crs_w(int state) { m_crs = !(state & 1); } @@ -522,7 +522,7 @@ WRITE_LINE_MEMBER( saa5050_device::crs_w ) // dew_w - data entry window //------------------------------------------------- -WRITE_LINE_MEMBER( saa5050_device::dew_w ) +void saa5050_device::dew_w(int state) { if (state) { @@ -538,7 +538,7 @@ WRITE_LINE_MEMBER( saa5050_device::dew_w ) // lose_w - load output shift register enable //------------------------------------------------- -WRITE_LINE_MEMBER( saa5050_device::lose_w ) +void saa5050_device::lose_w(int state) { if (state) { @@ -574,7 +574,7 @@ WRITE_LINE_MEMBER( saa5050_device::lose_w ) // tlc_r - transmitted large character //------------------------------------------------- -READ_LINE_MEMBER( saa5050_device::tlc_r ) +int saa5050_device::tlc_r() { return !m_double_height_bottom_row; } @@ -594,7 +594,7 @@ void saa5050_device::write(uint8_t data) // f1_w - character clock //------------------------------------------------- -WRITE_LINE_MEMBER( saa5050_device::f1_w ) +void saa5050_device::f1_w(int state) { if (state) { @@ -607,7 +607,7 @@ WRITE_LINE_MEMBER( saa5050_device::f1_w ) // tr6_w - pixel clock //------------------------------------------------- -WRITE_LINE_MEMBER( saa5050_device::tr6_w ) +void saa5050_device::tr6_w(int state) { if (state) { diff --git a/src/devices/video/saa5050.h b/src/devices/video/saa5050.h index 99a0e69836f..544c3110743 100644 --- a/src/devices/video/saa5050.h +++ b/src/devices/video/saa5050.h @@ -48,13 +48,13 @@ public: // optional information overrides virtual const tiny_rom_entry *device_rom_region() const override; - DECLARE_WRITE_LINE_MEMBER( crs_w ); - DECLARE_WRITE_LINE_MEMBER( dew_w ); - DECLARE_WRITE_LINE_MEMBER( lose_w ); - DECLARE_READ_LINE_MEMBER( tlc_r ); + void crs_w(int state); + void dew_w(int state); + void lose_w(int state); + int tlc_r(); void write(uint8_t data); - DECLARE_WRITE_LINE_MEMBER( f1_w ); - DECLARE_WRITE_LINE_MEMBER( tr6_w ); + void f1_w(int state); + void tr6_w(int state); int get_rgb(); // NOTE: the following are provided for convenience only, SAA5050 is not a display controller diff --git a/src/devices/video/saa5240.cpp b/src/devices/video/saa5240.cpp index 3ce826a9c28..318ccc48d27 100644 --- a/src/devices/video/saa5240.cpp +++ b/src/devices/video/saa5240.cpp @@ -172,7 +172,7 @@ void saa5240_device::device_reset() // READ/WRITE HANDLERS //************************************************************************** -WRITE_LINE_MEMBER(saa5240_device::write_scl) +void saa5240_device::write_scl(int state) { if (m_i2c_scl != state) { @@ -335,7 +335,7 @@ WRITE_LINE_MEMBER(saa5240_device::write_scl) } } -WRITE_LINE_MEMBER(saa5240_device::write_sda) +void saa5240_device::write_sda(int state) { state &= 1; if (m_i2c_sdaw != state) @@ -362,7 +362,7 @@ WRITE_LINE_MEMBER(saa5240_device::write_sda) } } -READ_LINE_MEMBER(saa5240_device::read_sda) +int saa5240_device::read_sda() { int res = m_i2c_sdar & 1; @@ -639,7 +639,7 @@ void saa5240_device::get_character_data(uint8_t data) // vcs_w - video composite sync //------------------------------------------------- -WRITE_LINE_MEMBER(saa5240_device::vcs_w) +void saa5240_device::vcs_w(int state) { if (state) { @@ -675,7 +675,7 @@ WRITE_LINE_MEMBER(saa5240_device::vcs_w) // f6_w - character display clock //------------------------------------------------- -WRITE_LINE_MEMBER(saa5240_device::f6_w) +void saa5240_device::f6_w(int state) { if (state) { diff --git a/src/devices/video/saa5240.h b/src/devices/video/saa5240.h index b4f2a78decd..14792c04d21 100644 --- a/src/devices/video/saa5240.h +++ b/src/devices/video/saa5240.h @@ -60,12 +60,12 @@ public: // construction/destruction saa5240_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - DECLARE_WRITE_LINE_MEMBER(write_scl); - DECLARE_WRITE_LINE_MEMBER(write_sda); - DECLARE_READ_LINE_MEMBER(read_sda); + void write_scl(int state); + void write_sda(int state); + int read_sda(); - DECLARE_WRITE_LINE_MEMBER(vcs_w); - DECLARE_WRITE_LINE_MEMBER(f6_w); + void vcs_w(int state); + void f6_w(int state); int get_rgb(); uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); diff --git a/src/devices/video/sda5708.cpp b/src/devices/video/sda5708.cpp index a4fb22dd67d..bf4f5044252 100644 --- a/src/devices/video/sda5708.cpp +++ b/src/devices/video/sda5708.cpp @@ -143,7 +143,7 @@ void sda5708_device::update_display() } } -WRITE_LINE_MEMBER( sda5708_device::load_w ) +void sda5708_device::load_w(int state) { LOG("%s - line %s\n", FUNCNAME, state == ASSERT_LINE ? "asserted" : "cleared"); if (m_load != state && m_reset == CLEAR_LINE && state == CLEAR_LINE) @@ -205,7 +205,7 @@ WRITE_LINE_MEMBER( sda5708_device::load_w ) // line goes high. The least significant bit D0 is loaded first. //------------------------------------------------- -WRITE_LINE_MEMBER( sda5708_device::data_w ) +void sda5708_device::data_w(int state) { LOG("%s - line %s\n", FUNCNAME, state == ASSERT_LINE ? "asserted" : "cleared"); m_data = state; @@ -220,7 +220,7 @@ WRITE_LINE_MEMBER( sda5708_device::data_w ) // 200ns. Setup time, the time between a stable Data line and a rising SDCLK signal, should be a minimum of 50ns. //------------------------------------------------- -WRITE_LINE_MEMBER( sda5708_device::sdclk_w ) +void sda5708_device::sdclk_w(int state) { LOG("%s - line %s\n", FUNCNAME, state == ASSERT_LINE ? "asserted" : "cleared"); @@ -242,7 +242,7 @@ WRITE_LINE_MEMBER( sda5708_device::sdclk_w ) // the circuit and is left at high level from then on. //------------------------------------------------- -WRITE_LINE_MEMBER( sda5708_device::reset_w ) +void sda5708_device::reset_w(int state) { LOG("%s - line %s\n", FUNCNAME, state == ASSERT_LINE ? "asserted" : "cleared"); m_reset = state; diff --git a/src/devices/video/sda5708.h b/src/devices/video/sda5708.h index 4237675b95e..94e64f14523 100644 --- a/src/devices/video/sda5708.h +++ b/src/devices/video/sda5708.h @@ -54,10 +54,10 @@ public: // construction/destruction sda5708_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - DECLARE_WRITE_LINE_MEMBER( load_w ); - DECLARE_WRITE_LINE_MEMBER( data_w ); - DECLARE_WRITE_LINE_MEMBER( sdclk_w ); - DECLARE_WRITE_LINE_MEMBER( reset_w ); + void load_w(int state); + void data_w(int state); + void sdclk_w(int state); + void reset_w(int state); protected: // device-level overrides diff --git a/src/devices/video/topcat.cpp b/src/devices/video/topcat.cpp index 5ba43d81e44..630cb3d3e87 100644 --- a/src/devices/video/topcat.cpp +++ b/src/devices/video/topcat.cpp @@ -445,7 +445,7 @@ void topcat_device::ctrl_w(address_space &space, offs_t offset, uint16_t data, u } } -WRITE_LINE_MEMBER(topcat_device::vblank_w) +void topcat_device::vblank_w(int state) { if (state) { m_vblank |= (m_plane_mask << 8); diff --git a/src/devices/video/topcat.h b/src/devices/video/topcat.h index ca08f16b9d4..ffa67ef5132 100644 --- a/src/devices/video/topcat.h +++ b/src/devices/video/topcat.h @@ -20,7 +20,7 @@ public: uint16_t ctrl_r(address_space &space, offs_t offset, uint16_t mem_mask = ~0); void ctrl_w(address_space &space, offs_t offset, uint16_t data, uint16_t mem_mask = ~0); - WRITE_LINE_MEMBER(vblank_w); + void vblank_w(int state); void topcat_mem(address_map &map); bool plane_enabled(); diff --git a/src/devices/video/upd7220.cpp b/src/devices/video/upd7220.cpp index 0dcecca025b..957eab0f31a 100644 --- a/src/devices/video/upd7220.cpp +++ b/src/devices/video/upd7220.cpp @@ -1653,7 +1653,7 @@ void upd7220_device::stop_dma() // ext_sync_w - //------------------------------------------------- -WRITE_LINE_MEMBER( upd7220_device::ext_sync_w ) +void upd7220_device::ext_sync_w(int state) { //LOG("uPD7220 External Synchronization: %u\n", state); @@ -1672,7 +1672,7 @@ WRITE_LINE_MEMBER( upd7220_device::ext_sync_w ) // ext_sync_w - //------------------------------------------------- -WRITE_LINE_MEMBER( upd7220_device::lpen_w ) +void upd7220_device::lpen_w(int state) { /* only if 2 rising edges on the lpen input occur at the same point during successive video fields are the pulses accepted */ diff --git a/src/devices/video/upd7220.h b/src/devices/video/upd7220.h index af203e2fdd7..753a19c651d 100644 --- a/src/devices/video/upd7220.h +++ b/src/devices/video/upd7220.h @@ -76,8 +76,8 @@ public: uint8_t dack_r(); void dack_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER( ext_sync_w ); - DECLARE_WRITE_LINE_MEMBER( lpen_w ); + void ext_sync_w(int state); + void lpen_w(int state); uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); diff --git a/src/devices/video/upd7227.cpp b/src/devices/video/upd7227.cpp index f512f8832be..8abbca35dd5 100644 --- a/src/devices/video/upd7227.cpp +++ b/src/devices/video/upd7227.cpp @@ -101,7 +101,7 @@ uint32_t upd7227_device::screen_update(screen_device &screen, bitmap_ind16 &bitm // cs_w - chip select //------------------------------------------------- -WRITE_LINE_MEMBER( upd7227_device::cs_w ) +void upd7227_device::cs_w(int state) { m_cs = state; } @@ -111,7 +111,7 @@ WRITE_LINE_MEMBER( upd7227_device::cs_w ) // cd_w - command/data select //------------------------------------------------- -WRITE_LINE_MEMBER( upd7227_device::cd_w ) +void upd7227_device::cd_w(int state) { m_cd = state; } @@ -121,7 +121,7 @@ WRITE_LINE_MEMBER( upd7227_device::cd_w ) // sck_w - serial clock //------------------------------------------------- -WRITE_LINE_MEMBER( upd7227_device::sck_w ) +void upd7227_device::sck_w(int state) { m_sck = state; } @@ -131,7 +131,7 @@ WRITE_LINE_MEMBER( upd7227_device::sck_w ) // si_w - serial input //------------------------------------------------- -WRITE_LINE_MEMBER( upd7227_device::si_w ) +void upd7227_device::si_w(int state) { m_si = state; } @@ -141,7 +141,7 @@ WRITE_LINE_MEMBER( upd7227_device::si_w ) // so_r - serial output/busy //------------------------------------------------- -READ_LINE_MEMBER( upd7227_device::so_r ) +int upd7227_device::so_r() { return m_so; } diff --git a/src/devices/video/upd7227.h b/src/devices/video/upd7227.h index 1f74b8d6102..d82e33b0720 100644 --- a/src/devices/video/upd7227.h +++ b/src/devices/video/upd7227.h @@ -30,11 +30,11 @@ public: // inline configuration helpers void set_offsets(int sx, int sy) { m_sx = sx; m_sy = sy; } - DECLARE_WRITE_LINE_MEMBER( cs_w ); - DECLARE_WRITE_LINE_MEMBER( cd_w ); - DECLARE_WRITE_LINE_MEMBER( sck_w ); - DECLARE_WRITE_LINE_MEMBER( si_w ); - DECLARE_READ_LINE_MEMBER( so_r ); + void cs_w(int state); + void cd_w(int state); + void sck_w(int state); + void si_w(int state); + int so_r(); uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); diff --git a/src/emu/device.h b/src/emu/device.h index 402bbb1ccff..4cf972a4825 100644 --- a/src/emu/device.h +++ b/src/emu/device.h @@ -36,19 +36,6 @@ -//************************************************************************** -// DEVICE CONFIGURATION MACROS -//************************************************************************** - -// configure devices - -#define DECLARE_READ_LINE_MEMBER(name) int name() -#define READ_LINE_MEMBER(name) int name() -#define DECLARE_WRITE_LINE_MEMBER(name) void name([[maybe_unused]] int state) -#define WRITE_LINE_MEMBER(name) void name([[maybe_unused]] int state) - - - //************************************************************************** // GLOBAL VARIABLES //************************************************************************** diff --git a/src/emu/diserial.cpp b/src/emu/diserial.cpp index b6ebb90b1c9..5f7c00b7e59 100644 --- a/src/emu/diserial.cpp +++ b/src/emu/diserial.cpp @@ -138,7 +138,7 @@ void device_serial_interface::rcv_edge() } } -WRITE_LINE_MEMBER(device_serial_interface::tx_clock_w) +void device_serial_interface::tx_clock_w(int state) { if(state != m_tra_clock_state) { m_tra_clock_state = state; @@ -147,7 +147,7 @@ WRITE_LINE_MEMBER(device_serial_interface::tx_clock_w) } } -WRITE_LINE_MEMBER(device_serial_interface::rx_clock_w) +void device_serial_interface::rx_clock_w(int state) { if(state != m_rcv_clock_state) { m_rcv_clock_state = state; @@ -156,7 +156,7 @@ WRITE_LINE_MEMBER(device_serial_interface::rx_clock_w) } } -WRITE_LINE_MEMBER(device_serial_interface::clock_w) +void device_serial_interface::clock_w(int state) { tx_clock_w(state); rx_clock_w(state); @@ -216,7 +216,7 @@ void device_serial_interface::receive_register_reset() } } -WRITE_LINE_MEMBER(device_serial_interface::rx_w) +void device_serial_interface::rx_w(int state) { m_rcv_line = state; if (m_rcv_flags & RECEIVE_REGISTER_SYNCHRONISED) diff --git a/src/emu/diserial.h b/src/emu/diserial.h index 62b13c028a1..aab03940206 100644 --- a/src/emu/diserial.h +++ b/src/emu/diserial.h @@ -76,10 +76,10 @@ public: device_serial_interface(const machine_config &mconfig, device_t &device); virtual ~device_serial_interface(); - DECLARE_WRITE_LINE_MEMBER(rx_w); - DECLARE_WRITE_LINE_MEMBER(tx_clock_w); - DECLARE_WRITE_LINE_MEMBER(rx_clock_w); - DECLARE_WRITE_LINE_MEMBER(clock_w); + void rx_w(int state); + void tx_clock_w(int state); + void rx_clock_w(int state); + void clock_w(int state); protected: void set_data_frame(int start_bit_count, int data_bit_count, parity_t parity, stop_bits_t stop_bits); diff --git a/src/emu/screen.h b/src/emu/screen.h index 685d4c913a9..a2d9e7f7f2e 100644 --- a/src/emu/screen.h +++ b/src/emu/screen.h @@ -385,8 +385,8 @@ public: // beam positioning and state int vpos() const; int hpos() const; - DECLARE_READ_LINE_MEMBER(vblank) const { return (machine().time() < m_vblank_end_time) ? 1 : 0; } - DECLARE_READ_LINE_MEMBER(hblank) const { int const curpos = hpos(); return (curpos < m_visarea.left() || curpos > m_visarea.right()) ? 1 : 0; } + int vblank() const { return (machine().time() < m_vblank_end_time) ? 1 : 0; } + int hblank() const { int const curpos = hpos(); return (curpos < m_visarea.left() || curpos > m_visarea.right()) ? 1 : 0; } // timing attotime time_until_pos(int vpos, int hpos = 0) const; diff --git a/src/mame/acorn/aristmk5.cpp b/src/mame/acorn/aristmk5.cpp index c6897d39d0f..f1880f6f82b 100644 --- a/src/mame/acorn/aristmk5.cpp +++ b/src/mame/acorn/aristmk5.cpp @@ -743,7 +743,7 @@ public: INPUT_CHANGED_MEMBER(coin_start); CUSTOM_INPUT_MEMBER(coin_r); CUSTOM_INPUT_MEMBER(coin_usa_r); - DECLARE_READ_LINE_MEMBER(hopper_r); + int hopper_r(); private: void Ns5w48(uint32_t data); @@ -1237,7 +1237,7 @@ void aristmk5_state::aristmk5_drame_map(address_map &map) } -READ_LINE_MEMBER(aristmk5_state::hopper_r) +int aristmk5_state::hopper_r() { return (m_hopper_test && m_hopper->line_r()) ? 0 : 1; } diff --git a/src/mame/acorn/atom.cpp b/src/mame/acorn/atom.cpp index 019cfc67b4a..d271b7d13f8 100644 --- a/src/mame/acorn/atom.cpp +++ b/src/mame/acorn/atom.cpp @@ -561,7 +561,7 @@ void atom_state::ppi_pc_w(uint8_t data) i8271 interface -------------------------------------------------*/ -WRITE_LINE_MEMBER( atom_state::atom_8271_interrupt_callback ) +void atom_state::atom_8271_interrupt_callback(int state) { /* I'm assuming that the nmi is edge triggered */ /* a interrupt from the fdc will cause a change in line state, and @@ -582,7 +582,7 @@ WRITE_LINE_MEMBER( atom_state::atom_8271_interrupt_callback ) m_previous_i8271_int_state = state; } -WRITE_LINE_MEMBER( atom_state::motor_w ) +void atom_state::motor_w(int state) { for (u8 i = 0; i < 2; i++) { @@ -594,7 +594,7 @@ WRITE_LINE_MEMBER( atom_state::motor_w ) } } -WRITE_LINE_MEMBER(atom_state::cassette_output_tick) +void atom_state::cassette_output_tick(int state) { m_hz2400 = state; diff --git a/src/mame/acorn/atom.h b/src/mame/acorn/atom.h index 9d8f5b7c1ed..b001d4a35b0 100644 --- a/src/mame/acorn/atom.h +++ b/src/mame/acorn/atom.h @@ -84,8 +84,8 @@ protected: uint8_t ppi_pc_r(); void ppi_pc_w(uint8_t data); uint8_t vdg_videoram_r(offs_t offset); - DECLARE_WRITE_LINE_MEMBER( atom_8271_interrupt_callback ); - DECLARE_WRITE_LINE_MEMBER( motor_w ); + void atom_8271_interrupt_callback(int state); + void motor_w(int state); /* keyboard state */ u8 m_keylatch = 0U; @@ -98,7 +98,7 @@ protected: /* devices */ bool m_previous_i8271_int_state = false; static void floppy_formats(format_registration &fr); - DECLARE_WRITE_LINE_MEMBER(cassette_output_tick); + void cassette_output_tick(int state); std::pair load_cart(device_image_interface &image, generic_slot_device &slot); DECLARE_DEVICE_IMAGE_LOAD_MEMBER(cart_load) { return load_cart(image, *m_cart); } diff --git a/src/mame/acorn/bbc.cpp b/src/mame/acorn/bbc.cpp index 8270ac648fd..10db04a5916 100644 --- a/src/mame/acorn/bbc.cpp +++ b/src/mame/acorn/bbc.cpp @@ -1078,7 +1078,7 @@ static const char *const bbc_sample_names[] = }; -WRITE_LINE_MEMBER(bbc_state::adlc_irq_w) +void bbc_state::adlc_irq_w(int state) { m_adlc_irq = state; update_nmi(); diff --git a/src/mame/acorn/bbc.h b/src/mame/acorn/bbc.h index b7207ca1801..d5a372922a2 100644 --- a/src/mame/acorn/bbc.h +++ b/src/mame/acorn/bbc.h @@ -152,36 +152,36 @@ public: INTERRUPT_GEN_MEMBER(bbcb_keyscan); TIMER_CALLBACK_MEMBER(tape_timer_cb); TIMER_CALLBACK_MEMBER(reset_timer_cb); - DECLARE_WRITE_LINE_MEMBER(write_acia_clock); - DECLARE_WRITE_LINE_MEMBER(adlc_irq_w); - DECLARE_WRITE_LINE_MEMBER(bus_nmi_w); - DECLARE_WRITE_LINE_MEMBER(snd_enable_w); - DECLARE_WRITE_LINE_MEMBER(speech_rsq_w); - DECLARE_WRITE_LINE_MEMBER(speech_wsq_w); - DECLARE_WRITE_LINE_MEMBER(kbd_enable_w); + void write_acia_clock(int state); + void adlc_irq_w(int state); + void bus_nmi_w(int state); + void snd_enable_w(int state); + void speech_rsq_w(int state); + void speech_wsq_w(int state); + void kbd_enable_w(int state); uint8_t via_system_porta_r(); void via_system_porta_w(uint8_t data); uint8_t via_system_portb_r(); void via_system_portb_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(lpstb_w); - DECLARE_WRITE_LINE_MEMBER(bbc_hsync_changed); - DECLARE_WRITE_LINE_MEMBER(bbc_vsync_changed); - DECLARE_WRITE_LINE_MEMBER(bbc_de_changed); + void lpstb_w(int state); + void bbc_hsync_changed(int state); + void bbc_vsync_changed(int state); + void bbc_de_changed(int state); DECLARE_INPUT_CHANGED_MEMBER(reset_palette); void update_palette(monitor_type monitor_type); void update_acia_rxd(); void update_acia_dcd(); void update_acia_cts(); - DECLARE_WRITE_LINE_MEMBER(write_rts); - DECLARE_WRITE_LINE_MEMBER(write_txd); - DECLARE_WRITE_LINE_MEMBER(write_rxd); - DECLARE_WRITE_LINE_MEMBER(write_dcd); - DECLARE_WRITE_LINE_MEMBER(write_cts); + void write_rts(int state); + void write_txd(int state); + void write_rxd(int state); + void write_dcd(int state); + void write_cts(int state); DECLARE_INPUT_CHANGED_MEMBER(trigger_reset); - DECLARE_WRITE_LINE_MEMBER(fdc_intrq_w); - DECLARE_WRITE_LINE_MEMBER(fdc_drq_w); + void fdc_intrq_w(int state); + void fdc_drq_w(int state); int get_analogue_input(int channel_number); void upd7002_eoc(int data); diff --git a/src/mame/acorn/bbc_m.cpp b/src/mame/acorn/bbc_m.cpp index 8188c3227bc..8661cb34d89 100644 --- a/src/mame/acorn/bbc_m.cpp +++ b/src/mame/acorn/bbc_m.cpp @@ -805,7 +805,7 @@ int bbc_state::bbc_keyboard(int data) } -WRITE_LINE_MEMBER(bbc_state::snd_enable_w) +void bbc_state::snd_enable_w(int state) { if (!state && m_sn) { @@ -813,7 +813,7 @@ WRITE_LINE_MEMBER(bbc_state::snd_enable_w) } } -WRITE_LINE_MEMBER(bbc_state::speech_rsq_w) +void bbc_state::speech_rsq_w(int state) { if (m_tms) { @@ -825,7 +825,7 @@ WRITE_LINE_MEMBER(bbc_state::speech_rsq_w) } } -WRITE_LINE_MEMBER(bbc_state::speech_wsq_w) +void bbc_state::speech_wsq_w(int state) { /* Write select on the speech processor */ if (m_tms) @@ -838,7 +838,7 @@ WRITE_LINE_MEMBER(bbc_state::speech_wsq_w) } } -WRITE_LINE_MEMBER(bbc_state::kbd_enable_w) +void bbc_state::kbd_enable_w(int state) { if (!state) { @@ -953,7 +953,7 @@ void bbc_state::via_system_portb_w(uint8_t data) } -WRITE_LINE_MEMBER(bbc_state::lpstb_w) +void bbc_state::lpstb_w(int state) { m_via6522_0->write_cb2(state); if (!state) @@ -1109,7 +1109,7 @@ TIMER_CALLBACK_MEMBER(bbc_state::tape_timer_cb) } } -WRITE_LINE_MEMBER(bbc_state::write_rxd) +void bbc_state::write_rxd(int state) { m_rxd_serial = state; update_acia_rxd(); @@ -1121,7 +1121,7 @@ void bbc_state::update_acia_rxd() } -WRITE_LINE_MEMBER(bbc_state::write_dcd) +void bbc_state::write_dcd(int state) { m_dcd_serial = state; update_acia_dcd(); @@ -1133,7 +1133,7 @@ void bbc_state::update_acia_dcd() } -WRITE_LINE_MEMBER(bbc_state::write_cts) +void bbc_state::write_cts(int state) { m_cts_serial = state; update_acia_cts(); @@ -1145,7 +1145,7 @@ void bbc_state::update_acia_cts() } -WRITE_LINE_MEMBER(bbc_state::write_rts) +void bbc_state::write_rts(int state) { if (BIT(m_serproc_data, 6)) { @@ -1159,7 +1159,7 @@ WRITE_LINE_MEMBER(bbc_state::write_rts) } -WRITE_LINE_MEMBER(bbc_state::write_txd) +void bbc_state::write_txd(int state) { if (BIT(m_serproc_data, 6)) { @@ -1243,7 +1243,7 @@ void bbc_state::serial_ula_w(uint8_t data) m_acia_clock->set_clock_scale( (double) 1 / serial_clocks[ data & 0x07 ] ); } -WRITE_LINE_MEMBER(bbc_state::write_acia_clock) +void bbc_state::write_acia_clock(int state) { m_acia->write_txc(state); @@ -1257,7 +1257,7 @@ WRITE_LINE_MEMBER(bbc_state::write_acia_clock) ***************************************/ -WRITE_LINE_MEMBER(bbc_state::bus_nmi_w) +void bbc_state::bus_nmi_w(int state) { m_bus_nmi = state; update_nmi(); @@ -1281,13 +1281,13 @@ void bbc_state::update_nmi() } } -WRITE_LINE_MEMBER(bbc_state::fdc_intrq_w) +void bbc_state::fdc_intrq_w(int state) { m_fdc_irq = state; update_nmi(); } -WRITE_LINE_MEMBER(bbc_state::fdc_drq_w) +void bbc_state::fdc_drq_w(int state) { m_fdc_drq = state; update_nmi(); diff --git a/src/mame/acorn/bbc_v.cpp b/src/mame/acorn/bbc_v.cpp index 493ebedff2f..bed02846781 100644 --- a/src/mame/acorn/bbc_v.cpp +++ b/src/mame/acorn/bbc_v.cpp @@ -327,19 +327,19 @@ MC6845_UPDATE_ROW( bbc_state::crtc_update_row ) } } -WRITE_LINE_MEMBER(bbc_state::bbc_hsync_changed) +void bbc_state::bbc_hsync_changed(int state) { m_hsync = state; } -WRITE_LINE_MEMBER(bbc_state::bbc_vsync_changed) +void bbc_state::bbc_vsync_changed(int state) { m_vsync = state; m_via6522_0->write_ca1(state); // screen refresh interrupts m_trom->dew_w(state); } -WRITE_LINE_MEMBER(bbc_state::bbc_de_changed) +void bbc_state::bbc_de_changed(int state) { if (!state) m_teletext_latch |= 0x80; diff --git a/src/mame/acorn/cms.cpp b/src/mame/acorn/cms.cpp index 83749ec13b0..eb0f2a2370e 100644 --- a/src/mame/acorn/cms.cpp +++ b/src/mame/acorn/cms.cpp @@ -77,7 +77,7 @@ protected: private: void map_select_w(uint8_t data); void page_select_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(bus_nmi_w); + void bus_nmi_w(int state); required_device m_maincpu; required_memory_region m_rom; @@ -148,7 +148,7 @@ void cms_state::machine_reset() } -WRITE_LINE_MEMBER(cms_state::bus_nmi_w) +void cms_state::bus_nmi_w(int state) { m_maincpu->set_input_line(INPUT_LINE_NMI, state); } diff --git a/src/mame/acorn/riscpc.cpp b/src/mame/acorn/riscpc.cpp index 905393ad722..7b4598d9501 100644 --- a/src/mame/acorn/riscpc.cpp +++ b/src/mame/acorn/riscpc.cpp @@ -70,29 +70,29 @@ private: void riscpc_map(address_map &map); bool m_i2cmem_clock = false; - DECLARE_READ_LINE_MEMBER(iocr_od0_r); - DECLARE_READ_LINE_MEMBER(iocr_od1_r); - DECLARE_WRITE_LINE_MEMBER(iocr_od0_w); - DECLARE_WRITE_LINE_MEMBER(iocr_od1_w); + int iocr_od0_r(); + int iocr_od1_r(); + void iocr_od0_w(int state); + void iocr_od1_w(int state); }; -READ_LINE_MEMBER(riscpc_state::iocr_od1_r) +int riscpc_state::iocr_od1_r() { // TODO: presuming same as Acorn Archimedes, where i2c clock can be readback return (m_i2cmem_clock == true) ? 1 : 0; } -READ_LINE_MEMBER(riscpc_state::iocr_od0_r) +int riscpc_state::iocr_od0_r() { return (m_i2cmem->read_sda() ? 1 : 0); //eeprom read } -WRITE_LINE_MEMBER(riscpc_state::iocr_od0_w) +void riscpc_state::iocr_od0_w(int state) { m_i2cmem->write_sda(state == true ? 1 : 0); } -WRITE_LINE_MEMBER(riscpc_state::iocr_od1_w) +void riscpc_state::iocr_od1_w(int state) { m_i2cmem_clock = state; m_i2cmem->write_scl(state == true ? 1 : 0); diff --git a/src/mame/acorn/ssfindo.cpp b/src/mame/acorn/ssfindo.cpp index 486c311f1ab..abc836fa192 100644 --- a/src/mame/acorn/ssfindo.cpp +++ b/src/mame/acorn/ssfindo.cpp @@ -233,10 +233,10 @@ private: void tetfight_map(address_map &map); - DECLARE_READ_LINE_MEMBER(iocr_od0_r); - DECLARE_READ_LINE_MEMBER(iocr_od1_r); - DECLARE_WRITE_LINE_MEMBER(iocr_od0_w); - DECLARE_WRITE_LINE_MEMBER(iocr_od1_w); + int iocr_od0_r(); + int iocr_od1_r(); + void iocr_od0_w(int state); + void iocr_od1_w(int state); uint32_t tetfight_unk_r(); }; @@ -263,19 +263,19 @@ void ssfindo_state::iolines_w(uint8_t data) // inverted compared to riscpc.cpp // TODO: simplify hookup over i2cmem having AND 1 on state for a writeline (?) -READ_LINE_MEMBER(tetfight_state::iocr_od1_r) +int tetfight_state::iocr_od1_r() { // TODO: completely get rid of this speedup fn or move anywhere else //if (m_speedup) (this->*m_speedup)(); return (m_i2cmem->read_sda() ? 1 : 0); //eeprom read } -READ_LINE_MEMBER(tetfight_state::iocr_od0_r) +int tetfight_state::iocr_od0_r() { return (m_i2cmem_clock == true ? 1 : 0); //eeprom read } -WRITE_LINE_MEMBER(tetfight_state::iocr_od1_w) +void tetfight_state::iocr_od1_w(int state) { // TODO: i2c cares about the order of this!? // tetfight reaches PC=0x106c if initialization has success @@ -285,7 +285,7 @@ WRITE_LINE_MEMBER(tetfight_state::iocr_od1_w) //m_i2cmem->write_sda(state == true ? 1 : 0); } -WRITE_LINE_MEMBER(tetfight_state::iocr_od0_w) +void tetfight_state::iocr_od0_w(int state) { m_i2cmem_clock = state; m_i2cmem->write_scl(state == true ? 1 : 0); diff --git a/src/mame/acorn/upd65031.cpp b/src/mame/acorn/upd65031.cpp index 9811769901d..c09ad130845 100644 --- a/src/mame/acorn/upd65031.cpp +++ b/src/mame/acorn/upd65031.cpp @@ -763,7 +763,7 @@ void upd65031_device::rcv_complete() update_uart_interrupt(); } -WRITE_LINE_MEMBER( upd65031_device::cts_w ) +void upd65031_device::cts_w(int state) { if (state == BIT(m_uit, 0)) { @@ -776,7 +776,7 @@ WRITE_LINE_MEMBER( upd65031_device::cts_w ) } } -WRITE_LINE_MEMBER( upd65031_device::dcd_w ) +void upd65031_device::dcd_w(int state) { if (state == BIT(m_uit, 1)) { @@ -793,7 +793,7 @@ WRITE_LINE_MEMBER( upd65031_device::dcd_w ) // flp line //------------------------------------------------- -WRITE_LINE_MEMBER( upd65031_device::flp_w ) +void upd65031_device::flp_w(int state) { if (!(m_sta & STA_FLAPOPEN) && state) { @@ -813,7 +813,7 @@ WRITE_LINE_MEMBER( upd65031_device::flp_w ) // battery low line //------------------------------------------------- -WRITE_LINE_MEMBER( upd65031_device::btl_w ) +void upd65031_device::btl_w(int state) { if (state) m_sta |= STA_BTL; diff --git a/src/mame/acorn/upd65031.h b/src/mame/acorn/upd65031.h index 13dd6710647..cc16b3d5db3 100644 --- a/src/mame/acorn/upd65031.h +++ b/src/mame/acorn/upd65031.h @@ -47,11 +47,11 @@ public: uint8_t read(offs_t offset); void write(offs_t offset, uint8_t data); - DECLARE_WRITE_LINE_MEMBER( flp_w ); - DECLARE_WRITE_LINE_MEMBER( btl_w ); - DECLARE_WRITE_LINE_MEMBER( rxd_w ) { rx_w(state); } - DECLARE_WRITE_LINE_MEMBER( cts_w ); - DECLARE_WRITE_LINE_MEMBER( dcd_w ); + void flp_w(int state); + void btl_w(int state); + void rxd_w(int state) { rx_w(state); } + void cts_w(int state); + void dcd_w(int state); uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); protected: diff --git a/src/mame/acorn/z88_impexp.cpp b/src/mame/acorn/z88_impexp.cpp index 99f564d9b40..214767746dd 100644 --- a/src/mame/acorn/z88_impexp.cpp +++ b/src/mame/acorn/z88_impexp.cpp @@ -82,7 +82,7 @@ TIMER_CALLBACK_MEMBER(z88_impexp_device::poll_queue) queue(); } -WRITE_LINE_MEMBER( z88_impexp_device::input_rts ) +void z88_impexp_device::input_rts(int state) { if (!state && m_rts) { diff --git a/src/mame/acorn/z88_impexp.h b/src/mame/acorn/z88_impexp.h index 85a0c3c3751..d67fa5cc1fc 100644 --- a/src/mame/acorn/z88_impexp.h +++ b/src/mame/acorn/z88_impexp.h @@ -20,9 +20,9 @@ class z88_impexp_device : public device_t, public: z88_impexp_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - virtual WRITE_LINE_MEMBER( input_txd ) override { device_serial_interface::rx_w(state); } - virtual WRITE_LINE_MEMBER( input_rts ) override; - virtual WRITE_LINE_MEMBER( input_dtr ) override { m_dtr = state; } + virtual void input_txd(int state) override { device_serial_interface::rx_w(state); } + virtual void input_rts(int state) override; + virtual void input_dtr(int state) override { m_dtr = state; } protected: virtual void device_start() override; diff --git a/src/mame/act/apricot.cpp b/src/mame/act/apricot.cpp index 46b8faa6b8f..975e1c78c77 100644 --- a/src/mame/act/apricot.cpp +++ b/src/mame/act/apricot.cpp @@ -77,22 +77,22 @@ public: private: static void floppy_formats(format_registration &fr); - DECLARE_WRITE_LINE_MEMBER(i8086_lock_w); + void i8086_lock_w(int state); void i8089_ca1_w(uint8_t data); void i8089_ca2_w(uint8_t data); void i8255_portb_w(uint8_t data); uint8_t i8255_portc_r(); void i8255_portc_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(fdc_intrq_w); + void fdc_intrq_w(int state); uint8_t sio_da_r(); uint8_t sio_ca_r(); uint8_t sio_db_r(); uint8_t sio_cb_r(); - DECLARE_WRITE_LINE_MEMBER(write_centronics_fault); - DECLARE_WRITE_LINE_MEMBER(write_centronics_perror); + void write_centronics_fault(int state); + void write_centronics_perror(int state); - DECLARE_WRITE_LINE_MEMBER(apricot_hd6845_de) { m_display_enabled = state; }; + void apricot_hd6845_de(int state) { m_display_enabled = state; }; MC6845_UPDATE_ROW(crtc_update_row); uint32_t screen_update_apricot(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); @@ -148,14 +148,14 @@ void apricot_state::i8089_ca2_w(uint8_t data) m_iop->ca_w(0); } -WRITE_LINE_MEMBER( apricot_state::write_centronics_fault ) +void apricot_state::write_centronics_fault(int state) { m_centronics_fault = state; m_sio->syncb_w(state); m_ppi->pc2_w(state); } -WRITE_LINE_MEMBER( apricot_state::write_centronics_perror ) +void apricot_state::write_centronics_perror(int state) { m_centronics_perror = state; } @@ -247,7 +247,7 @@ uint8_t apricot_state::sio_db_r() // FLOPPY //************************************************************************** -WRITE_LINE_MEMBER( apricot_state::fdc_intrq_w ) +void apricot_state::fdc_intrq_w(int state) { m_pic->ir4_w(state); m_iop->ext1_w(state); @@ -324,7 +324,7 @@ void apricot_state::machine_start() membank("ram")->set_base(m_ram->pointer()); } -WRITE_LINE_MEMBER( apricot_state::i8086_lock_w ) +void apricot_state::i8086_lock_w(int state) { m_bus_locked = state; } diff --git a/src/mame/act/apricotf.cpp b/src/mame/act/apricotf.cpp index 3d2226707e6..145c8ddcdaa 100644 --- a/src/mame/act/apricotf.cpp +++ b/src/mame/act/apricotf.cpp @@ -107,8 +107,8 @@ private: u16 palette_r(offs_t offset); void palette_w(offs_t offset, u16 data, u16 mem_mask = ~0); void system_w(offs_t offset, u8 data); - DECLARE_WRITE_LINE_MEMBER(ctc_z1_w); - DECLARE_WRITE_LINE_MEMBER(ctc_z2_w); + void ctc_z1_w(int state); + void ctc_z2_w(int state); void m1_w(u8 data); int m_40_80 = 0; @@ -310,13 +310,13 @@ INPUT_PORTS_END // Z80CTC //------------------------------------------------- -WRITE_LINE_MEMBER(f1_state::ctc_z1_w) +void f1_state::ctc_z1_w(int state) { m_sio->rxcb_w(state); m_sio->txcb_w(state); } -WRITE_LINE_MEMBER(f1_state::ctc_z2_w) +void f1_state::ctc_z2_w(int state) { m_sio->txca_w(state); } diff --git a/src/mame/act/apricotp.cpp b/src/mame/act/apricotp.cpp index 4f534e5e3a4..ebc590af71b 100644 --- a/src/mame/act/apricotp.cpp +++ b/src/mame/act/apricotp.cpp @@ -151,10 +151,10 @@ private: int m_centronics_fault; int m_centronics_perror; - DECLARE_WRITE_LINE_MEMBER( write_centronics_busy ); - DECLARE_WRITE_LINE_MEMBER( write_centronics_select ); - DECLARE_WRITE_LINE_MEMBER( write_centronics_fault ); - DECLARE_WRITE_LINE_MEMBER( write_centronics_perror ); + void write_centronics_busy(int state); + void write_centronics_select(int state); + void write_centronics_fault(int state); + void write_centronics_perror(int state); void fp_io(address_map &map); void fp_mem(address_map &map); @@ -502,23 +502,23 @@ INPUT_PORTS_END */ -WRITE_LINE_MEMBER( fp_state::write_centronics_busy ) +void fp_state::write_centronics_busy(int state) { m_centronics_busy = state; if (!state) m_pic->ir6_w(ASSERT_LINE); } -WRITE_LINE_MEMBER( fp_state::write_centronics_select ) +void fp_state::write_centronics_select(int state) { m_centronics_select = state; } -WRITE_LINE_MEMBER( fp_state::write_centronics_fault ) +void fp_state::write_centronics_fault(int state) { m_centronics_fault = state; } -WRITE_LINE_MEMBER( fp_state::write_centronics_perror ) +void fp_state::write_centronics_perror(int state) { m_centronics_perror = state; } diff --git a/src/mame/act/apxen.cpp b/src/mame/act/apxen.cpp index 4a0604d019b..f107ed85495 100644 --- a/src/mame/act/apxen.cpp +++ b/src/mame/act/apxen.cpp @@ -152,7 +152,7 @@ private: static void floppy_formats(format_registration &fr); - DECLARE_WRITE_LINE_MEMBER(apvid_w); + void apvid_w(int state); uint16_t mem_r(offs_t offset, uint16_t mem_mask); void mem_w(offs_t offset, uint16_t data, uint16_t mem_mask); @@ -247,7 +247,7 @@ static void apricot_floppies(device_slot_interface &device) // VIDEO EMULATION //************************************************************************** -WRITE_LINE_MEMBER( apxen_state::apvid_w ) +void apxen_state::apvid_w(int state) { m_apvid = bool(state); } diff --git a/src/mame/act/victor9k.cpp b/src/mame/act/victor9k.cpp index 9143366f702..e2d412e1dba 100644 --- a/src/mame/act/victor9k.cpp +++ b/src/mame/act/victor9k.cpp @@ -152,34 +152,34 @@ private: virtual void machine_reset() override; void via1_pa_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER( write_nfrd ); - DECLARE_WRITE_LINE_MEMBER( write_ndac ); + void write_nfrd(int state); + void write_ndac(int state); void via1_pb_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER( via1_irq_w ); - DECLARE_WRITE_LINE_MEMBER( codec_vol_w ); + void via1_irq_w(int state); + void codec_vol_w(int state); void via2_pa_w(uint8_t data); void via2_pb_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER( via2_irq_w ); + void via2_irq_w(int state); void via3_pb_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER( via3_irq_w ); + void via3_irq_w(int state); - DECLARE_WRITE_LINE_MEMBER( fdc_irq_w ); + void fdc_irq_w(int state); - DECLARE_WRITE_LINE_MEMBER( ssda_irq_w ); - DECLARE_WRITE_LINE_MEMBER( ssda_sm_dtr_w ); + void ssda_irq_w(int state); + void ssda_sm_dtr_w(int state); - DECLARE_WRITE_LINE_MEMBER( kbrdy_w ); - DECLARE_WRITE_LINE_MEMBER( kbdata_w ); - DECLARE_WRITE_LINE_MEMBER( vert_w ); + void kbrdy_w(int state); + void kbdata_w(int state); + void vert_w(int state); MC6845_UPDATE_ROW( crtc_update_row ); MC6845_BEGIN_UPDATE( crtc_begin_update ); - DECLARE_WRITE_LINE_MEMBER( mux_serial_b_w ); - DECLARE_WRITE_LINE_MEMBER( mux_serial_a_w ); + void mux_serial_b_w(int state); + void mux_serial_a_w(int state); void victor9k_palette(palette_device &palette) const; @@ -342,17 +342,17 @@ MC6845_BEGIN_UPDATE( victor9k_state::crtc_begin_update ) } } -WRITE_LINE_MEMBER(victor9k_state::vert_w) +void victor9k_state::vert_w(int state) { m_via2->write_pa7(state); m_pic->ir7_w(state); } -WRITE_LINE_MEMBER(victor9k_state::mux_serial_b_w) +void victor9k_state::mux_serial_b_w(int state) { } -WRITE_LINE_MEMBER(victor9k_state::mux_serial_a_w) +void victor9k_state::mux_serial_a_w(int state) { } @@ -379,7 +379,7 @@ WRITE_LINE_MEMBER(victor9k_state::mux_serial_a_w) // MC6852_INTERFACE( ssda_intf ) //------------------------------------------------- -WRITE_LINE_MEMBER( victor9k_state::ssda_irq_w ) +void victor9k_state::ssda_irq_w(int state) { m_ssda_irq = state; @@ -387,7 +387,7 @@ WRITE_LINE_MEMBER( victor9k_state::ssda_irq_w ) } -WRITE_LINE_MEMBER( victor9k_state::ssda_sm_dtr_w ) +void victor9k_state::ssda_sm_dtr_w(int state) { m_ssda->cts_w(state); m_ssda->dcd_w(!state); @@ -426,13 +426,13 @@ void victor9k_state::via1_pa_w(uint8_t data) m_ieee488->host_dio_w(data); } -DECLARE_WRITE_LINE_MEMBER( victor9k_state::write_nfrd ) +void victor9k_state::write_nfrd(int state) { m_via1->write_pb6(state); m_via1->write_ca1(state); } -DECLARE_WRITE_LINE_MEMBER( victor9k_state::write_ndac ) +void victor9k_state::write_ndac(int state) { m_via1->write_pb7(state); m_via1->write_ca2(state); @@ -469,11 +469,11 @@ void victor9k_state::via1_pb_w(uint8_t data) m_ieee488->host_ndac_w(BIT(data, 7)); } -WRITE_LINE_MEMBER( victor9k_state::codec_vol_w ) +void victor9k_state::codec_vol_w(int state) { } -WRITE_LINE_MEMBER( victor9k_state::via1_irq_w ) +void victor9k_state::via1_irq_w(int state) { m_via1_irq = state; @@ -535,7 +535,7 @@ void victor9k_state::via2_pb_w(uint8_t data) LOGDISPLAY("BRT %u CONT %u\n", m_brt, m_cont); } -WRITE_LINE_MEMBER( victor9k_state::via2_irq_w ) +void victor9k_state::via2_irq_w(int state) { m_via2_irq = state; @@ -577,7 +577,7 @@ void victor9k_state::via3_pb_w(uint8_t data) m_cvsd->clock_w(!BIT(data, 7)); } -WRITE_LINE_MEMBER( victor9k_state::via3_irq_w ) +void victor9k_state::via3_irq_w(int state) { m_via3_irq = state; @@ -589,7 +589,7 @@ WRITE_LINE_MEMBER( victor9k_state::via3_irq_w ) // VICTOR9K_KEYBOARD_INTERFACE( kb_intf ) //------------------------------------------------- -WRITE_LINE_MEMBER( victor9k_state::kbrdy_w ) +void victor9k_state::kbrdy_w(int state) { LOGKEYBOARD("KBRDY %u\n", state); @@ -599,7 +599,7 @@ WRITE_LINE_MEMBER( victor9k_state::kbrdy_w ) update_kback(); } -WRITE_LINE_MEMBER( victor9k_state::kbdata_w ) +void victor9k_state::kbdata_w(int state) { LOGKEYBOARD("KBDATA %u\n", state); @@ -608,7 +608,7 @@ WRITE_LINE_MEMBER( victor9k_state::kbdata_w ) } -WRITE_LINE_MEMBER( victor9k_state::fdc_irq_w ) +void victor9k_state::fdc_irq_w(int state) { m_fdc_irq = state; diff --git a/src/mame/act/victor9k_fdc.cpp b/src/mame/act/victor9k_fdc.cpp index d58d48634f0..eb8e4224994 100644 --- a/src/mame/act/victor9k_fdc.cpp +++ b/src/mame/act/victor9k_fdc.cpp @@ -513,7 +513,7 @@ void victor_9000_fdc_device::floppy_p2_w(uint8_t data) // tach0_r - //------------------------------------------------- -READ_LINE_MEMBER(victor_9000_fdc_device::tach0_r) +int victor_9000_fdc_device::tach0_r() { LOGSCP("%s %s Read TACH0 %u\n", machine().time().as_string(), machine().describe_context(), m_tach[0]); return m_tach[0]; @@ -524,7 +524,7 @@ READ_LINE_MEMBER(victor_9000_fdc_device::tach0_r) // tach1_r - //------------------------------------------------- -READ_LINE_MEMBER(victor_9000_fdc_device::tach1_r) +int victor_9000_fdc_device::tach1_r() { LOGSCP("%s %s Read TACH1 %u\n", machine().time().as_string(), machine().describe_context(), m_tach[1]); return m_tach[1]; @@ -750,7 +750,7 @@ void victor_9000_fdc_device::via4_pb_w(uint8_t data) } } -WRITE_LINE_MEMBER( victor_9000_fdc_device::wrsync_w ) +void victor_9000_fdc_device::wrsync_w(int state) { if (m_wrsync != state) { @@ -763,7 +763,7 @@ WRITE_LINE_MEMBER( victor_9000_fdc_device::wrsync_w ) } } -WRITE_LINE_MEMBER( victor_9000_fdc_device::via4_irq_w ) +void victor_9000_fdc_device::via4_irq_w(int state) { m_via4_irq = state; @@ -820,7 +820,7 @@ void victor_9000_fdc_device::via5_pb_w(uint8_t data) } } -WRITE_LINE_MEMBER( victor_9000_fdc_device::via5_irq_w ) +void victor_9000_fdc_device::via5_irq_w(int state) { m_via5_irq = state; @@ -1014,7 +1014,7 @@ void victor_9000_fdc_device::via6_pb_w(uint8_t data) } } -WRITE_LINE_MEMBER( victor_9000_fdc_device::drw_w ) +void victor_9000_fdc_device::drw_w(int state) { if (m_drw != state) { @@ -1034,7 +1034,7 @@ WRITE_LINE_MEMBER( victor_9000_fdc_device::drw_w ) } } -WRITE_LINE_MEMBER( victor_9000_fdc_device::erase_w ) +void victor_9000_fdc_device::erase_w(int state) { if (m_erase != state) { @@ -1046,7 +1046,7 @@ WRITE_LINE_MEMBER( victor_9000_fdc_device::erase_w ) } } -WRITE_LINE_MEMBER( victor_9000_fdc_device::via6_irq_w ) +void victor_9000_fdc_device::via6_irq_w(int state) { m_via6_irq = state; diff --git a/src/mame/act/victor9k_fdc.h b/src/mame/act/victor9k_fdc.h index 300f063269a..7cba5749ca0 100644 --- a/src/mame/act/victor9k_fdc.h +++ b/src/mame/act/victor9k_fdc.h @@ -185,28 +185,28 @@ private: void floppy_p1_w(uint8_t data); uint8_t floppy_p2_r(); void floppy_p2_w(uint8_t data); - DECLARE_READ_LINE_MEMBER( tach0_r ); - DECLARE_READ_LINE_MEMBER( tach1_r ); + int tach0_r(); + int tach1_r(); void da_w(uint8_t data); uint8_t via4_pa_r(); void via4_pa_w(uint8_t data); uint8_t via4_pb_r(); void via4_pb_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER( wrsync_w ); - DECLARE_WRITE_LINE_MEMBER( via4_irq_w ); + void wrsync_w(int state); + void via4_irq_w(int state); uint8_t via5_pa_r(); void via5_pb_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER( via5_irq_w ); + void via5_irq_w(int state); uint8_t via6_pa_r(); uint8_t via6_pb_r(); void via6_pa_w(uint8_t data); void via6_pb_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER( drw_w ); - DECLARE_WRITE_LINE_MEMBER( erase_w ); - DECLARE_WRITE_LINE_MEMBER( via6_irq_w ); + void drw_w(int state); + void erase_w(int state); + void via6_irq_w(int state); }; diff --git a/src/mame/act/victor9k_kb.cpp b/src/mame/act/victor9k_kb.cpp index 42c319c642a..c5389036e97 100644 --- a/src/mame/act/victor9k_kb.cpp +++ b/src/mame/act/victor9k_kb.cpp @@ -588,7 +588,7 @@ void victor_9000_keyboard_device::device_start() // kback_w - //------------------------------------------------- -WRITE_LINE_MEMBER( victor_9000_keyboard_device::kback_w ) +void victor_9000_keyboard_device::kback_w(int state) { if (LOG) logerror("KBACK %u\n", state); @@ -664,7 +664,7 @@ void victor_9000_keyboard_device::kb_p2_w(uint8_t data) // kb_t1_r - //------------------------------------------------- -READ_LINE_MEMBER( victor_9000_keyboard_device::kb_t1_r ) +int victor_9000_keyboard_device::kb_t1_r() { return m_kback; } diff --git a/src/mame/act/victor9k_kb.h b/src/mame/act/victor9k_kb.h index 29735baffa2..deeb365cd06 100644 --- a/src/mame/act/victor9k_kb.h +++ b/src/mame/act/victor9k_kb.h @@ -31,7 +31,7 @@ public: auto kbrdy_handler() { return m_kbrdy_cb.bind(); } auto kbdata_handler() { return m_kbdata_cb.bind(); } - DECLARE_WRITE_LINE_MEMBER( kback_w ); + void kback_w(int state); protected: // device-level overrides @@ -59,7 +59,7 @@ private: uint8_t kb_p1_r(); void kb_p1_w(uint8_t data); void kb_p2_w(uint8_t data); - DECLARE_READ_LINE_MEMBER( kb_t1_r ); + int kb_t1_r(); }; diff --git a/src/mame/adc/super6.cpp b/src/mame/adc/super6.cpp index 596f6fc705e..0d23f2d32e2 100644 --- a/src/mame/adc/super6.cpp +++ b/src/mame/adc/super6.cpp @@ -379,7 +379,7 @@ static void super6_floppies(device_slot_interface &device) device.option_add("525dd", FLOPPY_525_QD); } -WRITE_LINE_MEMBER( super6_state::fdc_intrq_w ) +void super6_state::fdc_intrq_w(int state) { if (state) m_maincpu->set_input_line(Z80_INPUT_LINE_WAIT, CLEAR_LINE); @@ -387,7 +387,7 @@ WRITE_LINE_MEMBER( super6_state::fdc_intrq_w ) // m_maincpu->set_state_int(Z80_AF, 0x7f00); // hack, see notes } -WRITE_LINE_MEMBER( super6_state::fdc_drq_w ) +void super6_state::fdc_drq_w(int state) { if (state) m_maincpu->set_input_line(Z80_INPUT_LINE_WAIT, CLEAR_LINE); diff --git a/src/mame/adc/super6.h b/src/mame/adc/super6.h index 2ca923618b5..db0cdb58019 100644 --- a/src/mame/adc/super6.h +++ b/src/mame/adc/super6.h @@ -56,8 +56,8 @@ private: void s100_w(uint8_t data); void bank0_w(uint8_t data); void bank1_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER( fdc_intrq_w ); - DECLARE_WRITE_LINE_MEMBER( fdc_drq_w ); + void fdc_intrq_w(int state); + void fdc_drq_w(int state); uint8_t memory_read_byte(offs_t offset); void memory_write_byte(offs_t offset, uint8_t data); uint8_t io_read_byte(offs_t offset); diff --git a/src/mame/agat/agat.cpp b/src/mame/agat/agat.cpp index aa3d4430e15..c0c80737656 100644 --- a/src/mame/agat/agat.cpp +++ b/src/mame/agat/agat.cpp @@ -130,9 +130,9 @@ public: void c800_w(offs_t offset, uint8_t data); uint8_t inh_r(offs_t offset); void inh_w(offs_t offset, uint8_t data); - DECLARE_WRITE_LINE_MEMBER(a2bus_irq_w); - DECLARE_WRITE_LINE_MEMBER(a2bus_nmi_w); - DECLARE_WRITE_LINE_MEMBER(a2bus_inh_w); + void a2bus_irq_w(int state); + void a2bus_nmi_w(int state); + void a2bus_inh_w(int state); uint8_t agat7_membank_r(offs_t offset); void agat7_membank_w(offs_t offset, uint8_t data); @@ -153,7 +153,7 @@ public: void controller_strobe_w(uint8_t data); void kbd_put(u8 data); - DECLARE_WRITE_LINE_MEMBER(kbd_meta); + void kbd_meta(int state); protected: required_device m_maincpu; @@ -270,18 +270,18 @@ private: #define JOYSTICK_SENSITIVITY 50 #define JOYSTICK_AUTOCENTER 80 -WRITE_LINE_MEMBER(agat_base_state::a2bus_irq_w) +void agat_base_state::a2bus_irq_w(int state) { m_maincpu->set_input_line(M6502_IRQ_LINE, state); } -WRITE_LINE_MEMBER(agat_base_state::a2bus_nmi_w) +void agat_base_state::a2bus_nmi_w(int state) { m_maincpu->set_input_line(INPUT_LINE_NMI, state); } // This code makes a ton of assumptions because we can guarantee a pre-IIe machine! -WRITE_LINE_MEMBER(agat_base_state::a2bus_inh_w) +void agat_base_state::a2bus_inh_w(int state) { if (state == ASSERT_LINE) { @@ -462,7 +462,7 @@ void agat_base_state::kbd_put(u8 data) } } -WRITE_LINE_MEMBER( agat_base_state::kbd_meta ) +void agat_base_state::kbd_meta(int state) { m_meta = state; } diff --git a/src/mame/alpha/ad_sound.cpp b/src/mame/alpha/ad_sound.cpp index 9a94805a7d4..659b83bd1bb 100644 --- a/src/mame/alpha/ad_sound.cpp +++ b/src/mame/alpha/ad_sound.cpp @@ -146,7 +146,7 @@ ad_59mc07_device::ad_59mc07_device(const machine_config &mconfig, const char *ta /******************************************************************************/ // Sound -WRITE_LINE_MEMBER(ad_59mc07_device::i8155_timer_pulse) +void ad_59mc07_device::i8155_timer_pulse(int state) { if (!state) m_audiocpu->set_input_line(I8085_TRAP_LINE, ASSERT_LINE); @@ -309,7 +309,7 @@ void ad_59mc07_device::i8155_portc_w(uint8_t data) m_msm->set_output_gain(9, 0); // SOLO 16' from msm5232 } -WRITE_LINE_MEMBER(ad_59mc07_device::msm5232_gate) +void ad_59mc07_device::msm5232_gate(int state) { } diff --git a/src/mame/alpha/ad_sound.h b/src/mame/alpha/ad_sound.h index e46acefa986..4234f72c3eb 100644 --- a/src/mame/alpha/ad_sound.h +++ b/src/mame/alpha/ad_sound.h @@ -78,10 +78,10 @@ private: void i8155_portc_w(uint8_t data); void ay8910_porta_w(uint8_t data); void ay8910_portb_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(i8155_timer_pulse); + void i8155_timer_pulse(int state); TIMER_CALLBACK_MEMBER(frq_adjuster_callback); void update_dac(); - DECLARE_WRITE_LINE_MEMBER(msm5232_gate); + void msm5232_gate(int state); }; diff --git a/src/mame/alpha/alpha68k.h b/src/mame/alpha/alpha68k.h index 03c902103a2..dfb485caa83 100644 --- a/src/mame/alpha/alpha68k.h +++ b/src/mame/alpha/alpha68k.h @@ -142,8 +142,8 @@ protected: u16 control_3_r(); u16 control_4_r(); void videoram_w(offs_t offset, u16 data); - DECLARE_WRITE_LINE_MEMBER(video_control2_w); - DECLARE_WRITE_LINE_MEMBER(video_control3_w); + void video_control2_w(int state); + void video_control3_w(int state); private: TILE_GET_INFO_MEMBER(get_tile_info); }; diff --git a/src/mame/alpha/alpha68k_v.cpp b/src/mame/alpha/alpha68k_v.cpp index b8ccfcbd931..dcbaa8f9044 100644 --- a/src/mame/alpha/alpha68k_v.cpp +++ b/src/mame/alpha/alpha68k_v.cpp @@ -77,12 +77,12 @@ VIDEO_START_MEMBER(alpha68k_II_state,alpha68k) /******************************************************************************/ // TODO: sprite flip select as in snk68.cpp, palette bank for V games if they ever trigger it -WRITE_LINE_MEMBER(alpha68k_II_state::video_control2_w) +void alpha68k_II_state::video_control2_w(int state) { logerror("%s: Q2 changed to %d\n", machine().describe_context(), state); } -WRITE_LINE_MEMBER(alpha68k_II_state::video_control3_w) +void alpha68k_II_state::video_control3_w(int state) { logerror("%s: Q3 changed to %d\n", machine().describe_context(), state); } diff --git a/src/mame/alpha/alpha8201.cpp b/src/mame/alpha/alpha8201.cpp index 0f3da510f57..23c1578264d 100644 --- a/src/mame/alpha/alpha8201.cpp +++ b/src/mame/alpha/alpha8201.cpp @@ -400,7 +400,7 @@ void alpha_8201_device::mcu_d_w(u16 data) ***************************************************************************/ -WRITE_LINE_MEMBER(alpha_8201_device::bus_dir_w) +void alpha_8201_device::bus_dir_w(int state) { // set RAM bus direction to 0: external, 1: MCU side // selects one of two 74LS245 (octal bus transceiver) for databus, address bus via @@ -409,7 +409,7 @@ WRITE_LINE_MEMBER(alpha_8201_device::bus_dir_w) mcu_writeram(); } -WRITE_LINE_MEMBER(alpha_8201_device::mcu_start_w) +void alpha_8201_device::mcu_start_w(int state) { // connected to MCU INT0 m_mcu->set_input_line(0, (state) ? ASSERT_LINE : CLEAR_LINE); diff --git a/src/mame/alpha/alpha8201.h b/src/mame/alpha/alpha8201.h index 7ce6e0ab3ab..542ef22b5e3 100644 --- a/src/mame/alpha/alpha8201.h +++ b/src/mame/alpha/alpha8201.h @@ -18,8 +18,8 @@ public: ~alpha_8201_device() {} // external I/O - DECLARE_WRITE_LINE_MEMBER(bus_dir_w); - DECLARE_WRITE_LINE_MEMBER(mcu_start_w); + void bus_dir_w(int state); + void mcu_start_w(int state); u8 ext_ram_r(offs_t offset); void ext_ram_w(offs_t offset, u8 data); diff --git a/src/mame/alpha/champbas.cpp b/src/mame/alpha/champbas.cpp index c5705d05b71..85208aa81ff 100644 --- a/src/mame/alpha/champbas.cpp +++ b/src/mame/alpha/champbas.cpp @@ -97,12 +97,12 @@ TODO: * *************************************/ -READ_LINE_MEMBER(champbas_state::watchdog_bit2) +int champbas_state::watchdog_bit2() { return (0x10 - m_watchdog->get_vblank_counter()) >> 2 & 1; } -WRITE_LINE_MEMBER(champbas_state::irq_enable_w) +void champbas_state::irq_enable_w(int state) { m_irq_mask = state; @@ -512,7 +512,7 @@ void champbas_state::machine_start() save_item(NAME(m_gfx_bank)); } -WRITE_LINE_MEMBER(champbas_state::vblank_irq) +void champbas_state::vblank_irq(int state) { if (state && m_irq_mask) m_maincpu->set_input_line(0, ASSERT_LINE); diff --git a/src/mame/alpha/champbas.h b/src/mame/alpha/champbas.h index b42b7e9dfd7..2dca4c22ce4 100644 --- a/src/mame/alpha/champbas.h +++ b/src/mame/alpha/champbas.h @@ -36,7 +36,7 @@ public: { } - DECLARE_READ_LINE_MEMBER(watchdog_bit2); + int watchdog_bit2(); void init_champbas(); @@ -51,15 +51,15 @@ public: protected: // handlers - DECLARE_WRITE_LINE_MEMBER(irq_enable_w); + void irq_enable_w(int state); uint8_t champbja_protection_r(offs_t offset); - DECLARE_WRITE_LINE_MEMBER(vblank_irq); + void vblank_irq(int state); void tilemap_w(offs_t offset, uint8_t data); - DECLARE_WRITE_LINE_MEMBER(gfxbank_w); - DECLARE_WRITE_LINE_MEMBER(palette_bank_w); - DECLARE_WRITE_LINE_MEMBER(flipscreen_w); + void gfxbank_w(int state); + void palette_bank_w(int state); + void flipscreen_w(int state); void champbas_palette(palette_device &palette) const; TILE_GET_INFO_MEMBER(champbas_get_bg_tile_info); diff --git a/src/mame/alpha/champbas_v.cpp b/src/mame/alpha/champbas_v.cpp index 8f427ae5a96..688e8cef122 100644 --- a/src/mame/alpha/champbas_v.cpp +++ b/src/mame/alpha/champbas_v.cpp @@ -181,19 +181,19 @@ void champbas_state::tilemap_w(offs_t offset, uint8_t data) m_bg_tilemap->mark_tile_dirty(offset & 0x3ff); } -WRITE_LINE_MEMBER(champbas_state::gfxbank_w) +void champbas_state::gfxbank_w(int state) { m_gfx_bank = state; m_bg_tilemap->mark_all_dirty(); } -WRITE_LINE_MEMBER(champbas_state::palette_bank_w) +void champbas_state::palette_bank_w(int state) { m_palette_bank = state; m_bg_tilemap->set_palette_offset(m_palette_bank << 8); } -WRITE_LINE_MEMBER(champbas_state::flipscreen_w) +void champbas_state::flipscreen_w(int state) { flip_screen_set(!state); } diff --git a/src/mame/alpha/equites.cpp b/src/mame/alpha/equites.cpp index da7706952d9..10a954d1ebe 100644 --- a/src/mame/alpha/equites.cpp +++ b/src/mame/alpha/equites.cpp @@ -408,7 +408,7 @@ public: equites_state(mconfig, type, tag) { } - DECLARE_READ_LINE_MEMBER(unknown_bit_r); + int unknown_bit_r(); void gekisou(machine_config &config); protected: @@ -608,7 +608,7 @@ uint16_t equites_state::spriteram_kludge_r() } -READ_LINE_MEMBER(gekisou_state::unknown_bit_r) +int gekisou_state::unknown_bit_r() { return m_unknown_bit; } diff --git a/src/mame/alpha/shougi.cpp b/src/mame/alpha/shougi.cpp index 2c822450c99..4663d5d5687 100644 --- a/src/mame/alpha/shougi.cpp +++ b/src/mame/alpha/shougi.cpp @@ -107,7 +107,7 @@ public: void shougi(machine_config &config); private: - DECLARE_WRITE_LINE_MEMBER(nmi_enable_w); + void nmi_enable_w(int state); uint8_t semaphore_r(); void shougi_palette(palette_device &palette) const; @@ -233,7 +233,7 @@ uint32_t shougi_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap // maincpu side -WRITE_LINE_MEMBER(shougi_state::nmi_enable_w) +void shougi_state::nmi_enable_w(int state) { m_nmi_enabled = state; diff --git a/src/mame/alpha/splendor.cpp b/src/mame/alpha/splendor.cpp index 1f4acc74a03..cff55b9349b 100644 --- a/src/mame/alpha/splendor.cpp +++ b/src/mame/alpha/splendor.cpp @@ -123,7 +123,7 @@ private: void fg_videoram_w(offs_t offset, uint8_t data); void bg_videoram_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); void bgcolor_w(offs_t offset, uint8_t data); - DECLARE_WRITE_LINE_MEMBER(selchar_w); + void selchar_w(int state); void bg_scrollx_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); void bg_scrolly_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); TILE_GET_INFO_MEMBER(fg_info); @@ -434,7 +434,7 @@ void splendor_state::bgcolor_w(offs_t offset, uint8_t data) m_bgcolor = data; } -WRITE_LINE_MEMBER(splendor_state::selchar_w) +void splendor_state::selchar_w(int state) { // select active char map m_fg_char_bank = (state == 0) ? 0 : 1; diff --git a/src/mame/altos/acs8600_ics.cpp b/src/mame/altos/acs8600_ics.cpp index a5d29748e2e..2ad55917359 100644 --- a/src/mame/altos/acs8600_ics.cpp +++ b/src/mame/altos/acs8600_ics.cpp @@ -51,7 +51,7 @@ void acs8600_ics_device::hostram_w(offs_t offset, u8 data) m_host_space->write_byte((m_hiaddr << 16) | (BIT(m_ctrl, 0) << 15) | (offset & 0x7fff), data); } -WRITE_LINE_MEMBER(acs8600_ics_device::attn_w) +void acs8600_ics_device::attn_w(int state) { m_icscpu->set_input_line(INPUT_LINE_NMI, state); } diff --git a/src/mame/altos/acs8600_ics.h b/src/mame/altos/acs8600_ics.h index 4f28e14e5cc..869344c7da7 100644 --- a/src/mame/altos/acs8600_ics.h +++ b/src/mame/altos/acs8600_ics.h @@ -13,7 +13,7 @@ class acs8600_ics_device : public device_t public: acs8600_ics_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - DECLARE_WRITE_LINE_MEMBER(attn_w); + void attn_w(int state); auto irq1_callback() { return m_out_irq1_func.bind(); } auto irq2_callback() { return m_out_irq2_func.bind(); } diff --git a/src/mame/altos/altos2_kbd.cpp b/src/mame/altos/altos2_kbd.cpp index 5ba2ed4735a..6bd9f430821 100644 --- a/src/mame/altos/altos2_kbd.cpp +++ b/src/mame/altos/altos2_kbd.cpp @@ -53,7 +53,7 @@ void altos2_keyboard_device::device_start() save_item(NAME(m_key_row)); } -WRITE_LINE_MEMBER(altos2_keyboard_device::rxd_w) +void altos2_keyboard_device::rxd_w(int state) { m_mcu->set_input_line(MCS48_INPUT_IRQ, state ? CLEAR_LINE : ASSERT_LINE); } @@ -76,7 +76,7 @@ void altos2_keyboard_device::p2_w(u8 data) m_txd_callback(BIT(data, 4)); } -WRITE_LINE_MEMBER(altos2_keyboard_device::prog_w) +void altos2_keyboard_device::prog_w(int state) { if (state) m_key_row = m_mcu->p2_r() & 0x0f; diff --git a/src/mame/altos/altos2_kbd.h b/src/mame/altos/altos2_kbd.h index f3c439e2d12..de2c4549107 100644 --- a/src/mame/altos/altos2_kbd.h +++ b/src/mame/altos/altos2_kbd.h @@ -30,7 +30,7 @@ public: auto txd_callback() { return m_txd_callback.bind(); } // serial line input - DECLARE_WRITE_LINE_MEMBER(rxd_w); + void rxd_w(int state); protected: // device-level overrides @@ -45,7 +45,7 @@ private: void leds_w(u8 data); u8 p1_r(); void p2_w(u8 data); - DECLARE_WRITE_LINE_MEMBER(prog_w); + void prog_w(int state); // address maps void ext_map(address_map &map); diff --git a/src/mame/altos/altos5.cpp b/src/mame/altos/altos5.cpp index b436cb7d592..7edfc652b05 100644 --- a/src/mame/altos/altos5.cpp +++ b/src/mame/altos/altos5.cpp @@ -63,8 +63,8 @@ private: void port14_w(uint8_t data); void setup_banks(uint8_t source); uint8_t convert(offs_t offset, bool state); - DECLARE_WRITE_LINE_MEMBER(busreq_w); - DECLARE_WRITE_LINE_MEMBER(fdc_intrq_w); + void busreq_w(int state); + void fdc_intrq_w(int state); void io_map(address_map &map); void mem_map(address_map &map); @@ -222,7 +222,7 @@ void altos5_state::io_write_byte(offs_t offset, uint8_t data) prog_space.write_byte(offset, data); } -WRITE_LINE_MEMBER( altos5_state::busreq_w ) +void altos5_state::busreq_w(int state) { // since our Z80 has no support for BUSACK, we assume it is granted immediately m_maincpu->set_input_line(Z80_INPUT_LINE_BUSRQ, state); @@ -345,7 +345,7 @@ static void altos5_floppies(device_slot_interface &device) device.option_add("525qd", FLOPPY_525_QD); } -WRITE_LINE_MEMBER( altos5_state::fdc_intrq_w ) +void altos5_state::fdc_intrq_w(int state) { uint8_t data = m_port08 | ((uint8_t)(state) << 7); m_pio0->port_a_write(data); diff --git a/src/mame/altos/altos8600.cpp b/src/mame/altos/altos8600.cpp index 47daba8ac3b..80414d9bfcf 100644 --- a/src/mame/altos/altos8600.cpp +++ b/src/mame/altos/altos8600.cpp @@ -68,9 +68,9 @@ private: void romport_w(offs_t offset, u8 data); void clrsys_w(u8 data); void mode_w(u16 data); - DECLARE_WRITE_LINE_MEMBER(cpuif_w); - DECLARE_WRITE_LINE_MEMBER(fddrq_w); - DECLARE_WRITE_LINE_MEMBER(sintr1_w); + void cpuif_w(int state); + void fddrq_w(int state); + void sintr1_w(int state); void ics_attn_w(offs_t offset, u8 data); IRQ_CALLBACK_MEMBER(inta); @@ -338,7 +338,7 @@ void altos8600_state::hd_w(offs_t offset, u8 data) } } -WRITE_LINE_MEMBER(altos8600_state::cpuif_w) +void altos8600_state::cpuif_w(int state) { if(m_user) { @@ -350,13 +350,13 @@ WRITE_LINE_MEMBER(altos8600_state::cpuif_w) m_user = true; } -WRITE_LINE_MEMBER(altos8600_state::fddrq_w) +void altos8600_state::fddrq_w(int state) { if(!m_dmamplex) m_dmac->drq2_w(state); } -WRITE_LINE_MEMBER(altos8600_state::sintr1_w) +void altos8600_state::sintr1_w(int state) { if(state) { diff --git a/src/mame/amiga/alg.cpp b/src/mame/amiga/alg.cpp index a9697847ee3..5c96cf1155d 100644 --- a/src/mame/amiga/alg.cpp +++ b/src/mame/amiga/alg.cpp @@ -71,8 +71,8 @@ public: { } DECLARE_CUSTOM_INPUT_MEMBER(lightgun_pos_r); - DECLARE_READ_LINE_MEMBER(lightgun_trigger_r); - DECLARE_READ_LINE_MEMBER(lightgun_holster_r); + int lightgun_trigger_r(); + int lightgun_holster_r(); void init_aplatoon(); void init_palr3(); @@ -177,14 +177,14 @@ CUSTOM_INPUT_MEMBER(alg_state::lightgun_pos_r) } -READ_LINE_MEMBER(alg_state::lightgun_trigger_r) +int alg_state::lightgun_trigger_r() { // Read the trigger control based on the input select return (m_triggers->read() >> m_input_select) & 1; } -READ_LINE_MEMBER(alg_state::lightgun_holster_r) +int alg_state::lightgun_holster_r() { // Read the holster control based on the input select return (m_triggers->read() >> (2 + m_input_select)) & 1; diff --git a/src/mame/amiga/amiga.cpp b/src/mame/amiga/amiga.cpp index cdb7bb2c374..cb8e61587c4 100644 --- a/src/mame/amiga/amiga.cpp +++ b/src/mame/amiga/amiga.cpp @@ -115,7 +115,7 @@ public: return *this; } - DECLARE_WRITE_LINE_MEMBER(kbclk_w) + void kbclk_w(int state) { if (bool(state) != bool(m_kbclk)) { @@ -275,8 +275,8 @@ public: void init_pal(); void init_ntsc(); - DECLARE_WRITE_LINE_MEMBER( zorro2_int2_w ); - DECLARE_WRITE_LINE_MEMBER( zorro2_int6_w ); + void zorro2_int2_w(int state); + void zorro2_int6_w(int state); u16 clock_r(offs_t offset); void clock_w(offs_t offset, u16 data); @@ -315,8 +315,8 @@ public: void init_pal(); void init_ntsc(); - DECLARE_WRITE_LINE_MEMBER( side_int2_w ); - DECLARE_WRITE_LINE_MEMBER( side_int6_w ); + void side_int2_w(int state); + void side_int6_w(int state); void a500n(machine_config &config); void a500(machine_config &config); @@ -359,10 +359,10 @@ public: uint8_t dmac_scsi_data_read(offs_t offset); void dmac_scsi_data_write(offs_t offset, uint8_t data); - DECLARE_WRITE_LINE_MEMBER( dmac_int_w ); + void dmac_int_w(int state); void tpi_port_b_write(uint8_t data); - DECLARE_WRITE_LINE_MEMBER( tpi_int_w ); + void tpi_int_w(int state); void cdtv(machine_config &config); void cdtvn(machine_config &config); @@ -461,8 +461,8 @@ public: , m_gayle_int2(0) { } - DECLARE_WRITE_LINE_MEMBER( gayle_int2_w ); - DECLARE_WRITE_LINE_MEMBER( gayle_int6_w ); + void gayle_int2_w(int state); + void gayle_int6_w(int state); void init_pal(); void init_ntsc(); @@ -496,8 +496,8 @@ public: , m_gayle_int2(0) { } - DECLARE_WRITE_LINE_MEMBER( gayle_int2_w ); - DECLARE_WRITE_LINE_MEMBER( gayle_int6_w ); + void gayle_int2_w(int state); + void gayle_int6_w(int state); void init_pal(); void init_ntsc(); @@ -538,7 +538,7 @@ public: void scsi_w(offs_t offset, u32 data, u32 mem_mask = ~0); u16 ide_r(offs_t offset, u16 mem_mask = ~0); void ide_w(offs_t offset, u16 data, u16 mem_mask); - DECLARE_WRITE_LINE_MEMBER( ide_interrupt_w ); + void ide_interrupt_w(int state); u32 motherboard_r(offs_t offset, u32 mem_mask = ~0); void motherboard_w(offs_t offset, u32 data, u32 mem_mask = ~0); @@ -576,14 +576,14 @@ public: , m_cdda(*this, "akiko:cdda") { } - DECLARE_WRITE_LINE_MEMBER( akiko_int_w ); + void akiko_int_w(int state); void akiko_cia_0_port_a_write(uint8_t data); void handle_joystick_cia(u8 pra, u8 dra); u16 handle_joystick_potgor(u16 potgor); DECLARE_CUSTOM_INPUT_MEMBER( cd32_input ); - template DECLARE_READ_LINE_MEMBER( cd32_sel_mirror_input ); + template int cd32_sel_mirror_input(); void init_pal(); void init_ntsc(); @@ -660,7 +660,7 @@ void cdtv_state::dmac_scsi_data_write(offs_t offset, uint8_t data) m_tpi->write(offset, data); } -WRITE_LINE_MEMBER( cdtv_state::dmac_int_w ) +void cdtv_state::dmac_int_w(int state) { m_dmac_irq = state; update_int2(); @@ -672,7 +672,7 @@ void cdtv_state::tpi_port_b_write(uint8_t data) m_cdrom->enable_w(BIT(data, 1)); } -WRITE_LINE_MEMBER( cdtv_state::tpi_int_w ) +void cdtv_state::tpi_int_w(int state) { m_tpi_irq = state; update_int2(); @@ -847,13 +847,13 @@ void a2000_state::machine_reset() m_zorro->reset(); } -WRITE_LINE_MEMBER( a2000_state::zorro2_int2_w ) +void a2000_state::zorro2_int2_w(int state) { m_zorro2_int2 = state; update_int2(); } -WRITE_LINE_MEMBER( a2000_state::zorro2_int6_w ) +void a2000_state::zorro2_int6_w(int state) { m_zorro2_int6 = state; update_int6(); @@ -878,13 +878,13 @@ void a500_state::machine_reset() m_side->reset(); } -WRITE_LINE_MEMBER( a500_state::side_int2_w ) +void a500_state::side_int2_w(int state) { m_side_int2 = state; update_int2(); } -WRITE_LINE_MEMBER( a500_state::side_int6_w ) +void a500_state::side_int6_w(int state) { m_side_int6 = state; update_int6(); @@ -973,13 +973,13 @@ bool a600_state::int6_pending() return m_cia_1_irq || m_gayle_int6; } -WRITE_LINE_MEMBER( a600_state::gayle_int2_w ) +void a600_state::gayle_int2_w(int state) { m_gayle_int2 = state; update_int2(); } -WRITE_LINE_MEMBER( a600_state::gayle_int6_w ) +void a600_state::gayle_int6_w(int state) { m_gayle_int6 = state; update_int6(); @@ -995,13 +995,13 @@ bool a1200_state::int6_pending() return m_cia_1_irq || m_gayle_int6; } -WRITE_LINE_MEMBER( a1200_state::gayle_int2_w ) +void a1200_state::gayle_int2_w(int state) { m_gayle_int2 = state; update_int2(); } -WRITE_LINE_MEMBER( a1200_state::gayle_int6_w ) +void a1200_state::gayle_int6_w(int state) { m_gayle_int6 = state; update_int6(); @@ -1045,7 +1045,7 @@ void a4000_state::ide_w(offs_t offset, u16 data, u16 mem_mask) m_ata->cs0_swap_w((offset >> 1) & 0x07, data, mem_mask); } -WRITE_LINE_MEMBER( a4000_state::ide_interrupt_w ) +void a4000_state::ide_interrupt_w(int state) { m_ide_interrupt = state; } @@ -1090,7 +1090,7 @@ void a4000_state::motherboard_w(offs_t offset, u32 data, u32 mem_mask) logerror("motherboard_w(%06x): %08x & %08x\n", offset, data, mem_mask); } -WRITE_LINE_MEMBER(cd32_state::akiko_int_w) +void cd32_state::akiko_int_w(int state) { set_interrupt(INTENA_SETCLR | INTENA_PORTS); } @@ -1177,7 +1177,7 @@ CUSTOM_INPUT_MEMBER( cd32_state::cd32_input ) } template -READ_LINE_MEMBER( cd32_state::cd32_sel_mirror_input ) +int cd32_state::cd32_sel_mirror_input() { u8 bits = m_player_ports[P]->read(); return (bits & 0x20)>>5; diff --git a/src/mame/amiga/amiga.h b/src/mame/amiga/amiga.h index 40e05d66a2b..c7e424ebe2a 100644 --- a/src/mame/amiga/amiga.h +++ b/src/mame/amiga/amiga.h @@ -446,28 +446,28 @@ public: template DECLARE_CUSTOM_INPUT_MEMBER( amiga_joystick_convert ); DECLARE_CUSTOM_INPUT_MEMBER( floppy_drive_status ); - DECLARE_WRITE_LINE_MEMBER( m68k_reset ); - DECLARE_WRITE_LINE_MEMBER( kbreset_w ); + void m68k_reset(int state); + void kbreset_w(int state); uint16_t cia_r(offs_t offset, uint16_t mem_mask = ~0); void cia_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); void gayle_cia_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); void cia_0_port_a_write(uint8_t data); - DECLARE_WRITE_LINE_MEMBER( cia_0_irq ); + void cia_0_irq(int state); uint8_t cia_1_port_a_read(); void cia_1_port_a_write(uint8_t data); - DECLARE_WRITE_LINE_MEMBER( cia_1_irq ); + void cia_1_irq(int state); - DECLARE_WRITE_LINE_MEMBER( rs232_rx_w ); - DECLARE_WRITE_LINE_MEMBER( rs232_dcd_w ); - DECLARE_WRITE_LINE_MEMBER( rs232_dsr_w ); - DECLARE_WRITE_LINE_MEMBER( rs232_ri_w ); - DECLARE_WRITE_LINE_MEMBER( rs232_cts_w ); + void rs232_rx_w(int state); + void rs232_dcd_w(int state); + void rs232_dsr_w(int state); + void rs232_ri_w(int state); + void rs232_cts_w(int state); - DECLARE_WRITE_LINE_MEMBER( centronics_ack_w ); - DECLARE_WRITE_LINE_MEMBER( centronics_busy_w ); - DECLARE_WRITE_LINE_MEMBER( centronics_perror_w ); - DECLARE_WRITE_LINE_MEMBER( centronics_select_w ); + void centronics_ack_w(int state); + void centronics_busy_w(int state); + void centronics_perror_w(int state); + void centronics_select_w(int state); uint16_t custom_chip_r(offs_t offset); void custom_chip_w(offs_t offset, uint16_t data); @@ -477,8 +477,8 @@ public: uint16_t rom_mirror_r(offs_t offset, uint16_t mem_mask = ~0); uint32_t rom_mirror32_r(offs_t offset, uint32_t mem_mask = ~0); - DECLARE_WRITE_LINE_MEMBER(fdc_dskblk_w); - DECLARE_WRITE_LINE_MEMBER(fdc_dsksyn_w); + void fdc_dskblk_w(int state); + void fdc_dsksyn_w(int state); // standard clocks static constexpr XTAL CLK_28M_PAL = XTAL(28'375'160); diff --git a/src/mame/amiga/amiga_m.cpp b/src/mame/amiga/amiga_m.cpp index dd5d5419097..93adb100ba6 100644 --- a/src/mame/amiga/amiga_m.cpp +++ b/src/mame/amiga/amiga_m.cpp @@ -172,7 +172,7 @@ void amiga_state::machine_start() m_scanline_timer->adjust(m_screen->time_until_pos(0)); } -WRITE_LINE_MEMBER( amiga_state::m68k_reset ) +void amiga_state::m68k_reset(int state) { logerror("%s: Executed RESET\n", machine().describe_context()); machine_reset(); @@ -194,17 +194,17 @@ void amiga_state::machine_reset() m_overlay->set_bank(1); } -WRITE_LINE_MEMBER(amiga_state::fdc_dskblk_w) +void amiga_state::fdc_dskblk_w(int state) { set_interrupt(INTENA_SETCLR | INTENA_DSKBLK); } -WRITE_LINE_MEMBER(amiga_state::fdc_dsksyn_w) +void amiga_state::fdc_dsksyn_w(int state) { set_interrupt((state ? INTENA_SETCLR : 0) | INTENA_DSKSYN); } -WRITE_LINE_MEMBER( amiga_state::kbreset_w ) +void amiga_state::kbreset_w(int state) { // this is connected to the gary chip, gary then resets the 68k, agnus, paula and the cias if (!state) @@ -978,24 +978,24 @@ void amiga_state::blitter_setup() // CENTRONICS //************************************************************************** -WRITE_LINE_MEMBER( amiga_state::centronics_ack_w ) +void amiga_state::centronics_ack_w(int state) { m_cia_0->flag_w(state); } -WRITE_LINE_MEMBER( amiga_state::centronics_busy_w ) +void amiga_state::centronics_busy_w(int state) { m_centronics_busy = state; m_cia_1->sp_w(state); } -WRITE_LINE_MEMBER( amiga_state::centronics_perror_w ) +void amiga_state::centronics_perror_w(int state) { m_centronics_perror = state; m_cia_1->cnt_w(state); } -WRITE_LINE_MEMBER( amiga_state::centronics_select_w ) +void amiga_state::centronics_select_w(int state) { m_centronics_select = state; } @@ -1061,7 +1061,7 @@ void amiga_state::cia_0_port_a_write(uint8_t data) m_power_led = BIT(~data, 1); } -WRITE_LINE_MEMBER( amiga_state::cia_0_irq ) +void amiga_state::cia_0_irq(int state) { LOGMASKED(LOG_CIA, "%s: cia_0_irq: %d\n", machine().describe_context(), state); @@ -1096,7 +1096,7 @@ void amiga_state::cia_1_port_a_write(uint8_t data) } } -WRITE_LINE_MEMBER( amiga_state::cia_1_irq ) +void amiga_state::cia_1_irq(int state) { LOGMASKED(LOG_CIA, "%s: cia_1_irq: %d\n", machine().describe_context(), state); @@ -1806,7 +1806,7 @@ void amiga_state::rx_write(int level) CUSTOM_REG(REG_SERDATR) |= level << 11; } -WRITE_LINE_MEMBER( amiga_state::rs232_rx_w ) +void amiga_state::rs232_rx_w(int state) { rx_write(state); @@ -1815,22 +1815,22 @@ WRITE_LINE_MEMBER( amiga_state::rs232_rx_w ) serial_adjust(); } -WRITE_LINE_MEMBER( amiga_state::rs232_dcd_w ) +void amiga_state::rs232_dcd_w(int state) { m_rs232_dcd = state; } -WRITE_LINE_MEMBER( amiga_state::rs232_dsr_w ) +void amiga_state::rs232_dsr_w(int state) { m_rs232_dsr = state; } -WRITE_LINE_MEMBER( amiga_state::rs232_ri_w ) +void amiga_state::rs232_ri_w(int state) { m_rs232_ri = state; } -WRITE_LINE_MEMBER( amiga_state::rs232_cts_w ) +void amiga_state::rs232_cts_w(int state) { m_rs232_cts = state; } diff --git a/src/mame/amiga/cubo.cpp b/src/mame/amiga/cubo.cpp index a19025f9b26..c86f61fd1e1 100644 --- a/src/mame/amiga/cubo.cpp +++ b/src/mame/amiga/cubo.cpp @@ -344,9 +344,9 @@ public: uint16_t handle_joystick_potgor(uint16_t potgor); DECLARE_CUSTOM_INPUT_MEMBER(cubo_input); - template DECLARE_READ_LINE_MEMBER(cd32_sel_mirror_input); + template int cd32_sel_mirror_input(); - DECLARE_WRITE_LINE_MEMBER( akiko_int_w ); + void akiko_int_w(int state); void akiko_cia_0_port_a_write(uint8_t data); void init_cubo(); @@ -389,7 +389,7 @@ private: }; -WRITE_LINE_MEMBER( cubo_state::akiko_int_w ) +void cubo_state::akiko_int_w(int state) { set_interrupt(INTENA_SETCLR | INTENA_PORTS); } @@ -543,7 +543,7 @@ CUSTOM_INPUT_MEMBER( cubo_state::cubo_input ) } template -READ_LINE_MEMBER( cubo_state::cd32_sel_mirror_input ) +int cubo_state::cd32_sel_mirror_input() { uint8_t bits = m_player_ports[P]->read(); return (bits & 0x20)>>5; diff --git a/src/mame/ampro/lbpc.cpp b/src/mame/ampro/lbpc.cpp index 82c60ef49c3..0e983a4fd50 100644 --- a/src/mame/ampro/lbpc.cpp +++ b/src/mame/ampro/lbpc.cpp @@ -60,7 +60,7 @@ public: void lbpc(machine_config &config); - DECLARE_READ_LINE_MEMBER(hsi_r); + int hsi_r(); protected: virtual void machine_start() override; @@ -69,18 +69,18 @@ protected: private: u8 exp_dack1_r(); void exp_dack1_w(u8 data); - DECLARE_WRITE_LINE_MEMBER(iochck_w); - template DECLARE_WRITE_LINE_MEMBER(dmaak_w); - DECLARE_WRITE_LINE_MEMBER(eop_w); + void iochck_w(int state); + template void dmaak_w(int state); + void eop_w(int state); void keyboard_shift_in(); - DECLARE_WRITE_LINE_MEMBER(kbd_clock_w); - DECLARE_WRITE_LINE_MEMBER(kbd_data_w); + void kbd_clock_w(int state); + void kbd_data_w(int state); u8 keyboard_r(); u8 port61_r(); void port61_w(u8 data); u8 port62_r(); - DECLARE_WRITE_LINE_MEMBER(tout2_w); + void tout2_w(int state); void mem_map(address_map &map); void io_map(address_map &map); @@ -130,13 +130,13 @@ void lbpc_state::exp_dack1_w(u8 data) m_expbus->dack_w(0, data); } -WRITE_LINE_MEMBER(lbpc_state::iochck_w) +void lbpc_state::iochck_w(int state) { // TODO } template -WRITE_LINE_MEMBER(lbpc_state::dmaak_w) +void lbpc_state::dmaak_w(int state) { m_expbus->dack_line_w(Line + 1, state); if (!state) @@ -165,7 +165,7 @@ WRITE_LINE_MEMBER(lbpc_state::dmaak_w) } } -WRITE_LINE_MEMBER(lbpc_state::eop_w) +void lbpc_state::eop_w(int state) { m_eop_active = state == ASSERT_LINE; if (m_dma_channel != 0xff) @@ -199,14 +199,14 @@ void lbpc_state::keyboard_shift_in() LOG("%s: Shifting in 0 bit (%02X)\n", machine().describe_context(), m_kbd_input); } -WRITE_LINE_MEMBER(lbpc_state::kbd_clock_w) +void lbpc_state::kbd_clock_w(int state) { if (m_kbd_clock && !state) keyboard_shift_in(); m_kbd_clock = state; } -WRITE_LINE_MEMBER(lbpc_state::kbd_data_w) +void lbpc_state::kbd_data_w(int state) { m_kbd_data = state; } @@ -263,14 +263,14 @@ u8 lbpc_state::port62_r() return 0; } -WRITE_LINE_MEMBER(lbpc_state::tout2_w) +void lbpc_state::tout2_w(int state) { m_speaker_data = state; if (BIT(m_port61, 1)) m_speaker->level_w(state); } -READ_LINE_MEMBER(lbpc_state::hsi_r) +int lbpc_state::hsi_r() { // TODO return 0; diff --git a/src/mame/amstrad/amstrad.h b/src/mame/amstrad/amstrad.h index cab79b679c8..b14b98b3800 100644 --- a/src/mame/amstrad/amstrad.h +++ b/src/mame/amstrad/amstrad.h @@ -229,23 +229,23 @@ private: DECLARE_MACHINE_RESET(aleste); void aleste_palette(palette_device &palette) const; uint32_t screen_update_amstrad(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(screen_vblank_amstrad); + void screen_vblank_amstrad(int state); TIMER_CALLBACK_MEMBER(amstrad_pc2_low); TIMER_CALLBACK_MEMBER(amstrad_video_update_timer); TIMER_CALLBACK_MEMBER(cb_set_resolution); - DECLARE_WRITE_LINE_MEMBER(amstrad_hsync_changed); - DECLARE_WRITE_LINE_MEMBER(amstrad_plus_hsync_changed); - DECLARE_WRITE_LINE_MEMBER(amstrad_vsync_changed); - DECLARE_WRITE_LINE_MEMBER(amstrad_plus_vsync_changed); - DECLARE_WRITE_LINE_MEMBER(amstrad_de_changed); - DECLARE_WRITE_LINE_MEMBER(amstrad_plus_de_changed); + void amstrad_hsync_changed(int state); + void amstrad_plus_hsync_changed(int state); + void amstrad_vsync_changed(int state); + void amstrad_plus_vsync_changed(int state); + void amstrad_de_changed(int state); + void amstrad_plus_de_changed(int state); uint8_t amstrad_ppi_porta_r(); void amstrad_ppi_porta_w(uint8_t data); uint8_t amstrad_ppi_portb_r(); void amstrad_ppi_portc_w(uint8_t data); device_t* get_expansion_device(const char* tag); - DECLARE_WRITE_LINE_MEMBER( cpc_romdis ); + void cpc_romdis(int state); void rom_select(uint8_t data); static void amstrad_floppy_formats(format_registration &fr); @@ -259,7 +259,7 @@ private: void amstrad_rethinkMemory(); DECLARE_SNAPSHOT_LOAD_MEMBER(snapshot_cb); - DECLARE_WRITE_LINE_MEMBER(write_centronics_busy); + void write_centronics_busy(int state); void amstrad_io(address_map &map); void amstrad_mem(address_map &map); diff --git a/src/mame/amstrad/amstrad_m.cpp b/src/mame/amstrad/amstrad_m.cpp index 2914544398b..4d0aa81f3e4 100644 --- a/src/mame/amstrad/amstrad_m.cpp +++ b/src/mame/amstrad/amstrad_m.cpp @@ -820,7 +820,7 @@ void amstrad_state::amstrad_plus_update_video_sprites() } -WRITE_LINE_MEMBER(amstrad_state::amstrad_hsync_changed) +void amstrad_state::amstrad_hsync_changed(int state) { amstrad_update_video(); @@ -864,7 +864,7 @@ WRITE_LINE_MEMBER(amstrad_state::amstrad_hsync_changed) } -WRITE_LINE_MEMBER(amstrad_state::amstrad_plus_hsync_changed) +void amstrad_state::amstrad_plus_hsync_changed(int state) { amstrad_plus_update_video(); @@ -939,7 +939,7 @@ WRITE_LINE_MEMBER(amstrad_state::amstrad_plus_hsync_changed) } -WRITE_LINE_MEMBER(amstrad_state::amstrad_vsync_changed) +void amstrad_state::amstrad_vsync_changed(int state) { amstrad_update_video(); @@ -960,7 +960,7 @@ WRITE_LINE_MEMBER(amstrad_state::amstrad_vsync_changed) } -WRITE_LINE_MEMBER(amstrad_state::amstrad_plus_vsync_changed) +void amstrad_state::amstrad_plus_vsync_changed(int state) { amstrad_plus_update_video(); @@ -981,7 +981,7 @@ WRITE_LINE_MEMBER(amstrad_state::amstrad_plus_vsync_changed) } -WRITE_LINE_MEMBER(amstrad_state::amstrad_de_changed) +void amstrad_state::amstrad_de_changed(int state) { amstrad_update_video(); @@ -1004,7 +1004,7 @@ WRITE_LINE_MEMBER(amstrad_state::amstrad_de_changed) } -WRITE_LINE_MEMBER(amstrad_state::amstrad_plus_de_changed) +void amstrad_state::amstrad_plus_de_changed(int state) { amstrad_plus_update_video(); @@ -1097,7 +1097,7 @@ device_t* amstrad_state::get_expansion_device(const char* tag) return nullptr; } -WRITE_LINE_MEMBER(amstrad_state::cpc_romdis) +void amstrad_state::cpc_romdis(int state) { m_gate_array.romdis = state; amstrad_rethinkMemory(); @@ -2425,7 +2425,7 @@ void amstrad_state::kccomp_reset_machine() } -WRITE_LINE_MEMBER(amstrad_state::screen_vblank_amstrad) +void amstrad_state::screen_vblank_amstrad(int state) { // rising edge if (state) @@ -2553,7 +2553,7 @@ Note: On the CPC this can be used by a expansion device to report its presence. "1" = device connected, "0" = device not connected. This is not always used by all expansion devices. */ -WRITE_LINE_MEMBER(amstrad_state::write_centronics_busy) +void amstrad_state::write_centronics_busy(int state) { m_centronics_busy = state; } diff --git a/src/mame/amstrad/nc.cpp b/src/mame/amstrad/nc.cpp index 6cbf5c56e5a..f56cc07c312 100644 --- a/src/mame/amstrad/nc.cpp +++ b/src/mame/amstrad/nc.cpp @@ -104,9 +104,9 @@ public: { } - DECLARE_READ_LINE_MEMBER( pcmcia_card_detect_r ) { return m_pcmcia_card_detect; } - DECLARE_READ_LINE_MEMBER( pcmcia_write_protect_r ) { return m_pcmcia_write_protect; } - DECLARE_READ_LINE_MEMBER( pcmcia_battery_voltage_r ) { return m_pcmcia_battery_voltage_1 | m_pcmcia_battery_voltage_2; } + int pcmcia_card_detect_r() { return m_pcmcia_card_detect; } + int pcmcia_write_protect_r() { return m_pcmcia_write_protect; } + int pcmcia_battery_voltage_r() { return m_pcmcia_battery_voltage_1 | m_pcmcia_battery_voltage_2; } void nc_base(machine_config &config); @@ -123,7 +123,7 @@ protected: virtual void poweroff_control_w(uint8_t data); uint8_t irq_status_r(); - DECLARE_WRITE_LINE_MEMBER(centronics_busy_w); + void centronics_busy_w(int state); template uint8_t pcmcia_r(offs_t offset); template void pcmcia_w(offs_t offset, uint8_t data); @@ -177,10 +177,10 @@ private: uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER( pcmcia_card_detect_w ) { m_pcmcia_card_detect = state; } - DECLARE_WRITE_LINE_MEMBER( pcmcia_write_protect_w ) { m_pcmcia_write_protect = state; } - DECLARE_WRITE_LINE_MEMBER( pcmcia_battery_voltage_1_w ) { m_pcmcia_battery_voltage_1 = state; } - DECLARE_WRITE_LINE_MEMBER( pcmcia_battery_voltage_2_w ) { m_pcmcia_battery_voltage_2 = state; } + void pcmcia_card_detect_w(int state) { m_pcmcia_card_detect = state; } + void pcmcia_write_protect_w(int state) { m_pcmcia_write_protect = state; } + void pcmcia_battery_voltage_1_w(int state) { m_pcmcia_battery_voltage_1 = state; } + void pcmcia_battery_voltage_2_w(int state) { m_pcmcia_battery_voltage_2 = state; } int m_sound_channel_periods[2]{}; }; @@ -196,8 +196,8 @@ public: DECLARE_INPUT_CHANGED_MEMBER( power_button ); - DECLARE_READ_LINE_MEMBER( centronics_ack_r ) { return m_centronics_ack; } - DECLARE_READ_LINE_MEMBER( centronics_busy_r ) { return m_centronics_busy; } + int centronics_ack_r() { return m_centronics_ack; } + int centronics_busy_r() { return m_centronics_busy; } void nc100(machine_config &config); void nc150(machine_config &config); @@ -214,9 +214,9 @@ private: void irq_status_w(uint8_t data); uint8_t keyboard_r(offs_t offset); - DECLARE_WRITE_LINE_MEMBER(uart_txrdy_w); - DECLARE_WRITE_LINE_MEMBER(uart_rxrdy_w); - DECLARE_WRITE_LINE_MEMBER(centronics_ack_w); + void uart_txrdy_w(int state); + void uart_rxrdy_w(int state); + void centronics_ack_w(int state); int m_centronics_ack; }; @@ -257,7 +257,7 @@ private: uint8_t keyboard_r(offs_t offset); void fdc_int_w(int state); - DECLARE_WRITE_LINE_MEMBER(uart_rxrdy_w); + void uart_rxrdy_w(int state); void centronics_ack_w(int state); emu_timer *m_fdc_irq_timer; @@ -962,7 +962,7 @@ void nc200_state::card_wait_control_w(uint8_t data) // CENTRONICS //************************************************************************** -WRITE_LINE_MEMBER( nc_state::centronics_busy_w ) +void nc_state::centronics_busy_w(int state) { m_centronics_busy = state; } @@ -975,7 +975,7 @@ uint8_t nc200_state::centronics_busy_r() return m_centronics_busy; } -WRITE_LINE_MEMBER( nc100_state::centronics_ack_w ) +void nc100_state::centronics_ack_w(int state) { LOGMASKED(LOG_IRQ, "centronics_ack_w: %02x\n", state); @@ -987,7 +987,7 @@ WRITE_LINE_MEMBER( nc100_state::centronics_ack_w ) update_interrupts(); } -WRITE_LINE_MEMBER( nc200_state::centronics_ack_w ) +void nc200_state::centronics_ack_w(int state) { LOGMASKED(LOG_IRQ, "centronics_ack_w: %02x\n", state); @@ -1034,7 +1034,7 @@ void nc200_state::uart_control_w(uint8_t data) nc_state::uart_control_w(data); } -WRITE_LINE_MEMBER( nc100_state::uart_txrdy_w ) +void nc100_state::uart_txrdy_w(int state) { LOGMASKED(LOG_IRQ, "uart_txrdy_w: %02x\n", state); @@ -1046,7 +1046,7 @@ WRITE_LINE_MEMBER( nc100_state::uart_txrdy_w ) m_uart_txrdy = state; } -WRITE_LINE_MEMBER( nc100_state::uart_rxrdy_w ) +void nc100_state::uart_rxrdy_w(int state) { LOGMASKED(LOG_IRQ, "uart_rxrdy_w: %02x\n", state); @@ -1058,7 +1058,7 @@ WRITE_LINE_MEMBER( nc100_state::uart_rxrdy_w ) m_uart_rxrdy = state; } -WRITE_LINE_MEMBER( nc200_state::uart_rxrdy_w ) +void nc200_state::uart_rxrdy_w(int state) { LOGMASKED(LOG_IRQ, "uart_rxrdy_w: %02x\n", state); @@ -1075,7 +1075,7 @@ WRITE_LINE_MEMBER( nc200_state::uart_rxrdy_w ) // FLOPPY //************************************************************************** -WRITE_LINE_MEMBER( nc200_state::fdc_int_w ) +void nc200_state::fdc_int_w(int state) { LOGMASKED(LOG_IRQ, "fdc_int_w: %02x\n", state); diff --git a/src/mame/amstrad/pc1512.cpp b/src/mame/amstrad/pc1512.cpp index 2cd85a836a7..aa34b699f7e 100644 --- a/src/mame/amstrad/pc1512.cpp +++ b/src/mame/amstrad/pc1512.cpp @@ -778,12 +778,12 @@ INPUT_PORTS_END // PC1512_KEYBOARD_INTERFACE( kb_intf ) //------------------------------------------------- -WRITE_LINE_MEMBER( pc1512_base_state::kbdata_w ) +void pc1512_base_state::kbdata_w(int state) { m_kbdata = state; } -WRITE_LINE_MEMBER( pc1512_base_state::kbclk_w ) +void pc1512_base_state::kbclk_w(int state) { if (!BIT(m_port61, 7) && m_kbclk && !state) { @@ -833,14 +833,14 @@ void pc1512_base_state::update_fdc_tc() m_fdc->tc_w(false); } -WRITE_LINE_MEMBER( pc1512_base_state::hrq_w ) +void pc1512_base_state::hrq_w(int state) { m_maincpu->set_input_line(INPUT_LINE_HALT, state ? ASSERT_LINE : CLEAR_LINE); m_dmac->hack_w(state); } -WRITE_LINE_MEMBER( pc1512_base_state::eop_w ) +void pc1512_base_state::eop_w(int state) { if (m_dma_channel == 2) { @@ -907,22 +907,22 @@ void pc1512_base_state::iow3_w(uint8_t data) m_bus->dack_w(3, data); } -WRITE_LINE_MEMBER( pc1512_base_state::dack0_w ) +void pc1512_base_state::dack0_w(int state) { if (!state) m_dma_channel = 0; } -WRITE_LINE_MEMBER( pc1512_base_state::dack1_w ) +void pc1512_base_state::dack1_w(int state) { if (!state) m_dma_channel = 1; } -WRITE_LINE_MEMBER( pc1512_base_state::dack2_w ) +void pc1512_base_state::dack2_w(int state) { if (!state) m_dma_channel = 2; } -WRITE_LINE_MEMBER( pc1512_base_state::dack3_w ) +void pc1512_base_state::dack3_w(int state) { if (!state) m_dma_channel = 3; } @@ -936,7 +936,7 @@ void pc1512_base_state::update_speaker() m_speaker->level_w(m_speaker_drive & m_pit2); } -WRITE_LINE_MEMBER( pc1512_base_state::pit1_w ) +void pc1512_base_state::pit1_w(int state) { if (!m_pit1 && state && !m_dreq0) { @@ -947,7 +947,7 @@ WRITE_LINE_MEMBER( pc1512_base_state::pit1_w ) m_pit1 = state; } -WRITE_LINE_MEMBER( pc1512_base_state::pit2_w ) +void pc1512_base_state::pit2_w(int state) { m_pit2 = state; update_speaker(); @@ -973,13 +973,13 @@ void pc1512_base_state::update_fdc_drq() m_dmac->dreq2_w(0); } -WRITE_LINE_MEMBER( pc1512_base_state::fdc_int_w ) +void pc1512_base_state::fdc_int_w(int state) { m_dint = state; update_fdc_int(); } -WRITE_LINE_MEMBER( pc1512_base_state::fdc_drq_w ) +void pc1512_base_state::fdc_drq_w(int state) { m_ddrq = state; update_fdc_drq(); @@ -1013,28 +1013,28 @@ void pc1512_base_state::update_ack() m_pic->ir7_w(CLEAR_LINE); } -WRITE_LINE_MEMBER( pc1512_base_state::write_centronics_ack ) +void pc1512_base_state::write_centronics_ack(int state) { m_centronics_ack = state; update_ack(); } -WRITE_LINE_MEMBER( pc1512_base_state::write_centronics_busy ) +void pc1512_base_state::write_centronics_busy(int state) { m_centronics_busy = state; } -WRITE_LINE_MEMBER( pc1512_base_state::write_centronics_perror ) +void pc1512_base_state::write_centronics_perror(int state) { m_centronics_perror = state; } -WRITE_LINE_MEMBER( pc1512_base_state::write_centronics_select ) +void pc1512_base_state::write_centronics_select(int state) { m_centronics_select = state; } -WRITE_LINE_MEMBER( pc1512_base_state::write_centronics_fault ) +void pc1512_base_state::write_centronics_fault(int state) { m_centronics_fault = state; } diff --git a/src/mame/amstrad/pc1512.h b/src/mame/amstrad/pc1512.h index 94e98c09401..527996511d9 100644 --- a/src/mame/amstrad/pc1512.h +++ b/src/mame/amstrad/pc1512.h @@ -115,12 +115,12 @@ public: void nmi_mask_w(uint8_t data); uint8_t printer_r(offs_t offset); void printer_w(offs_t offset, uint8_t data); - DECLARE_WRITE_LINE_MEMBER( kbdata_w ); - DECLARE_WRITE_LINE_MEMBER( kbclk_w ); - DECLARE_WRITE_LINE_MEMBER( pit1_w ); - DECLARE_WRITE_LINE_MEMBER( pit2_w ); - DECLARE_WRITE_LINE_MEMBER( hrq_w ); - DECLARE_WRITE_LINE_MEMBER( eop_w ); + void kbdata_w(int state); + void kbclk_w(int state); + void pit1_w(int state); + void pit2_w(int state); + void hrq_w(int state); + void eop_w(int state); uint8_t memr_r(offs_t offset); void memw_w(offs_t offset, uint8_t data); uint8_t ior1_r(); @@ -130,18 +130,18 @@ public: void iow1_w(uint8_t data); void iow2_w(uint8_t data); void iow3_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER( dack0_w ); - DECLARE_WRITE_LINE_MEMBER( dack1_w ); - DECLARE_WRITE_LINE_MEMBER( dack2_w ); - DECLARE_WRITE_LINE_MEMBER( dack3_w ); - DECLARE_WRITE_LINE_MEMBER( fdc_int_w ); - DECLARE_WRITE_LINE_MEMBER( fdc_drq_w ); + void dack0_w(int state); + void dack1_w(int state); + void dack2_w(int state); + void dack3_w(int state); + void fdc_int_w(int state); + void fdc_drq_w(int state); void drive_select_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER( write_centronics_ack ); - DECLARE_WRITE_LINE_MEMBER( write_centronics_busy ); - DECLARE_WRITE_LINE_MEMBER( write_centronics_perror ); - DECLARE_WRITE_LINE_MEMBER( write_centronics_select ); - DECLARE_WRITE_LINE_MEMBER( write_centronics_fault ); + void write_centronics_ack(int state); + void write_centronics_busy(int state); + void write_centronics_perror(int state); + void write_centronics_select(int state); + void write_centronics_fault(int state); void mouse_x_w(uint8_t data); void mouse_y_w(uint8_t data); diff --git a/src/mame/amstrad/pc1512kb.cpp b/src/mame/amstrad/pc1512kb.cpp index febc7d917f9..1882b4fa02c 100644 --- a/src/mame/amstrad/pc1512kb.cpp +++ b/src/mame/amstrad/pc1512kb.cpp @@ -270,7 +270,7 @@ TIMER_CALLBACK_MEMBER(pc1512_keyboard_device::reset_timer_tick) // data_w - keyboard data input //------------------------------------------------- -WRITE_LINE_MEMBER( pc1512_keyboard_device::data_w ) +void pc1512_keyboard_device::data_w(int state) { m_data_in = state; } @@ -280,7 +280,7 @@ WRITE_LINE_MEMBER( pc1512_keyboard_device::data_w ) // clock_w - keyboard clock input //------------------------------------------------- -WRITE_LINE_MEMBER( pc1512_keyboard_device::clock_w ) +void pc1512_keyboard_device::clock_w(int state) { if (m_clock_in != state) { @@ -302,7 +302,7 @@ WRITE_LINE_MEMBER( pc1512_keyboard_device::clock_w ) // m1_w - mouse button 1 //------------------------------------------------- -WRITE_LINE_MEMBER( pc1512_keyboard_device::m1_w ) +void pc1512_keyboard_device::m1_w(int state) { m_m1 = state; } @@ -312,7 +312,7 @@ WRITE_LINE_MEMBER( pc1512_keyboard_device::m1_w ) // m2_w - mouse button 2 //------------------------------------------------- -WRITE_LINE_MEMBER( pc1512_keyboard_device::m2_w ) +void pc1512_keyboard_device::m2_w(int state) { m_m2 = state; } @@ -458,7 +458,7 @@ void pc1512_keyboard_device::kb_p2_w(uint8_t data) // kb_t0_r - //------------------------------------------------- -READ_LINE_MEMBER( pc1512_keyboard_device::kb_t0_r ) +int pc1512_keyboard_device::kb_t0_r() { return m_m1; } @@ -468,7 +468,7 @@ READ_LINE_MEMBER( pc1512_keyboard_device::kb_t0_r ) // kb_t1_r - //------------------------------------------------- -READ_LINE_MEMBER( pc1512_keyboard_device::kb_t1_r ) +int pc1512_keyboard_device::kb_t1_r() { return m_m2; } diff --git a/src/mame/amstrad/pc1512kb.h b/src/mame/amstrad/pc1512kb.h index 5c85a6ea532..69ef24c28f7 100644 --- a/src/mame/amstrad/pc1512kb.h +++ b/src/mame/amstrad/pc1512kb.h @@ -39,10 +39,10 @@ public: auto clock_wr_callback() { return m_write_clock.bind(); } auto data_wr_callback() { return m_write_data.bind(); } - DECLARE_WRITE_LINE_MEMBER( data_w ); - DECLARE_WRITE_LINE_MEMBER( clock_w ); - DECLARE_WRITE_LINE_MEMBER( m1_w ); - DECLARE_WRITE_LINE_MEMBER( m2_w ); + void data_w(int state); + void clock_w(int state); + void m1_w(int state); + void m2_w(int state); protected: // device-level overrides @@ -85,8 +85,8 @@ private: void kb_p1_w(uint8_t data); uint8_t kb_p2_r(); void kb_p2_w(uint8_t data); - DECLARE_READ_LINE_MEMBER( kb_t0_r ); - DECLARE_READ_LINE_MEMBER( kb_t1_r ); + int kb_t0_r(); + int kb_t1_r(); }; diff --git a/src/mame/amstrad/pcw.cpp b/src/mame/amstrad/pcw.cpp index 140efd0f640..d1290189727 100644 --- a/src/mame/amstrad/pcw.cpp +++ b/src/mame/amstrad/pcw.cpp @@ -193,7 +193,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(pcw_state::pcw_timer_interrupt) /* PCW uses UPD765 in NON-DMA mode. FDC Ints are connected to /INT or * /NMI depending on choice (see system control below) * fdc interrupt callback. set/clear fdc int */ -WRITE_LINE_MEMBER( pcw_state::pcw_fdc_interrupt ) +void pcw_state::pcw_fdc_interrupt(int state) { if (!state) m_system_status &= ~(1<<5); @@ -810,13 +810,13 @@ void pcw_state::mcu_printer_p2_w(uint8_t data) } // Paper sensor -READ_LINE_MEMBER(pcw_state::mcu_printer_t1_r) +int pcw_state::mcu_printer_t1_r() { return 1; } // Print head location (0 if at left margin, otherwise 1) -READ_LINE_MEMBER(pcw_state::mcu_printer_t0_r) +int pcw_state::mcu_printer_t0_r() { if(m_printer_headpos == 0) return 0; @@ -911,12 +911,12 @@ uint8_t pcw_state::mcu_kb_data_r() return 0xff; } -READ_LINE_MEMBER(pcw_state::mcu_kb_t1_r) +int pcw_state::mcu_kb_t1_r() { return 1; } -READ_LINE_MEMBER(pcw_state::mcu_kb_t0_r) +int pcw_state::mcu_kb_t0_r() { return 0; } diff --git a/src/mame/amstrad/pcw.h b/src/mame/amstrad/pcw.h index 1a1b6d3150c..c27feda1e73 100644 --- a/src/mame/amstrad/pcw.h +++ b/src/mame/amstrad/pcw.h @@ -116,15 +116,15 @@ private: void mcu_printer_p1_w(uint8_t data); uint8_t mcu_printer_p2_r(); void mcu_printer_p2_w(uint8_t data); - DECLARE_READ_LINE_MEMBER(mcu_printer_t1_r); - DECLARE_READ_LINE_MEMBER(mcu_printer_t0_r); + int mcu_printer_t1_r(); + int mcu_printer_t0_r(); uint8_t mcu_kb_scan_r(); void mcu_kb_scan_w(uint8_t data); uint8_t mcu_kb_scan_high_r(); void mcu_kb_scan_high_w(uint8_t data); uint8_t mcu_kb_data_r(); - DECLARE_READ_LINE_MEMBER(mcu_kb_t1_r); - DECLARE_READ_LINE_MEMBER(mcu_kb_t0_r); + int mcu_kb_t1_r(); + int mcu_kb_t0_r(); uint8_t pcw9512_parallel_r(offs_t offset); void pcw9512_parallel_w(offs_t offset, uint8_t data); void mcu_transmit_serial(uint8_t bit); @@ -142,7 +142,7 @@ private: static void floppy_formats(format_registration &fr); - DECLARE_WRITE_LINE_MEMBER( pcw_fdc_interrupt ); + void pcw_fdc_interrupt(int state); required_device m_maincpu; required_device m_printer_mcu; required_device m_keyboard_mcu; diff --git a/src/mame/amstrad/pcw16.cpp b/src/mame/amstrad/pcw16.cpp index 30269417e00..58ae3df0837 100644 --- a/src/mame/amstrad/pcw16.cpp +++ b/src/mame/amstrad/pcw16.cpp @@ -523,7 +523,7 @@ void pcw16_state::pcw16_keyboard_control_w(uint8_t data) } -WRITE_LINE_MEMBER(pcw16_state::pcw16_keyboard_callback) +void pcw16_state::pcw16_keyboard_callback(int state) { if(!state) return; @@ -891,7 +891,7 @@ void pcw16_state::pcw16_system_control_w(uint8_t data) } } -WRITE_LINE_MEMBER( pcw16_state::fdc_interrupt ) +void pcw16_state::fdc_interrupt(int state) { /* IRQ6 */ /* bit 6 of PCW16 system status indicates floppy ints */ @@ -904,7 +904,7 @@ WRITE_LINE_MEMBER( pcw16_state::fdc_interrupt ) } -WRITE_LINE_MEMBER(pcw16_state::pcw16_com_interrupt_1) +void pcw16_state::pcw16_com_interrupt_1(int state) { m_system_status &= ~(1 << 4); @@ -916,7 +916,7 @@ WRITE_LINE_MEMBER(pcw16_state::pcw16_com_interrupt_1) } -WRITE_LINE_MEMBER(pcw16_state::pcw16_com_interrupt_2) +void pcw16_state::pcw16_com_interrupt_2(int state) { m_system_status &= ~(1 << 3); diff --git a/src/mame/amstrad/pcw16.h b/src/mame/amstrad/pcw16.h index aa58808a074..529e9f7c2c6 100644 --- a/src/mame/amstrad/pcw16.h +++ b/src/mame/amstrad/pcw16.h @@ -101,12 +101,12 @@ protected: uint32_t screen_update_pcw16(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); TIMER_DEVICE_CALLBACK_MEMBER(pcw16_timer_callback); TIMER_DEVICE_CALLBACK_MEMBER(rtc_timer_callback); - DECLARE_WRITE_LINE_MEMBER(pcw16_com_interrupt_1); - DECLARE_WRITE_LINE_MEMBER(pcw16_com_interrupt_2); - DECLARE_WRITE_LINE_MEMBER(pcw16_keyboard_callback); + void pcw16_com_interrupt_1(int state); + void pcw16_com_interrupt_2(int state); + void pcw16_keyboard_callback(int state); void trigger_fdc_int(); - DECLARE_WRITE_LINE_MEMBER( fdc_interrupt ); + void fdc_interrupt(int state); inline void pcw16_plot_pixel(bitmap_ind16 &bitmap, int x, int y, uint32_t color); void pcw16_vh_decode_mode0(bitmap_ind16 &bitmap, int x, int y, uint8_t byte); void pcw16_vh_decode_mode1(bitmap_ind16 &bitmap, int x, int y, uint8_t byte); diff --git a/src/mame/amstrad/pda600.cpp b/src/mame/amstrad/pda600.cpp index deb73b749cb..6c90f850796 100644 --- a/src/mame/amstrad/pda600.cpp +++ b/src/mame/amstrad/pda600.cpp @@ -124,7 +124,7 @@ public: } void pda600(machine_config &config); - DECLARE_WRITE_LINE_MEMBER(power_off_w) { m_maincpu->set_input_line(Z180_INPUT_LINE_IRQ1, state); } + void power_off_w(int state) { m_maincpu->set_input_line(Z180_INPUT_LINE_IRQ1, state); } private: required_device m_maincpu; diff --git a/src/mame/amstrad/pda600_copro.cpp b/src/mame/amstrad/pda600_copro.cpp index 0608d57634c..bb67fe10be7 100644 --- a/src/mame/amstrad/pda600_copro.cpp +++ b/src/mame/amstrad/pda600_copro.cpp @@ -285,7 +285,7 @@ TIMER_CALLBACK_MEMBER(pda600_copro_device::update_timer) } -WRITE_LINE_MEMBER( pda600_copro_device::wakeup_w ) +void pda600_copro_device::wakeup_w(int state) { if (m_state != STATE_SLEEP && m_state != STATE_READY) logerror("PDA600: wakeup_w in %d state\n", m_state); diff --git a/src/mame/amstrad/pda600_copro.h b/src/mame/amstrad/pda600_copro.h index 16187e06b59..a504655d583 100644 --- a/src/mame/amstrad/pda600_copro.h +++ b/src/mame/amstrad/pda600_copro.h @@ -28,9 +28,9 @@ public: auto tx_callback() { return m_tx_cb.bind(); } auto tone_callback() { return m_tone_cb.bind(); } - DECLARE_WRITE_LINE_MEMBER( wakeup_w ); - DECLARE_WRITE_LINE_MEMBER( reset_w ) { if (state) device_reset(); } - DECLARE_WRITE_LINE_MEMBER( write_txd ) { rx_w(state); } + void wakeup_w(int state); + void reset_w(int state) { if (state) device_reset(); } + void write_txd(int state) { rx_w(state); } private: // device-level overrides diff --git a/src/mame/apf/apf.cpp b/src/mame/apf/apf.cpp index d806253d1a1..3cda9bc9e93 100644 --- a/src/mame/apf/apf.cpp +++ b/src/mame/apf/apf.cpp @@ -133,7 +133,7 @@ private: uint8_t videoram_r(offs_t offset); uint8_t pia0_porta_r(); void pia0_portb_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(pia0_ca2_w); + void pia0_ca2_w(int state); uint8_t pia1_porta_r(); uint8_t pia1_portb_r(); void pia1_portb_w(uint8_t data); @@ -219,7 +219,7 @@ void apf_state::pia0_portb_w(uint8_t data) m_pad_data = data; } -WRITE_LINE_MEMBER( apf_state::pia0_ca2_w ) +void apf_state::pia0_ca2_w(int state) { m_ca2 = state; } diff --git a/src/mame/apollo/apollo.cpp b/src/mame/apollo/apollo.cpp index 20bf0882b5e..74b7734551f 100644 --- a/src/mame/apollo/apollo.cpp +++ b/src/mame/apollo/apollo.cpp @@ -920,7 +920,7 @@ void apollo_state::machine_reset() #endif } -WRITE_LINE_MEMBER(apollo_state::apollo_reset_instr_callback) +void apollo_state::apollo_reset_instr_callback(int state) { MLOG1(("apollo_reset_instr_callback")); @@ -1032,7 +1032,7 @@ static INPUT_PORTS_START( dsp3500 ) PORT_INCLUDE(apollo_config) INPUT_PORTS_END -READ_LINE_MEMBER( apollo_state::apollo_kbd_is_german ) +int apollo_state::apollo_kbd_is_german() { return (apollo_config(APOLLO_CONF_GERMAN_KBD) != 0) ? ASSERT_LINE : CLEAR_LINE; } diff --git a/src/mame/apollo/apollo.h b/src/mame/apollo/apollo.h index 25f80124fc1..3a3ba03f59d 100644 --- a/src/mame/apollo/apollo.h +++ b/src/mame/apollo/apollo.h @@ -242,19 +242,19 @@ private: u16 apollo_irq_acknowledge(offs_t offset); u16 apollo_pic_get_vector(); void apollo_bus_error(); - DECLARE_READ_LINE_MEMBER( apollo_kbd_is_german ); - DECLARE_WRITE_LINE_MEMBER( apollo_dma8237_out_eop ); - DECLARE_WRITE_LINE_MEMBER( apollo_dma_1_hrq_changed ); - DECLARE_WRITE_LINE_MEMBER( apollo_dma_2_hrq_changed ); - DECLARE_WRITE_LINE_MEMBER( apollo_pic8259_master_set_int_line ); - DECLARE_WRITE_LINE_MEMBER( apollo_pic8259_slave_set_int_line ); - DECLARE_WRITE_LINE_MEMBER( sio_irq_handler ); + int apollo_kbd_is_german(); + void apollo_dma8237_out_eop(int state); + void apollo_dma_1_hrq_changed(int state); + void apollo_dma_2_hrq_changed(int state); + void apollo_pic8259_master_set_int_line(int state); + void apollo_pic8259_slave_set_int_line(int state); + void sio_irq_handler(int state); void sio_output(uint8_t data); - DECLARE_WRITE_LINE_MEMBER( sio2_irq_handler ); - DECLARE_WRITE_LINE_MEMBER( apollo_ptm_irq_function ); - DECLARE_WRITE_LINE_MEMBER( apollo_ptm_timer_tick ); + void sio2_irq_handler(int state); + void apollo_ptm_irq_function(int state); + void apollo_ptm_timer_tick(int state); uint8_t apollo_pic8259_get_slave_ack(offs_t offset); - DECLARE_WRITE_LINE_MEMBER( apollo_rtc_irq_function ); + void apollo_rtc_irq_function(int state); uint8_t pc_dma8237_0_dack_r(); uint8_t pc_dma8237_1_dack_r(); @@ -270,19 +270,19 @@ private: void pc_dma8237_5_dack_w(uint8_t data); void pc_dma8237_6_dack_w(uint8_t data); void pc_dma8237_7_dack_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(pc_dack0_w); - DECLARE_WRITE_LINE_MEMBER(pc_dack1_w); - DECLARE_WRITE_LINE_MEMBER(pc_dack2_w); - DECLARE_WRITE_LINE_MEMBER(pc_dack3_w); - DECLARE_WRITE_LINE_MEMBER(pc_dack4_w); - DECLARE_WRITE_LINE_MEMBER(pc_dack5_w); - DECLARE_WRITE_LINE_MEMBER(pc_dack6_w); - DECLARE_WRITE_LINE_MEMBER(pc_dack7_w); + void pc_dack0_w(int state); + void pc_dack1_w(int state); + void pc_dack2_w(int state); + void pc_dack3_w(int state); + void pc_dack4_w(int state); + void pc_dack5_w(int state); + void pc_dack6_w(int state); + void pc_dack7_w(int state); void apollo_pic_set_irq_line(int irq, int state); void select_dma_channel(int channel, bool state); - DECLARE_WRITE_LINE_MEMBER(apollo_reset_instr_callback); + void apollo_reset_instr_callback(int state); void common(machine_config &config); void apollo(machine_config &config); diff --git a/src/mame/apollo/apollo_m.cpp b/src/mame/apollo/apollo_m.cpp index 3f6fcb50dce..52e34f02722 100644 --- a/src/mame/apollo/apollo_m.cpp +++ b/src/mame/apollo/apollo_m.cpp @@ -465,14 +465,14 @@ void apollo_state::apollo_dma_write_word(offs_t offset, uint8_t data){ SLOG1(("dma write word at offset %x+%03x = %02x", page_offset, offset, data)); } -WRITE_LINE_MEMBER(apollo_state::apollo_dma8237_out_eop ) { +void apollo_state::apollo_dma8237_out_eop(int state) { CLOG1(("dma out eop state %02x", state)); m_cur_eop = state == ASSERT_LINE; if(m_dma_channel != -1) m_isa->eop_w(m_dma_channel, m_cur_eop ? ASSERT_LINE : CLEAR_LINE ); } -WRITE_LINE_MEMBER(apollo_state::apollo_dma_1_hrq_changed ) { +void apollo_state::apollo_dma_1_hrq_changed(int state) { CLOG2(("dma 1 hrq changed state %02x", state)); m_dma8237_1->dreq0_w(state); @@ -483,7 +483,7 @@ WRITE_LINE_MEMBER(apollo_state::apollo_dma_1_hrq_changed ) { // i8237_hlda_w(get_device_dma8237_2(device), state); } -WRITE_LINE_MEMBER(apollo_state::apollo_dma_2_hrq_changed ) { +void apollo_state::apollo_dma_2_hrq_changed(int state) { CLOG2(("dma 2 hrq changed state %02x", state)); m_maincpu->set_input_line(INPUT_LINE_HALT, state ? ASSERT_LINE : CLEAR_LINE); @@ -507,14 +507,14 @@ void apollo_state::pc_dma8237_5_dack_w(uint8_t data){ m_isa->dack_w(5, data); } void apollo_state::pc_dma8237_6_dack_w(uint8_t data){ m_isa->dack_w(6, data); } void apollo_state::pc_dma8237_7_dack_w(uint8_t data){ m_isa->dack_w(7, data); } -WRITE_LINE_MEMBER( apollo_state::pc_dack0_w ) { select_dma_channel(0, state); } -WRITE_LINE_MEMBER( apollo_state::pc_dack1_w ) { select_dma_channel(1, state); } -WRITE_LINE_MEMBER( apollo_state::pc_dack2_w ) { select_dma_channel(2, state); } -WRITE_LINE_MEMBER( apollo_state::pc_dack3_w ) { select_dma_channel(3, state); } -WRITE_LINE_MEMBER( apollo_state::pc_dack4_w ) { m_dma8237_1->hack_w( state ? 0 : 1); } // it's inverted -WRITE_LINE_MEMBER( apollo_state::pc_dack5_w ) { select_dma_channel(5, state); } -WRITE_LINE_MEMBER( apollo_state::pc_dack6_w ) { select_dma_channel(6, state); } -WRITE_LINE_MEMBER( apollo_state::pc_dack7_w ) { select_dma_channel(7, state); } +void apollo_state::pc_dack0_w(int state) { select_dma_channel(0, state); } +void apollo_state::pc_dack1_w(int state) { select_dma_channel(1, state); } +void apollo_state::pc_dack2_w(int state) { select_dma_channel(2, state); } +void apollo_state::pc_dack3_w(int state) { select_dma_channel(3, state); } +void apollo_state::pc_dack4_w(int state) { m_dma8237_1->hack_w( state ? 0 : 1); } // it's inverted +void apollo_state::pc_dack5_w(int state) { select_dma_channel(5, state); } +void apollo_state::pc_dack6_w(int state) { select_dma_channel(6, state); } +void apollo_state::pc_dack7_w(int state) { select_dma_channel(7, state); } void apollo_state::select_dma_channel(int channel, bool state) { @@ -594,7 +594,7 @@ uint8_t apollo_state::apollo_pic8259_get_slave_ack(offs_t offset) return offset == 3 ? m_pic8259_slave->acknowledge() : 0; } -WRITE_LINE_MEMBER( apollo_state::apollo_pic8259_master_set_int_line ) { +void apollo_state::apollo_pic8259_master_set_int_line(int state) { static int interrupt_line = -1; if (state != interrupt_line) { device_t *device = m_pic8259_master; @@ -613,7 +613,7 @@ WRITE_LINE_MEMBER( apollo_state::apollo_pic8259_master_set_int_line ) { m_maincpu->set_input_line(M68K_IRQ_6,state ? ASSERT_LINE : CLEAR_LINE); } -WRITE_LINE_MEMBER( apollo_state::apollo_pic8259_slave_set_int_line ) { +void apollo_state::apollo_pic8259_slave_set_int_line(int state) { static int interrupt_line = -1; if (state != interrupt_line) { device_t *device = m_pic8259_slave; @@ -630,7 +630,7 @@ WRITE_LINE_MEMBER( apollo_state::apollo_pic8259_slave_set_int_line ) { #undef VERBOSE #define VERBOSE 0 -WRITE_LINE_MEMBER(apollo_state::apollo_ptm_timer_tick) +void apollo_state::apollo_ptm_timer_tick(int state) { if ((state) && (m_ptm->started())) { @@ -646,7 +646,7 @@ WRITE_LINE_MEMBER(apollo_state::apollo_ptm_timer_tick) } } -WRITE_LINE_MEMBER(apollo_state::apollo_ptm_irq_function) +void apollo_state::apollo_ptm_irq_function(int state) { apollo_pic_set_irq_line(APOLLO_IRQ_PTM, state); } @@ -688,7 +688,7 @@ uint8_t apollo_state::apollo_rtc_r(offs_t offset) return data; } -WRITE_LINE_MEMBER(apollo_state::apollo_rtc_irq_function) +void apollo_state::apollo_rtc_irq_function(int state) { apollo_pic_set_irq_line(APOLLO_IRQ_RTC, state); } @@ -790,7 +790,7 @@ void apollo_sio::write(offs_t offset, uint8_t data) // device type definition DEFINE_DEVICE_TYPE(APOLLO_SIO, apollo_sio, "apollo_sio", "DN3000/DS3500 SIO (MC2681)") -WRITE_LINE_MEMBER(apollo_state::sio_irq_handler) +void apollo_state::sio_irq_handler(int state) { apollo_pic_set_irq_line(APOLLO_IRQ_SIO1, state); } @@ -820,7 +820,7 @@ void apollo_state::sio_output(uint8_t data) // machine/apollo_sio2.c - APOLLO DS3500 SIO2 //########################################################################## -WRITE_LINE_MEMBER(apollo_state::sio2_irq_handler) +void apollo_state::sio2_irq_handler(int state) { apollo_pic_set_irq_line(APOLLO_IRQ_SIO2, state); } diff --git a/src/mame/apple/apple1.cpp b/src/mame/apple/apple1.cpp index 027d7124df5..63301adab1c 100644 --- a/src/mame/apple/apple1.cpp +++ b/src/mame/apple/apple1.cpp @@ -143,7 +143,7 @@ private: void ram_w(offs_t offset, uint8_t data); uint8_t pia_keyboard_r(); void pia_display_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(pia_display_gate_w); + void pia_display_gate_w(int state); DECLARE_SNAPSHOT_LOAD_MEMBER(snapshot_cb); TIMER_CALLBACK_MEMBER(ready_start_cb); TIMER_CALLBACK_MEMBER(ready_end_cb); @@ -475,7 +475,7 @@ void apple1_state::pia_display_w(uint8_t data) // CB2 here is connected two places: Port B bit 7 for CPU readback, // and to the display hardware -WRITE_LINE_MEMBER(apple1_state::pia_display_gate_w) +void apple1_state::pia_display_gate_w(int state) { m_pia->portb_w((state << 7) ^ 0x80); diff --git a/src/mame/apple/apple2.cpp b/src/mame/apple/apple2.cpp index 26f2deb84a2..4cb076c027d 100644 --- a/src/mame/apple/apple2.cpp +++ b/src/mame/apple/apple2.cpp @@ -142,13 +142,13 @@ public: void c800_w(offs_t offset, u8 data); u8 inh_r(offs_t offset); void inh_w(offs_t offset, u8 data); - DECLARE_WRITE_LINE_MEMBER(a2bus_irq_w); - DECLARE_WRITE_LINE_MEMBER(a2bus_nmi_w); - DECLARE_WRITE_LINE_MEMBER(a2bus_inh_w); - DECLARE_READ_LINE_MEMBER(ay3600_shift_r); - DECLARE_READ_LINE_MEMBER(ay3600_control_r); - DECLARE_WRITE_LINE_MEMBER(ay3600_data_ready_w); - DECLARE_WRITE_LINE_MEMBER(ay3600_ako_w); + void a2bus_irq_w(int state); + void a2bus_nmi_w(int state); + void a2bus_inh_w(int state); + int ay3600_shift_r(); + int ay3600_control_r(); + void ay3600_data_ready_w(int state); + void ay3600_ako_w(int state); void apple2_common(machine_config &config); void apple2jp(machine_config &config); @@ -201,18 +201,18 @@ offs_t apple2_state::dasm_trampoline(std::ostream &stream, offs_t pc, const util return m_a2common->dasm_override(stream, pc, opcodes, params); } -WRITE_LINE_MEMBER(apple2_state::a2bus_irq_w) +void apple2_state::a2bus_irq_w(int state) { m_maincpu->set_input_line(M6502_IRQ_LINE, state); } -WRITE_LINE_MEMBER(apple2_state::a2bus_nmi_w) +void apple2_state::a2bus_nmi_w(int state) { m_maincpu->set_input_line(INPUT_LINE_NMI, state); } // This code makes a ton of assumptions because we can guarantee a pre-IIe machine! -WRITE_LINE_MEMBER(apple2_state::a2bus_inh_w) +void apple2_state::a2bus_inh_w(int state) { if (state == ASSERT_LINE) { @@ -834,7 +834,7 @@ void apple2_state::apple2_map(address_map &map) KEYBOARD ***************************************************************************/ -READ_LINE_MEMBER(apple2_state::ay3600_shift_r) +int apple2_state::ay3600_shift_r() { // either shift key if (m_kbspecial->read() & 0x06) @@ -845,7 +845,7 @@ READ_LINE_MEMBER(apple2_state::ay3600_shift_r) return CLEAR_LINE; } -READ_LINE_MEMBER(apple2_state::ay3600_control_r) +int apple2_state::ay3600_control_r() { if (m_kbspecial->read() & 0x08) { @@ -910,7 +910,7 @@ static const u8 a2_key_remap[0x32][4] = { 0x0d,0x0d,0x0d,0x0d }, /* Enter 31 */ }; -WRITE_LINE_MEMBER(apple2_state::ay3600_data_ready_w) +void apple2_state::ay3600_data_ready_w(int state) { if (state == ASSERT_LINE) { @@ -935,7 +935,7 @@ WRITE_LINE_MEMBER(apple2_state::ay3600_data_ready_w) } } -WRITE_LINE_MEMBER(apple2_state::ay3600_ako_w) +void apple2_state::ay3600_ako_w(int state) { m_anykeydown = (state == ASSERT_LINE) ? true : false; } diff --git a/src/mame/apple/apple2e.cpp b/src/mame/apple/apple2e.cpp index fa6f7341277..f9431c88471 100644 --- a/src/mame/apple/apple2e.cpp +++ b/src/mame/apple/apple2e.cpp @@ -362,14 +362,14 @@ public: void lc_romswitch_w(offs_t offset, u8 data); u8 laser_mouse_r(offs_t offset); void laser_mouse_w(offs_t offset, u8 data); - DECLARE_WRITE_LINE_MEMBER(a2bus_irq_w); - DECLARE_WRITE_LINE_MEMBER(a2bus_nmi_w); - DECLARE_WRITE_LINE_MEMBER(a2bus_inh_w); - DECLARE_WRITE_LINE_MEMBER(busy_w); - DECLARE_READ_LINE_MEMBER(ay3600_shift_r); - DECLARE_READ_LINE_MEMBER(ay3600_control_r); - DECLARE_WRITE_LINE_MEMBER(ay3600_data_ready_w); - DECLARE_WRITE_LINE_MEMBER(ay3600_ako_w); + void a2bus_irq_w(int state); + void a2bus_nmi_w(int state); + void a2bus_inh_w(int state); + void busy_w(int state); + int ay3600_shift_r(); + int ay3600_control_r(); + void ay3600_data_ready_w(int state); + void ay3600_ako_w(int state); u8 memexp_r(offs_t offset); void memexp_w(offs_t offset, u8 data); u8 nsc_backing_r(offs_t offset); @@ -711,7 +711,7 @@ void apple2e_state::recalc_active_device() } } -WRITE_LINE_MEMBER(apple2e_state::a2bus_irq_w) +void apple2e_state::a2bus_irq_w(int state) { if (state == ASSERT_LINE) { @@ -723,13 +723,13 @@ WRITE_LINE_MEMBER(apple2e_state::a2bus_irq_w) } } -WRITE_LINE_MEMBER(apple2e_state::a2bus_nmi_w) +void apple2e_state::a2bus_nmi_w(int state) { m_maincpu->set_input_line(INPUT_LINE_NMI, state); } // TODO: this assumes /INH only on ROM, needs expansion to support e.g. phantom-slotting cards and etc. -WRITE_LINE_MEMBER(apple2e_state::a2bus_inh_w) +void apple2e_state::a2bus_inh_w(int state) { if (state == ASSERT_LINE) { @@ -777,7 +777,7 @@ WRITE_LINE_MEMBER(apple2e_state::a2bus_inh_w) } } -WRITE_LINE_MEMBER(apple2e_state::busy_w) +void apple2e_state::busy_w(int state) { m_centronics_busy = state; } @@ -3682,7 +3682,7 @@ void apple2e_state::spectred_keyb_map(address_map &map) KEYBOARD ***************************************************************************/ -READ_LINE_MEMBER(apple2e_state::ay3600_shift_r) +int apple2e_state::ay3600_shift_r() { // either shift key if (m_kbspecial->read() & 0x06) @@ -3693,7 +3693,7 @@ READ_LINE_MEMBER(apple2e_state::ay3600_shift_r) return CLEAR_LINE; } -READ_LINE_MEMBER(apple2e_state::ay3600_control_r) +int apple2e_state::ay3600_control_r() { if (m_kbspecial->read() & 0x08) { @@ -3703,7 +3703,7 @@ READ_LINE_MEMBER(apple2e_state::ay3600_control_r) return CLEAR_LINE; } -WRITE_LINE_MEMBER(apple2e_state::ay3600_data_ready_w) +void apple2e_state::ay3600_data_ready_w(int state) { if (state == ASSERT_LINE) { @@ -3750,7 +3750,7 @@ WRITE_LINE_MEMBER(apple2e_state::ay3600_data_ready_w) } } -WRITE_LINE_MEMBER(apple2e_state::ay3600_ako_w) +void apple2e_state::ay3600_ako_w(int state) { m_anykeydown = (state == ASSERT_LINE) ? true : false; diff --git a/src/mame/apple/apple2gs.cpp b/src/mame/apple/apple2gs.cpp index 96d4be36443..d0d0fdd47ad 100644 --- a/src/mame/apple/apple2gs.cpp +++ b/src/mame/apple/apple2gs.cpp @@ -386,11 +386,11 @@ private: void bank1_0000_sh_w(offs_t offset, u8 data); u8 bank1_c000_r(offs_t offset); void bank1_c000_w(offs_t offset, u8 data); - DECLARE_WRITE_LINE_MEMBER(a2bus_irq_w); - DECLARE_WRITE_LINE_MEMBER(a2bus_nmi_w); - DECLARE_WRITE_LINE_MEMBER(a2bus_inh_w); - DECLARE_WRITE_LINE_MEMBER(doc_irq_w); - DECLARE_WRITE_LINE_MEMBER(scc_irq_w); + void a2bus_irq_w(int state); + void a2bus_nmi_w(int state); + void a2bus_inh_w(int state); + void doc_irq_w(int state); + void scc_irq_w(int state); u8 doc_adc_read(); u8 apple2gs_read_vector(offs_t offset); @@ -568,7 +568,7 @@ offs_t apple2gs_state::dasm_trampoline(std::ostream &stream, offs_t pc, const ut return m_a2common->dasm_override_GS(stream, pc, opcodes, params); } -WRITE_LINE_MEMBER(apple2gs_state::a2bus_irq_w) +void apple2gs_state::a2bus_irq_w(int state) { if (state == ASSERT_LINE) { @@ -581,13 +581,13 @@ WRITE_LINE_MEMBER(apple2gs_state::a2bus_irq_w) } } -WRITE_LINE_MEMBER(apple2gs_state::a2bus_nmi_w) +void apple2gs_state::a2bus_nmi_w(int state) { m_maincpu->set_input_line(INPUT_LINE_NMI, state); } // TODO: this assumes /INH only on ROM, needs expansion to support e.g. phantom-slotting cards and etc. -WRITE_LINE_MEMBER(apple2gs_state::a2bus_inh_w) +void apple2gs_state::a2bus_inh_w(int state) { if (state == ASSERT_LINE) { @@ -3642,7 +3642,7 @@ void apple2gs_state::keyglu_regen_irqs() } } -WRITE_LINE_MEMBER(apple2gs_state::scc_irq_w) +void apple2gs_state::scc_irq_w(int state) { if (state) { @@ -3655,7 +3655,7 @@ WRITE_LINE_MEMBER(apple2gs_state::scc_irq_w) } /* Sound - DOC */ -WRITE_LINE_MEMBER(apple2gs_state::doc_irq_w) +void apple2gs_state::doc_irq_w(int state) { if (state) { diff --git a/src/mame/apple/apple2video.cpp b/src/mame/apple/apple2video.cpp index 4dd71aade49..e71fbd5db83 100644 --- a/src/mame/apple/apple2video.cpp +++ b/src/mame/apple/apple2video.cpp @@ -100,7 +100,7 @@ void a2_video_device::device_reset() m_monochrome = 0; // TODO: never set, but if left uninitialized could cause the emulation to start in monochrome by accident. Default to color for now } -WRITE_LINE_MEMBER(a2_video_device::txt_w) +void a2_video_device::txt_w(int state) { if (m_graphics == state) // avoid flickering from II+ refresh polling { @@ -110,14 +110,14 @@ WRITE_LINE_MEMBER(a2_video_device::txt_w) } } -WRITE_LINE_MEMBER(a2_video_device::mix_w) +void a2_video_device::mix_w(int state) { // select mixed mode or nomix screen().update_now(); m_mix = state; } -WRITE_LINE_MEMBER(a2_video_device::scr_w) +void a2_video_device::scr_w(int state) { // select primary or secondary page if (!m_80col) @@ -125,14 +125,14 @@ WRITE_LINE_MEMBER(a2_video_device::scr_w) m_page2 = state; } -WRITE_LINE_MEMBER(a2_video_device::res_w) +void a2_video_device::res_w(int state) { // select lo-res or hi-res screen().update_now(); m_hires = state; } -WRITE_LINE_MEMBER(a2_video_device::dhires_w) +void a2_video_device::dhires_w(int state) { // select double hi-res screen().update_now(); @@ -147,7 +147,7 @@ WRITE_LINE_MEMBER(a2_video_device::dhires_w) m_dhires = !state; } -WRITE_LINE_MEMBER(a2_video_device::an2_w) +void a2_video_device::an2_w(int state) { m_an2 = state; } diff --git a/src/mame/apple/apple2video.h b/src/mame/apple/apple2video.h index 4c9b07e2b83..030b6049c9d 100644 --- a/src/mame/apple/apple2video.h +++ b/src/mame/apple/apple2video.h @@ -24,12 +24,12 @@ public: u32 m_GSborder_colors[16]{}, m_shr_palette[256]{}; std::unique_ptr m_8bit_graphics; - DECLARE_WRITE_LINE_MEMBER(txt_w); - DECLARE_WRITE_LINE_MEMBER(mix_w); - DECLARE_WRITE_LINE_MEMBER(scr_w); - DECLARE_WRITE_LINE_MEMBER(res_w); - DECLARE_WRITE_LINE_MEMBER(dhires_w); - DECLARE_WRITE_LINE_MEMBER(an2_w); + void txt_w(int state); + void mix_w(int state); + void scr_w(int state); + void res_w(int state); + void dhires_w(int state); + void an2_w(int state); bool get_graphics() const { return m_graphics; } bool get_hires() const { return m_hires; } diff --git a/src/mame/apple/apple3.h b/src/mame/apple/apple3.h index 0cf9d3092c7..c68ba6d3723 100644 --- a/src/mame/apple/apple3.h +++ b/src/mame/apple/apple3.h @@ -90,7 +90,7 @@ public: uint8_t apple3_memory_r(offs_t offset); void apple3_memory_w(offs_t offset, uint8_t data); - DECLARE_WRITE_LINE_MEMBER(apple3_sync_w); + void apple3_sync_w(int state); uint8_t apple3_c0xx_r(offs_t offset); void apple3_c0xx_w(offs_t offset, uint8_t data); void init_apple3(); @@ -117,17 +117,17 @@ public: uint8_t *apple3_get_indexed_addr(offs_t offset); TIMER_DEVICE_CALLBACK_MEMBER(apple3_c040_tick); void palette_init(palette_device &palette) const; - DECLARE_READ_LINE_MEMBER(ay3600_shift_r); - DECLARE_READ_LINE_MEMBER(ay3600_control_r); - DECLARE_WRITE_LINE_MEMBER(ay3600_data_ready_w); + int ay3600_shift_r(); + int ay3600_control_r(); + void ay3600_data_ready_w(int state); virtual void device_post_load() override; TIMER_DEVICE_CALLBACK_MEMBER(paddle_timer); void pdl_handler(int offset); static void floppy_formats(format_registration &fr); - DECLARE_WRITE_LINE_MEMBER(a2bus_irq_w); - DECLARE_WRITE_LINE_MEMBER(a2bus_nmi_w); - DECLARE_WRITE_LINE_MEMBER(vbl_w); - DECLARE_WRITE_LINE_MEMBER(a2bus_inh_w); + void a2bus_irq_w(int state); + void a2bus_nmi_w(int state); + void vbl_w(int state); + void a2bus_inh_w(int state); // these need to be public for now uint32_t m_flags = 0; diff --git a/src/mame/apple/apple3_m.cpp b/src/mame/apple/apple3_m.cpp index 38eedada44f..99f92f879a6 100644 --- a/src/mame/apple/apple3_m.cpp +++ b/src/mame/apple/apple3_m.cpp @@ -491,7 +491,7 @@ void apple3_state::apple3_c0xx_w(offs_t offset, uint8_t data) } } -WRITE_LINE_MEMBER(apple3_state::vbl_w) +void apple3_state::vbl_w(int state) { // do the font upload at the end of VBL, not the start if ((!state) && (m_charwrt)) @@ -664,7 +664,7 @@ void apple3_state::machine_reset() m_scanend->adjust(attotime::never); } -WRITE_LINE_MEMBER(apple3_state::a2bus_inh_w) +void apple3_state::a2bus_inh_w(int state) { m_inh_state = state; } @@ -1083,7 +1083,7 @@ void apple3_state::apple3_memory_w(offs_t offset, uint8_t data) } } -WRITE_LINE_MEMBER(apple3_state::apple3_sync_w) +void apple3_state::apple3_sync_w(int state) { // printf("sync: %d\n", state); m_sync = (state == ASSERT_LINE) ? true : false; @@ -1131,7 +1131,7 @@ TIMER_CALLBACK_MEMBER(apple3_state::scanend_cb) } } -READ_LINE_MEMBER(apple3_state::ay3600_shift_r) +int apple3_state::ay3600_shift_r() { // either shift key if (m_kbspecial->read() & 0x06) @@ -1142,7 +1142,7 @@ READ_LINE_MEMBER(apple3_state::ay3600_shift_r) return CLEAR_LINE; } -READ_LINE_MEMBER(apple3_state::ay3600_control_r) +int apple3_state::ay3600_control_r() { if (m_kbspecial->read() & 0x08) { @@ -1237,7 +1237,7 @@ static const uint8_t key_remap[0x50][4] = { 0x00,0x00,0x00,0x00 } /* 0x4f unused */ }; -WRITE_LINE_MEMBER(apple3_state::ay3600_data_ready_w) +void apple3_state::ay3600_data_ready_w(int state) { m_via[1]->write_ca2(state); @@ -1358,7 +1358,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(apple3_state::paddle_timer) } } -WRITE_LINE_MEMBER(apple3_state::a2bus_irq_w) +void apple3_state::a2bus_irq_w(int state) { uint8_t irq_mask = m_a2bus->get_a2bus_irq_mask(); @@ -1383,7 +1383,7 @@ WRITE_LINE_MEMBER(apple3_state::a2bus_irq_w) } } -WRITE_LINE_MEMBER(apple3_state::a2bus_nmi_w) +void apple3_state::a2bus_nmi_w(int state) { m_via[1]->write_pb7(state); diff --git a/src/mame/apple/heathrow.cpp b/src/mame/apple/heathrow.cpp index f2fded83fc9..eeeb1fb7a30 100644 --- a/src/mame/apple/heathrow.cpp +++ b/src/mame/apple/heathrow.cpp @@ -353,7 +353,7 @@ u8 macio_device::via_in_b() return read_pb3() << 3; } -WRITE_LINE_MEMBER(macio_device::via_out_cb2) +void macio_device::via_out_cb2(int state) { write_cb2(state & 1); } @@ -377,12 +377,12 @@ void macio_device::via_out_b(u8 data) write_pb5(BIT(data, 5)); } -WRITE_LINE_MEMBER(macio_device::cb1_w) +void macio_device::cb1_w(int state) { m_via1->write_cb1(state); } -WRITE_LINE_MEMBER(macio_device::cb2_w) +void macio_device::cb2_w(int state) { m_via1->write_cb2(state); } @@ -575,7 +575,7 @@ void macio_device::recalc_irqs() } } -template WRITE_LINE_MEMBER(macio_device::set_irq_line) +template void macio_device::set_irq_line(int state) { if (bit < 32) { diff --git a/src/mame/apple/heathrow.h b/src/mame/apple/heathrow.h index 54886678475..dd7715a37dc 100644 --- a/src/mame/apple/heathrow.h +++ b/src/mame/apple/heathrow.h @@ -34,11 +34,11 @@ public: template void set_maincpu_tag(T &&... args) { m_maincpu.set_tag(std::forward(args)...); } template void set_pci_root_tag(T &&... args) { m_pci_memory.set_tag(std::forward(args)...); } - DECLARE_WRITE_LINE_MEMBER(cb1_w); - DECLARE_WRITE_LINE_MEMBER(cb2_w); - DECLARE_WRITE_LINE_MEMBER(scc_irq_w); + void cb1_w(int state); + void cb2_w(int state); + void scc_irq_w(int state); - template DECLARE_WRITE_LINE_MEMBER(set_irq_line); + template void set_irq_line(int state); u32 codec_dma_read(u32 offset); void codec_dma_write(u32 offset, u32 data); @@ -98,7 +98,7 @@ private: void via_out_b(u8 data); void via_sync(); void field_interrupts(); - DECLARE_WRITE_LINE_MEMBER(via_out_cb2); + void via_out_cb2(int state); void phases_w(u8 phases); void devsel_w(u8 devsel); diff --git a/src/mame/apple/imacg3.cpp b/src/mame/apple/imacg3.cpp index 9f733a9829a..86da29b2cf6 100644 --- a/src/mame/apple/imacg3.cpp +++ b/src/mame/apple/imacg3.cpp @@ -58,13 +58,13 @@ private: virtual void machine_start() override; virtual void machine_reset() override; - WRITE_LINE_MEMBER(cuda_reset_w) + void cuda_reset_w(int state) { m_maincpu->set_input_line(INPUT_LINE_HALT, state); m_maincpu->set_input_line(INPUT_LINE_RESET, state); } - WRITE_LINE_MEMBER(irq_w) + void irq_w(int state) { m_maincpu->set_input_line(PPC_IRQ, state); } diff --git a/src/mame/apple/lisa.h b/src/mame/apple/lisa.h index c2331fef0cc..193bfb32b7b 100644 --- a/src/mame/apple/lisa.h +++ b/src/mame/apple/lisa.h @@ -215,14 +215,14 @@ private: void lisa_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); uint16_t lisa_IO_r(offs_t offset, uint16_t mem_mask = ~0); void lisa_IO_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); - DECLARE_WRITE_LINE_MEMBER(diag1_w); - DECLARE_WRITE_LINE_MEMBER(diag2_w); - DECLARE_WRITE_LINE_MEMBER(seg1_w); - DECLARE_WRITE_LINE_MEMBER(seg2_w); - DECLARE_WRITE_LINE_MEMBER(setup_w); - DECLARE_WRITE_LINE_MEMBER(vtmsk_w); - DECLARE_WRITE_LINE_MEMBER(sfmsk_w); - DECLARE_WRITE_LINE_MEMBER(hdmsk_w); + void diag1_w(int state); + void diag2_w(int state); + void seg1_w(int state); + void seg2_w(int state); + void setup_w(int state); + void vtmsk_w(int state); + void sfmsk_w(int state); + void hdmsk_w(int state); virtual void machine_start() override; virtual void machine_reset() override; @@ -234,9 +234,9 @@ private: TIMER_CALLBACK_MEMBER(read_COPS_command); TIMER_CALLBACK_MEMBER(set_COPS_ready); void COPS_via_out_a(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(COPS_via_out_ca2); + void COPS_via_out_ca2(int state); void COPS_via_out_b(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(COPS_via_out_cb2); + void COPS_via_out_cb2(int state); void field_interrupts(); void set_parity_error_pending(int value); diff --git a/src/mame/apple/lisa_m.cpp b/src/mame/apple/lisa_m.cpp index 8c63f45b1c2..a5d6485e155 100644 --- a/src/mame/apple/lisa_m.cpp +++ b/src/mame/apple/lisa_m.cpp @@ -601,7 +601,7 @@ void lisa_state::COPS_via_out_a(uint8_t data) m_COPS_command = data; } -WRITE_LINE_MEMBER(lisa_state::COPS_via_out_ca2) +void lisa_state::COPS_via_out_ca2(int state) { m_hold_COPS_data = state; @@ -650,7 +650,7 @@ void lisa_state::COPS_via_out_b(uint8_t data) } } -WRITE_LINE_MEMBER(lisa_state::COPS_via_out_cb2) +void lisa_state::COPS_via_out_cb2(int state) { m_speaker->level_w(state); } @@ -1569,18 +1569,18 @@ void lisa_state::cpu_board_control_access(offs_t offset) m_latch->write_bit(offset >> 1, offset & 1); } -WRITE_LINE_MEMBER(lisa_state::diag1_w) +void lisa_state::diag1_w(int state) { // Set/reset DIAG1 } -WRITE_LINE_MEMBER(lisa_state::diag2_w) +void lisa_state::diag2_w(int state) { // Set/reset DIAG2 m_diag2 = state; } -WRITE_LINE_MEMBER(lisa_state::seg1_w) +void lisa_state::seg1_w(int state) { // Set/reset SEG1 Context Selection bit //logerror("seg bit 0 %s\n", state ? "set" : "clear"); @@ -1590,7 +1590,7 @@ WRITE_LINE_MEMBER(lisa_state::seg1_w) m_seg &= ~1; } -WRITE_LINE_MEMBER(lisa_state::seg2_w) +void lisa_state::seg2_w(int state) { // Set/reset SEG2 Context Selection bit //logerror("seg bit 1 %s\n", state ? "set" : "clear"); @@ -1600,14 +1600,14 @@ WRITE_LINE_MEMBER(lisa_state::seg2_w) m_seg &= ~2; } -WRITE_LINE_MEMBER(lisa_state::setup_w) +void lisa_state::setup_w(int state) { // Reset/set SETUP register logerror("setup %s %s\n", state ? "UNSET" : "SET", machine().describe_context()); m_setup = !state; } -WRITE_LINE_MEMBER(lisa_state::vtmsk_w) +void lisa_state::vtmsk_w(int state) { // Enable/disable Vertical Retrace Interrupt logerror("%s retrace %s\n", state ? "enable" : "disable", machine().describe_context()); @@ -1616,12 +1616,12 @@ WRITE_LINE_MEMBER(lisa_state::vtmsk_w) set_VTIR(2); } -WRITE_LINE_MEMBER(lisa_state::sfmsk_w) +void lisa_state::sfmsk_w(int state) { // Enable/disable Soft Error Detect } -WRITE_LINE_MEMBER(lisa_state::hdmsk_w) +void lisa_state::hdmsk_w(int state) { // Enable/disable Hard Error Detect m_test_parity = state; diff --git a/src/mame/apple/lwriter.cpp b/src/mame/apple/lwriter.cpp index 72ecf675ea3..f4cee8d5941 100644 --- a/src/mame/apple/lwriter.cpp +++ b/src/mame/apple/lwriter.cpp @@ -162,18 +162,18 @@ private: uint8_t via_pa_r(); void via_pa_w(uint8_t data); void via_pa_lw_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(via_ca2_w); + void via_ca2_w(int state); uint8_t via_pb_r(); uint8_t via_pb_lw2nt_r(); void write_dtr(int state); void via_pb_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(via_cb1_w); - DECLARE_WRITE_LINE_MEMBER(via_cb2_w); - DECLARE_WRITE_LINE_MEMBER(via_int_w); + void via_cb1_w(int state); + void via_cb2_w(int state); + void via_int_w(int state); emu_timer *m_pb6_timer; TIMER_CALLBACK_MEMBER(pb6_tick); uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); - //DECLARE_WRITE_LINE_MEMBER(scc_int); + //void scc_int(int state); void maincpu_map(address_map &map); required_device m_maincpu; @@ -470,7 +470,7 @@ void lwriter_state::via_pa_lw_w(uint8_t data) m_cbsy = data & 1; } -WRITE_LINE_MEMBER(lwriter_state::via_ca2_w) +void lwriter_state::via_ca2_w(int state) { logerror(" VIA: CA2 written with %d!\n", state); } @@ -517,17 +517,17 @@ void lwriter_state::via_pb_w(uint8_t data) m_via_pb = data; } -WRITE_LINE_MEMBER (lwriter_state::via_cb1_w) +void lwriter_state::via_cb1_w(int state) { logerror(" VIA: CB1 written with %d!\n", state); } -WRITE_LINE_MEMBER(lwriter_state::via_cb2_w) +void lwriter_state::via_cb2_w(int state) { logerror(" VIA: CB2 written with %d!\n", state); } -WRITE_LINE_MEMBER(lwriter_state::via_int_w) +void lwriter_state::via_int_w(int state) { logerror(" VIA: INT output set to %d!\n", state); //TODO: this is likely wrong, the VPA pin which controls whether autovector is enabled or not is controlled by PAL U8D, which is not dumped. @@ -536,7 +536,7 @@ WRITE_LINE_MEMBER(lwriter_state::via_int_w) /* scc stuff */ /* -WRITE_LINE_MEMBER(lwriter_state::scc_int) +void lwriter_state::scc_int(int state) { logerror(" SCC: INT output set to %d!\n", state); //m_via->set_input_line(VIA_CA1, state ? ASSERT_LINE : CLEAR_LINE); diff --git a/src/mame/apple/mac128.cpp b/src/mame/apple/mac128.cpp index a736ee53d8e..3d7c18ef3f0 100644 --- a/src/mame/apple/mac128.cpp +++ b/src/mame/apple/mac128.cpp @@ -217,13 +217,13 @@ private: void macplus_scsi_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); uint16_t macse_scsi_r(offs_t offset, uint16_t mem_mask = ~0); void macse_scsi_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); - DECLARE_WRITE_LINE_MEMBER(scsi_irq_w); - DECLARE_WRITE_LINE_MEMBER(scsi_drq_w); + void scsi_irq_w(int state); + void scsi_drq_w(int state); void scsi_berr_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(set_scc_interrupt); - DECLARE_WRITE_LINE_MEMBER(vblank_w); + void set_scc_interrupt(int state); + void vblank_w(int state); - WRITE_LINE_MEMBER(adb_irq_w) { m_adb_irq_pending = state; } + void adb_irq_w(int state) { m_adb_irq_pending = state; } TIMER_CALLBACK_MEMBER(mac_scanline); TIMER_CALLBACK_MEMBER(mac_hblank); @@ -236,7 +236,7 @@ private: void mac_via_out_b(uint8_t data); void mac_via_out_a_se(uint8_t data); void mac_via_out_b_se(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(mac_via_irq); + void mac_via_irq(int state); void update_volume(); void mac512ke_map(address_map &map); @@ -400,7 +400,7 @@ void mac128_state::field_interrupts() } } -WRITE_LINE_MEMBER(mac128_state::set_scc_interrupt) +void mac128_state::set_scc_interrupt(int state) { // printf("SCC IRQ: %d\n", state); m_scc_interrupt = state; @@ -450,7 +450,7 @@ void mac128_state::update_volume() m_volfilter->opamp_mfb_lowpass_modify(res_ohm_tbl[m_snd_vol&7], RES_K(0), RES_K(200), CAP_U(0), CAP_P(220)); // variable based on cd4016, short, R15, absent, C10 } -WRITE_LINE_MEMBER(mac128_state::vblank_w) +void mac128_state::vblank_w(int state) { m_via->write_ca1(state); } @@ -598,11 +598,11 @@ void mac128_state::pwm_push(uint8_t data) } } -WRITE_LINE_MEMBER(mac128_state::scsi_irq_w) +void mac128_state::scsi_irq_w(int state) { } -WRITE_LINE_MEMBER(mac128_state::scsi_drq_w) +void mac128_state::scsi_drq_w(int state) { m_scsi_drq = state; } @@ -714,7 +714,7 @@ void mac128_state::mac_iwm_w(offs_t offset, uint16_t data, uint16_t mem_mask) m_iwm->write((offset >> 8) & 0xf, data>>8); } -WRITE_LINE_MEMBER(mac128_state::mac_via_irq) +void mac128_state::mac_via_irq(int state) { /* interrupt the 68k (level 1) */ set_via_interrupt(state); diff --git a/src/mame/apple/macadb.cpp b/src/mame/apple/macadb.cpp index 35e04eb6de1..cf5993acc0f 100644 --- a/src/mame/apple/macadb.cpp +++ b/src/mame/apple/macadb.cpp @@ -303,7 +303,7 @@ void macadb_device::device_start() save_item(NAME(m_keyboard_handler)); } -WRITE_LINE_MEMBER(macadb_device::adb_data_w) +void macadb_device::adb_data_w(int state) { if (m_adb_timer_ticks > 0) { @@ -1105,7 +1105,7 @@ void macadb_device::device_reset() m_last_adb_time = 0; } -WRITE_LINE_MEMBER(macadb_device::adb_linechange_w) +void macadb_device::adb_linechange_w(int state) { /* static char const *const states[] = { diff --git a/src/mame/apple/macadb.h b/src/mame/apple/macadb.h index 2cdcbd0d79b..e55e72dac5e 100644 --- a/src/mame/apple/macadb.h +++ b/src/mame/apple/macadb.h @@ -30,8 +30,8 @@ public: required_ioport_array<8> m_keys; devcb_write_line write_via_clock, write_via_data, write_adb_data, write_adb_irq; - DECLARE_WRITE_LINE_MEMBER(adb_data_w); - DECLARE_WRITE_LINE_MEMBER(adb_linechange_w); + void adb_data_w(int state); + void adb_linechange_w(int state); void adb_vblank(); void mac_adb_newaction(int state); diff --git a/src/mame/apple/macii.cpp b/src/mame/apple/macii.cpp index bc55873f9d2..005b631c406 100644 --- a/src/mame/apple/macii.cpp +++ b/src/mame/apple/macii.cpp @@ -151,7 +151,7 @@ private: // ADB refresh timer, independent of anything else going on emu_timer *m_adbupdate_timer = nullptr; - WRITE_LINE_MEMBER(adb_irq_w) { m_adb_irq_pending = state; } + void adb_irq_w(int state) { m_adb_irq_pending = state; } // this is shared among all video setups with vram optional_shared_ptr m_vram; @@ -163,7 +163,7 @@ private: void set_memory_overlay(int overlay); void scc_mouse_irq( int x, int y ); void nubus_slot_interrupt(uint8_t slot, uint32_t state); - DECLARE_WRITE_LINE_MEMBER(set_scc_interrupt); + void set_scc_interrupt(int state); void set_via_interrupt(int value); void set_via2_interrupt(int value); void field_interrupts(); @@ -185,10 +185,10 @@ private: void macii_scsi_drq_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0); void scsi_berr_w(uint8_t data); - template DECLARE_WRITE_LINE_MEMBER(nubus_irq_w); + template void nubus_irq_w(int state); - DECLARE_WRITE_LINE_MEMBER(mac_scsi_irq); - DECLARE_WRITE_LINE_MEMBER(mac_asc_irq); + void mac_scsi_irq(int state); + void mac_asc_irq(int state); void macii_map(address_map &map); void macse30_map(address_map &map); @@ -211,7 +211,7 @@ private: TIMER_CALLBACK_MEMBER(mac_adbrefresh_tick); TIMER_CALLBACK_MEMBER(mac_scanline_tick); - DECLARE_WRITE_LINE_MEMBER(mac_adb_via_out_cb2); + void mac_adb_via_out_cb2(int state); uint8_t mac_via_in_a(); uint8_t mac_via_in_b(); void mac_via_out_a(uint8_t data); @@ -221,8 +221,8 @@ private: void mac_via2_out_a(uint8_t data); void mac_via2_out_b(uint8_t data); void mac_state_load(); - DECLARE_WRITE_LINE_MEMBER(mac_via_irq); - DECLARE_WRITE_LINE_MEMBER(mac_via2_irq); + void mac_via_irq(int state); + void mac_via2_irq(int state); void mac_driver_init(model_t model); void mac_install_memory(offs_t memory_begin, offs_t memory_end, offs_t memory_size, void *memory_data, int is_rom); }; @@ -302,7 +302,7 @@ void mac_state::field_interrupts() } } -WRITE_LINE_MEMBER(mac_state::set_scc_interrupt) +void mac_state::set_scc_interrupt(int state) { m_scc_interrupt = state; this->field_interrupts(); @@ -320,7 +320,7 @@ void mac_state::set_via2_interrupt(int value) this->field_interrupts(); } -WRITE_LINE_MEMBER(mac_state::mac_asc_irq) +void mac_state::mac_asc_irq(int state) { m_via2->write_cb1(state ^ 1); } @@ -478,7 +478,7 @@ void mac_state::macii_scsi_w(offs_t offset, uint16_t data, uint16_t mem_mask) m_scsihelp->write_wrapper(pseudo_dma, reg, data >> 8); } -WRITE_LINE_MEMBER(mac_state::mac_scsi_irq) +void mac_state::mac_scsi_irq(int state) { } @@ -536,7 +536,7 @@ void mac_state::mac_iwm_w(offs_t offset, uint16_t data, uint16_t mem_mask) m_maincpu->adjust_icount(-5); } -WRITE_LINE_MEMBER(mac_state::mac_adb_via_out_cb2) +void mac_state::mac_adb_via_out_cb2(int state) { // printf("VIA OUT CB2 = %x\n", state); #if !MACII_USE_ADBMODEM @@ -661,7 +661,7 @@ void mac_state::mac_via_out_b(uint8_t data) m_rtc->clk_w((data >> 1) & 0x01); } -WRITE_LINE_MEMBER(mac_state::mac_via_irq) +void mac_state::mac_via_irq(int state) { /* interrupt the 68k (level 1) */ set_via_interrupt(state); @@ -722,7 +722,7 @@ void mac_state::mac_via_w(offs_t offset, uint16_t data, uint16_t mem_mask) * VIA 2 (on Mac IIs, PowerBooks > 100, and PowerMacs) * *************************************************************************/ -WRITE_LINE_MEMBER(mac_state::mac_via2_irq) +void mac_state::mac_via2_irq(int state) { set_via2_interrupt(state); } @@ -961,17 +961,17 @@ TIMER_CALLBACK_MEMBER(mac_state::mac_scanline_tick) m_scanline_timer->adjust(m_screen->time_until_pos(next_scanline), next_scanline); } -template WRITE_LINE_MEMBER(mac_state::nubus_irq_w) +template void mac_state::nubus_irq_w(int state) { nubus_slot_interrupt(Slot, state); } -template WRITE_LINE_MEMBER(mac_state::nubus_irq_w<9>); -template WRITE_LINE_MEMBER(mac_state::nubus_irq_w<0xa>); -template WRITE_LINE_MEMBER(mac_state::nubus_irq_w<0xb>); -template WRITE_LINE_MEMBER(mac_state::nubus_irq_w<0xc>); -template WRITE_LINE_MEMBER(mac_state::nubus_irq_w<0xd>); -template WRITE_LINE_MEMBER(mac_state::nubus_irq_w<0xe>); +template void mac_state::nubus_irq_w<9>(int state); +template void mac_state::nubus_irq_w<0xa>(int state); +template void mac_state::nubus_irq_w<0xb>(int state); +template void mac_state::nubus_irq_w<0xc>(int state); +template void mac_state::nubus_irq_w<0xd>(int state); +template void mac_state::nubus_irq_w<0xe>(int state); void mac_state::phases_w(uint8_t phases) { diff --git a/src/mame/apple/maciici.cpp b/src/mame/apple/maciici.cpp index 900b2a1aaeb..58fc82ed04f 100644 --- a/src/mame/apple/maciici.cpp +++ b/src/mame/apple/maciici.cpp @@ -111,11 +111,11 @@ private: void via_out_b(uint8_t data); void via_out_b_iisi(uint8_t data); void via_sync(); - DECLARE_WRITE_LINE_MEMBER(via_irq); - WRITE_LINE_MEMBER(via_out_cb2); - WRITE_LINE_MEMBER(via_out_cb2_iisi); - WRITE_LINE_MEMBER(adb_irq_w) { m_adb_irq_pending = state; } - DECLARE_WRITE_LINE_MEMBER(scc_irq_w); + void via_irq(int state); + void via_out_cb2(int state); + void via_out_cb2_iisi(int state); + void adb_irq_w(int state) { m_adb_irq_pending = state; } + void scc_irq_w(int state); uint32_t rom_switch_r(offs_t offset); @@ -141,7 +141,7 @@ private: m_maincpu->pulse_input_line(M68K_LINE_BUSERROR, attotime::zero); } - WRITE_LINE_MEMBER(egret_reset_w) + void egret_reset_w(int state) { m_maincpu->set_input_line(INPUT_LINE_HALT, state); m_maincpu->set_input_line(INPUT_LINE_RESET, state); @@ -171,7 +171,7 @@ private: m_fdc->write((offset >> 8) & 0xf, data >> 8); } - WRITE_LINE_MEMBER(write_6015) + void write_6015(int state) { if (state) { @@ -258,13 +258,13 @@ void maciici_state::field_interrupts() } } -WRITE_LINE_MEMBER(maciici_state::via_irq) +void maciici_state::via_irq(int state) { m_via_interrupt = state; field_interrupts(); } -WRITE_LINE_MEMBER(maciici_state::scc_irq_w) +void maciici_state::scc_irq_w(int state) { m_scc_interrupt = state; field_interrupts(); @@ -385,12 +385,12 @@ void maciici_state::via_out_b_iisi(uint8_t data) m_egret->set_sys_session(BIT(data, 5)); } -WRITE_LINE_MEMBER(maciici_state::via_out_cb2) +void maciici_state::via_out_cb2(int state) { m_macadb->adb_data_w(state); } -WRITE_LINE_MEMBER(maciici_state::via_out_cb2_iisi) +void maciici_state::via_out_cb2_iisi(int state) { m_egret->set_via_data(state & 1); } diff --git a/src/mame/apple/maciifx.cpp b/src/mame/apple/maciifx.cpp index b8a9024f249..e2faf280360 100644 --- a/src/mame/apple/maciifx.cpp +++ b/src/mame/apple/maciifx.cpp @@ -121,7 +121,7 @@ private: uint32_t biu_r(offs_t offset, uint32_t mem_mask = ~0); void biu_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0); template - DECLARE_WRITE_LINE_MEMBER(oss_interrupt); + void oss_interrupt(int state); TIMER_CALLBACK_MEMBER(oss_6015_tick); uint8_t oss_r(offs_t offset); void oss_w(offs_t offset, uint8_t data); @@ -397,7 +397,7 @@ void maciifx_state::biu_w(offs_t offset, uint32_t data, uint32_t mem_mask) } template -WRITE_LINE_MEMBER(maciifx_state::oss_interrupt) +void maciifx_state::oss_interrupt(int state) { if (state == ASSERT_LINE) m_oss_regs[N >= 8 ? 0x202 : 0x203] |= 1 << (N & 7); diff --git a/src/mame/apple/maciivx.cpp b/src/mame/apple/maciivx.cpp index 28fdab64bcb..c3e93739f4d 100644 --- a/src/mame/apple/maciivx.cpp +++ b/src/mame/apple/maciivx.cpp @@ -111,7 +111,7 @@ private: m_maincpu->pulse_input_line(M68K_LINE_BUSERROR, attotime::zero); } - WRITE_LINE_MEMBER(egret_reset_w) + void egret_reset_w(int state) { m_maincpu->set_input_line(INPUT_LINE_HALT, state); m_maincpu->set_input_line(INPUT_LINE_RESET, state); @@ -124,7 +124,7 @@ private: void devsel_w(uint8_t devsel); uint16_t swim_r(offs_t offset, u16 mem_mask); void swim_w(offs_t offset, u16 data, u16 mem_mask); - WRITE_LINE_MEMBER(hdsel_w); + void hdsel_w(int state); }; void maciivx_state::machine_start() @@ -261,7 +261,7 @@ void maciivx_state::devsel_w(uint8_t devsel) m_cur_floppy->ss_w(m_hdsel); } -WRITE_LINE_MEMBER(maciivx_state::hdsel_w) +void maciivx_state::hdsel_w(int state) { if (state != m_hdsel) { diff --git a/src/mame/apple/maclc.cpp b/src/mame/apple/maclc.cpp index bcfda6ce38f..f38550f7d41 100644 --- a/src/mame/apple/maclc.cpp +++ b/src/mame/apple/maclc.cpp @@ -109,7 +109,7 @@ private: m_maincpu->pulse_input_line(M68K_LINE_BUSERROR, attotime::zero); } - WRITE_LINE_MEMBER(cuda_reset_w) + void cuda_reset_w(int state) { m_maincpu->set_input_line(INPUT_LINE_HALT, state); m_maincpu->set_input_line(INPUT_LINE_RESET, state); @@ -122,15 +122,15 @@ private: void devsel_w(uint8_t devsel); uint16_t swim_r(offs_t offset, u16 mem_mask); void swim_w(offs_t offset, u16 data, u16 mem_mask); - WRITE_LINE_MEMBER(hdsel_w); + void hdsel_w(int state); - WRITE_LINE_MEMBER(egret_reset_w) + void egret_reset_w(int state) { m_maincpu->set_input_line(INPUT_LINE_HALT, state); m_maincpu->set_input_line(INPUT_LINE_RESET, state); } - WRITE_LINE_MEMBER(set_hmmu) + void set_hmmu(int state) { m_maincpu->set_hmmu_enable((state == ASSERT_LINE) ? M68K_HMMU_DISABLE : M68K_HMMU_ENABLE_LC); } @@ -273,7 +273,7 @@ void maclc_state::devsel_w(uint8_t devsel) m_cur_floppy->ss_w(m_hdsel); } -WRITE_LINE_MEMBER(maclc_state::hdsel_w) +void maclc_state::hdsel_w(int state) { if (state != m_hdsel) { diff --git a/src/mame/apple/maclc3.cpp b/src/mame/apple/maclc3.cpp index 906984b50e6..6ce02391b47 100644 --- a/src/mame/apple/maclc3.cpp +++ b/src/mame/apple/maclc3.cpp @@ -101,7 +101,7 @@ private: m_maincpu->pulse_input_line(M68K_LINE_BUSERROR, attotime::zero); } - WRITE_LINE_MEMBER(cuda_reset_w) + void cuda_reset_w(int state) { m_maincpu->set_input_line(INPUT_LINE_HALT, state); m_maincpu->set_input_line(INPUT_LINE_RESET, state); diff --git a/src/mame/apple/macpdm.cpp b/src/mame/apple/macpdm.cpp index 6057fb32dda..cdfbba2eb3a 100644 --- a/src/mame/apple/macpdm.cpp +++ b/src/mame/apple/macpdm.cpp @@ -82,46 +82,46 @@ private: void pdm_map(address_map &map); - DECLARE_WRITE_LINE_MEMBER(nmi_irq); - DECLARE_WRITE_LINE_MEMBER(dma_irq); - DECLARE_WRITE_LINE_MEMBER(enet_irq); - DECLARE_WRITE_LINE_MEMBER(scc_irq); - DECLARE_WRITE_LINE_MEMBER(via1_irq); - - DECLARE_WRITE_LINE_MEMBER(bus_err_irq); - DECLARE_WRITE_LINE_MEMBER(fdc_dma_irq); - DECLARE_WRITE_LINE_MEMBER(etx_dma_irq); - DECLARE_WRITE_LINE_MEMBER(erx_dma_irq); - DECLARE_WRITE_LINE_MEMBER(txa_dma_irq); - DECLARE_WRITE_LINE_MEMBER(rxa_dma_irq); - DECLARE_WRITE_LINE_MEMBER(txb_dma_irq); - DECLARE_WRITE_LINE_MEMBER(rxb_dma_irq); - - DECLARE_WRITE_LINE_MEMBER(sndo_dma_irq); - DECLARE_WRITE_LINE_MEMBER(sndi_dma_irq); - - DECLARE_WRITE_LINE_MEMBER(fdc_err_irq); - DECLARE_WRITE_LINE_MEMBER(etx_err_irq); - DECLARE_WRITE_LINE_MEMBER(erx_err_irq); - DECLARE_WRITE_LINE_MEMBER(txa_err_irq); - DECLARE_WRITE_LINE_MEMBER(rxa_err_irq); - DECLARE_WRITE_LINE_MEMBER(txb_err_irq); - DECLARE_WRITE_LINE_MEMBER(rxb_err_irq); - - DECLARE_WRITE_LINE_MEMBER(scsi_err_irq); - DECLARE_WRITE_LINE_MEMBER(sndo_err_irq); - DECLARE_WRITE_LINE_MEMBER(sndi_err_irq); - - DECLARE_WRITE_LINE_MEMBER(vblank_irq); - [[maybe_unused]] DECLARE_WRITE_LINE_MEMBER(slot2_irq); - [[maybe_unused]] DECLARE_WRITE_LINE_MEMBER(slot1_irq); - DECLARE_WRITE_LINE_MEMBER(slot0_irq); - - DECLARE_WRITE_LINE_MEMBER(fdc_irq); - DECLARE_WRITE_LINE_MEMBER(fdc_drq); - [[maybe_unused]] DECLARE_WRITE_LINE_MEMBER(sound_irq); - DECLARE_WRITE_LINE_MEMBER(scsi_irq); - DECLARE_WRITE_LINE_MEMBER(scsi_drq); + void nmi_irq(int state); + void dma_irq(int state); + void enet_irq(int state); + void scc_irq(int state); + void via1_irq(int state); + + void bus_err_irq(int state); + void fdc_dma_irq(int state); + void etx_dma_irq(int state); + void erx_dma_irq(int state); + void txa_dma_irq(int state); + void rxa_dma_irq(int state); + void txb_dma_irq(int state); + void rxb_dma_irq(int state); + + void sndo_dma_irq(int state); + void sndi_dma_irq(int state); + + void fdc_err_irq(int state); + void etx_err_irq(int state); + void erx_err_irq(int state); + void txa_err_irq(int state); + void rxa_err_irq(int state); + void txb_err_irq(int state); + void rxb_err_irq(int state); + + void scsi_err_irq(int state); + void sndo_err_irq(int state); + void sndi_err_irq(int state); + + void vblank_irq(int state); + [[maybe_unused]] void slot2_irq(int state); + [[maybe_unused]] void slot1_irq(int state); + void slot0_irq(int state); + + void fdc_irq(int state); + void fdc_drq(int state); + [[maybe_unused]] void sound_irq(int state); + void scsi_irq(int state); + void scsi_drq(int state); void phases_w(uint8_t phases); void sel35_w(int sel35); @@ -133,9 +133,9 @@ private: void via1_out_a(uint8_t data); void via1_out_b(uint8_t data); TIMER_DEVICE_CALLBACK_MEMBER(via1_60_15_timer); - DECLARE_WRITE_LINE_MEMBER(via1_out_cb2); + void via1_out_cb2(int state); - DECLARE_WRITE_LINE_MEMBER(cuda_reset_w); + void cuda_reset_w(int state); uint8_t via1_r(offs_t offset); void via1_w(offs_t offset, uint8_t data); @@ -441,13 +441,13 @@ TIMER_DEVICE_CALLBACK_MEMBER(macpdm_state::via1_60_15_timer) m_via1->write_ca1(0); } -WRITE_LINE_MEMBER(macpdm_state::via1_out_cb2) +void macpdm_state::via1_out_cb2(int state) { m_cuda->set_via_data(state & 1); } -WRITE_LINE_MEMBER(macpdm_state::cuda_reset_w) +void macpdm_state::cuda_reset_w(int state) { m_maincpu->set_input_line(INPUT_LINE_HALT, state); m_maincpu->set_input_line(INPUT_LINE_RESET, state); @@ -640,42 +640,42 @@ uint32_t macpdm_state::id_r() return m_model_id; } -WRITE_LINE_MEMBER(macpdm_state::scc_irq) +void macpdm_state::scc_irq(int state) { logerror("scc irq %d\n", state); } -WRITE_LINE_MEMBER(macpdm_state::via1_irq) +void macpdm_state::via1_irq(int state) { irq_main_set(0x01, state); } -WRITE_LINE_MEMBER(macpdm_state::sound_irq) +void macpdm_state::sound_irq(int state) { via2_irq_main_set(0x20, state); } -WRITE_LINE_MEMBER(macpdm_state::vblank_irq) +void macpdm_state::vblank_irq(int state) { via2_irq_slot_set(0x40, state); } -WRITE_LINE_MEMBER(macpdm_state::slot2_irq) +void macpdm_state::slot2_irq(int state) { via2_irq_slot_set(0x20, state); } -WRITE_LINE_MEMBER(macpdm_state::slot1_irq) +void macpdm_state::slot1_irq(int state) { via2_irq_slot_set(0x10, state); } -WRITE_LINE_MEMBER(macpdm_state::sndo_dma_irq) +void macpdm_state::sndo_dma_irq(int state) { // TODO } -WRITE_LINE_MEMBER(macpdm_state::sndi_dma_irq) +void macpdm_state::sndi_dma_irq(int state) { // TODO } @@ -751,12 +751,12 @@ void macpdm_state::dma_scsi_a_step() m_dma_scsi_a_in_step = false; } -WRITE_LINE_MEMBER(macpdm_state::scsi_irq) +void macpdm_state::scsi_irq(int state) { via2_irq_main_set(0x08, state); } -WRITE_LINE_MEMBER(macpdm_state::scsi_drq) +void macpdm_state::scsi_drq(int state) { via2_irq_main_set(0x01, state); if((m_dma_scsi_a_ctrl & 0x02) && (m_via2_ifr & 0x01) && !m_dma_scsi_a_in_step) @@ -898,7 +898,7 @@ void macpdm_state::dma_floppy_adr_w(offs_t, uint32_t data, uint32_t mem_mask) logerror("dma floppy adr %08x\n", m_dma_floppy_adr); } -WRITE_LINE_MEMBER(macpdm_state::fdc_irq) +void macpdm_state::fdc_irq(int state) { via2_irq_main_set(0x20, state); } @@ -930,7 +930,7 @@ void macpdm_state::dma_floppy_step() m_dma_floppy_in_step = false; } -WRITE_LINE_MEMBER(macpdm_state::fdc_drq) +void macpdm_state::fdc_drq(int state) { m_floppy_drq = state; if((m_dma_floppy_ctrl & 0x02) && m_floppy_drq && !m_dma_floppy_in_step) diff --git a/src/mame/apple/macprtb.cpp b/src/mame/apple/macprtb.cpp index c5893b725c5..96537ec92b0 100644 --- a/src/mame/apple/macprtb.cpp +++ b/src/mame/apple/macprtb.cpp @@ -180,7 +180,7 @@ private: void mac_via_out_a(uint8_t data); void mac_via_out_b(uint8_t data); void field_interrupts(); - DECLARE_WRITE_LINE_MEMBER(via_irq_w); + void via_irq_w(int state); TIMER_CALLBACK_MEMBER(mac_6015_tick); int m_via_cycles = 0, m_via_interrupt = 0, m_scc_interrupt = 0, m_asc_interrupt = 0, m_last_taken_interrupt = 0; int m_ca1_data = 0; @@ -221,7 +221,7 @@ private: // returns nonzero if no PDS RAM expansion, 0 if present uint16_t mac_config_r() { return 0xffff; } - DECLARE_WRITE_LINE_MEMBER(asc_irq_w) + void asc_irq_w(int state) { m_asc_interrupt = state; field_interrupts(); @@ -365,7 +365,7 @@ void macportable_state::mac_via_w(offs_t offset, uint16_t data, uint16_t mem_mas m_maincpu->adjust_icount(m_via_cycles); } -WRITE_LINE_MEMBER(macportable_state::via_irq_w) +void macportable_state::via_irq_w(int state) { m_via_interrupt = state; field_interrupts(); diff --git a/src/mame/apple/macpwrbk030.cpp b/src/mame/apple/macpwrbk030.cpp index b4f55d755f6..0ae633f494b 100644 --- a/src/mame/apple/macpwrbk030.cpp +++ b/src/mame/apple/macpwrbk030.cpp @@ -219,8 +219,8 @@ private: void mac_via2_out_b(u8 data); void field_interrupts(); void mac_via_sync(); - DECLARE_WRITE_LINE_MEMBER(via_irq_w); - DECLARE_WRITE_LINE_MEMBER(via2_irq_w); + void via_irq_w(int state); + void via2_irq_w(int state); TIMER_CALLBACK_MEMBER(mac_6015_tick); int m_via_interrupt = 0, m_via2_interrupt = 0, m_scc_interrupt = 0, m_asc_interrupt = 0, m_last_taken_interrupt = 0; int m_ca1_data = 0, m_via2_ca1_hack = 0; @@ -267,7 +267,7 @@ private: u32 buserror_r(); - DECLARE_WRITE_LINE_MEMBER(asc_irq_w) + void asc_irq_w(int state) { m_asc_interrupt = state; field_interrupts(); @@ -568,13 +568,13 @@ void macpb030_state::mac_via2_w(offs_t offset, uint16_t data, uint16_t mem_mask) m_via2->write(offset, (data >> 8) & 0xff); } -WRITE_LINE_MEMBER(macpb030_state::via_irq_w) +void macpb030_state::via_irq_w(int state) { m_via_interrupt = state; field_interrupts(); } -WRITE_LINE_MEMBER(macpb030_state::via2_irq_w) +void macpb030_state::via2_irq_w(int state) { m_via2_interrupt = state; field_interrupts(); diff --git a/src/mame/apple/macquadra700.cpp b/src/mame/apple/macquadra700.cpp index ce4b3973465..6fd84580286 100644 --- a/src/mame/apple/macquadra700.cpp +++ b/src/mame/apple/macquadra700.cpp @@ -123,22 +123,22 @@ private: uint32_t m_dafb_colors[3]{}, m_dafb_count = 0, m_dafb_clutoffs = 0, m_dafb_montype = 0, m_dafb_vbltime = 0; uint32_t m_dafb_palette[256]{}; - DECLARE_WRITE_LINE_MEMBER(nubus_irq_9_w); - DECLARE_WRITE_LINE_MEMBER(nubus_irq_a_w); - DECLARE_WRITE_LINE_MEMBER(nubus_irq_b_w); - DECLARE_WRITE_LINE_MEMBER(nubus_irq_c_w); - DECLARE_WRITE_LINE_MEMBER(nubus_irq_d_w); - DECLARE_WRITE_LINE_MEMBER(nubus_irq_e_w); + void nubus_irq_9_w(int state); + void nubus_irq_a_w(int state); + void nubus_irq_b_w(int state); + void nubus_irq_c_w(int state); + void nubus_irq_d_w(int state); + void nubus_irq_e_w(int state); void nubus_slot_interrupt(uint8_t slot, uint32_t state); int m_via2_ca1_hack = 0, m_nubus_irq_state = 0; - WRITE_LINE_MEMBER(adb_irq_w) { m_adb_irq_pending = state; } + void adb_irq_w(int state) { m_adb_irq_pending = state; } int m_adb_irq_pending = 0; - DECLARE_WRITE_LINE_MEMBER(irq_539x_1_w); - [[maybe_unused]] DECLARE_WRITE_LINE_MEMBER(irq_539x_2_w); - DECLARE_WRITE_LINE_MEMBER(drq_539x_1_w); - [[maybe_unused]] DECLARE_WRITE_LINE_MEMBER(drq_539x_2_w); + void irq_539x_1_w(int state); + [[maybe_unused]] void irq_539x_2_w(int state); + void drq_539x_1_w(int state); + [[maybe_unused]] void drq_539x_2_w(int state); floppy_image_device *m_cur_floppy = nullptr; int m_hdsel = 0; @@ -157,8 +157,8 @@ private: void mac_via2_out_b(uint8_t data); void mac_via_sync(); void field_interrupts(); - DECLARE_WRITE_LINE_MEMBER(mac_via_irq); - DECLARE_WRITE_LINE_MEMBER(mac_via2_irq); + void mac_via_irq(int state); + void mac_via2_irq(int state); TIMER_CALLBACK_MEMBER(mac_6015_tick); int m_via_interrupt = 0, m_via2_interrupt = 0, m_scc_interrupt = 0, m_last_taken_interrupt = 0; @@ -327,12 +327,12 @@ void macquadra_state::nubus_slot_interrupt(uint8_t slot, uint32_t state) } } -WRITE_LINE_MEMBER(macquadra_state::nubus_irq_9_w) { nubus_slot_interrupt(9, state); } -WRITE_LINE_MEMBER(macquadra_state::nubus_irq_a_w) { nubus_slot_interrupt(0xa, state); } -WRITE_LINE_MEMBER(macquadra_state::nubus_irq_b_w) { nubus_slot_interrupt(0xb, state); } -WRITE_LINE_MEMBER(macquadra_state::nubus_irq_c_w) { nubus_slot_interrupt(0xc, state); } -WRITE_LINE_MEMBER(macquadra_state::nubus_irq_d_w) { nubus_slot_interrupt(0xd, state); } -WRITE_LINE_MEMBER(macquadra_state::nubus_irq_e_w) { nubus_slot_interrupt(0xe, state); } +void macquadra_state::nubus_irq_9_w(int state) { nubus_slot_interrupt(9, state); } +void macquadra_state::nubus_irq_a_w(int state) { nubus_slot_interrupt(0xa, state); } +void macquadra_state::nubus_irq_b_w(int state) { nubus_slot_interrupt(0xb, state); } +void macquadra_state::nubus_irq_c_w(int state) { nubus_slot_interrupt(0xc, state); } +void macquadra_state::nubus_irq_d_w(int state) { nubus_slot_interrupt(0xd, state); } +void macquadra_state::nubus_irq_e_w(int state) { nubus_slot_interrupt(0xe, state); } // DAFB: video for Quadra 700/900 @@ -630,17 +630,17 @@ uint32_t macquadra_state::screen_update_dafb(screen_device &screen, bitmap_rgb32 return 0; } -WRITE_LINE_MEMBER(macquadra_state::drq_539x_1_w) +void macquadra_state::drq_539x_1_w(int state) { m_dafb_scsi1_drq = state; } -WRITE_LINE_MEMBER(macquadra_state::drq_539x_2_w) +void macquadra_state::drq_539x_2_w(int state) { m_dafb_scsi2_drq = state; } -WRITE_LINE_MEMBER(macquadra_state::irq_539x_1_w) +void macquadra_state::irq_539x_1_w(int state) { if (state) // make sure a CB1 transition occurs { @@ -649,7 +649,7 @@ WRITE_LINE_MEMBER(macquadra_state::irq_539x_1_w) } } -WRITE_LINE_MEMBER(macquadra_state::irq_539x_2_w) +void macquadra_state::irq_539x_2_w(int state) { } @@ -681,13 +681,13 @@ void macquadra_state::mac_via_w(offs_t offset, uint16_t data, uint16_t mem_mask) m_via1->write(offset, (data >> 8) & 0xff); } -WRITE_LINE_MEMBER(macquadra_state::mac_via_irq) +void macquadra_state::mac_via_irq(int state) { m_via_interrupt = state; field_interrupts(); } -WRITE_LINE_MEMBER(macquadra_state::mac_via2_irq) +void macquadra_state::mac_via2_irq(int state) { m_via2_interrupt = state; field_interrupts(); diff --git a/src/mame/apple/macrtc.cpp b/src/mame/apple/macrtc.cpp index 17a11a1c125..c14ad00e8f3 100644 --- a/src/mame/apple/macrtc.cpp +++ b/src/mame/apple/macrtc.cpp @@ -183,7 +183,7 @@ void rtc3430042_device::rtc_clock_updated(int year, int month, int day, int day_ } /* write the chip enable state */ -WRITE_LINE_MEMBER( rtc3430042_device::ce_w ) +void rtc3430042_device::ce_w(int state) { if (state && (! m_rTCEnb)) { @@ -203,7 +203,7 @@ WRITE_LINE_MEMBER( rtc3430042_device::ce_w ) m_rTCEnb = state; } -WRITE_LINE_MEMBER( rtc3430042_device::clk_w ) +void rtc3430042_device::clk_w(int state) { if ((!state) && (m_rTCClk)) { @@ -213,12 +213,12 @@ WRITE_LINE_MEMBER( rtc3430042_device::clk_w ) m_rTCClk = state; } -READ_LINE_MEMBER( rtc3430042_device::data_r ) +int rtc3430042_device::data_r() { return m_data_out; } -WRITE_LINE_MEMBER( rtc3430042_device::data_w ) +void rtc3430042_device::data_w(int state) { m_data_latch = state; } diff --git a/src/mame/apple/macrtc.h b/src/mame/apple/macrtc.h index 299fd0fdcb7..2d9689ea3f2 100644 --- a/src/mame/apple/macrtc.h +++ b/src/mame/apple/macrtc.h @@ -32,10 +32,10 @@ public: rtc3430042_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock, bool hasBigPRAM); rtc3430042_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - DECLARE_WRITE_LINE_MEMBER( ce_w ); - DECLARE_WRITE_LINE_MEMBER( clk_w ); - DECLARE_READ_LINE_MEMBER( data_r ); - DECLARE_WRITE_LINE_MEMBER( data_w ); + void ce_w(int state); + void clk_w(int state); + int data_r(); + void data_w(int state); // 1 second square wave output auto cko_cb() { return m_cko_cb.bind(); } diff --git a/src/mame/apple/macscsi.cpp b/src/mame/apple/macscsi.cpp index 3bc17a15fad..15524a6bec4 100644 --- a/src/mame/apple/macscsi.cpp +++ b/src/mame/apple/macscsi.cpp @@ -147,7 +147,7 @@ void mac_scsi_helper_device::write_fifo_process() } } -WRITE_LINE_MEMBER(mac_scsi_helper_device::drq_w) +void mac_scsi_helper_device::drq_w(int state) { if (state) { diff --git a/src/mame/apple/macscsi.h b/src/mame/apple/macscsi.h index 53562aac9c8..c5bdf198a4b 100644 --- a/src/mame/apple/macscsi.h +++ b/src/mame/apple/macscsi.h @@ -27,7 +27,7 @@ public: u8 read_wrapper(bool pseudo_dma, offs_t offset); void write_wrapper(bool pseudo_dma, offs_t offset, u8 data); - DECLARE_WRITE_LINE_MEMBER(drq_w); + void drq_w(int state); protected: // device-level overrides diff --git a/src/mame/apple/pippin.cpp b/src/mame/apple/pippin.cpp index fc0e8497d49..cf15021dc0c 100644 --- a/src/mame/apple/pippin.cpp +++ b/src/mame/apple/pippin.cpp @@ -81,13 +81,13 @@ private: virtual void machine_start() override; virtual void machine_reset() override; - WRITE_LINE_MEMBER(cuda_reset_w) + void cuda_reset_w(int state) { m_maincpu->set_input_line(INPUT_LINE_HALT, state); m_maincpu->set_input_line(INPUT_LINE_RESET, state); } - WRITE_LINE_MEMBER(irq_w) + void irq_w(int state) { m_maincpu->set_input_line(PPC_IRQ, state); } diff --git a/src/mame/apple/powermacg3.cpp b/src/mame/apple/powermacg3.cpp index 9d9e3eba47f..b3c37147d91 100644 --- a/src/mame/apple/powermacg3.cpp +++ b/src/mame/apple/powermacg3.cpp @@ -56,13 +56,13 @@ private: u16 read_sense(); void write_sense(u16 data); - WRITE_LINE_MEMBER(cuda_reset_w) + void cuda_reset_w(int state) { m_maincpu->set_input_line(INPUT_LINE_HALT, state); m_maincpu->set_input_line(INPUT_LINE_RESET, state); } - WRITE_LINE_MEMBER(irq_w) + void irq_w(int state) { m_maincpu->set_input_line(PPC_IRQ, state); } diff --git a/src/mame/apple/rbv.cpp b/src/mame/apple/rbv.cpp index d7bdf34d138..7fa8f7d24d0 100644 --- a/src/mame/apple/rbv.cpp +++ b/src/mame/apple/rbv.cpp @@ -135,7 +135,7 @@ TIMER_CALLBACK_MEMBER(rbv_device::mac_6015_tick) write_6015(ASSERT_LINE); } -WRITE_LINE_MEMBER(rbv_device::vbl_w) +void rbv_device::vbl_w(int state) { if (!state) { @@ -149,7 +149,7 @@ WRITE_LINE_MEMBER(rbv_device::vbl_w) pseudovia_recalc_irqs(); } -WRITE_LINE_MEMBER(rbv_device::slot0_irq_w) +void rbv_device::slot0_irq_w(int state) { if (state) { @@ -163,7 +163,7 @@ WRITE_LINE_MEMBER(rbv_device::slot0_irq_w) pseudovia_recalc_irqs(); } -WRITE_LINE_MEMBER(rbv_device::slot1_irq_w) +void rbv_device::slot1_irq_w(int state) { if (state) { @@ -177,7 +177,7 @@ WRITE_LINE_MEMBER(rbv_device::slot1_irq_w) pseudovia_recalc_irqs(); } -WRITE_LINE_MEMBER(rbv_device::slot2_irq_w) +void rbv_device::slot2_irq_w(int state) { if (state) { @@ -191,7 +191,7 @@ WRITE_LINE_MEMBER(rbv_device::slot2_irq_w) pseudovia_recalc_irqs(); } -WRITE_LINE_MEMBER(rbv_device::asc_irq_w) +void rbv_device::asc_irq_w(int state) { if (state == ASSERT_LINE) { diff --git a/src/mame/apple/rbv.h b/src/mame/apple/rbv.h index 77d4e229255..68012498638 100644 --- a/src/mame/apple/rbv.h +++ b/src/mame/apple/rbv.h @@ -29,10 +29,10 @@ public: auto via6015_callback() { return write_6015.bind(); } auto irq_callback() { return write_irq.bind(); } - DECLARE_WRITE_LINE_MEMBER(slot0_irq_w); - DECLARE_WRITE_LINE_MEMBER(slot1_irq_w); - DECLARE_WRITE_LINE_MEMBER(slot2_irq_w); - DECLARE_WRITE_LINE_MEMBER(asc_irq_w); + void slot0_irq_w(int state); + void slot1_irq_w(int state); + void slot2_irq_w(int state); + void asc_irq_w(int state); protected: // device-level overrides @@ -59,7 +59,7 @@ private: void pseudovia_recalc_irqs(); TIMER_CALLBACK_MEMBER(mac_6015_tick); - WRITE_LINE_MEMBER(vbl_w); + void vbl_w(int state); u8 dac_r(offs_t offset); void dac_w(offs_t offset, u8 data); diff --git a/src/mame/apple/sonora.cpp b/src/mame/apple/sonora.cpp index 96c97269d2a..a59eddcd771 100644 --- a/src/mame/apple/sonora.cpp +++ b/src/mame/apple/sonora.cpp @@ -216,7 +216,7 @@ uint8_t sonora_device::via_in_b() return read_pb3() << 3; } -WRITE_LINE_MEMBER(sonora_device::via_out_cb2) +void sonora_device::via_out_cb2(int state) { write_cb2(state & 1); } @@ -240,13 +240,13 @@ void sonora_device::via_out_b(uint8_t data) write_pb5(BIT(data, 5)); } -WRITE_LINE_MEMBER(sonora_device::via1_irq) +void sonora_device::via1_irq(int state) { m_via_interrupt = state; field_interrupts(); } -WRITE_LINE_MEMBER(sonora_device::via2_irq) +void sonora_device::via2_irq(int state) { m_via2_interrupt = state; field_interrupts(); @@ -282,13 +282,13 @@ void sonora_device::field_interrupts() } } -WRITE_LINE_MEMBER(sonora_device::scc_irq_w) +void sonora_device::scc_irq_w(int state) { m_scc_interrupt = (state == ASSERT_LINE); field_interrupts(); } -WRITE_LINE_MEMBER(sonora_device::vbl_w) +void sonora_device::vbl_w(int state) { if (!state) { @@ -303,7 +303,7 @@ WRITE_LINE_MEMBER(sonora_device::vbl_w) } } -WRITE_LINE_MEMBER(sonora_device::asc_irq) +void sonora_device::asc_irq(int state) { if (state == ASSERT_LINE) { @@ -481,12 +481,12 @@ void sonora_device::pseudovia_w(offs_t offset, uint8_t data) } } -WRITE_LINE_MEMBER(sonora_device::cb1_w) +void sonora_device::cb1_w(int state) { m_via1->write_cb1(state); } -WRITE_LINE_MEMBER(sonora_device::cb2_w) +void sonora_device::cb2_w(int state) { m_via1->write_cb2(state); } diff --git a/src/mame/apple/sonora.h b/src/mame/apple/sonora.h index 7898dddea31..e2208b04f67 100644 --- a/src/mame/apple/sonora.h +++ b/src/mame/apple/sonora.h @@ -38,10 +38,10 @@ public: template void set_rom_tag(T &&... args) { m_rom.set_tag(std::forward(args)...); } void set_ram_info(u32 *ram, u32 size); - DECLARE_WRITE_LINE_MEMBER(cb1_w); - DECLARE_WRITE_LINE_MEMBER(cb2_w); - DECLARE_WRITE_LINE_MEMBER(vbl_w); - DECLARE_WRITE_LINE_MEMBER(scc_irq_w); + void cb1_w(int state); + void cb2_w(int state); + void vbl_w(int state); + void scc_irq_w(int state); protected: // device-level overrides @@ -86,10 +86,10 @@ private: void via_out_b(uint8_t data); void via_sync(); void field_interrupts(); - DECLARE_WRITE_LINE_MEMBER(via_out_cb2); - DECLARE_WRITE_LINE_MEMBER(via1_irq); - DECLARE_WRITE_LINE_MEMBER(via2_irq); - DECLARE_WRITE_LINE_MEMBER(asc_irq); + void via_out_cb2(int state); + void via1_irq(int state); + void via2_irq(int state); + void asc_irq(int state); TIMER_CALLBACK_MEMBER(mac_6015_tick); void phases_w(uint8_t phases); diff --git a/src/mame/apple/tk2000.cpp b/src/mame/apple/tk2000.cpp index d803786dccf..fa8522eb19f 100644 --- a/src/mame/apple/tk2000.cpp +++ b/src/mame/apple/tk2000.cpp @@ -99,7 +99,7 @@ private: uint8_t ram_r(offs_t offset); void ram_w(offs_t offset, uint8_t data); - DECLARE_WRITE_LINE_MEMBER(printer_busy_w); + void printer_busy_w(int state); void kbout_w(uint8_t data); uint8_t kbin_r(); uint8_t casout_r(); @@ -108,11 +108,11 @@ private: void snd_w(uint8_t data); uint8_t switches_r(offs_t offset); uint8_t cassette_r(); - DECLARE_WRITE_LINE_MEMBER(color_w); - DECLARE_WRITE_LINE_MEMBER(motor_a_w); - DECLARE_WRITE_LINE_MEMBER(motor_b_w); - DECLARE_WRITE_LINE_MEMBER(rom_ram_w); - DECLARE_WRITE_LINE_MEMBER(ctrl_key_w); + void color_w(int state); + void motor_a_w(int state); + void motor_b_w(int state); + void rom_ram_w(int state); + void ctrl_key_w(int state); uint8_t c080_r(offs_t offset); void c080_w(offs_t offset, uint8_t data); uint8_t c100_r(offs_t offset); @@ -172,7 +172,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(tk2000_state::apple2_interrupt) I/O ***************************************************************************/ -WRITE_LINE_MEMBER(tk2000_state::printer_busy_w) +void tk2000_state::printer_busy_w(int state) { m_printer_busy = state; } @@ -243,26 +243,26 @@ uint8_t tk2000_state::cassette_r() return (m_cassette->input() > 0.0 ? 0x80 : 0) | (read_floatingbus() & 0x7f); } -WRITE_LINE_MEMBER(tk2000_state::color_w) +void tk2000_state::color_w(int state) { // 0 = color, 1 = black/white } -WRITE_LINE_MEMBER(tk2000_state::motor_a_w) +void tk2000_state::motor_a_w(int state) { } -WRITE_LINE_MEMBER(tk2000_state::motor_b_w) +void tk2000_state::motor_b_w(int state) { } -WRITE_LINE_MEMBER(tk2000_state::rom_ram_w) +void tk2000_state::rom_ram_w(int state) { // 0 = ROM, 1 = RAM m_upperbank->set_bank(state); } -WRITE_LINE_MEMBER(tk2000_state::ctrl_key_w) +void tk2000_state::ctrl_key_w(int state) { m_ctrl_key = state; } diff --git a/src/mame/apple/v8.cpp b/src/mame/apple/v8.cpp index 9f9336ad86d..8abbda5590f 100644 --- a/src/mame/apple/v8.cpp +++ b/src/mame/apple/v8.cpp @@ -251,7 +251,7 @@ u8 v8_device::via_in_b() return read_pb3() << 3; } -WRITE_LINE_MEMBER(v8_device::via_out_cb2) +void v8_device::via_out_cb2(int state) { write_cb2(state & 1); } @@ -267,13 +267,13 @@ void v8_device::via_out_b(u8 data) write_pb5(BIT(data, 5)); } -WRITE_LINE_MEMBER(v8_device::via1_irq) +void v8_device::via1_irq(int state) { m_via_interrupt = state; field_interrupts(); } -WRITE_LINE_MEMBER(v8_device::via2_irq) +void v8_device::via2_irq(int state) { m_via2_interrupt = state; field_interrupts(); @@ -309,13 +309,13 @@ void v8_device::field_interrupts() } } -WRITE_LINE_MEMBER(v8_device::scc_irq_w) +void v8_device::scc_irq_w(int state) { m_scc_interrupt = (state == ASSERT_LINE); field_interrupts(); } -WRITE_LINE_MEMBER(v8_device::vbl_w) +void v8_device::vbl_w(int state) { if (!state) { @@ -330,7 +330,7 @@ WRITE_LINE_MEMBER(v8_device::vbl_w) } } -WRITE_LINE_MEMBER(v8_device::asc_irq) +void v8_device::asc_irq(int state) { if (state == ASSERT_LINE) { @@ -603,12 +603,12 @@ void v8_device::ram_size(u8 config) } } -WRITE_LINE_MEMBER(v8_device::cb1_w) +void v8_device::cb1_w(int state) { m_via1->write_cb1(state); } -WRITE_LINE_MEMBER(v8_device::cb2_w) +void v8_device::cb2_w(int state) { m_via1->write_cb2(state); } diff --git a/src/mame/apple/v8.h b/src/mame/apple/v8.h index 8f2b1931726..5b5966768a3 100644 --- a/src/mame/apple/v8.h +++ b/src/mame/apple/v8.h @@ -37,10 +37,10 @@ public: void set_ram_info(u32 *ram, u32 size); void set_baseram_is_4M(bool ramSize) { m_baseIs4M = ramSize; } - DECLARE_WRITE_LINE_MEMBER(cb1_w); - DECLARE_WRITE_LINE_MEMBER(cb2_w); - DECLARE_WRITE_LINE_MEMBER(vbl_w); - DECLARE_WRITE_LINE_MEMBER(scc_irq_w); + void cb1_w(int state); + void cb2_w(int state); + void vbl_w(int state); + void scc_irq_w(int state); protected: required_device m_maincpu; @@ -63,7 +63,7 @@ protected: virtual u8 pseudovia_r(offs_t offset); - DECLARE_WRITE_LINE_MEMBER(asc_irq); + void asc_irq(int state); private: devcb_write_line write_pb4, write_pb5, write_cb2, write_hdsel, write_hmmu_enable; @@ -97,9 +97,9 @@ private: void via_out_b(u8 data); void via_sync(); void field_interrupts(); - DECLARE_WRITE_LINE_MEMBER(via_out_cb2); - DECLARE_WRITE_LINE_MEMBER(via1_irq); - DECLARE_WRITE_LINE_MEMBER(via2_irq); + void via_out_cb2(int state); + void via1_irq(int state); + void via2_irq(int state); TIMER_CALLBACK_MEMBER(mac_6015_tick); u32 vram_r(offs_t offset); diff --git a/src/mame/apple/vasp.cpp b/src/mame/apple/vasp.cpp index 6024e51bc72..2558ce03ab8 100644 --- a/src/mame/apple/vasp.cpp +++ b/src/mame/apple/vasp.cpp @@ -226,7 +226,7 @@ uint8_t vasp_device::via_in_b() return read_pb3() << 3; } -WRITE_LINE_MEMBER(vasp_device::via_out_cb2) +void vasp_device::via_out_cb2(int state) { write_cb2(state & 1); } @@ -242,13 +242,13 @@ void vasp_device::via_out_b(uint8_t data) write_pb5(BIT(data, 5)); } -WRITE_LINE_MEMBER(vasp_device::via1_irq) +void vasp_device::via1_irq(int state) { m_via_interrupt = state; field_interrupts(); } -WRITE_LINE_MEMBER(vasp_device::via2_irq) +void vasp_device::via2_irq(int state) { m_via2_interrupt = state; field_interrupts(); @@ -284,13 +284,13 @@ void vasp_device::field_interrupts() } } -WRITE_LINE_MEMBER(vasp_device::scc_irq_w) +void vasp_device::scc_irq_w(int state) { m_scc_interrupt = (state == ASSERT_LINE); field_interrupts(); } -WRITE_LINE_MEMBER(vasp_device::vbl_w) +void vasp_device::vbl_w(int state) { if (!state) { @@ -305,7 +305,7 @@ WRITE_LINE_MEMBER(vasp_device::vbl_w) } } -WRITE_LINE_MEMBER(vasp_device::slot0_irq_w) +void vasp_device::slot0_irq_w(int state) { if (state) { @@ -319,7 +319,7 @@ WRITE_LINE_MEMBER(vasp_device::slot0_irq_w) pseudovia_recalc_irqs(); } -WRITE_LINE_MEMBER(vasp_device::slot1_irq_w) +void vasp_device::slot1_irq_w(int state) { if (state) { @@ -333,7 +333,7 @@ WRITE_LINE_MEMBER(vasp_device::slot1_irq_w) pseudovia_recalc_irqs(); } -WRITE_LINE_MEMBER(vasp_device::slot2_irq_w) +void vasp_device::slot2_irq_w(int state) { if (state) { @@ -347,7 +347,7 @@ WRITE_LINE_MEMBER(vasp_device::slot2_irq_w) pseudovia_recalc_irqs(); } -WRITE_LINE_MEMBER(vasp_device::asc_irq) +void vasp_device::asc_irq(int state) { if (state == ASSERT_LINE) { @@ -526,12 +526,12 @@ void vasp_device::pseudovia_w(offs_t offset, uint8_t data) } } -WRITE_LINE_MEMBER(vasp_device::cb1_w) +void vasp_device::cb1_w(int state) { m_via1->write_cb1(state); } -WRITE_LINE_MEMBER(vasp_device::cb2_w) +void vasp_device::cb2_w(int state) { m_via1->write_cb2(state); } diff --git a/src/mame/apple/vasp.h b/src/mame/apple/vasp.h index f935208e484..9c98ab7bded 100644 --- a/src/mame/apple/vasp.h +++ b/src/mame/apple/vasp.h @@ -38,13 +38,13 @@ public: template void set_rom_tag(T &&... args) { m_rom.set_tag(std::forward(args)...); } void set_ram_info(u32 *ram, u32 size); - DECLARE_WRITE_LINE_MEMBER(cb1_w); - DECLARE_WRITE_LINE_MEMBER(cb2_w); - DECLARE_WRITE_LINE_MEMBER(vbl_w); - DECLARE_WRITE_LINE_MEMBER(scc_irq_w); - DECLARE_WRITE_LINE_MEMBER(slot0_irq_w); - DECLARE_WRITE_LINE_MEMBER(slot1_irq_w); - DECLARE_WRITE_LINE_MEMBER(slot2_irq_w); + void cb1_w(int state); + void cb2_w(int state); + void vbl_w(int state); + void scc_irq_w(int state); + void slot0_irq_w(int state); + void slot1_irq_w(int state); + void slot2_irq_w(int state); protected: // device-level overrides @@ -89,10 +89,10 @@ private: void via_out_b(uint8_t data); void via_sync(); void field_interrupts(); - DECLARE_WRITE_LINE_MEMBER(via_out_cb2); - DECLARE_WRITE_LINE_MEMBER(via1_irq); - DECLARE_WRITE_LINE_MEMBER(via2_irq); - DECLARE_WRITE_LINE_MEMBER(asc_irq); + void via_out_cb2(int state); + void via1_irq(int state); + void via2_irq(int state); + void asc_irq(int state); TIMER_CALLBACK_MEMBER(mac_6015_tick); u32 vram_r(offs_t offset); diff --git a/src/mame/arcadia/arcadia.h b/src/mame/arcadia/arcadia.h index 7e634712c5d..f2cba3b59e3 100644 --- a/src/mame/arcadia/arcadia.h +++ b/src/mame/arcadia/arcadia.h @@ -123,7 +123,7 @@ private: required_device m_palette; required_device m_screen; - DECLARE_READ_LINE_MEMBER(vsync_r); + int vsync_r(); uint8_t video_r(offs_t offset); void video_w(offs_t offset, uint8_t data); void palette_init(palette_device &palette) const; diff --git a/src/mame/arcadia/arcadia_v.cpp b/src/mame/arcadia/arcadia_v.cpp index 4701360672f..48b171c6a49 100644 --- a/src/mame/arcadia/arcadia_v.cpp +++ b/src/mame/arcadia/arcadia_v.cpp @@ -668,7 +668,7 @@ INTERRUPT_GEN_MEMBER(arcadia_state::video_line) draw_sprites(); } -READ_LINE_MEMBER(arcadia_state::vsync_r) +int arcadia_state::vsync_r() { return m_line >= 216 ? ASSERT_LINE : CLEAR_LINE; } diff --git a/src/mame/aristocrat/aristmk4.cpp b/src/mame/aristocrat/aristmk4.cpp index 11a00334839..2e74a6e7487 100644 --- a/src/mame/aristocrat/aristmk4.cpp +++ b/src/mame/aristocrat/aristmk4.cpp @@ -428,15 +428,15 @@ private: uint8_t cashcade_r(); void mk4_printer_w(uint8_t data); uint8_t mk4_printer_r(); - DECLARE_WRITE_LINE_MEMBER(mkiv_pia_ca2); - DECLARE_WRITE_LINE_MEMBER(mkiv_pia_cb2); + void mkiv_pia_ca2(int state); + void mkiv_pia_cb2(int state); void mkiv_pia_outb(uint8_t data); uint8_t via_a_r(); uint8_t via_b_r(); void via_a_w(uint8_t data); void via_b_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(via_ca2_w); - DECLARE_WRITE_LINE_MEMBER(via_cb2_w); + void via_ca2_w(int state); + void via_cb2_w(int state); void pblp_out(uint8_t data); void pbltlp_out(uint8_t data); void zn434_w(uint8_t data); @@ -696,14 +696,14 @@ void aristmk4_state::mkiv_pia_outa(uint8_t data) } //output ca2 -WRITE_LINE_MEMBER(aristmk4_state::mkiv_pia_ca2) +void aristmk4_state::mkiv_pia_ca2(int state) { m_rtc_address_strobe = state; // logerror("address strobe %02X\n", address_strobe); } //output cb2 -WRITE_LINE_MEMBER(aristmk4_state::mkiv_pia_cb2) +void aristmk4_state::mkiv_pia_cb2(int state) { m_rtc_data_strobe = state; //logerror("data strobe: %02X\n", data); @@ -937,13 +937,13 @@ void aristmk4_state::via_b_w(uint8_t data) } } -WRITE_LINE_MEMBER(aristmk4_state::via_ca2_w) +void aristmk4_state::via_ca2_w(int state) { // CA2 is connected to CDSOL1 on schematics ? //logerror("Via Port CA2 write %02X\n",data) ; } -WRITE_LINE_MEMBER(aristmk4_state::via_cb2_w) +void aristmk4_state::via_cb2_w(int state) { // CB2 = hopper motor (HOPMO1). When it is 0x01, it is not running (active low) // when it goes to 0, we're expecting to coins to be paid out, handled in via_b_r diff --git a/src/mame/atari/a2600.cpp b/src/mame/atari/a2600.cpp index db0bf1d113d..b6e562c004a 100644 --- a/src/mame/atari/a2600.cpp +++ b/src/mame/atari/a2600.cpp @@ -147,7 +147,7 @@ protected: void switch_A_w(uint8_t data); uint8_t switch_A_r(); void switch_B_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(irq_callback); + void irq_callback(int state); uint16_t a2600_read_input_port(offs_t offset); uint8_t a2600_get_databus_contents(offs_t offset); void a2600_tia_vsync_callback(uint16_t data); @@ -378,7 +378,7 @@ void a2600_base_state::switch_B_w(uint8_t data) { } -WRITE_LINE_MEMBER(a2600_base_state::irq_callback) +void a2600_base_state::irq_callback(int state) { } diff --git a/src/mame/atari/asic65.cpp b/src/mame/atari/asic65.cpp index 89f0776c1b9..ed86b878be3 100644 --- a/src/mame/atari/asic65.cpp +++ b/src/mame/atari/asic65.cpp @@ -514,7 +514,7 @@ u16 asic65_device::stat_r() } -READ_LINE_MEMBER( asic65_device::get_bio ) +int asic65_device::get_bio() { if (!machine().side_effects_disabled()) { diff --git a/src/mame/atari/asic65.h b/src/mame/atari/asic65.h index eb04a3fa863..f662fe0a266 100644 --- a/src/mame/atari/asic65.h +++ b/src/mame/atari/asic65.h @@ -73,7 +73,7 @@ private: u16 m_68data; u16 m_tdata; - DECLARE_READ_LINE_MEMBER( get_bio ); + int get_bio(); }; DECLARE_DEVICE_TYPE(ASIC65, asic65_device) diff --git a/src/mame/atari/asteroid.cpp b/src/mame/atari/asteroid.cpp index 04efc06c9c9..21383d94397 100644 --- a/src/mame/atari/asteroid.cpp +++ b/src/mame/atari/asteroid.cpp @@ -367,17 +367,17 @@ void asteroid_state::llander_sound(machine_config &config) * *************************************/ -WRITE_LINE_MEMBER(asteroid_state::coin_counter_left_w) +void asteroid_state::coin_counter_left_w(int state) { machine().bookkeeping().coin_counter_w(0, state); } -WRITE_LINE_MEMBER(asteroid_state::coin_counter_center_w) +void asteroid_state::coin_counter_center_w(int state) { machine().bookkeeping().coin_counter_w(1, state); } -WRITE_LINE_MEMBER(asteroid_state::coin_counter_right_w) +void asteroid_state::coin_counter_right_w(int state) { machine().bookkeeping().coin_counter_w(2, state); } @@ -489,7 +489,7 @@ void asteroid_state::llander_map(address_map &map) * *************************************/ -READ_LINE_MEMBER(asteroid_state::clock_r) +int asteroid_state::clock_r() { return (m_maincpu->total_cycles() & 0x100) ? 1 : 0; } diff --git a/src/mame/atari/asteroid.h b/src/mame/atari/asteroid.h index 771cc4737c8..eec6619f143 100644 --- a/src/mame/atari/asteroid.h +++ b/src/mame/atari/asteroid.h @@ -48,9 +48,9 @@ public: memory_share_creator m_sram1; memory_share_creator m_sram2; - DECLARE_WRITE_LINE_MEMBER(coin_counter_left_w); - DECLARE_WRITE_LINE_MEMBER(coin_counter_center_w); - DECLARE_WRITE_LINE_MEMBER(coin_counter_right_w); + void coin_counter_left_w(int state); + void coin_counter_center_w(int state); + void coin_counter_right_w(int state); uint8_t asteroid_IN0_r(offs_t offset); uint8_t asterock_IN0_r(offs_t offset); uint8_t asteroid_IN1_r(offs_t offset); @@ -65,13 +65,13 @@ public: void earom_write(offs_t offset, uint8_t data); void earom_control_w(uint8_t data); - DECLARE_READ_LINE_MEMBER(clock_r); + int clock_r(); INTERRUPT_GEN_MEMBER(asteroid_interrupt); INTERRUPT_GEN_MEMBER(asterock_interrupt); INTERRUPT_GEN_MEMBER(llander_interrupt); - DECLARE_WRITE_LINE_MEMBER(cocktail_inv_w); + void cocktail_inv_w(int state); void init_asterock(); void init_asteroidb(); diff --git a/src/mame/atari/asteroid_m.cpp b/src/mame/atari/asteroid_m.cpp index c4ec5c1ea67..57a67516dd9 100644 --- a/src/mame/atari/asteroid_m.cpp +++ b/src/mame/atari/asteroid_m.cpp @@ -34,7 +34,7 @@ INTERRUPT_GEN_MEMBER(asteroid_state::llander_interrupt) device.execute().pulse_input_line(INPUT_LINE_NMI, attotime::zero); } -WRITE_LINE_MEMBER(asteroid_state::cocktail_inv_w) +void asteroid_state::cocktail_inv_w(int state) { // Inverter circuit is only hooked up for Cocktail Asteroids int flip = state && m_cocktail->read(); diff --git a/src/mame/atari/atarifdc.cpp b/src/mame/atari/atarifdc.cpp index 83da87a0be3..8573b8ff179 100644 --- a/src/mame/atari/atarifdc.cpp +++ b/src/mame/atari/atarifdc.cpp @@ -719,7 +719,7 @@ void atari_fdc_device::serout_w(uint8_t data) } } -WRITE_LINE_MEMBER(atari_fdc_device::pia_cb2_w) +void atari_fdc_device::pia_cb2_w(int state) { if (!state) { diff --git a/src/mame/atari/atarifdc.h b/src/mame/atari/atarifdc.h index 4f2382d0a96..968a34c474d 100644 --- a/src/mame/atari/atarifdc.h +++ b/src/mame/atari/atarifdc.h @@ -19,7 +19,7 @@ public: uint8_t serin_r(); void serout_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER( pia_cb2_w ); + void pia_cb2_w(int state); void atari_load_proc(device_image_interface &image, bool is_created); protected: diff --git a/src/mame/atari/atarigt.cpp b/src/mame/atari/atarigt.cpp index 5b2d35d09b4..810d34a91af 100644 --- a/src/mame/atari/atarigt.cpp +++ b/src/mame/atari/atarigt.cpp @@ -82,7 +82,7 @@ INTERRUPT_GEN_MEMBER(atarigt_state::scanline_int_gen) } -WRITE_LINE_MEMBER(atarigt_state::video_int_write_line) +void atarigt_state::video_int_write_line(int state) { if (state) { diff --git a/src/mame/atari/atarigt.h b/src/mame/atari/atarigt.h index 3cbc93752a7..f5bfb0f391d 100644 --- a/src/mame/atari/atarigt.h +++ b/src/mame/atari/atarigt.h @@ -93,7 +93,7 @@ private: std::unique_ptr m_protdata; INTERRUPT_GEN_MEMBER(scanline_int_gen); - DECLARE_WRITE_LINE_MEMBER(video_int_write_line); + void video_int_write_line(int state); void scanline_int_ack_w(uint32_t data = 0); void video_int_ack_w(uint32_t data = 0); TIMER_DEVICE_CALLBACK_MEMBER(scanline_update); diff --git a/src/mame/atari/atarijsa.cpp b/src/mame/atari/atarijsa.cpp index 765de024b78..8b14ae8f4f9 100644 --- a/src/mame/atari/atarijsa.cpp +++ b/src/mame/atari/atarijsa.cpp @@ -340,7 +340,7 @@ void atari_jsa_base_device::ym2151_port_w(uint8_t data) // main's test line, provided by a callback //------------------------------------------------- -READ_LINE_MEMBER(atari_jsa_base_device::main_test_read_line) +int atari_jsa_base_device::main_test_read_line() { return !m_test_read_cb(); } @@ -351,7 +351,7 @@ READ_LINE_MEMBER(atari_jsa_base_device::main_test_read_line) // from the comm device to the owning callback //------------------------------------------------- -WRITE_LINE_MEMBER(atari_jsa_base_device::main_int_write_line) +void atari_jsa_base_device::main_int_write_line(int state) { m_main_int_cb(state); } @@ -397,7 +397,7 @@ void atari_jsa_base_device::sound_irq_ack_w(u8 data) // YM2151's IRQ line. //------------------------------------------------- -WRITE_LINE_MEMBER(atari_jsa_base_device::ym2151_irq_gen) +void atari_jsa_base_device::ym2151_irq_gen(int state) { m_ym2151_int = state; update_sound_irq(); diff --git a/src/mame/atari/atarijsa.h b/src/mame/atari/atarijsa.h index f2c522f57b7..1379082590c 100644 --- a/src/mame/atari/atarijsa.h +++ b/src/mame/atari/atarijsa.h @@ -64,8 +64,8 @@ public: // getters m6502_device &soundcpu() const { return *m_jsacpu; } - DECLARE_READ_LINE_MEMBER(main_to_sound_ready) { return m_soundcomm->main_to_sound_ready(); } - DECLARE_READ_LINE_MEMBER(sound_to_main_ready) { return m_soundcomm->sound_to_main_ready(); } + int main_to_sound_ready() { return m_soundcomm->main_to_sound_ready(); } + int sound_to_main_ready() { return m_soundcomm->sound_to_main_ready(); } // main cpu accessors void main_command_w(uint8_t data); @@ -74,16 +74,16 @@ public: // read/write handlers void ym2151_port_w(uint8_t data); - DECLARE_READ_LINE_MEMBER(main_test_read_line); + int main_test_read_line(); // I/O lines - DECLARE_WRITE_LINE_MEMBER(main_int_write_line); + void main_int_write_line(int state); // 6502 interrupt handlers INTERRUPT_GEN_MEMBER(sound_irq_gen); void sound_irq_ack_w(u8 data = 0); u8 sound_irq_ack_r(); - DECLARE_WRITE_LINE_MEMBER(ym2151_irq_gen); + void ym2151_irq_gen(int state); protected: // device-level overrides diff --git a/src/mame/atari/atariscom.h b/src/mame/atari/atariscom.h index e90037e1cb6..0f3af40f8e2 100644 --- a/src/mame/atari/atariscom.h +++ b/src/mame/atari/atariscom.h @@ -47,8 +47,8 @@ public: auto int_callback() { return m_main_int_cb.bind(); } // getters - DECLARE_READ_LINE_MEMBER(main_to_sound_ready) { return m_main_to_sound_ready ? ASSERT_LINE : CLEAR_LINE; } - DECLARE_READ_LINE_MEMBER(sound_to_main_ready) { return m_sound_to_main_ready ? ASSERT_LINE : CLEAR_LINE; } + int main_to_sound_ready() { return m_main_to_sound_ready ? ASSERT_LINE : CLEAR_LINE; } + int sound_to_main_ready() { return m_sound_to_main_ready ? ASSERT_LINE : CLEAR_LINE; } // main cpu accessors (forward internally to the atari_sound_comm_device) void main_command_w(u8 data); diff --git a/src/mame/atari/atarist.cpp b/src/mame/atari/atarist.cpp index 7d6b4920ff8..877066e1d03 100644 --- a/src/mame/atari/atarist.cpp +++ b/src/mame/atari/atarist.cpp @@ -123,7 +123,7 @@ public: m_screen(*this, "screen") { } - DECLARE_WRITE_LINE_MEMBER( write_monochrome ); + void write_monochrome(int state); void st(machine_config &config); @@ -148,7 +148,7 @@ protected: void psg_pa_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER( reset_w ); + void reset_w(int state); static void floppy_formats(format_registration &fr); @@ -203,7 +203,7 @@ public: uint16_t microwire_mask_r(); void microwire_mask_w(uint16_t data); - DECLARE_WRITE_LINE_MEMBER( write_monochrome ); + void write_monochrome(int state); void dmasound_set_state(int level); TIMER_CALLBACK_MEMBER(dmasound_tick); @@ -299,13 +299,13 @@ void st_state::fpu_w(uint16_t data) { } -WRITE_LINE_MEMBER( st_state::write_monochrome ) +void st_state::write_monochrome(int state) { m_monochrome = state; m_mfp->i7_w(m_monochrome); } -WRITE_LINE_MEMBER( st_state::reset_w ) +void st_state::reset_w(int state) { m_video->reset(); if (m_stb.found()) @@ -345,7 +345,7 @@ void ste_state::dmasound_set_state(int level) } -WRITE_LINE_MEMBER( ste_state::write_monochrome ) +void ste_state::write_monochrome(int state) { m_monochrome = state; m_mfp->i7_w(m_monochrome ^ m_dmasnd_active); diff --git a/src/mame/atari/atarisy1.cpp b/src/mame/atari/atarisy1.cpp index cc3aad4677e..ac704ac6b82 100644 --- a/src/mame/atari/atarisy1.cpp +++ b/src/mame/atari/atarisy1.cpp @@ -383,13 +383,13 @@ uint8_t atarisy1_state::via_pb_r() * *************************************/ -WRITE_LINE_MEMBER(atarisy1_state::coin_counter_right_w) +void atarisy1_state::coin_counter_right_w(int state) { machine().bookkeeping().coin_counter_w(0, state); } -WRITE_LINE_MEMBER(atarisy1_state::coin_counter_left_w) +void atarisy1_state::coin_counter_left_w(int state) { machine().bookkeeping().coin_counter_w(1, state); } diff --git a/src/mame/atari/atarisy1.h b/src/mame/atari/atarisy1.h index 68a42973719..842a08f0817 100644 --- a/src/mame/atari/atarisy1.h +++ b/src/mame/atari/atarisy1.h @@ -124,8 +124,8 @@ protected: void adc_w(offs_t offset, uint8_t data); uint16_t trakball_r(offs_t offset); uint8_t switch_6502_r(); - DECLARE_WRITE_LINE_MEMBER(coin_counter_right_w); - DECLARE_WRITE_LINE_MEMBER(coin_counter_left_w); + void coin_counter_right_w(int state); + void coin_counter_left_w(int state); void via_pb_w(uint8_t data); uint8_t via_pb_r(); TILE_GET_INFO_MEMBER(get_alpha_tile_info); diff --git a/src/mame/atari/atarisy2.cpp b/src/mame/atari/atarisy2.cpp index 7f02dc7257f..2a0169897a2 100644 --- a/src/mame/atari/atarisy2.cpp +++ b/src/mame/atari/atarisy2.cpp @@ -249,7 +249,7 @@ void atarisy2_state::machine_reset() * *************************************/ -WRITE_LINE_MEMBER(atarisy2_state::vblank_int) +void atarisy2_state::vblank_int(int state) { if (state) { diff --git a/src/mame/atari/atarisy2.h b/src/mame/atari/atarisy2.h index b3d7963da04..bd82fcd398b 100644 --- a/src/mame/atari/atarisy2.h +++ b/src/mame/atari/atarisy2.h @@ -145,7 +145,7 @@ private: TILE_GET_INFO_MEMBER(get_alpha_tile_info); TILE_GET_INFO_MEMBER(get_playfield_tile_info); uint32_t screen_update_atarisy2(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(vblank_int); + void vblank_int(int state); TIMER_CALLBACK_MEMBER(delayed_int_enable_w); TIMER_CALLBACK_MEMBER(reset_yscroll_callback); void yscroll_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); diff --git a/src/mame/atari/atarisy4.cpp b/src/mame/atari/atarisy4.cpp index abb3c434a43..96f96e10506 100644 --- a/src/mame/atari/atarisy4.cpp +++ b/src/mame/atari/atarisy4.cpp @@ -126,7 +126,7 @@ protected: void m68k_shared_1_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); uint16_t dsp0_status_r(); void dsp0_control_w(uint16_t data); - DECLARE_READ_LINE_MEMBER(dsp0_bio_r); + int dsp0_bio_r(); void dsp0_bank_w(uint16_t data); uint16_t analog_r(); @@ -193,7 +193,7 @@ public: protected: uint16_t dsp1_status_r(); void dsp1_control_w(uint16_t data); - DECLARE_READ_LINE_MEMBER(dsp1_bio_r); + int dsp1_bio_r(); void dsp1_bank_w(uint16_t data); virtual void machine_reset() override; @@ -641,7 +641,7 @@ void atarisy4_state::dsp0_control_w(uint16_t data) m_csr[0] = data; } -READ_LINE_MEMBER(atarisy4_state::dsp0_bio_r) +int atarisy4_state::dsp0_bio_r() { return BIT(m_csr[0], 2); } @@ -675,7 +675,7 @@ void airrace_state::dsp1_control_w(uint16_t data) m_csr[1] = data; } -READ_LINE_MEMBER(airrace_state::dsp1_bio_r) +int airrace_state::dsp1_bio_r() { return BIT(m_csr[1], 2); } diff --git a/src/mame/atari/avalnche.cpp b/src/mame/atari/avalnche.cpp index d229e0ad265..1a34371b3ff 100644 --- a/src/mame/atari/avalnche.cpp +++ b/src/mame/atari/avalnche.cpp @@ -87,7 +87,7 @@ uint32_t avalnche_state::screen_update_avalnche(screen_device &screen, bitmap_rg * *************************************/ -WRITE_LINE_MEMBER(avalnche_state::video_invert_w) +void avalnche_state::video_invert_w(int state) { m_avalance_video_inverted = state; } diff --git a/src/mame/atari/avalnche.h b/src/mame/atari/avalnche.h index ffd004e4824..a52245f0f73 100644 --- a/src/mame/atari/avalnche.h +++ b/src/mame/atari/avalnche.h @@ -34,18 +34,18 @@ private: uint8_t m_avalance_video_inverted = 0U; - DECLARE_WRITE_LINE_MEMBER(video_invert_w); + void video_invert_w(int state); void catch_coin_counter_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(credit_1_lamp_w); - DECLARE_WRITE_LINE_MEMBER(credit_2_lamp_w); - DECLARE_WRITE_LINE_MEMBER(start_lamp_w); + void credit_1_lamp_w(int state); + void credit_2_lamp_w(int state); + void start_lamp_w(int state); virtual void machine_start() override; TIMER_DEVICE_CALLBACK_MEMBER(nmi_16v); uint32_t screen_update_avalnche(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); void avalnche_noise_amplitude_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(catch_aud0_w); - DECLARE_WRITE_LINE_MEMBER(catch_aud1_w); - DECLARE_WRITE_LINE_MEMBER(catch_aud2_w); + void catch_aud0_w(int state); + void catch_aud1_w(int state); + void catch_aud2_w(int state); void catch_map(address_map &map); void main_map(address_map &map); }; diff --git a/src/mame/atari/avalnche_a.cpp b/src/mame/atari/avalnche_a.cpp index 5007b106dbd..cd5e3b3483a 100644 --- a/src/mame/atari/avalnche_a.cpp +++ b/src/mame/atari/avalnche_a.cpp @@ -129,16 +129,16 @@ void avalnche_state::acatch_sound(machine_config &config) Catch memory audio output handlers ***************************************************************************/ -WRITE_LINE_MEMBER(avalnche_state::catch_aud0_w) +void avalnche_state::catch_aud0_w(int state) { /* Different from avalnche, it plays a sound (offset 0/1/2) on data bit 0 rising edge. There's no indication that the game silences sound, it's probably done automatically. */ } -WRITE_LINE_MEMBER(avalnche_state::catch_aud1_w) +void avalnche_state::catch_aud1_w(int state) { } -WRITE_LINE_MEMBER(avalnche_state::catch_aud2_w) +void avalnche_state::catch_aud2_w(int state) { } diff --git a/src/mame/atari/bsktball.h b/src/mame/atari/bsktball.h index f0889f5bf42..d2a73cbbcfa 100644 --- a/src/mame/atari/bsktball.h +++ b/src/mame/atari/bsktball.h @@ -41,9 +41,9 @@ public: void bsktball(machine_config &config); protected: - DECLARE_WRITE_LINE_MEMBER(nmion_w); - DECLARE_WRITE_LINE_MEMBER(ld1_w); - DECLARE_WRITE_LINE_MEMBER(ld2_w); + void nmion_w(int state); + void ld1_w(int state); + void ld2_w(int state); uint8_t bsktball_in0_r(); void bsktball_videoram_w(offs_t offset, uint8_t data); TILE_GET_INFO_MEMBER(get_bg_tile_info); diff --git a/src/mame/atari/bsktball_m.cpp b/src/mame/atari/bsktball_m.cpp index d90ad416ba0..b7e921f498e 100644 --- a/src/mame/atari/bsktball_m.cpp +++ b/src/mame/atari/bsktball_m.cpp @@ -13,7 +13,7 @@ bsktball_nmion_w ***************************************************************************/ -WRITE_LINE_MEMBER(bsktball_state::nmion_w) +void bsktball_state::nmion_w(int state) { m_nmi_on = state; } @@ -34,12 +34,12 @@ TIMER_DEVICE_CALLBACK_MEMBER(bsktball_state::bsktball_scanline) bsktball_ld_w ***************************************************************************/ -WRITE_LINE_MEMBER(bsktball_state::ld1_w) +void bsktball_state::ld1_w(int state) { m_ld1 = state; } -WRITE_LINE_MEMBER(bsktball_state::ld2_w) +void bsktball_state::ld2_w(int state) { m_ld2 = state; } diff --git a/src/mame/atari/bwidow.cpp b/src/mame/atari/bwidow.cpp index 0d4f814c47d..ee1b7668b4d 100644 --- a/src/mame/atari/bwidow.cpp +++ b/src/mame/atari/bwidow.cpp @@ -305,7 +305,7 @@ uint8_t bwidow_state::spacduel_IN3_r(offs_t offset) return res; } -READ_LINE_MEMBER(bwidow_state::clock_r) +int bwidow_state::clock_r() { return (m_maincpu->total_cycles() & 0x100) ? 1 : 0; } diff --git a/src/mame/atari/bwidow.h b/src/mame/atari/bwidow.h index 94923413d04..8a829b86480 100644 --- a/src/mame/atari/bwidow.h +++ b/src/mame/atari/bwidow.h @@ -34,7 +34,7 @@ public: void bwidow_audio(machine_config &config); void gravitar_audio(machine_config &config); - DECLARE_READ_LINE_MEMBER(clock_r); + int clock_r(); protected: uint8_t spacduel_IN3_r(offs_t offset); diff --git a/src/mame/atari/bzone.cpp b/src/mame/atari/bzone.cpp index c997de0d2ed..a3b36586aff 100644 --- a/src/mame/atari/bzone.cpp +++ b/src/mame/atari/bzone.cpp @@ -270,7 +270,7 @@ INTERRUPT_GEN_MEMBER(bzone_state::bzone_interrupt) * *************************************/ -READ_LINE_MEMBER(bzone_state::clock_r) +int bzone_state::clock_r() { return (m_maincpu->total_cycles() & 0x100) ? 1 : 0; } diff --git a/src/mame/atari/bzone.h b/src/mame/atari/bzone.h index 5005f3b4eb7..7f7106489fd 100644 --- a/src/mame/atari/bzone.h +++ b/src/mame/atari/bzone.h @@ -31,7 +31,7 @@ public: m_startled(*this, "startled") { } - DECLARE_READ_LINE_MEMBER(clock_r); + int clock_r(); void bzone(machine_config &config); void bradley(machine_config &config); void dsrtwars(machine_config &config); diff --git a/src/mame/atari/ccastles.cpp b/src/mame/atari/ccastles.cpp index 8d1dc7fb357..2cfd192d6c1 100644 --- a/src/mame/atari/ccastles.cpp +++ b/src/mame/atari/ccastles.cpp @@ -171,7 +171,7 @@ TIMER_CALLBACK_MEMBER(ccastles_state::clock_irq) } -READ_LINE_MEMBER(ccastles_state::vblank_r) +int ccastles_state::vblank_r() { int scanline = m_screen->vpos(); return m_syncprom[scanline & 0xff] & 1; @@ -274,7 +274,7 @@ void ccastles_state::nvram_recall_w(uint8_t data) } -WRITE_LINE_MEMBER(ccastles_state::nvram_store_w) +void ccastles_state::nvram_store_w(int state) { m_nvram_4b->store(!m_outlatch[0]->q2_r() && m_outlatch[0]->q3_r()); m_nvram_4a->store(!m_outlatch[0]->q2_r() && m_outlatch[0]->q3_r()); diff --git a/src/mame/atari/ccastles.h b/src/mame/atari/ccastles.h index 8e601e5d6c3..76796c2c28d 100644 --- a/src/mame/atari/ccastles.h +++ b/src/mame/atari/ccastles.h @@ -32,14 +32,14 @@ public: m_palette(*this, "palette") { } - DECLARE_READ_LINE_MEMBER(vblank_r); + int vblank_r(); void ccastles(machine_config &config); protected: void irq_ack_w(uint8_t data); uint8_t leta_r(offs_t offset); void nvram_recall_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(nvram_store_w); + void nvram_store_w(int state); uint8_t nvram_r(address_space &space, offs_t offset); void nvram_w(offs_t offset, uint8_t data); void ccastles_hscroll_w(uint8_t data); diff --git a/src/mame/atari/centiped.cpp b/src/mame/atari/centiped.cpp index 668c7c09ebe..e9398e1dbbc 100644 --- a/src/mame/atari/centiped.cpp +++ b/src/mame/atari/centiped.cpp @@ -581,13 +581,13 @@ uint8_t centiped_state::milliped_IN2_r() return data; } -WRITE_LINE_MEMBER(centiped_state::input_select_w) +void centiped_state::input_select_w(int state) { m_dsw_select = !state; } /* used P2 controls if 1, P1 controls if 0 */ -WRITE_LINE_MEMBER(centiped_state::control_select_w) +void centiped_state::control_select_w(int state) { m_control_select = state; } @@ -635,25 +635,25 @@ uint8_t centiped_state::caterplr_unknown_r() } -WRITE_LINE_MEMBER(centiped_state::coin_counter_left_w) +void centiped_state::coin_counter_left_w(int state) { machine().bookkeeping().coin_counter_w(0, state); } -WRITE_LINE_MEMBER(centiped_state::coin_counter_center_w) +void centiped_state::coin_counter_center_w(int state) { machine().bookkeeping().coin_counter_w(1, state); } -WRITE_LINE_MEMBER(centiped_state::coin_counter_right_w) +void centiped_state::coin_counter_right_w(int state) { machine().bookkeeping().coin_counter_w(2, state); } -WRITE_LINE_MEMBER(centiped_state::bullsdrt_coin_count_w) +void centiped_state::bullsdrt_coin_count_w(int state) { machine().bookkeeping().coin_counter_w(0, state); } diff --git a/src/mame/atari/centiped.h b/src/mame/atari/centiped.h index 41ddf2c0eb0..238e0685c5a 100644 --- a/src/mame/atari/centiped.h +++ b/src/mame/atari/centiped.h @@ -93,15 +93,15 @@ private: uint8_t m_penmask[64]{}; // drivers/centiped.cpp - DECLARE_WRITE_LINE_MEMBER(input_select_w); - DECLARE_WRITE_LINE_MEMBER(control_select_w); + void input_select_w(int state); + void control_select_w(int state); uint8_t mazeinv_input_r(); void mazeinv_input_select_w(offs_t offset, uint8_t data); uint8_t bullsdrt_data_port_r(); - DECLARE_WRITE_LINE_MEMBER(coin_counter_left_w); - DECLARE_WRITE_LINE_MEMBER(coin_counter_center_w); - DECLARE_WRITE_LINE_MEMBER(coin_counter_right_w); - DECLARE_WRITE_LINE_MEMBER(bullsdrt_coin_count_w); + void coin_counter_left_w(int state); + void coin_counter_center_w(int state); + void coin_counter_right_w(int state); + void bullsdrt_coin_count_w(int state); uint8_t earom_read(); void earom_write(offs_t offset, uint8_t data); void earom_control_w(uint8_t data); @@ -110,7 +110,7 @@ private: uint8_t caterplr_AY8910_r(offs_t offset); // video/centiped.cpp - DECLARE_WRITE_LINE_MEMBER(flip_screen_w); + void flip_screen_w(int state); void bullsdrt_tilesbank_w(offs_t offset, uint8_t data); void bullsdrt_sprites_bank_w(uint8_t data); void centiped_paletteram_w(offs_t offset, uint8_t data); diff --git a/src/mame/atari/centiped_v.cpp b/src/mame/atari/centiped_v.cpp index 3c6ac0cc1c8..317e78f53bb 100644 --- a/src/mame/atari/centiped_v.cpp +++ b/src/mame/atari/centiped_v.cpp @@ -141,7 +141,7 @@ void centiped_state::centiped_videoram_w(offs_t offset, uint8_t data) * *************************************/ -WRITE_LINE_MEMBER(centiped_state::flip_screen_w) +void centiped_state::flip_screen_w(int state) { m_flipscreen = state; } diff --git a/src/mame/atari/cloak.cpp b/src/mame/atari/cloak.cpp index 7f485ac418e..a04f5e81455 100644 --- a/src/mame/atari/cloak.cpp +++ b/src/mame/atari/cloak.cpp @@ -172,7 +172,7 @@ private: uint8_t m_bitmap_videoram_address_y = 0; tilemap_t *m_bg_tilemap = nullptr; - template DECLARE_WRITE_LINE_MEMBER(coin_counter_w); + template void coin_counter_w(int state); void custom_w(uint8_t data); void irq_reset_0_w(uint8_t data); void irq_reset_1_w(uint8_t data); @@ -390,7 +390,7 @@ uint32_t cloak_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, *************************************/ template -WRITE_LINE_MEMBER(cloak_state::coin_counter_w) +void cloak_state::coin_counter_w(int state) { machine().bookkeeping().coin_counter_w(Which, state); } diff --git a/src/mame/atari/cloud9.cpp b/src/mame/atari/cloud9.cpp index 72af2e89619..350e9799569 100644 --- a/src/mame/atari/cloud9.cpp +++ b/src/mame/atari/cloud9.cpp @@ -128,7 +128,7 @@ public: m_track(*this, "TRACK%c", 'X') { } - DECLARE_READ_LINE_MEMBER(vblank_r); + int vblank_r(); void cloud9(machine_config &config); protected: @@ -505,7 +505,7 @@ TIMER_CALLBACK_MEMBER(cloud9_state::clock_irq) } -READ_LINE_MEMBER(cloud9_state::vblank_r) +int cloud9_state::vblank_r() { int const scanline = m_screen->vpos(); return (~m_syncprom[scanline & 0xff] >> 1) & 1; diff --git a/src/mame/atari/cops.cpp b/src/mame/atari/cops.cpp index 9dfcfc61122..2ccd7709112 100644 --- a/src/mame/atari/cops.cpp +++ b/src/mame/atari/cops.cpp @@ -103,10 +103,10 @@ private: uint8_t io1_lm_r(offs_t offset); void io2_w(offs_t offset, uint8_t data); uint8_t io2_r(offs_t offset); - DECLARE_WRITE_LINE_MEMBER(dacia_irq); - [[maybe_unused]] DECLARE_WRITE_LINE_MEMBER(ld_w); - DECLARE_WRITE_LINE_MEMBER(via1_irq); - DECLARE_WRITE_LINE_MEMBER(via2_irq); + void dacia_irq(int state); + [[maybe_unused]] void ld_w(int state); + void via1_irq(int state); + void via2_irq(int state); void dacia_receive(uint8_t data); void update_dacia_irq(); void dacia_w(offs_t offset, uint8_t data); @@ -260,7 +260,7 @@ TIMER_CALLBACK_MEMBER(cops_state::ld_timer_callback) } } -WRITE_LINE_MEMBER(cops_state::ld_w) +void cops_state::ld_w(int state) { m_lddata <<= 1; @@ -737,7 +737,7 @@ void cops_state::io2_w(offs_t offset, uint8_t data) * *************************************/ -WRITE_LINE_MEMBER(cops_state::via1_irq) +void cops_state::via1_irq(int state) { if ( state == ASSERT_LINE ) { @@ -773,7 +773,7 @@ void cops_state::via1_cb1_w(uint8_t data) * *************************************/ -WRITE_LINE_MEMBER(cops_state::via2_irq) +void cops_state::via2_irq(int state) { if ( state == ASSERT_LINE ) { diff --git a/src/mame/atari/copsnrob.cpp b/src/mame/atari/copsnrob.cpp index 4305ba46adc..637f9122554 100644 --- a/src/mame/atari/copsnrob.cpp +++ b/src/mame/atari/copsnrob.cpp @@ -121,7 +121,7 @@ private: uint8_t misc_r(); void misc2_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(one_start_w); + void one_start_w(int state); uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -249,7 +249,7 @@ uint32_t copsnrob_state::screen_update(screen_device &screen, bitmap_ind16 &bitm // machine -WRITE_LINE_MEMBER(copsnrob_state::one_start_w) +void copsnrob_state::one_start_w(int state) { // One Start m_leds[0] = state ? 0 :1; diff --git a/src/mame/atari/cyberbal.cpp b/src/mame/atari/cyberbal.cpp index b330c02f8fb..69bfb4c7bef 100644 --- a/src/mame/atari/cyberbal.cpp +++ b/src/mame/atari/cyberbal.cpp @@ -100,7 +100,7 @@ private: required_device m_screen; required_device m_jsa; - DECLARE_WRITE_LINE_MEMBER(video_int_write_line); + void video_int_write_line(int state); void video_int_ack_w(uint16_t data = 0); TIMER_DEVICE_CALLBACK_MEMBER(scanline_update); @@ -151,7 +151,7 @@ private: required_device m_lscreen; required_device m_rscreen; - DECLARE_WRITE_LINE_MEMBER(video_int_write_line); + void video_int_write_line(int state); void video_int_ack_w(uint16_t data = 0); TIMER_DEVICE_CALLBACK_MEMBER(scanline_update); @@ -431,13 +431,13 @@ uint32_t cyberbal2p_state::screen_update_cyberbal2p(screen_device &screen, bitma * *************************************/ -WRITE_LINE_MEMBER(cyberbal2p_state::video_int_write_line) +void cyberbal2p_state::video_int_write_line(int state) { if (state) m_maincpu->set_input_line(M68K_IRQ_1, ASSERT_LINE); } -WRITE_LINE_MEMBER(cyberbal_state::video_int_write_line) +void cyberbal_state::video_int_write_line(int state) { if (state) m_extracpu->set_input_line(M68K_IRQ_1, ASSERT_LINE); diff --git a/src/mame/atari/firefox.cpp b/src/mame/atari/firefox.cpp index 84a9ae967a1..d9489c26177 100644 --- a/src/mame/atari/firefox.cpp +++ b/src/mame/atari/firefox.cpp @@ -77,17 +77,17 @@ private: uint8_t firefox_disc_status_r(); uint8_t firefox_disc_data_r(); void firefox_disc_read_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(firefox_disc_lock_w); - DECLARE_WRITE_LINE_MEMBER(audio_enable_left_w); - DECLARE_WRITE_LINE_MEMBER(audio_enable_right_w); - DECLARE_WRITE_LINE_MEMBER(firefox_disc_reset_w); - DECLARE_WRITE_LINE_MEMBER(firefox_disc_write_w); + void firefox_disc_lock_w(int state); + void audio_enable_left_w(int state); + void audio_enable_right_w(int state); + void firefox_disc_reset_w(int state); + void firefox_disc_write_w(int state); void firefox_disc_data_w(uint8_t data); void tileram_w(offs_t offset, uint8_t data); void tile_palette_w(offs_t offset, uint8_t data); void sprite_palette_w(offs_t offset, uint8_t data); void firefox_objram_bank_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(sound_reset_w); + void sound_reset_w(int state); uint8_t adc_r(); void adc_select_w(uint8_t data); void nvram_w(offs_t offset, uint8_t data); @@ -96,8 +96,8 @@ private: void main_irq_clear_w(uint8_t data); void main_firq_clear_w(uint8_t data); void self_reset_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(coin_counter_right_w); - DECLARE_WRITE_LINE_MEMBER(coin_counter_left_w); + void coin_counter_right_w(int state); + void coin_counter_left_w(int state); uint8_t riot_porta_r(); void riot_porta_w(uint8_t data); TILE_GET_INFO_MEMBER(bgtile_get_info); @@ -193,28 +193,28 @@ void firefox_state::firefox_disc_read_w(uint8_t data) m_n_disc_read_data = m_laserdisc->data_r(); } -WRITE_LINE_MEMBER(firefox_state::firefox_disc_lock_w) +void firefox_state::firefox_disc_lock_w(int state) { m_n_disc_lock = state; } -WRITE_LINE_MEMBER(firefox_state::audio_enable_left_w) +void firefox_state::audio_enable_left_w(int state) { m_laserdisc->set_output_gain(0, state ? 1.0 : 0.0); } -WRITE_LINE_MEMBER(firefox_state::audio_enable_right_w) +void firefox_state::audio_enable_right_w(int state) { m_laserdisc->set_output_gain(1, state ? 1.0 : 0.0); } -WRITE_LINE_MEMBER(firefox_state::firefox_disc_reset_w) +void firefox_state::firefox_disc_reset_w(int state) { m_laserdisc->reset_w(state ? CLEAR_LINE : ASSERT_LINE); } /* active low on dbb7 */ -WRITE_LINE_MEMBER(firefox_state::firefox_disc_write_w) +void firefox_state::firefox_disc_write_w(int state) { if (state == 0) m_laserdisc->data_w(m_n_disc_data); @@ -330,7 +330,7 @@ void firefox_state::firefox_objram_bank_w(uint8_t data) * *************************************/ -WRITE_LINE_MEMBER(firefox_state::sound_reset_w) +void firefox_state::sound_reset_w(int state) { m_audiocpu->set_input_line(INPUT_LINE_RESET, state ? ASSERT_LINE : CLEAR_LINE); if (state != 0) @@ -422,12 +422,12 @@ void firefox_state::self_reset_w(uint8_t data) * *************************************/ -WRITE_LINE_MEMBER(firefox_state::coin_counter_right_w) +void firefox_state::coin_counter_right_w(int state) { machine().bookkeeping().coin_counter_w(0, state); } -WRITE_LINE_MEMBER(firefox_state::coin_counter_left_w) +void firefox_state::coin_counter_left_w(int state) { machine().bookkeeping().coin_counter_w(1, state); } diff --git a/src/mame/atari/firetrk.cpp b/src/mame/atari/firetrk.cpp index 4951c092672..53aaa35ac6a 100644 --- a/src/mame/atari/firetrk.cpp +++ b/src/mame/atari/firetrk.cpp @@ -57,11 +57,11 @@ public: void firetrk(machine_config &config); - template DECLARE_READ_LINE_MEMBER(steer_dir_r); - template DECLARE_READ_LINE_MEMBER(steer_flag_r); - template DECLARE_READ_LINE_MEMBER(skid_r); - template DECLARE_READ_LINE_MEMBER(crash_r); - template DECLARE_READ_LINE_MEMBER(gear_r); + template int steer_dir_r(); + template int steer_flag_r(); + template int skid_r(); + template int crash_r(); + template int gear_r(); DECLARE_INPUT_CHANGED_MEMBER(service_mode_switch_changed); DECLARE_INPUT_CHANGED_MEMBER(firetrk_horn_changed); DECLARE_INPUT_CHANGED_MEMBER(gear_changed); @@ -839,21 +839,21 @@ uint8_t montecar_state::dip_r(offs_t offset) template -READ_LINE_MEMBER(firetrk_state::steer_dir_r) +int firetrk_state::steer_dir_r() { return m_steer_dir[P]; } template -READ_LINE_MEMBER(firetrk_state::steer_flag_r) +int firetrk_state::steer_flag_r() { return m_steer_flag[P]; } template -READ_LINE_MEMBER(firetrk_state::skid_r) +int firetrk_state::skid_r() { uint32_t ret; @@ -867,7 +867,7 @@ READ_LINE_MEMBER(firetrk_state::skid_r) template -READ_LINE_MEMBER(firetrk_state::crash_r) +int firetrk_state::crash_r() { uint32_t ret; @@ -881,7 +881,7 @@ READ_LINE_MEMBER(firetrk_state::crash_r) template -READ_LINE_MEMBER(firetrk_state::gear_r) +int firetrk_state::gear_r() { return (m_gear == P) ? 1 : 0; } diff --git a/src/mame/atari/flyball.cpp b/src/mame/atari/flyball.cpp index 986c8b59a2e..a9de0028c13 100644 --- a/src/mame/atari/flyball.cpp +++ b/src/mame/atari/flyball.cpp @@ -64,7 +64,7 @@ private: void pitcher_vert_w(uint8_t data); void pitcher_horz_w(uint8_t data); void misc_w(offs_t offset, uint8_t data); - DECLARE_WRITE_LINE_MEMBER(lamp_w); + void lamp_w(int state); TILEMAP_MAPPER_MEMBER(get_memory_offset); TILE_GET_INFO_MEMBER(get_tile_info); @@ -282,7 +282,7 @@ void flyball_state::misc_w(offs_t offset, uint8_t data) m_outlatch->write_d0(~offset, ~data); } -WRITE_LINE_MEMBER(flyball_state::lamp_w) +void flyball_state::lamp_w(int state) { m_lamp = state ? 1 : 0; } diff --git a/src/mame/atari/foodf.cpp b/src/mame/atari/foodf.cpp index 9b9939caa55..218bea50ae3 100644 --- a/src/mame/atari/foodf.cpp +++ b/src/mame/atari/foodf.cpp @@ -148,7 +148,7 @@ private: TILE_GET_INFO_MEMBER(get_playfield_tile_info); uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); TIMER_DEVICE_CALLBACK_MEMBER(scanline_update_timer); - DECLARE_WRITE_LINE_MEMBER(video_int_write_line); + void video_int_write_line(int state); void main_map(address_map &map); }; @@ -342,7 +342,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(foodf_state::scanline_update_timer) } -WRITE_LINE_MEMBER(foodf_state::video_int_write_line) +void foodf_state::video_int_write_line(int state) { if (state) { diff --git a/src/mame/atari/gauntlet.cpp b/src/mame/atari/gauntlet.cpp index 1dfd77cc86e..ed50e034f04 100644 --- a/src/mame/atari/gauntlet.cpp +++ b/src/mame/atari/gauntlet.cpp @@ -211,11 +211,11 @@ private: TIMER_DEVICE_CALLBACK_MEMBER(scanline_update); uint8_t sound_irq_ack_r(); void sound_irq_ack_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(sound_reset_w); + void sound_reset_w(int state); uint8_t switch_6502_r(); - DECLARE_WRITE_LINE_MEMBER(speech_squeak_w); - template DECLARE_WRITE_LINE_MEMBER(coin_counter_w); - DECLARE_WRITE_LINE_MEMBER(coin_counter_right_w); + void speech_squeak_w(int state); + template void coin_counter_w(int state); + void coin_counter_right_w(int state); void mixer_w(uint8_t data); void common_init(); TILE_GET_INFO_MEMBER(get_alpha_tile_info); @@ -460,7 +460,7 @@ void gauntlet_state::sound_irq_ack_w(uint8_t data) * *************************************/ -WRITE_LINE_MEMBER(gauntlet_state::sound_reset_w) +void gauntlet_state::sound_reset_w(int state) { m_audiocpu->set_input_line(INPUT_LINE_RESET, state ? CLEAR_LINE : ASSERT_LINE); m_soundctl->clear_w(state); @@ -498,14 +498,14 @@ uint8_t gauntlet_state::switch_6502_r() * *************************************/ -WRITE_LINE_MEMBER(gauntlet_state::speech_squeak_w) +void gauntlet_state::speech_squeak_w(int state) { uint8_t const data = 5 | (state ? 2 : 0); m_tms5220->set_unscaled_clock(14.318181_MHz_XTAL/2 / (16 - data)); } template -WRITE_LINE_MEMBER(gauntlet_state::coin_counter_w) +void gauntlet_state::coin_counter_w(int state) { machine().bookkeeping().coin_counter_w(Which, state); } diff --git a/src/mame/atari/harddriv.cpp b/src/mame/atari/harddriv.cpp index 1bef4ed24e6..77be2f6e305 100644 --- a/src/mame/atari/harddriv.cpp +++ b/src/mame/atari/harddriv.cpp @@ -532,7 +532,7 @@ public: private: TIMER_DEVICE_CALLBACK_MEMBER(hack_timer); - DECLARE_WRITE_LINE_MEMBER(tx_a); + void tx_a(int state); required_device m_mainpcb; optional_device m_leftpcb; @@ -1440,7 +1440,7 @@ INPUT_PORTS_END * *************************************/ -WRITE_LINE_MEMBER(harddriv_state::video_int_write_line) +void harddriv_state::video_int_write_line(int state) { if (state) { @@ -1665,7 +1665,7 @@ void harddriv_state::dsk2(machine_config &config) } -WRITE_LINE_MEMBER(harddriv_state::sound_int_write_line) +void harddriv_state::sound_int_write_line(int state) { m_sound_int_state = state; update_interrupts(); @@ -2073,7 +2073,7 @@ void harddriv_new_state::steeltalp_machine(machine_config &config) STEELTALP_BOARD(config, "mainpcb", 0); } -WRITE_LINE_MEMBER(harddriv_new_state::tx_a) +void harddriv_new_state::tx_a(int state) { // passive connection, one way, to both screens m_leftpcb->get_duart()->rx_a_w(state); diff --git a/src/mame/atari/harddriv.h b/src/mame/atari/harddriv.h index 74b6b31f535..f07b1a5be08 100644 --- a/src/mame/atari/harddriv.h +++ b/src/mame/atari/harddriv.h @@ -95,8 +95,8 @@ public: mc68681_device* get_duart() { return m_duartn68681; } screen_device* get_screen() { return m_screen; } - DECLARE_WRITE_LINE_MEMBER(video_int_write_line); - DECLARE_WRITE_LINE_MEMBER(sound_int_write_line); + void video_int_write_line(int state); + void sound_int_write_line(int state); protected: @@ -110,7 +110,7 @@ protected: /* Driver/Multisync board */ void hd68k_irq_ack_w(uint16_t data); - DECLARE_WRITE_LINE_MEMBER(harddriv_duart_irq_handler); + void harddriv_duart_irq_handler(int state); uint16_t hd68k_gsp_io_r(offs_t offset); void hd68k_gsp_io_w(offs_t offset, uint16_t data); @@ -140,8 +140,8 @@ protected: void hdgsp_protection_w(uint16_t data); - DECLARE_WRITE_LINE_MEMBER( hdgsp_irq_gen ); - DECLARE_WRITE_LINE_MEMBER( hdmsp_irq_gen ); + void hdgsp_irq_gen(int state); + void hdmsp_irq_gen(int state); /* ADSP board */ uint16_t hd68k_adsp_program_r(offs_t offset); @@ -260,11 +260,11 @@ protected: void display_speedups(); - DECLARE_WRITE_LINE_MEMBER(hdds3sdsp_timer_enable_callback); + void hdds3sdsp_timer_enable_callback(int state); void hdds3sdsp_serial_tx_callback(uint32_t data); uint32_t hdds3sdsp_serial_rx_callback(); - DECLARE_WRITE_LINE_MEMBER(hdds3xdsp_timer_enable_callback); + void hdds3xdsp_timer_enable_callback(int state); void hdds3xdsp_serial_tx_callback(uint32_t data); uint32_t hdds3xdsp_serial_rx_callback(); @@ -522,11 +522,11 @@ private: uint16_t hdsnd68k_320port_r(offs_t offset); uint16_t hdsnd68k_status_r(); void hdsnd68k_latches_w(offs_t offset, uint16_t data); - DECLARE_WRITE_LINE_MEMBER(speech_write_w); - DECLARE_WRITE_LINE_MEMBER(speech_reset_w); - DECLARE_WRITE_LINE_MEMBER(speech_rate_w); - DECLARE_WRITE_LINE_MEMBER(cram_enable_w); - DECLARE_WRITE_LINE_MEMBER(led_w); + void speech_write_w(int state); + void speech_reset_w(int state); + void speech_rate_w(int state); + void cram_enable_w(int state); + void led_w(int state); void hdsnd68k_speech_w(offs_t offset, uint16_t data); void hdsnd68k_irqclr_w(uint16_t data); uint16_t hdsnd68k_320ram_r(offs_t offset); @@ -576,7 +576,7 @@ private: void update_68k_interrupts(); TIMER_CALLBACK_MEMBER( delayed_68k_w ); - DECLARE_READ_LINE_MEMBER(hdsnddsp_get_bio); + int hdsnddsp_get_bio(); }; /* Hard Drivin' */ diff --git a/src/mame/atari/harddriv_a.cpp b/src/mame/atari/harddriv_a.cpp index a9a876c643e..d11db2cdfae 100644 --- a/src/mame/atari/harddriv_a.cpp +++ b/src/mame/atari/harddriv_a.cpp @@ -197,35 +197,35 @@ void harddriv_sound_board_device::hdsnd68k_latches_w(offs_t offset, uint16_t dat } -WRITE_LINE_MEMBER(harddriv_sound_board_device::speech_write_w) +void harddriv_sound_board_device::speech_write_w(int state) { // data == 0 means high, 1 means low logerror("%06X:SPWR=%d\n", m_soundcpu->pcbase(), state); } -WRITE_LINE_MEMBER(harddriv_sound_board_device::speech_reset_w) +void harddriv_sound_board_device::speech_reset_w(int state) { // data == 0 means low, 1 means high logerror("%06X:SPRES=%d\n", m_soundcpu->pcbase(), state); } -WRITE_LINE_MEMBER(harddriv_sound_board_device::speech_rate_w) +void harddriv_sound_board_device::speech_rate_w(int state) { // data == 0 means 8kHz, 1 means 10kHz logerror("%06X:SPRATE=%d\n", m_soundcpu->pcbase(), state); } -WRITE_LINE_MEMBER(harddriv_sound_board_device::cram_enable_w) +void harddriv_sound_board_device::cram_enable_w(int state) { // data == 0 means disable 68k access to COM320, 1 means enable m_cramen = state; } -WRITE_LINE_MEMBER(harddriv_sound_board_device::led_w) +void harddriv_sound_board_device::led_w(int state) { } @@ -300,7 +300,7 @@ void harddriv_sound_board_device::hdsnd68k_320com_w(offs_t offset, uint16_t data * *************************************/ -READ_LINE_MEMBER(harddriv_sound_board_device::hdsnddsp_get_bio) +int harddriv_sound_board_device::hdsnddsp_get_bio() { uint64_t cycles_since_last_bio = m_sounddsp->total_cycles() - m_last_bio_cycles; int32_t cycles_until_bio = CYCLES_PER_BIO - cycles_since_last_bio; diff --git a/src/mame/atari/harddriv_m.cpp b/src/mame/atari/harddriv_m.cpp index 47d1a910883..11a9c6d73f7 100644 --- a/src/mame/atari/harddriv_m.cpp +++ b/src/mame/atari/harddriv_m.cpp @@ -117,14 +117,14 @@ void harddriv_state::hd68k_irq_ack_w(uint16_t data) } -WRITE_LINE_MEMBER(harddriv_state::hdgsp_irq_gen) +void harddriv_state::hdgsp_irq_gen(int state) { m_gsp_irq_state = state; update_interrupts(); } -WRITE_LINE_MEMBER(harddriv_state::hdmsp_irq_gen) +void harddriv_state::hdmsp_irq_gen(int state) { m_msp_irq_state = state; update_interrupts(); @@ -488,7 +488,7 @@ void harddriv_state::hd68k_zram_w(offs_t offset, uint16_t data, uint16_t mem_mas * *************************************/ -WRITE_LINE_MEMBER(harddriv_state::harddriv_duart_irq_handler) +void harddriv_state::harddriv_duart_irq_handler(int state) { m_duart_irq_state = state; update_interrupts(); @@ -1275,7 +1275,7 @@ void harddriv_state::hdds3sdsp_reset_timer() m_ds3sdsp_internal_timer->adjust(m_ds3sdsp->cycles_to_attotime(count * scale)); } -WRITE_LINE_MEMBER(harddriv_state::hdds3sdsp_timer_enable_callback) +void harddriv_state::hdds3sdsp_timer_enable_callback(int state) { m_ds3sdsp_timer_en = state; @@ -1311,7 +1311,7 @@ void harddriv_state::hdds3xdsp_reset_timer() } -WRITE_LINE_MEMBER(harddriv_state::hdds3xdsp_timer_enable_callback) +void harddriv_state::hdds3xdsp_timer_enable_callback(int state) { m_ds3xdsp_timer_en = state; diff --git a/src/mame/atari/jaguar.h b/src/mame/atari/jaguar.h index 8482a65c177..0829d406786 100644 --- a/src/mame/atari/jaguar.h +++ b/src/mame/atari/jaguar.h @@ -268,9 +268,9 @@ private: TIMER_CALLBACK_MEMBER(pit_update); TIMER_CALLBACK_MEMBER(gpu_sync); - DECLARE_WRITE_LINE_MEMBER( gpu_cpu_int ); - DECLARE_WRITE_LINE_MEMBER( dsp_cpu_int ); - DECLARE_WRITE_LINE_MEMBER( external_int ); + void gpu_cpu_int(int state); + void dsp_cpu_int(int state); + void external_int(int state); std::pair quickload_cb(snapshot_image_device &image); DECLARE_DEVICE_IMAGE_LOAD_MEMBER( cart_load ); diff --git a/src/mame/atari/jaguar_a.cpp b/src/mame/atari/jaguar_a.cpp index 2e0469ea82c..ad15622f443 100644 --- a/src/mame/atari/jaguar_a.cpp +++ b/src/mame/atari/jaguar_a.cpp @@ -180,7 +180,7 @@ void jaguar_state::update_gpu_irq() } -WRITE_LINE_MEMBER( jaguar_state::external_int ) +void jaguar_state::external_int(int state) { if (state != CLEAR_LINE) m_gpu_irq_state |= 1; diff --git a/src/mame/atari/jaguar_v.cpp b/src/mame/atari/jaguar_v.cpp index eb6e5b6aeb5..1f63bf11bcd 100644 --- a/src/mame/atari/jaguar_v.cpp +++ b/src/mame/atari/jaguar_v.cpp @@ -302,12 +302,12 @@ inline void jaguar_state::trigger_host_cpu_irq(int level) } -WRITE_LINE_MEMBER( jaguar_state::gpu_cpu_int ) +void jaguar_state::gpu_cpu_int(int state) { trigger_host_cpu_irq(1); } -WRITE_LINE_MEMBER( jaguar_state::dsp_cpu_int ) +void jaguar_state::dsp_cpu_int(int state) { trigger_host_cpu_irq(4); } diff --git a/src/mame/atari/jedi.cpp b/src/mame/atari/jedi.cpp index 35ff96cbac5..80a724dcb50 100644 --- a/src/mame/atari/jedi.cpp +++ b/src/mame/atari/jedi.cpp @@ -204,7 +204,7 @@ private: void main_irq_ack_w(u8 data); void rom_banksel_w(u8 data); - template DECLARE_WRITE_LINE_MEMBER(coin_counter_w); + template void coin_counter_w(int state); u8 novram_data_r(address_space &space, offs_t offset); void novram_data_w(offs_t offset, u8 data); void novram_recall_w(offs_t offset, u8 data); @@ -212,13 +212,13 @@ private: void vscroll_w(offs_t offset, u8 data); void hscroll_w(offs_t offset, u8 data); void irq_ack_w(u8 data); - DECLARE_WRITE_LINE_MEMBER(audio_reset_w); + void audio_reset_w(int state); u8 audio_comm_stat_r(); void speech_strobe_w(offs_t offset, u8 data); u8 speech_ready_r(); void speech_reset_w(u8 data); - DECLARE_WRITE_LINE_MEMBER(foreground_bank_w); - DECLARE_WRITE_LINE_MEMBER(video_off_w); + void foreground_bank_w(int state); + void video_off_w(int state); u32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); TIMER_CALLBACK_MEMBER(generate_interrupt); static rgb_t jedi_IRGB_3333(u32 raw); @@ -252,7 +252,7 @@ void jedi_state::irq_ack_w(u8 data) * *************************************/ -WRITE_LINE_MEMBER(jedi_state::audio_reset_w) +void jedi_state::audio_reset_w(int state) { m_audiocpu->set_input_line(INPUT_LINE_RESET, state ? CLEAR_LINE : ASSERT_LINE); if (!state) @@ -386,13 +386,13 @@ void jedi_state::video_start() } -WRITE_LINE_MEMBER(jedi_state::foreground_bank_w) +void jedi_state::foreground_bank_w(int state) { m_foreground_bank = state; } -WRITE_LINE_MEMBER(jedi_state::video_off_w) +void jedi_state::video_off_w(int state) { m_video_off = state; } @@ -786,7 +786,7 @@ void jedi_state::rom_banksel_w(u8 data) *************************************/ template // 0 left, 1 right -WRITE_LINE_MEMBER(jedi_state::coin_counter_w) +void jedi_state::coin_counter_w(int state) { machine().bookkeeping().coin_counter_w(Which, state); } diff --git a/src/mame/atari/liberatr.cpp b/src/mame/atari/liberatr.cpp index 7126f80401f..62297267bed 100644 --- a/src/mame/atari/liberatr.cpp +++ b/src/mame/atari/liberatr.cpp @@ -245,10 +245,10 @@ private: static constexpr uint8_t NUM_PENS = 0x18; void output_latch_w(offs_t offset, uint8_t data); - DECLARE_WRITE_LINE_MEMBER(coin_counter_left_w); - DECLARE_WRITE_LINE_MEMBER(coin_counter_right_w); + void coin_counter_left_w(int state); + void coin_counter_right_w(int state); - DECLARE_WRITE_LINE_MEMBER(trackball_reset_w); + void trackball_reset_w(int state); uint8_t port0_r(); void bitmap_w(offs_t offset, uint8_t data); @@ -575,13 +575,13 @@ void liberatr_state::output_latch_w(offs_t offset, uint8_t data) } -WRITE_LINE_MEMBER(liberatr_state::coin_counter_left_w) +void liberatr_state::coin_counter_left_w(int state) { machine().bookkeeping().coin_counter_w(0, state); } -WRITE_LINE_MEMBER(liberatr_state::coin_counter_right_w) +void liberatr_state::coin_counter_right_w(int state) { machine().bookkeeping().coin_counter_w(1, state); } @@ -594,7 +594,7 @@ WRITE_LINE_MEMBER(liberatr_state::coin_counter_right_w) * *************************************/ -WRITE_LINE_MEMBER(liberatr_state::trackball_reset_w) +void liberatr_state::trackball_reset_w(int state) { /* on the rising edge of /ctrld, the /ld signal on the LS191 is released and the value of the switches input becomes the starting point for the trackball counters */ diff --git a/src/mame/atari/maxaflex.cpp b/src/mame/atari/maxaflex.cpp index ef5f7ce025a..f3fa91b700d 100644 --- a/src/mame/atari/maxaflex.cpp +++ b/src/mame/atari/maxaflex.cpp @@ -68,7 +68,7 @@ private: uint8_t pia_pa_r(); uint8_t pia_pb_r(); void pia_pb_w(uint8_t data) { mmu(data); } - WRITE_LINE_MEMBER(pia_cb2_w) { } // This is used by Floppy drive on Atari 8bits Home Computers + void pia_cb2_w(int state) { } // This is used by Floppy drive on Atari 8bits Home Computers TIMER_DEVICE_CALLBACK_MEMBER(mf_interrupt); bool atari_input_disabled() const { return !BIT(m_portb_out, 7); } diff --git a/src/mame/atari/mhavoc.cpp b/src/mame/atari/mhavoc.cpp index eee0be2f2ba..df17d43e040 100644 --- a/src/mame/atari/mhavoc.cpp +++ b/src/mame/atari/mhavoc.cpp @@ -235,7 +235,7 @@ public: void alphaone(machine_config &config); - DECLARE_READ_LINE_MEMBER(clock_r); + int clock_r(); protected: virtual void machine_start() override; @@ -278,10 +278,10 @@ public: void mhavoc(machine_config &config); DECLARE_CUSTOM_INPUT_MEMBER(coin_service_r); - DECLARE_READ_LINE_MEMBER(gamma_rcvd_r); - DECLARE_READ_LINE_MEMBER(gamma_xmtd_r); - DECLARE_READ_LINE_MEMBER(alpha_rcvd_r); - DECLARE_READ_LINE_MEMBER(alpha_xmtd_r); + int gamma_rcvd_r(); + int gamma_xmtd_r(); + int alpha_rcvd_r(); + int alpha_xmtd_r(); protected: virtual void machine_start() override; @@ -562,25 +562,25 @@ CUSTOM_INPUT_MEMBER(mhavoc_state::coin_service_r) return (m_player_1 ? m_service : m_coin)->read() & 0x03; } -READ_LINE_MEMBER(mhavoc_state::gamma_rcvd_r) +int mhavoc_state::gamma_rcvd_r() { // Gamma rcvd flag return m_gamma_rcvd; } -READ_LINE_MEMBER(mhavoc_state::gamma_xmtd_r) +int mhavoc_state::gamma_xmtd_r() { // Gamma xmtd flag return m_gamma_xmtd; } -READ_LINE_MEMBER(mhavoc_state::alpha_rcvd_r) +int mhavoc_state::alpha_rcvd_r() { // Alpha rcvd flag return m_alpha_rcvd; } -READ_LINE_MEMBER(mhavoc_state::alpha_xmtd_r) +int mhavoc_state::alpha_xmtd_r() { // Alpha xmtd flag return m_alpha_xmtd; @@ -848,7 +848,7 @@ void alphaone_state::alpha_map(address_map &map) * *************************************/ -READ_LINE_MEMBER(alphaone_state::clock_r) +int alphaone_state::clock_r() { // 2.4kHz (divide 2.5MHz by 1024) return (m_alpha->total_cycles() & 0x400) ? 0 : 1; diff --git a/src/mame/atari/missile.cpp b/src/mame/atari/missile.cpp index f7d94a79da0..7b1f907c9cf 100644 --- a/src/mame/atari/missile.cpp +++ b/src/mame/atari/missile.cpp @@ -393,7 +393,7 @@ public: void init_missilem(); void init_suprmatk(); - DECLARE_READ_LINE_MEMBER(vblank_r); + int vblank_r(); protected: virtual void machine_start() override; @@ -512,7 +512,7 @@ TIMER_CALLBACK_MEMBER(missile_state::clock_irq) } -READ_LINE_MEMBER(missile_state::vblank_r) +int missile_state::vblank_r() { int v = scanline_to_v(m_screen->vpos()); return v < 24; diff --git a/src/mame/atari/orbit.cpp b/src/mame/atari/orbit.cpp index 9901a9e2cc8..202584f76b0 100644 --- a/src/mame/atari/orbit.cpp +++ b/src/mame/atari/orbit.cpp @@ -83,7 +83,7 @@ private: uint8_t m_flip_screen; emu_timer *m_irq_off_timer = nullptr; - DECLARE_WRITE_LINE_MEMBER(coin_lockout_w); + void coin_lockout_w(int state); void playfield_w(offs_t offset, uint8_t data); TILE_GET_INFO_MEMBER(get_tile_info); uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); @@ -218,7 +218,7 @@ INTERRUPT_GEN_MEMBER(orbit_state::interrupt) *************************************/ -WRITE_LINE_MEMBER(orbit_state::coin_lockout_w) +void orbit_state::coin_lockout_w(int state) { machine().bookkeeping().coin_lockout_w(0, !state); machine().bookkeeping().coin_lockout_w(1, !state); diff --git a/src/mame/atari/pofo.cpp b/src/mame/atari/pofo.cpp index 21cd26692b4..d070017580c 100644 --- a/src/mame/atari/pofo.cpp +++ b/src/mame/atari/pofo.cpp @@ -136,9 +136,9 @@ private: void counter_w(offs_t offset, uint8_t data); void contrast_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER( eint_w ); - DECLARE_WRITE_LINE_MEMBER( wake_w ); - DECLARE_WRITE_LINE_MEMBER( keyboard_int_w ); + void eint_w(int state); + void wake_w(int state); + void keyboard_int_w(int state); void portfolio_palette(palette_device &palette) const; TIMER_DEVICE_CALLBACK_MEMBER(system_tick); @@ -201,7 +201,7 @@ void portfolio_state::trigger_interrupt(int level) // eint_w - external interrupt //------------------------------------------------- -WRITE_LINE_MEMBER( portfolio_state::eint_w ) +void portfolio_state::eint_w(int state) { if (state) { @@ -214,12 +214,12 @@ WRITE_LINE_MEMBER( portfolio_state::eint_w ) // wake_w - wake //------------------------------------------------- -WRITE_LINE_MEMBER( portfolio_state::wake_w ) +void portfolio_state::wake_w(int state) { // TODO } -WRITE_LINE_MEMBER( portfolio_state::keyboard_int_w ) +void portfolio_state::keyboard_int_w(int state) { if (state) { diff --git a/src/mame/atari/quizshow.cpp b/src/mame/atari/quizshow.cpp index fee79e86895..c17b385c2c8 100644 --- a/src/mame/atari/quizshow.cpp +++ b/src/mame/atari/quizshow.cpp @@ -87,8 +87,8 @@ private: void audio_w(uint8_t data); void video_disable_w(uint8_t data); uint8_t timing_r(); - DECLARE_READ_LINE_MEMBER(tape_signal_r); - DECLARE_WRITE_LINE_MEMBER(flag_output_w); + int tape_signal_r(); + void flag_output_w(int state); void main_ram_w(offs_t offset, uint8_t data); TILE_GET_INFO_MEMBER(get_tile_info); void quizshow_palette(palette_device &palette) const; @@ -229,12 +229,12 @@ uint8_t quizshow_state::timing_r() return ret; } -READ_LINE_MEMBER(quizshow_state::tape_signal_r) +int quizshow_state::tape_signal_r() { return (m_cass->input() > 0.0) ? 1 : 0; } -WRITE_LINE_MEMBER(quizshow_state::flag_output_w) +void quizshow_state::flag_output_w(int state) { logerror("Flag output: %d\n", state); } diff --git a/src/mame/atari/runaway.cpp b/src/mame/atari/runaway.cpp index b1640603a0d..6a16207b285 100644 --- a/src/mame/atari/runaway.cpp +++ b/src/mame/atari/runaway.cpp @@ -95,7 +95,7 @@ private: uint8_t earom_read(); void earom_write(offs_t offset, uint8_t data); void earom_control_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(tile_bank_w); + void tile_bank_w(int state); virtual TILE_GET_INFO_MEMBER(get_tile_info) override; virtual void get_sprite_info(int n, unsigned &code, int &flipx, int &flipy) override; @@ -216,7 +216,7 @@ void qwak_state::video_ram_w(offs_t offset, uint8_t data) -WRITE_LINE_MEMBER(runaway_state::tile_bank_w) +void runaway_state::tile_bank_w(int state) { if (state != m_tile_bank) { diff --git a/src/mame/atari/sbrkout.cpp b/src/mame/atari/sbrkout.cpp index 7822983783a..9dd79937b2a 100644 --- a/src/mame/atari/sbrkout.cpp +++ b/src/mame/atari/sbrkout.cpp @@ -73,14 +73,14 @@ protected: private: void irq_ack_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(pot_mask1_w); - DECLARE_WRITE_LINE_MEMBER(pot_mask2_w); + void pot_mask1_w(int state); + void pot_mask2_w(int state); void output_latch_w(offs_t offset, uint8_t data); - DECLARE_WRITE_LINE_MEMBER(start_1_led_w); - DECLARE_WRITE_LINE_MEMBER(start_2_led_w); - DECLARE_WRITE_LINE_MEMBER(serve_led_w); - DECLARE_WRITE_LINE_MEMBER(serve_2_led_w); - DECLARE_WRITE_LINE_MEMBER(coincount_w); + void start_1_led_w(int state); + void start_2_led_w(int state); + void serve_led_w(int state); + void serve_2_led_w(int state); + void coincount_w(int state); uint8_t sync_r(); uint8_t sync2_r(); void sbrkout_videoram_w(offs_t offset, uint8_t data); @@ -264,7 +264,7 @@ TIMER_CALLBACK_MEMBER(sbrkout_state::pot_trigger_callback) } -WRITE_LINE_MEMBER(sbrkout_state::pot_mask1_w) +void sbrkout_state::pot_mask1_w(int state) { m_pot_mask[0] = !state; m_pot_trigger[0] = 0; @@ -272,7 +272,7 @@ WRITE_LINE_MEMBER(sbrkout_state::pot_mask1_w) } -WRITE_LINE_MEMBER(sbrkout_state::pot_mask2_w) +void sbrkout_state::pot_mask2_w(int state) { m_pot_mask[1] = !state; m_pot_trigger[1] = 0; @@ -299,7 +299,7 @@ void sbrkout_state::output_latch_w(offs_t offset, uint8_t data) } -WRITE_LINE_MEMBER(sbrkout_state::coincount_w) +void sbrkout_state::coincount_w(int state) { machine().bookkeeping().coin_counter_w(0, state); } diff --git a/src/mame/atari/skydiver.cpp b/src/mame/atari/skydiver.cpp index 809627676ce..94871a5279f 100644 --- a/src/mame/atari/skydiver.cpp +++ b/src/mame/atari/skydiver.cpp @@ -141,12 +141,12 @@ private: tilemap_t *m_bg_tilemap = nullptr; uint8_t m_width = 0; - DECLARE_WRITE_LINE_MEMBER(nmion_w); + void nmion_w(int state); void videoram_w(offs_t offset, uint8_t data); uint8_t wram_r(offs_t offset); void wram_w(offs_t offset, uint8_t data); - DECLARE_WRITE_LINE_MEMBER(width_w); - DECLARE_WRITE_LINE_MEMBER(coin_lockout_w); + void width_w(int state); + void coin_lockout_w(int state); void latch3_watchdog_w(offs_t offset, uint8_t data); TILE_GET_INFO_MEMBER(get_tile_info); @@ -216,13 +216,13 @@ void skydiver_state::wram_w(offs_t offset, uint8_t data) } -WRITE_LINE_MEMBER(skydiver_state::width_w) +void skydiver_state::width_w(int state) { m_width = state; } -WRITE_LINE_MEMBER(skydiver_state::coin_lockout_w) +void skydiver_state::coin_lockout_w(int state) { machine().bookkeeping().coin_lockout_global_w(!state); } @@ -312,7 +312,7 @@ void skydiver_state::palette(palette_device &palette) const * *************************************/ -WRITE_LINE_MEMBER(skydiver_state::nmion_w) +void skydiver_state::nmion_w(int state) { m_nmion = state; } diff --git a/src/mame/atari/sprint2.cpp b/src/mame/atari/sprint2.cpp index 706b44deeec..3efea9bbcf4 100644 --- a/src/mame/atari/sprint2.cpp +++ b/src/mame/atari/sprint2.cpp @@ -112,7 +112,7 @@ private: TILE_GET_INFO_MEMBER(get_tile_info); void palette(palette_device &palette) const; uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(screen_vblank); + void screen_vblank(int state); INTERRUPT_GEN_MEMBER(irq); uint8_t collision_check(rectangle& rect); inline int get_sprite_code(int n); @@ -225,7 +225,7 @@ uint32_t sprint2_state::screen_update(screen_device &screen, bitmap_ind16 &bitma } -WRITE_LINE_MEMBER(sprint2_state::screen_vblank) +void sprint2_state::screen_vblank(int state) { // rising edge if (state) diff --git a/src/mame/atari/sprint4.cpp b/src/mame/atari/sprint4.cpp index 8c422ad1541..37dcedc2aa9 100644 --- a/src/mame/atari/sprint4.cpp +++ b/src/mame/atari/sprint4.cpp @@ -52,9 +52,9 @@ public: void sprint4(machine_config &config); - template DECLARE_READ_LINE_MEMBER(lever_r); - template DECLARE_READ_LINE_MEMBER(wheel_r); - template DECLARE_READ_LINE_MEMBER(collision_flipflop_r); + template int lever_r(); + template int wheel_r(); + template int collision_flipflop_r(); private: virtual void machine_start() override; @@ -80,7 +80,7 @@ private: TILE_GET_INFO_MEMBER(tile_info); uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(screen_vblank); + void screen_vblank(int state); TIMER_CALLBACK_MEMBER(nmi_callback); required_device m_maincpu; @@ -113,21 +113,21 @@ private: template -READ_LINE_MEMBER(sprint4_state::lever_r) +int sprint4_state::lever_r() { return 4 * m_gear[N] > m_da_latch; } template -READ_LINE_MEMBER(sprint4_state::wheel_r) +int sprint4_state::wheel_r() { return 8 * m_steer_FF1[N] + 8 * m_steer_FF2[N] > m_da_latch; } template -READ_LINE_MEMBER(sprint4_state::collision_flipflop_r) +int sprint4_state::collision_flipflop_r() { return m_collision[N]; } @@ -345,7 +345,7 @@ uint32_t sprint4_state::screen_update(screen_device &screen, bitmap_ind16 &bitma } -WRITE_LINE_MEMBER(sprint4_state::screen_vblank) +void sprint4_state::screen_vblank(int state) { // rising edge if (state) diff --git a/src/mame/atari/sprint8.cpp b/src/mame/atari/sprint8.cpp index 1f9c6561843..24650318e0a 100644 --- a/src/mame/atari/sprint8.cpp +++ b/src/mame/atari/sprint8.cpp @@ -76,8 +76,8 @@ private: uint8_t collision_r(); uint8_t input_r(offs_t offset); void lockout_w(offs_t offset, uint8_t data); - DECLARE_WRITE_LINE_MEMBER(int_reset_w); - DECLARE_WRITE_LINE_MEMBER(team_w); + void int_reset_w(int state); + void team_w(int state); void video_ram_w(offs_t offset, uint8_t data); void palette(palette_device &palette) const; @@ -85,7 +85,7 @@ private: TILE_GET_INFO_MEMBER(get_tile_info1); TILE_GET_INFO_MEMBER(get_tile_info2); uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(screen_vblank); + void screen_vblank(int state); TIMER_CALLBACK_MEMBER(collision_callback); TIMER_DEVICE_CALLBACK_MEMBER(input_callback); @@ -249,7 +249,7 @@ uint32_t sprint8_state::screen_update(screen_device &screen, bitmap_ind16 &bitma } -WRITE_LINE_MEMBER(sprint8_state::screen_vblank) +void sprint8_state::screen_vblank(int state) { // rising edge if (state) @@ -335,7 +335,7 @@ void sprint8_state::lockout_w(offs_t offset, uint8_t data) } -WRITE_LINE_MEMBER(sprint8_state::int_reset_w) +void sprint8_state::int_reset_w(int state) { m_collision_reset = !state; @@ -343,7 +343,7 @@ WRITE_LINE_MEMBER(sprint8_state::int_reset_w) m_maincpu->set_input_line(0, CLEAR_LINE); } -WRITE_LINE_MEMBER(sprint8_state::team_w) +void sprint8_state::team_w(int state) { m_team = state; } diff --git a/src/mame/atari/starshp1.cpp b/src/mame/atari/starshp1.cpp index 6dd7d529edb..20204b42696 100644 --- a/src/mame/atari/starshp1.cpp +++ b/src/mame/atari/starshp1.cpp @@ -117,23 +117,23 @@ private: void collision_reset_w(uint8_t data); void analog_in_w(offs_t offset, uint8_t data); - DECLARE_WRITE_LINE_MEMBER(ship_explode_w); - DECLARE_WRITE_LINE_MEMBER(circle_mod_w); - DECLARE_WRITE_LINE_MEMBER(circle_kill_w); - DECLARE_WRITE_LINE_MEMBER(starfield_kill_w); - DECLARE_WRITE_LINE_MEMBER(inverse_w); - DECLARE_WRITE_LINE_MEMBER(mux_w); + void ship_explode_w(int state); + void circle_mod_w(int state); + void circle_kill_w(int state); + void starfield_kill_w(int state); + void inverse_w(int state); + void mux_w(int state); uint8_t rng_r(); void ssadd_w(offs_t offset, uint8_t data); void sspic_w(uint8_t data); void playfield_w(offs_t offset, uint8_t data); - DECLARE_WRITE_LINE_MEMBER(attract_w); - DECLARE_WRITE_LINE_MEMBER(phasor_w); + void attract_w(int state); + void phasor_w(int state); void analog_out_w(offs_t offset, uint8_t data); TILE_GET_INFO_MEMBER(get_tile_info); void palette(palette_device &palette) const; uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(screen_vblank); + void screen_vblank(int state); INTERRUPT_GEN_MEMBER(interrupt); void set_pens(); void draw_starfield(bitmap_ind16 &bitmap, const rectangle &cliprect); @@ -502,7 +502,7 @@ uint32_t starshp1_state::screen_update(screen_device &screen, bitmap_ind16 &bitm } -WRITE_LINE_MEMBER(starshp1_state::screen_vblank) +void starshp1_state::screen_vblank(int state) { // rising edge if (state) @@ -543,7 +543,7 @@ INTERRUPT_GEN_MEMBER(starshp1_state::interrupt) } -WRITE_LINE_MEMBER(starshp1_state::attract_w) +void starshp1_state::attract_w(int state) { m_attract = state; m_discrete->write(STARSHP1_ATTRACT, state); @@ -553,7 +553,7 @@ WRITE_LINE_MEMBER(starshp1_state::attract_w) } -WRITE_LINE_MEMBER(starshp1_state::phasor_w) +void starshp1_state::phasor_w(int state) { m_phasor = state; m_discrete->write(STARSHP1_PHASOR_ON, state); @@ -631,37 +631,37 @@ void starshp1_state::analog_out_w(offs_t offset, uint8_t data) } -WRITE_LINE_MEMBER(starshp1_state::ship_explode_w) +void starshp1_state::ship_explode_w(int state) { m_ship_explode = state; } -WRITE_LINE_MEMBER(starshp1_state::circle_mod_w) +void starshp1_state::circle_mod_w(int state) { m_circle_mod = state; } -WRITE_LINE_MEMBER(starshp1_state::circle_kill_w) +void starshp1_state::circle_kill_w(int state) { m_circle_kill = !state; } -WRITE_LINE_MEMBER(starshp1_state::starfield_kill_w) +void starshp1_state::starfield_kill_w(int state) { m_starfield_kill = state; } -WRITE_LINE_MEMBER(starshp1_state::inverse_w) +void starshp1_state::inverse_w(int state) { m_inverse = state; } -WRITE_LINE_MEMBER(starshp1_state::mux_w) +void starshp1_state::mux_w(int state) { m_mux = state; } diff --git a/src/mame/atari/starwars.h b/src/mame/atari/starwars.h index 0d2838be79b..69df827ee8b 100644 --- a/src/mame/atari/starwars.h +++ b/src/mame/atari/starwars.h @@ -42,7 +42,7 @@ public: void init_esb(); void init_starwars(); - DECLARE_READ_LINE_MEMBER(matrix_flag_r); + int matrix_flag_r(); private: required_device m_soundlatch; @@ -74,11 +74,11 @@ private: int32_t m_ACC = 0; void irq_ack_w(uint8_t data); void starwars_nstore_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(recall_w); - DECLARE_WRITE_LINE_MEMBER(coin1_counter_w); - DECLARE_WRITE_LINE_MEMBER(coin2_counter_w); + void recall_w(int state); + void coin1_counter_w(int state); + void coin2_counter_w(int state); uint8_t starwars_prng_r(); - DECLARE_WRITE_LINE_MEMBER(prng_reset_w); + void prng_reset_w(int state); uint8_t starwars_div_reh_r(); uint8_t starwars_div_rel_r(); void starwars_math_w(offs_t offset, uint8_t data); diff --git a/src/mame/atari/starwars_m.cpp b/src/mame/atari/starwars_m.cpp index 9417dabc789..44bb77a4dbe 100644 --- a/src/mame/atari/starwars_m.cpp +++ b/src/mame/atari/starwars_m.cpp @@ -49,7 +49,7 @@ void starwars_state::starwars_nstore_w(uint8_t data) m_novram->store(0); } -WRITE_LINE_MEMBER(starwars_state::recall_w) +void starwars_state::recall_w(int state) { m_novram->recall(!state); } @@ -60,12 +60,12 @@ WRITE_LINE_MEMBER(starwars_state::recall_w) * *************************************/ -WRITE_LINE_MEMBER(starwars_state::coin1_counter_w) +void starwars_state::coin1_counter_w(int state) { machine().bookkeeping().coin_counter_w(0, state); } -WRITE_LINE_MEMBER(starwars_state::coin2_counter_w) +void starwars_state::coin2_counter_w(int state) { machine().bookkeeping().coin_counter_w(1, state); } @@ -78,7 +78,7 @@ WRITE_LINE_MEMBER(starwars_state::coin2_counter_w) * *************************************/ -READ_LINE_MEMBER(starwars_state::matrix_flag_r) +int starwars_state::matrix_flag_r() { /* set the matrix processor flag */ return m_math_run ? 1 : 0; @@ -320,7 +320,7 @@ uint8_t starwars_state::starwars_prng_r() return machine().rand(); } -WRITE_LINE_MEMBER(starwars_state::prng_reset_w) +void starwars_state::prng_reset_w(int state) { } diff --git a/src/mame/atari/stmmu.h b/src/mame/atari/stmmu.h index d415d5aa459..61246a6d31e 100644 --- a/src/mame/atari/stmmu.h +++ b/src/mame/atari/stmmu.h @@ -23,8 +23,8 @@ public: void map(address_map &map); void set_ram_size(u32 size); - DECLARE_WRITE_LINE_MEMBER(fdc_drq_w); - DECLARE_WRITE_LINE_MEMBER(hdc_drq_w); + void fdc_drq_w(int state); + void hdc_drq_w(int state); protected: virtual void device_start() override; diff --git a/src/mame/atari/subs.cpp b/src/mame/atari/subs.cpp index 8f234de30bd..1e6cb5a2785 100644 --- a/src/mame/atari/subs.cpp +++ b/src/mame/atari/subs.cpp @@ -79,7 +79,7 @@ private: uint8_t control_r(offs_t offset); uint8_t coin_r(offs_t offset); uint8_t options_r(offs_t offset); - template DECLARE_WRITE_LINE_MEMBER(invert_w); + template void invert_w(int state); void noise_reset_w(uint8_t data); void palette(palette_device &palette) const; @@ -97,7 +97,7 @@ private: // video template -WRITE_LINE_MEMBER(subs_state::invert_w) +void subs_state::invert_w(int state) { if (state) { diff --git a/src/mame/atari/tank8.cpp b/src/mame/atari/tank8.cpp index 6cf51aa0738..ba78bad5a1f 100644 --- a/src/mame/atari/tank8.cpp +++ b/src/mame/atari/tank8.cpp @@ -81,7 +81,7 @@ private: void palette(palette_device &palette) const; uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(screen_vblank); + void screen_vblank(int state); void set_pens(); inline int get_x_pos(int n); inline int get_y_pos(int n); @@ -258,7 +258,7 @@ uint32_t tank8_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, } -WRITE_LINE_MEMBER(tank8_state::screen_vblank) +void tank8_state::screen_vblank(int state) { // on falling edge if (!state) diff --git a/src/mame/atari/tempest.cpp b/src/mame/atari/tempest.cpp index d4bd415a9b3..226d9a5f6ae 100644 --- a/src/mame/atari/tempest.cpp +++ b/src/mame/atari/tempest.cpp @@ -324,7 +324,7 @@ public: DECLARE_CUSTOM_INPUT_MEMBER(tempest_knob_r); DECLARE_CUSTOM_INPUT_MEMBER(tempest_buttons_r); - DECLARE_READ_LINE_MEMBER(clock_r); + int clock_r(); protected: void wdclr_w(uint8_t data); @@ -396,7 +396,7 @@ CUSTOM_INPUT_MEMBER(tempest_state::tempest_buttons_r) } -READ_LINE_MEMBER(tempest_state::clock_r) +int tempest_state::clock_r() { /* Emulate the 3kHz source on bit 7 (divide 1.5MHz by 512) */ return (m_maincpu->total_cycles() & 0x100) ? 1 : 0; diff --git a/src/mame/atari/thunderj.cpp b/src/mame/atari/thunderj.cpp index 86e2e54d82c..a81a6cca213 100644 --- a/src/mame/atari/thunderj.cpp +++ b/src/mame/atari/thunderj.cpp @@ -86,7 +86,7 @@ private: static const atari_motion_objects_config s_mob_config; - DECLARE_WRITE_LINE_MEMBER(scanline_int_write_line); + void scanline_int_write_line(int state); uint16_t special_port2_r(); void latch_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); TILE_GET_INFO_MEMBER(get_alpha_tile_info); @@ -336,7 +336,7 @@ uint32_t thunderj_state::screen_update(screen_device &screen, bitmap_ind16 &bitm * *************************************/ -WRITE_LINE_MEMBER(thunderj_state::scanline_int_write_line) +void thunderj_state::scanline_int_write_line(int state) { m_maincpu->set_input_line(M68K_IRQ_4, state ? ASSERT_LINE : CLEAR_LINE); m_extra->set_input_line(M68K_IRQ_4, state ? ASSERT_LINE : CLEAR_LINE); diff --git a/src/mame/atari/tomcat.cpp b/src/mame/atari/tomcat.cpp index df2cc459164..fb072fcc907 100644 --- a/src/mame/atari/tomcat.cpp +++ b/src/mame/atari/tomcat.cpp @@ -66,18 +66,18 @@ private: void adcon_w(uint8_t data); uint16_t tomcat_inputs_r(offs_t offset, uint16_t mem_mask = ~0); void main_latch_w(offs_t offset, uint16_t data); - DECLARE_WRITE_LINE_MEMBER(lnkmode_w); - DECLARE_WRITE_LINE_MEMBER(err_w); - DECLARE_WRITE_LINE_MEMBER(ack_w); - DECLARE_WRITE_LINE_MEMBER(txbuff_w); - DECLARE_WRITE_LINE_MEMBER(sndres_w); - DECLARE_WRITE_LINE_MEMBER(mres_w); + void lnkmode_w(int state); + void err_w(int state); + void ack_w(int state); + void txbuff_w(int state); + void sndres_w(int state); + void mres_w(int state); void tomcat_irqclr_w(uint16_t data); uint16_t tomcat_inputs2_r(); uint16_t tomcat_320bio_r(); uint8_t tomcat_nvram_r(offs_t offset); void tomcat_nvram_w(offs_t offset, uint8_t data); - DECLARE_READ_LINE_MEMBER(dsp_bio_r); + int dsp_bio_r(); void soundlatches_w(offs_t offset, uint8_t data); virtual void machine_start() override; void dsp_map(address_map &map); @@ -119,36 +119,36 @@ void tomcat_state::main_latch_w(offs_t offset, uint16_t data) m_mainlatch->write_bit(offset & 7, BIT(offset, 3)); } -WRITE_LINE_MEMBER(tomcat_state::lnkmode_w) +void tomcat_state::lnkmode_w(int state) { // Link Mode // When Low: Master does not respond to Interrupts } -WRITE_LINE_MEMBER(tomcat_state::err_w) +void tomcat_state::err_w(int state) { // Link Error Flag } -WRITE_LINE_MEMBER(tomcat_state::ack_w) +void tomcat_state::ack_w(int state) { // Link ACK Flag } -WRITE_LINE_MEMBER(tomcat_state::txbuff_w) +void tomcat_state::txbuff_w(int state) { // Link Buffer Control // When High: Turn off TX (Link) Buffer } -WRITE_LINE_MEMBER(tomcat_state::sndres_w) +void tomcat_state::sndres_w(int state) { // Sound Reset // When Low: Reset Sound System // When High: Release reset of sound system } -WRITE_LINE_MEMBER(tomcat_state::mres_w) +void tomcat_state::mres_w(int state) { // 320 Reset // When Low: Reset TMS320 @@ -186,7 +186,7 @@ uint16_t tomcat_state::tomcat_320bio_r() return 0; } -READ_LINE_MEMBER(tomcat_state::dsp_bio_r) +int tomcat_state::dsp_bio_r() { if (m_dsp->pc() == 0x0001) { diff --git a/src/mame/atari/triplhnt.cpp b/src/mame/atari/triplhnt.cpp index 61d6d5ba342..680e827e8c7 100644 --- a/src/mame/atari/triplhnt.cpp +++ b/src/mame/atari/triplhnt.cpp @@ -90,8 +90,8 @@ private: emu_timer *m_hit_timer = nullptr; tilemap_t* m_bg_tilemap = nullptr; - DECLARE_WRITE_LINE_MEMBER(coin_lockout_w); - DECLARE_WRITE_LINE_MEMBER(tape_control_w); + void coin_lockout_w(int state); + void tape_control_w(int state); uint8_t cmos_r(offs_t offset); uint8_t input_port_4_r(); @@ -230,14 +230,14 @@ TIMER_CALLBACK_MEMBER(triplhnt_state::set_collision) } -WRITE_LINE_MEMBER(triplhnt_state::coin_lockout_w) +void triplhnt_state::coin_lockout_w(int state) { machine().bookkeeping().coin_lockout_w(0, !state); machine().bookkeeping().coin_lockout_w(1, !state); } -WRITE_LINE_MEMBER(triplhnt_state::tape_control_w) +void triplhnt_state::tape_control_w(int state) { bool const is_witch_hunt = m_0c09->read() == 0x40; bool const bit = !state; diff --git a/src/mame/atari/ultratnk.cpp b/src/mame/atari/ultratnk.cpp index 6864db2e706..57b93032b4a 100644 --- a/src/mame/atari/ultratnk.cpp +++ b/src/mame/atari/ultratnk.cpp @@ -43,8 +43,8 @@ public: m_dip(*this, "DIP") { } - template DECLARE_READ_LINE_MEMBER(collision_flipflop_r); - template DECLARE_READ_LINE_MEMBER(joystick_r); + template int collision_flipflop_r(); + template int joystick_r(); void ultratnk(machine_config &config); protected: @@ -86,7 +86,7 @@ private: void wram_w(offs_t offset, uint8_t data); void collision_reset_w(offs_t offset, uint8_t data); void da_latch_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(lockout_w); + void lockout_w(int state); void video_ram_w(offs_t offset, uint8_t data); void attract_w(uint8_t data); void explosion_w(uint8_t data); @@ -95,7 +95,7 @@ private: TILE_GET_INFO_MEMBER(tile_info); uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(screen_vblank); + void screen_vblank(int state); TIMER_CALLBACK_MEMBER(nmi_callback); void cpu_map(address_map &map); @@ -179,7 +179,7 @@ uint32_t ultratnk_state::screen_update(screen_device &screen, bitmap_ind16 &bitm } -WRITE_LINE_MEMBER(ultratnk_state::screen_vblank) +void ultratnk_state::screen_vblank(int state) { // rising edge if (state) @@ -238,14 +238,14 @@ void ultratnk_state::video_ram_w(offs_t offset, uint8_t data) // machine template -READ_LINE_MEMBER(ultratnk_state::collision_flipflop_r) +int ultratnk_state::collision_flipflop_r() { return m_collision[N]; } template -READ_LINE_MEMBER(ultratnk_state::joystick_r) +int ultratnk_state::joystick_r() { uint8_t const joy = m_joy[N]->read() & 3; @@ -341,7 +341,7 @@ void ultratnk_state::da_latch_w(uint8_t data) } -WRITE_LINE_MEMBER(ultratnk_state::lockout_w) +void ultratnk_state::lockout_w(int state) { machine().bookkeeping().coin_lockout_global_w(!state); } diff --git a/src/mame/atari/wolfpack.cpp b/src/mame/atari/wolfpack.cpp index 88394f5025b..83ca165fbe9 100644 --- a/src/mame/atari/wolfpack.cpp +++ b/src/mame/atari/wolfpack.cpp @@ -37,7 +37,7 @@ public: void wolfpack(machine_config &config); - template DECLARE_READ_LINE_MEMBER(dial_r); + template int dial_r(); protected: virtual void machine_start() override; @@ -78,7 +78,7 @@ private: void wolfpack_palette(palette_device &palette) const; uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(screen_vblank); + void screen_vblank(int state); TIMER_CALLBACK_MEMBER(periodic_callback); void draw_ship(bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_torpedo(bitmap_ind16 &bitmap, const rectangle &cliprect); @@ -366,7 +366,7 @@ uint32_t wolfpack_state::screen_update(screen_device &screen, bitmap_ind16 &bitm } -WRITE_LINE_MEMBER(wolfpack_state::screen_vblank) +void wolfpack_state::screen_vblank(int state) { // rising edge if (state) @@ -426,7 +426,7 @@ void wolfpack_state::machine_reset() template -READ_LINE_MEMBER(wolfpack_state::dial_r) +int wolfpack_state::dial_r() { return ((m_dial->read() + Bit) / 2) & 0x01; } diff --git a/src/mame/att/att4425.cpp b/src/mame/att/att4425.cpp index 678b936f5b8..baedf40ec4c 100644 --- a/src/mame/att/att4425.cpp +++ b/src/mame/att/att4425.cpp @@ -61,8 +61,8 @@ private: uint8_t port14_r(); uint8_t port15_r(); - DECLARE_WRITE_LINE_MEMBER(write_line_clock); - DECLARE_WRITE_LINE_MEMBER(write_keyboard_clock); + void write_line_clock(int state); + void write_keyboard_clock(int state); uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); @@ -207,14 +207,14 @@ void att4425_state::machine_start() /* Machine Driver */ -WRITE_LINE_MEMBER(att4425_state::write_line_clock) +void att4425_state::write_line_clock(int state) { m_sio->rxca_w(state); m_sio->txca_w(state); m_sio->rxtxcb_w(state); } -WRITE_LINE_MEMBER(att4425_state::write_keyboard_clock) +void att4425_state::write_keyboard_clock(int state) { m_i8251->write_txc(state); m_i8251->write_rxc(state); diff --git a/src/mame/att/unixpc.cpp b/src/mame/att/unixpc.cpp index 7806d65f6af..c406c8b24ce 100644 --- a/src/mame/att/unixpc.cpp +++ b/src/mame/att/unixpc.cpp @@ -72,10 +72,10 @@ private: uint16_t line_printer_r(); void disk_control_w(uint8_t data); void gcr_w(offs_t offset, uint16_t data); - DECLARE_WRITE_LINE_MEMBER(romlmap_w); - DECLARE_WRITE_LINE_MEMBER(error_enable_w); - DECLARE_WRITE_LINE_MEMBER(parity_enable_w); - DECLARE_WRITE_LINE_MEMBER(bpplus_w); + void romlmap_w(int state); + void error_enable_w(int state); + void parity_enable_w(int state); + void bpplus_w(int state); uint16_t ram_mmu_r(offs_t offset); void ram_mmu_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); uint16_t gsr_r(); @@ -87,10 +87,10 @@ private: void diskdma_size_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); void diskdma_ptr_w(offs_t offset, uint16_t data); - DECLARE_WRITE_LINE_MEMBER(wd2797_intrq_w); - DECLARE_WRITE_LINE_MEMBER(wd2797_drq_w); + void wd2797_intrq_w(int state); + void wd2797_drq_w(int state); - DECLARE_WRITE_LINE_MEMBER(wd1010_intrq_w); + void wd1010_intrq_w(int state); void unixpc_mem(address_map &map); @@ -127,7 +127,7 @@ void unixpc_state::gcr_w(offs_t offset, uint16_t data) m_gcr->write_bit(offset >> 11, BIT(data, 15)); } -WRITE_LINE_MEMBER(unixpc_state::romlmap_w) +void unixpc_state::romlmap_w(int state) { m_ramromview.select(state ? 1 : 0); } @@ -162,17 +162,17 @@ void unixpc_state::machine_reset() disk_control_w(0); } -WRITE_LINE_MEMBER(unixpc_state::error_enable_w) +void unixpc_state::error_enable_w(int state) { logerror("error_enable_w: %d\n", state); } -WRITE_LINE_MEMBER(unixpc_state::parity_enable_w) +void unixpc_state::parity_enable_w(int state) { logerror("parity_enable_w: %d\n", state); } -WRITE_LINE_MEMBER(unixpc_state::bpplus_w) +void unixpc_state::bpplus_w(int state) { logerror("bpplus_w: %d\n", state); } @@ -279,14 +279,14 @@ void unixpc_state::disk_control_w(uint8_t data) m_wd2797->mr_w(BIT(data, 7)); } -WRITE_LINE_MEMBER(unixpc_state::wd2797_intrq_w) +void unixpc_state::wd2797_intrq_w(int state) { logerror("wd2797_intrq_w: %d\n", state); m_fdc_intrq = state; m_int02->in_w<1>(state); } -WRITE_LINE_MEMBER(unixpc_state::wd2797_drq_w) +void unixpc_state::wd2797_drq_w(int state) { logerror("wd2797_drq_w: %d\n", state); } @@ -295,7 +295,7 @@ WRITE_LINE_MEMBER(unixpc_state::wd2797_drq_w) HARD DISK ***************************************************************************/ -WRITE_LINE_MEMBER(unixpc_state::wd1010_intrq_w) +void unixpc_state::wd1010_intrq_w(int state) { m_hdc_intrq = state; m_int02->in_w<0>(state); diff --git a/src/mame/ausnz/amust.cpp b/src/mame/ausnz/amust.cpp index b2f1e6fd22f..c99cc3f2ffc 100644 --- a/src/mame/ausnz/amust.cpp +++ b/src/mame/ausnz/amust.cpp @@ -128,10 +128,10 @@ private: u8 port0a_r(); void port0a_w(u8 data); void port0d_w(u8 data); - DECLARE_WRITE_LINE_MEMBER(hsync_w); - DECLARE_WRITE_LINE_MEMBER(vsync_w); - DECLARE_WRITE_LINE_MEMBER(drq_w); - DECLARE_WRITE_LINE_MEMBER(intrq_w); + void hsync_w(int state); + void vsync_w(int state); + void drq_w(int state); + void intrq_w(int state); void kbd_put(u8 data); MC6845_UPDATE_ROW(crtc_update_row); TIMER_DEVICE_CALLBACK_MEMBER(beep_timer); @@ -245,25 +245,25 @@ void amust_state::do_int() m_maincpu->set_input_line(INPUT_LINE_IRQ0, CLEAR_LINE); } -WRITE_LINE_MEMBER( amust_state::drq_w ) +void amust_state::drq_w(int state) { m_drq = state; do_int(); m_fdc->tc_w(1); } -WRITE_LINE_MEMBER( amust_state::intrq_w ) +void amust_state::intrq_w(int state) { m_port09 = (m_port09 & 0xdf) | (state ? 0x20 : 0); } -WRITE_LINE_MEMBER( amust_state::hsync_w ) +void amust_state::hsync_w(int state) { m_hsync = state; do_int(); } -WRITE_LINE_MEMBER( amust_state::vsync_w ) +void amust_state::vsync_w(int state) { m_vsync = state; do_int(); diff --git a/src/mame/ausnz/applix.cpp b/src/mame/ausnz/applix.cpp index 9f7e274f070..a3d29940e9c 100644 --- a/src/mame/ausnz/applix.cpp +++ b/src/mame/ausnz/applix.cpp @@ -99,7 +99,7 @@ private: u8 applix_pb_r(); void applix_pa_w(u8 data); void applix_pb_w(u8 data); - DECLARE_WRITE_LINE_MEMBER(vsync_w); + void vsync_w(int state); u8 port00_r(); u8 port08_r(); u8 port10_r(); @@ -818,7 +818,7 @@ MC6845_BEGIN_UPDATE( applix_state::crtc_update_border ) bitmap.fill(m_palette->pen(m_video_latch >> 4), cliprect); } -WRITE_LINE_MEMBER( applix_state::vsync_w ) +void applix_state::vsync_w(int state) { m_via->write_ca2(state); } diff --git a/src/mame/ausnz/aussiebyte.cpp b/src/mame/ausnz/aussiebyte.cpp index 0079e318160..913bc3991d2 100644 --- a/src/mame/ausnz/aussiebyte.cpp +++ b/src/mame/ausnz/aussiebyte.cpp @@ -281,7 +281,7 @@ void aussiebyte_state::io_write_byte(offs_t offset, u8 data) prog_space.write_byte(offset, data); } -WRITE_LINE_MEMBER( aussiebyte_state::busreq_w ) +void aussiebyte_state::busreq_w(int state) { // since our Z80 has no support for BUSACK, we assume it is granted immediately m_maincpu->set_input_line(Z80_INPUT_LINE_BUSRQ, state); @@ -293,28 +293,28 @@ WRITE_LINE_MEMBER( aussiebyte_state::busreq_w ) DMA selector ************************************************************/ -WRITE_LINE_MEMBER( aussiebyte_state::sio1_rdya_w ) +void aussiebyte_state::sio1_rdya_w(int state) { m_port17_rdy = (m_port17_rdy & 0xfd) | (u8)(state << 1); if (m_port17 == 1) m_dma->rdy_w(state); } -WRITE_LINE_MEMBER( aussiebyte_state::sio1_rdyb_w ) +void aussiebyte_state::sio1_rdyb_w(int state) { m_port17_rdy = (m_port17_rdy & 0xfb) | (u8)(state << 2); if (m_port17 == 2) m_dma->rdy_w(state); } -WRITE_LINE_MEMBER( aussiebyte_state::sio2_rdya_w ) +void aussiebyte_state::sio2_rdya_w(int state) { m_port17_rdy = (m_port17_rdy & 0xef) | (u8)(state << 4); if (m_port17 == 4) m_dma->rdy_w(state); } -WRITE_LINE_MEMBER( aussiebyte_state::sio2_rdyb_w ) +void aussiebyte_state::sio2_rdyb_w(int state) { m_port17_rdy = (m_port17_rdy & 0xdf) | (u8)(state << 5); if (m_port17 == 5) @@ -370,13 +370,13 @@ static const z80_daisy_config daisy_chain_intf[] = ************************************************************/ -WRITE_LINE_MEMBER( aussiebyte_state::fdc_intrq_w ) +void aussiebyte_state::fdc_intrq_w(int state) { u8 data = (m_port19 & 0xbf) | (state ? 0x40 : 0); m_port19 = data; } -WRITE_LINE_MEMBER( aussiebyte_state::fdc_drq_w ) +void aussiebyte_state::fdc_drq_w(int state) { u8 data = (m_port19 & 0x7f) | (state ? 0x80 : 0); m_port19 = data; diff --git a/src/mame/ausnz/aussiebyte.h b/src/mame/ausnz/aussiebyte.h index 88d0294e934..65d2bad55f3 100644 --- a/src/mame/ausnz/aussiebyte.h +++ b/src/mame/ausnz/aussiebyte.h @@ -100,13 +100,13 @@ private: u8 port37_r(); u8 rtc_r(offs_t offset); void rtc_w(offs_t offset, u8 data); - DECLARE_WRITE_LINE_MEMBER(fdc_intrq_w); - DECLARE_WRITE_LINE_MEMBER(fdc_drq_w); - DECLARE_WRITE_LINE_MEMBER(busreq_w); - DECLARE_WRITE_LINE_MEMBER(sio1_rdya_w); - DECLARE_WRITE_LINE_MEMBER(sio1_rdyb_w); - DECLARE_WRITE_LINE_MEMBER(sio2_rdya_w); - DECLARE_WRITE_LINE_MEMBER(sio2_rdyb_w); + void fdc_intrq_w(int state); + void fdc_drq_w(int state); + void busreq_w(int state); + void sio1_rdya_w(int state); + void sio1_rdyb_w(int state); + void sio2_rdya_w(int state); + void sio2_rdyb_w(int state); void address_w(u8 data); void register_w(u8 data); MC6845_UPDATE_ROW(crtc_update_row); diff --git a/src/mame/ausnz/binbug.cpp b/src/mame/ausnz/binbug.cpp index b5633ccfb4d..0526d9e3dad 100644 --- a/src/mame/ausnz/binbug.cpp +++ b/src/mame/ausnz/binbug.cpp @@ -71,9 +71,9 @@ public: private: u8 mem_r(offs_t offset); void mem_w(offs_t offset, u8 data); - DECLARE_WRITE_LINE_MEMBER(kansas_w); - DECLARE_READ_LINE_MEMBER(serial_r); - DECLARE_WRITE_LINE_MEMBER(serial_w); + void kansas_w(int state); + int serial_r(); + void serial_w(int state); DECLARE_QUICKLOAD_LOAD_MEMBER(quickload_cb); TIMER_DEVICE_CALLBACK_MEMBER(kansas_r); @@ -90,7 +90,7 @@ private: required_device m_s100; }; -WRITE_LINE_MEMBER( binbug_state::kansas_w ) +void binbug_state::kansas_w(int state) { if ((m_cass->get_state() & CASSETTE_MASK_UISTATE) != CASSETTE_RECORD) return; @@ -135,12 +135,12 @@ TIMER_DEVICE_CALLBACK_MEMBER( binbug_state::kansas_r ) } } -READ_LINE_MEMBER( binbug_state::serial_r ) +int binbug_state::serial_r() { return m_rs232->rxd_r() & m_cassinbit; } -WRITE_LINE_MEMBER( binbug_state::serial_w ) +void binbug_state::serial_w(int state) { m_cassoutbit = state; } diff --git a/src/mame/ausnz/d6800.cpp b/src/mame/ausnz/d6800.cpp index 7522efc820e..8b9a54d464d 100644 --- a/src/mame/ausnz/d6800.cpp +++ b/src/mame/ausnz/d6800.cpp @@ -85,7 +85,7 @@ private: void d6800_cassette_w(uint8_t data); uint8_t d6800_keyboard_r(); void d6800_keyboard_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER( d6800_screen_w ); + void d6800_screen_w(int state); uint32_t screen_update_d6800(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(rtc_interrupt); TIMER_DEVICE_CALLBACK_MEMBER(kansas_w); @@ -240,7 +240,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(d6800_state::kansas_r) } -WRITE_LINE_MEMBER( d6800_state::d6800_screen_w ) +void d6800_state::d6800_screen_w(int state) { m_cb2 = state; m_maincpu->set_unscaled_clock(state ? 589744 : 1e6); // effective clock is ~590kHz while screen is on diff --git a/src/mame/ausnz/dg680.cpp b/src/mame/ausnz/dg680.cpp index 7fe18949a95..615f2752358 100644 --- a/src/mame/ausnz/dg680.cpp +++ b/src/mame/ausnz/dg680.cpp @@ -97,7 +97,7 @@ private: void port08_w(u8 data); u8 mem_r(offs_t offset); void mem_w(offs_t offset, u8 data); - DECLARE_WRITE_LINE_MEMBER(kansas_w); + void kansas_w(int state); TIMER_DEVICE_CALLBACK_MEMBER(kansas_r); void kbd_put(u8 data); @@ -120,7 +120,7 @@ private: required_device m_s100; }; -WRITE_LINE_MEMBER( dg680_state::kansas_w ) +void dg680_state::kansas_w(int state) { if ((m_cass->get_state() & CASSETTE_MASK_UISTATE) != CASSETTE_RECORD) return; diff --git a/src/mame/ausnz/dmax8000.cpp b/src/mame/ausnz/dmax8000.cpp index d63b2224d45..24ad1c84f62 100644 --- a/src/mame/ausnz/dmax8000.cpp +++ b/src/mame/ausnz/dmax8000.cpp @@ -58,7 +58,7 @@ private: void port0d_w(u8 data); void port14_w(u8 data); void port40_w(u8 data); - DECLARE_WRITE_LINE_MEMBER(fdc_drq_w); + void fdc_drq_w(int state); void io_map(address_map &map); void mem_map(address_map &map); @@ -72,7 +72,7 @@ private: }; -WRITE_LINE_MEMBER( dmax8000_state::fdc_drq_w ) +void dmax8000_state::fdc_drq_w(int state) { if (state) printf("DRQ "); } diff --git a/src/mame/ausnz/eacc.cpp b/src/mame/ausnz/eacc.cpp index 49595a5522b..b70610b3f21 100644 --- a/src/mame/ausnz/eacc.cpp +++ b/src/mame/ausnz/eacc.cpp @@ -79,9 +79,9 @@ protected: virtual void machine_start() override; private: - DECLARE_WRITE_LINE_MEMBER(scan_w); - DECLARE_WRITE_LINE_MEMBER(cb2_w); - DECLARE_WRITE_LINE_MEMBER(inputs_w); + void scan_w(int state); + void cb2_w(int state); + void inputs_w(int state); uint8_t keyboard_r(); void digit_w(uint8_t data); void segment_w(uint8_t data); @@ -166,7 +166,7 @@ void eacc_state::machine_start() save_item(NAME(m_disp)); } -WRITE_LINE_MEMBER( eacc_state::inputs_w ) +void eacc_state::inputs_w(int state) { if (state) m_pia->ca1_w(machine().rand() & 1); // movement @@ -188,13 +188,13 @@ void eacc_state::do_nmi(bool in_scan, bool in_cb2) } } -WRITE_LINE_MEMBER( eacc_state::cb2_w ) +void eacc_state::cb2_w(int state) { m_cb2 = state ? 1 : 0; do_nmi(m_scan, m_cb2); } -WRITE_LINE_MEMBER( eacc_state::scan_w ) +void eacc_state::scan_w(int state) { m_scan = state ? 1 : 0; do_nmi(m_scan, m_cb2); diff --git a/src/mame/ausnz/eti660.cpp b/src/mame/ausnz/eti660.cpp index 474a7535a64..41ef606e1f8 100644 --- a/src/mame/ausnz/eti660.cpp +++ b/src/mame/ausnz/eti660.cpp @@ -81,11 +81,11 @@ private: u8 pia_r(); void pia_w(u8 data); void colorram_w(offs_t offset, u8 data); - DECLARE_READ_LINE_MEMBER( clear_r ); - DECLARE_READ_LINE_MEMBER( ef2_r ); - DECLARE_READ_LINE_MEMBER( ef4_r ); - DECLARE_WRITE_LINE_MEMBER( q_w ); - DECLARE_WRITE_LINE_MEMBER( ca2_w ); + int clear_r(); + int ef2_r(); + int ef4_r(); + void q_w(int state); + void ca2_w(int state); void dma_w(offs_t offset, u8 data); u8 pia_pa_r(); void pia_pa_w(u8 data); @@ -132,7 +132,7 @@ void eti660_state::pia_w(u8 data) m_pia->write(pia_offset, data); } -WRITE_LINE_MEMBER( eti660_state::ca2_w ) // test with Wipeout game - it should start up in colour +void eti660_state::ca2_w(int state) // test with Wipeout game - it should start up in colour { m_cti->con_w(state); } @@ -203,7 +203,7 @@ INPUT_PORTS_END /* CDP1802 Interface */ -READ_LINE_MEMBER( eti660_state::clear_r ) +int eti660_state::clear_r() { // A hack to make the machine reset itself on // boot, like the real one does. @@ -214,17 +214,17 @@ READ_LINE_MEMBER( eti660_state::clear_r ) return BIT(m_special->read(), 0); // R key } -READ_LINE_MEMBER( eti660_state::ef2_r ) +int eti660_state::ef2_r() { return m_cassette->input() < 0; } -READ_LINE_MEMBER( eti660_state::ef4_r ) +int eti660_state::ef4_r() { return BIT(m_special->read(), 1); // S key } -WRITE_LINE_MEMBER( eti660_state::q_w ) +void eti660_state::q_w(int state) { /* CDP1864 audio output enable */ m_cti->aoe_w(state); diff --git a/src/mame/ausnz/excali64.cpp b/src/mame/ausnz/excali64.cpp index d0e78a93245..1940a83bf62 100644 --- a/src/mame/ausnz/excali64.cpp +++ b/src/mame/ausnz/excali64.cpp @@ -96,16 +96,16 @@ private: u8 porte8_r(); void portec_w(u8 data); static void floppy_formats(format_registration &fr); - DECLARE_WRITE_LINE_MEMBER(cent_busy_w); - DECLARE_WRITE_LINE_MEMBER(busreq_w); + void cent_busy_w(int state); + void busreq_w(int state); u8 memory_read_byte(offs_t offset); void memory_write_byte(offs_t offset, u8 data); u8 io_read_byte(offs_t offset); void io_write_byte(offs_t offset, u8 data); MC6845_UPDATE_ROW(update_row); - DECLARE_WRITE_LINE_MEMBER(crtc_hs); - DECLARE_WRITE_LINE_MEMBER(crtc_vs); - DECLARE_WRITE_LINE_MEMBER(motor_w); + void crtc_hs(int state); + void crtc_vs(int state); + void motor_w(int state); void io_map(address_map &map); void mem_map(address_map &map); @@ -245,7 +245,7 @@ static INPUT_PORTS_START( excali64 ) PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("7 &") PORT_CODE(KEYCODE_7) PORT_CHAR('7') PORT_CHAR('&') INPUT_PORTS_END -WRITE_LINE_MEMBER( excali64_state::cent_busy_w ) +void excali64_state::cent_busy_w(int state) { m_centronics_busy = state; } @@ -262,7 +262,7 @@ static void excali64_floppies(device_slot_interface &device) } // pulses from port E4 bit 5 restart the 74123. After 3.6 secs without a pulse, the motor gets turned off. -WRITE_LINE_MEMBER( excali64_state::motor_w ) +void excali64_state::motor_w(int state) { m_motor = state; m_floppy1->get_device()->mon_w(!m_motor); @@ -301,7 +301,7 @@ void excali64_state::portec_w(u8 data) m_fdc->dden_w(BIT(data, 2)); } -WRITE_LINE_MEMBER( excali64_state::busreq_w ) +void excali64_state::busreq_w(int state) { // since our Z80 has no support for BUSACK, we assume it is granted immediately m_maincpu->set_input_line(Z80_INPUT_LINE_BUSRQ, state); @@ -459,12 +459,12 @@ void excali64_state::machine_start() m_sys_status = 0; } -WRITE_LINE_MEMBER( excali64_state::crtc_hs ) +void excali64_state::crtc_hs(int state) { m_crtc_hs = state; } -WRITE_LINE_MEMBER( excali64_state::crtc_vs ) +void excali64_state::crtc_vs(int state) { m_crtc_vs = state; } diff --git a/src/mame/ausnz/magnum.cpp b/src/mame/ausnz/magnum.cpp index 9af2a2a52b0..bfa3734180f 100644 --- a/src/mame/ausnz/magnum.cpp +++ b/src/mame/ausnz/magnum.cpp @@ -42,7 +42,7 @@ private: void sysctl_w(offs_t offset, u8 data); u16 irqstat_r(); void port50_w(u16 data); - DECLARE_WRITE_LINE_MEMBER(rtcirq_w); + void rtcirq_w(int state); void check_irq(); void magnum_io(address_map &map); @@ -254,7 +254,7 @@ void magnum_state::port50_w(u16 data) { } -WRITE_LINE_MEMBER(magnum_state::rtcirq_w) +void magnum_state::rtcirq_w(int state) { m_rtcirq = state == ASSERT_LINE; check_irq(); diff --git a/src/mame/ausnz/mbee.h b/src/mame/ausnz/mbee.h index 942b8903dfa..33b6a523798 100644 --- a/src/mame/ausnz/mbee.h +++ b/src/mame/ausnz/mbee.h @@ -115,8 +115,8 @@ private: void video_high_w(offs_t offset, u8 data); void pio_port_b_w(u8 data); u8 pio_port_b_r(); - DECLARE_WRITE_LINE_MEMBER(pio_ardy); - DECLARE_WRITE_LINE_MEMBER(crtc_vs); + void pio_ardy(int state); + void crtc_vs(int state); u8 fdc_status_r(); u8 pak_r(offs_t); u8 net_r(offs_t); @@ -130,9 +130,9 @@ private: DECLARE_QUICKLOAD_LOAD_MEMBER(quickload_cb); template DECLARE_DEVICE_IMAGE_LOAD_MEMBER(pak_load) { return load_cart(image, m_pak[T], T); } template DECLARE_DEVICE_IMAGE_UNLOAD_MEMBER(pak_unload) { unload_cart(T); } - WRITE_LINE_MEMBER(rtc_irq_w); - WRITE_LINE_MEMBER(fdc_intrq_w); - WRITE_LINE_MEMBER(fdc_drq_w); + void rtc_irq_w(int state); + void fdc_intrq_w(int state); + void fdc_drq_w(int state); MC6845_UPDATE_ROW(crtc_update_row); MC6845_ON_UPDATE_ADDR_CHANGED(crtc_update_addr); void machine_start() override; diff --git a/src/mame/ausnz/mbee_m.cpp b/src/mame/ausnz/mbee_m.cpp index c6dca14dd3d..8155f8f4991 100644 --- a/src/mame/ausnz/mbee_m.cpp +++ b/src/mame/ausnz/mbee_m.cpp @@ -21,7 +21,7 @@ Rewritten by Robbbert (see notes in driver file). ************************************************************/ -WRITE_LINE_MEMBER( mbee_state::pio_ardy ) +void mbee_state::pio_ardy(int state) { m_centronics->write_strobe((state) ? 0 : 1); } @@ -77,12 +77,12 @@ u8 mbee_state::pio_port_b_r() *************************************************************************************/ -WRITE_LINE_MEMBER( mbee_state::fdc_intrq_w ) +void mbee_state::fdc_intrq_w(int state) { m_fdc_rq = (m_fdc_rq & 2) | state; } -WRITE_LINE_MEMBER( mbee_state::fdc_drq_w ) +void mbee_state::fdc_drq_w(int state) { m_fdc_rq = (m_fdc_rq & 1) | (state << 1); } @@ -230,7 +230,7 @@ u8 mbee_state::port07_r() // read } // See it work: Run mbeett, choose RTC in the config switches, run the F3 test, press Esc. -WRITE_LINE_MEMBER( mbee_state::rtc_irq_w ) +void mbee_state::rtc_irq_w(int state) { m_b7_rtc = state; // inverted by IC15 (pins 8,9,10) then again by mame diff --git a/src/mame/ausnz/mbee_v.cpp b/src/mame/ausnz/mbee_v.cpp index fafe7a2ca6a..3d8a7f26658 100644 --- a/src/mame/ausnz/mbee_v.cpp +++ b/src/mame/ausnz/mbee_v.cpp @@ -38,7 +38,7 @@ See drivers\mbee.cpp for any issues. #include "emu.h" #include "mbee.h" -WRITE_LINE_MEMBER( mbee_state::crtc_vs ) +void mbee_state::crtc_vs(int state) { m_b7_vs = state; if ((m_io_config->read() & 0xc0) == 0) // VS selected in config menu diff --git a/src/mame/ausnz/pegasus.cpp b/src/mame/ausnz/pegasus.cpp index ee56f50c548..c3e0606725b 100644 --- a/src/mame/ausnz/pegasus.cpp +++ b/src/mame/ausnz/pegasus.cpp @@ -89,9 +89,9 @@ private: void pegasus_controls_w(u8 data); void pegasus_keyboard_w(u8 data); void pegasus_pcg_w(offs_t offset, u8 data); - DECLARE_READ_LINE_MEMBER(pegasus_cassette_r); - DECLARE_WRITE_LINE_MEMBER(pegasus_cassette_w); - DECLARE_WRITE_LINE_MEMBER(pegasus_firq_clr); + int pegasus_cassette_r(); + void pegasus_cassette_w(int state); + void pegasus_firq_clr(int state); u32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); TIMER_DEVICE_CALLBACK_MEMBER(pegasus_firq); std::pair load_cart(device_image_interface &image, generic_slot_device *slot, const char *reg_tag); @@ -127,7 +127,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(pegasus_state::pegasus_firq) m_maincpu->set_input_line(M6809_FIRQ_LINE, HOLD_LINE); } -WRITE_LINE_MEMBER( pegasus_state::pegasus_firq_clr ) +void pegasus_state::pegasus_firq_clr(int state) { m_maincpu->set_input_line(M6809_FIRQ_LINE, CLEAR_LINE); } @@ -161,12 +161,12 @@ void pegasus_state::pegasus_controls_w(u8 data) m_control_bits = data; } -READ_LINE_MEMBER( pegasus_state::pegasus_cassette_r ) +int pegasus_state::pegasus_cassette_r() { return m_cass->input(); } -WRITE_LINE_MEMBER( pegasus_state::pegasus_cassette_w ) +void pegasus_state::pegasus_cassette_w(int state) { m_cass->output(state ? 1 : -1); } diff --git a/src/mame/ausnz/pipbug.cpp b/src/mame/ausnz/pipbug.cpp index e96fbfcf9d8..6946b7ac980 100644 --- a/src/mame/ausnz/pipbug.cpp +++ b/src/mame/ausnz/pipbug.cpp @@ -70,7 +70,7 @@ public: private: virtual void machine_start() override; void pipbug_ctrl_w(u8 data); - DECLARE_READ_LINE_MEMBER(serial_r); + int serial_r(); TIMER_DEVICE_CALLBACK_MEMBER(kansas_r); required_device m_rs232; required_device m_maincpu; @@ -111,7 +111,7 @@ TIMER_DEVICE_CALLBACK_MEMBER( pipbug_state::kansas_r ) } } -READ_LINE_MEMBER( pipbug_state::serial_r ) +int pipbug_state::serial_r() { return m_rs232->rxd_r() & m_cassinbit; } diff --git a/src/mame/ausnz/poly.h b/src/mame/ausnz/poly.h index 7e386778d9c..1fe85326b4f 100644 --- a/src/mame/ausnz/poly.h +++ b/src/mame/ausnz/poly.h @@ -102,15 +102,15 @@ private: void logical_mem_w(offs_t offset, uint8_t data); uint8_t vector_r(offs_t offset); void kbd_put(u8 data); // remove when KR2376 is implemented - DECLARE_READ_LINE_MEMBER( kbd_shift_r ); - DECLARE_READ_LINE_MEMBER( kbd_control_r ); + int kbd_shift_r(); + int kbd_control_r(); void pia0_pa_w(uint8_t data); void pia0_pb_w(uint8_t data); uint8_t pia1_b_in(); uint8_t videoram_1_r(offs_t offset); uint8_t videoram_2_r(offs_t offset); - DECLARE_WRITE_LINE_MEMBER( ptm_o2_callback ); - DECLARE_WRITE_LINE_MEMBER( ptm_o3_callback ); + void ptm_o2_callback(int state); + void ptm_o3_callback(int state); void baud_rate_w(uint8_t data); TIMER_CALLBACK_MEMBER( set_protect ); void set_protect_w(uint8_t data); @@ -119,7 +119,7 @@ private: void select_map2_w(uint8_t data); uint8_t network_r(offs_t offset); void network_w(offs_t offset, uint8_t data); - DECLARE_WRITE_LINE_MEMBER( network_clk_w ); + void network_clk_w(int state); uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); @@ -170,7 +170,7 @@ public: private: void drive_register_w(uint8_t data); uint8_t drive_register_r(); - DECLARE_WRITE_LINE_MEMBER(motor_w); + void motor_w(int state); uint8_t fdc_inv_r(offs_t offset); void fdc_inv_w(offs_t offset, uint8_t data); diff --git a/src/mame/ausnz/poly_m.cpp b/src/mame/ausnz/poly_m.cpp index 815b6b758b5..387f5ab3bed 100644 --- a/src/mame/ausnz/poly_m.cpp +++ b/src/mame/ausnz/poly_m.cpp @@ -127,23 +127,23 @@ void poly_state::kbd_put(u8 data) m_pia[1]->cb1_w(0); } -READ_LINE_MEMBER(poly_state::kbd_shift_r) +int poly_state::kbd_shift_r() { return BIT(m_modifiers->read(), 1); } -READ_LINE_MEMBER(poly_state::kbd_control_r) +int poly_state::kbd_control_r() { return BIT(m_modifiers->read(), 0); } -WRITE_LINE_MEMBER(poly_state::ptm_o2_callback) +void poly_state::ptm_o2_callback(int state) { m_ptm->set_c1(state); } -WRITE_LINE_MEMBER(poly_state::ptm_o3_callback) +void poly_state::ptm_o3_callback(int state) { m_speaker->level_w(state); } @@ -165,7 +165,7 @@ void poly_state::network_w(offs_t offset, uint8_t data) m_adlc->write(offset >> 1, data); } -WRITE_LINE_MEMBER(poly_state::network_clk_w) +void poly_state::network_clk_w(int state) { m_adlc->rxc_w(state); m_adlc->txc_w(state); @@ -204,7 +204,7 @@ uint8_t polydev_state::drive_register_r() return (m_current_floppy ? m_current_floppy->dskchg_r() : 1) << 1; } -WRITE_LINE_MEMBER(polydev_state::motor_w) +void polydev_state::motor_w(int state) { if (m_current_floppy) m_current_floppy->mon_w(!state); } diff --git a/src/mame/ausnz/proteus.cpp b/src/mame/ausnz/proteus.cpp index 518c7b1d043..3d0a523d52d 100644 --- a/src/mame/ausnz/proteus.cpp +++ b/src/mame/ausnz/proteus.cpp @@ -84,14 +84,14 @@ private: virtual void machine_reset() override; virtual void machine_start() override; - DECLARE_WRITE_LINE_MEMBER(ptm_o2_callback); - DECLARE_WRITE_LINE_MEMBER(ptm_o3_callback); + void ptm_o2_callback(int state); + void ptm_o3_callback(int state); uint8_t network_r(offs_t offset); void network_w(offs_t offset, uint8_t data); uint8_t drive_register_r(); void drive_register_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(motor_w); + void motor_w(int state); uint8_t fdc_inv_r(offs_t offset); void fdc_inv_w(offs_t offset, uint8_t data); static void floppy_formats(format_registration &fr); @@ -150,12 +150,12 @@ void proteus_state::machine_reset() } -WRITE_LINE_MEMBER(proteus_state::ptm_o2_callback) +void proteus_state::ptm_o2_callback(int state) { m_ptm->set_c1(state); } -WRITE_LINE_MEMBER(proteus_state::ptm_o3_callback) +void proteus_state::ptm_o3_callback(int state) { m_adlc->txc_w(state); m_adlc->rxc_w(!state); @@ -205,7 +205,7 @@ uint8_t proteus_state::drive_register_r() return (m_floppy ? m_floppy->dskchg_r() : 1) << 1; } -WRITE_LINE_MEMBER(proteus_state::motor_w) +void proteus_state::motor_w(int state) { if (m_floppy) m_floppy->mon_w(!state); } diff --git a/src/mame/ausnz/super80.cpp b/src/mame/ausnz/super80.cpp index 50c9113bb32..27a7eaa5d4a 100644 --- a/src/mame/ausnz/super80.cpp +++ b/src/mame/ausnz/super80.cpp @@ -635,7 +635,7 @@ static const z80_daisy_config super80_daisy_chain[] = // Z80DMA //------------------------------------------------- -WRITE_LINE_MEMBER( super80v_state::busreq_w ) +void super80v_state::busreq_w(int state) { // since our Z80 has no support for BUSACK, we assume it is granted immediately m_maincpu->set_input_line(Z80_INPUT_LINE_BUSRQ, state); diff --git a/src/mame/ausnz/super80.h b/src/mame/ausnz/super80.h index 78c414b8683..53b50fa79d2 100644 --- a/src/mame/ausnz/super80.h +++ b/src/mame/ausnz/super80.h @@ -147,7 +147,7 @@ protected: void port3f_w(u8 data); u8 port3e_r(); std::unique_ptr m_vram; - DECLARE_WRITE_LINE_MEMBER(busreq_w); + void busreq_w(int state); uint8_t memory_read_byte(offs_t offset); void memory_write_byte(offs_t offset, uint8_t data); uint8_t io_read_byte(offs_t offset); diff --git a/src/mame/ausnz/tec1.cpp b/src/mame/ausnz/tec1.cpp index 969642bca6b..a061f291d96 100644 --- a/src/mame/ausnz/tec1.cpp +++ b/src/mame/ausnz/tec1.cpp @@ -108,7 +108,7 @@ private: void tec1_digit_w(u8 data); void tecjmon_digit_w(u8 data); void segment_w(u8 data); - DECLARE_WRITE_LINE_MEMBER(da_w); + void da_w(int state); bool m_key_pressed = 0; u8 m_seg = 0U; u8 m_digit = 0U; @@ -206,7 +206,7 @@ u8 tec1_state::kbd_r() return m_kb->read() | m_io_shift->read(); } -WRITE_LINE_MEMBER( tec1_state::da_w ) +void tec1_state::da_w(int state) { m_key_pressed = state; m_maincpu->set_input_line(INPUT_LINE_NMI, state ? ASSERT_LINE : CLEAR_LINE); diff --git a/src/mame/barcrest/mpu1.cpp b/src/mame/barcrest/mpu1.cpp index e6edc8e42ee..30b6d021fa3 100644 --- a/src/mame/barcrest/mpu1.cpp +++ b/src/mame/barcrest/mpu1.cpp @@ -66,7 +66,7 @@ protected: virtual void machine_reset() override; private: - template DECLARE_WRITE_LINE_MEMBER(pia_lamp_w) { m_lamps[Lamp] = state; } + template void pia_lamp_w(int state) { m_lamps[Lamp] = state; } void pia1_portb_w(uint8_t data); void pia1_portb_lg_w(uint8_t data); diff --git a/src/mame/barcrest/mpu3.cpp b/src/mame/barcrest/mpu3.cpp index be8dd5b49c8..c94ce6283fd 100644 --- a/src/mame/barcrest/mpu3.cpp +++ b/src/mame/barcrest/mpu3.cpp @@ -202,26 +202,26 @@ protected: required_device m_maincpu; private: - template DECLARE_WRITE_LINE_MEMBER(reel_optic_cb) { if (state) m_optic_pattern |= (1 << N); else m_optic_pattern &= ~(1 << N); } + template void reel_optic_cb(int state) { if (state) m_optic_pattern |= (1 << N); else m_optic_pattern &= ~(1 << N); } void mpu3ptm_w(offs_t offset, uint8_t data); uint8_t mpu3ptm_r(offs_t offset); - DECLARE_WRITE_LINE_MEMBER(ic2_o1_callback); - DECLARE_WRITE_LINE_MEMBER(ic2_o2_callback); - DECLARE_WRITE_LINE_MEMBER(ic2_o3_callback); + void ic2_o1_callback(int state); + void ic2_o2_callback(int state); + void ic2_o3_callback(int state); uint8_t pia_ic3_porta_r(); void pia_ic3_portb_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(pia_ic3_ca2_w); + void pia_ic3_ca2_w(int state); uint8_t pia_ic4_porta_r(); void pia_ic4_porta_w(uint8_t data); void pia_ic4_portb_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(pia_ic4_ca2_w); - DECLARE_WRITE_LINE_MEMBER(pia_ic4_cb2_w); + void pia_ic4_ca2_w(int state); + void pia_ic4_cb2_w(int state); void pia_ic5_porta_w(uint8_t data); uint8_t pia_ic5_portb_r(); void pia_ic5_portb_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(pia_ic5_ca2_w); - DECLARE_WRITE_LINE_MEMBER(pia_ic5_cb2_w); + void pia_ic5_ca2_w(int state); + void pia_ic5_cb2_w(int state); uint8_t pia_ic6_porta_r(); uint8_t pia_ic6_portb_r(); void pia_ic6_porta_w(uint8_t data); @@ -329,17 +329,17 @@ void mpu3_state::machine_reset() /* IC2 6840 PTM handler probably clocked from elsewhere*/ -WRITE_LINE_MEMBER(mpu3_state::ic2_o1_callback) +void mpu3_state::ic2_o1_callback(int state) { } //FIXME FROM HERE -WRITE_LINE_MEMBER(mpu3_state::ic2_o2_callback) +void mpu3_state::ic2_o2_callback(int state) { } -WRITE_LINE_MEMBER(mpu3_state::ic2_o3_callback) +void mpu3_state::ic2_o3_callback(int state) { } @@ -469,7 +469,7 @@ void mpu3_state::pia_ic3_portb_w(uint8_t data) } -WRITE_LINE_MEMBER(mpu3_state::pia_ic3_ca2_w) +void mpu3_state::pia_ic3_ca2_w(int state) { LOG("%s: IC3 PIA Port CA2 Set to %2x (input A)\n", machine().describe_context(),state); m_IC11GA = state; @@ -543,14 +543,14 @@ void mpu3_state::pia_ic4_portb_w(uint8_t data) } } -WRITE_LINE_MEMBER(mpu3_state::pia_ic4_ca2_w) +void mpu3_state::pia_ic4_ca2_w(int state) { LOG("%s: IC4 PIA Port CA2 Set to %2x (Input B)\n", machine().describe_context(),state); m_IC11GB = state; ic11_update(); } -WRITE_LINE_MEMBER(mpu3_state::pia_ic4_cb2_w) +void mpu3_state::pia_ic4_cb2_w(int state) { LOG("%s: IC4 PIA Port CA2 Set to %2x (Triac)\n", machine().describe_context(),state); m_triac_ic4=state; @@ -589,14 +589,14 @@ void mpu3_state::pia_ic5_portb_w(uint8_t data) m_ic3_data = data; } -WRITE_LINE_MEMBER(mpu3_state::pia_ic5_ca2_w) +void mpu3_state::pia_ic5_ca2_w(int state) { LOG("%s: IC5 PIA Port CA2 Set to %2x (C)\n", machine().describe_context(),state); m_IC11GC = state; ic11_update(); } -WRITE_LINE_MEMBER(mpu3_state::pia_ic5_cb2_w) +void mpu3_state::pia_ic5_cb2_w(int state) { LOG("%s: IC5 PIA Port CB2 Set to %2x (Triac)\n", machine().describe_context(),state); m_triac_ic5 = state; diff --git a/src/mame/barcrest/mpu4.cpp b/src/mame/barcrest/mpu4.cpp index 42242313dd8..7fc547863e1 100644 --- a/src/mame/barcrest/mpu4.cpp +++ b/src/mame/barcrest/mpu4.cpp @@ -440,7 +440,7 @@ MACHINE_RESET_MEMBER(mpu4_state, mpu4) /* 6809 IRQ handler */ -WRITE_LINE_MEMBER(mpu4_state::cpu0_irq) +void mpu4_state::cpu0_irq(int state) { /* The PIA and PTM IRQ lines are all connected to a common PCB track, leading directly to the 6809 IRQ line. */ uint8_t combined_state = m_pia3->irq_a_state() | m_pia3->irq_b_state() | @@ -502,7 +502,7 @@ void mpu4_state::bankset_w(uint8_t data) /* IC2 6840 PTM handler */ -WRITE_LINE_MEMBER(mpu4_state::ic2_o1_callback) +void mpu4_state::ic2_o1_callback(int state) { m_6840ptm->set_c2(state); /* copy output value to IC2 c2 this output is the clock for timer2 */ @@ -510,7 +510,7 @@ WRITE_LINE_MEMBER(mpu4_state::ic2_o1_callback) } -WRITE_LINE_MEMBER(mpu4_state::ic2_o2_callback) +void mpu4_state::ic2_o2_callback(int state) { m_pia3->ca1_w(state); /* copy output value to IC3 ca1 */ /* the output from timer2 is the input clock for timer3 */ @@ -519,7 +519,7 @@ WRITE_LINE_MEMBER(mpu4_state::ic2_o2_callback) } -WRITE_LINE_MEMBER(mpu4_state::ic2_o3_callback) +void mpu4_state::ic2_o3_callback(int state) { /* the output from timer3 is used as a square wave for the alarm output and as an external clock source for timer 1! */ @@ -577,14 +577,14 @@ void mpu4_state::pia_ic3_portb_w(uint8_t data) } } -WRITE_LINE_MEMBER(mpu4_state::pia_ic3_ca2_w) +void mpu4_state::pia_ic3_ca2_w(int state) { LOGMASKED(LOG_IC3, "%s: IC3 PIA Write CA2 (alpha data), %02X\n", machine().describe_context(), state); m_vfd->data(state); } -WRITE_LINE_MEMBER(mpu4_state::pia_ic3_cb2_w) +void mpu4_state::pia_ic3_cb2_w(int state) { LOGMASKED(LOG_IC3, "%s: IC3 PIA Write CB (alpha reset), %02X\n", machine().describe_context(), state); // DM Data pin A @@ -659,7 +659,7 @@ TIMER_CALLBACK_MEMBER(mpu4_state::update_ic24) } -WRITE_LINE_MEMBER(mpu4_state::dataport_rxd) +void mpu4_state::dataport_rxd(int state) { m_pia4->cb1_w(state); m_serial_output = state; @@ -739,7 +739,7 @@ uint8_t mpu4_state::pia_ic4_portb_r() } -WRITE_LINE_MEMBER(mpu4_state::pia_ic4_ca2_w) +void mpu4_state::pia_ic4_ca2_w(int state) { LOGMASKED(LOG_IC3, "%s: IC4 PIA Write CA (input MUX strobe /LED B), %02X\n", machine().describe_context(), state); @@ -747,7 +747,7 @@ WRITE_LINE_MEMBER(mpu4_state::pia_ic4_ca2_w) ic23_update(); } -WRITE_LINE_MEMBER(mpu4_state::pia_ic4_cb2_w) +void mpu4_state::pia_ic4_cb2_w(int state) { LOGMASKED(LOG_IC3, "%s: IC4 PIA Write CB (Reel optic flag), %02X\n", machine().describe_context(), state); m_reel_flag=state; @@ -1001,7 +1001,7 @@ void mpu4_state::update_ay() } -WRITE_LINE_MEMBER(mpu4_state::pia_ic5_cb2_w) +void mpu4_state::pia_ic5_cb2_w(int state) { update_ay(); } @@ -1040,7 +1040,7 @@ void mpu4_state::pia_ic6_porta_w(uint8_t data) } -WRITE_LINE_MEMBER(mpu4_state::pia_ic6_ca2_w) +void mpu4_state::pia_ic6_ca2_w(int state) { LOG("%s: IC6 PIA write CA2 %2x (AY8913 BC1)\n", machine().describe_context(), state); if (m_ay8913.found()) @@ -1052,7 +1052,7 @@ WRITE_LINE_MEMBER(mpu4_state::pia_ic6_ca2_w) } -WRITE_LINE_MEMBER(mpu4_state::pia_ic6_cb2_w) +void mpu4_state::pia_ic6_cb2_w(int state) { LOG("%s: IC6 PIA write CB2 %2x (AY8913 BCDIR)\n", machine().describe_context(), state); if (m_ay8913.found()) @@ -1133,7 +1133,7 @@ uint8_t mpu4_state::pia_ic7_portb_r() } } -WRITE_LINE_MEMBER(mpu4_state::pia_ic7_ca2_w) +void mpu4_state::pia_ic7_ca2_w(int state) { LOG("%s: IC7 PIA write CA2 %2x (input strobe bit 0 / LED A)\n", machine().describe_context(), state); @@ -1142,7 +1142,7 @@ WRITE_LINE_MEMBER(mpu4_state::pia_ic7_ca2_w) ic23_update(); } -WRITE_LINE_MEMBER(mpu4_state::pia_ic7_cb2_w) +void mpu4_state::pia_ic7_cb2_w(int state) { m_remote_meter = state?0x80:0x00; } @@ -1185,7 +1185,7 @@ void mpu4_state::pia_ic8_portb_w(uint8_t data) } } -WRITE_LINE_MEMBER(mpu4_state::pia_ic8_ca2_w) +void mpu4_state::pia_ic8_ca2_w(int state) { LOGMASKED(LOG_IC8, "%s: IC8 PIA write CA2 (input_strobe bit 2 / LED C) %02X\n", machine().describe_context(), state & 0xff); @@ -1194,7 +1194,7 @@ WRITE_LINE_MEMBER(mpu4_state::pia_ic8_ca2_w) } -WRITE_LINE_MEMBER(mpu4_state::pia_ic8_cb2_w) +void mpu4_state::pia_ic8_cb2_w(int state) { LOGMASKED(LOG_IC8, "%s: IC8 PIA write CB2 (alpha clock) %02X\n", machine().describe_context(), state & 0xff); @@ -1203,7 +1203,7 @@ WRITE_LINE_MEMBER(mpu4_state::pia_ic8_cb2_w) m_vfd->sclk(!state); } -WRITE_LINE_MEMBER(mpu4_state::pia_gb_cb2_w) +void mpu4_state::pia_gb_cb2_w(int state) { // Some BWB games use this to drive the bankswitching // should the regular bankswitch still work in these cases? diff --git a/src/mame/barcrest/mpu4.h b/src/mame/barcrest/mpu4.h index 26b4af0dc0f..058b604fd54 100644 --- a/src/mame/barcrest/mpu4.h +++ b/src/mame/barcrest/mpu4.h @@ -336,7 +336,7 @@ public: void mpu4base(machine_config &config); void mpu4_bacta(machine_config &config); - DECLARE_WRITE_LINE_MEMBER(pia_gb_cb2_w); + void pia_gb_cb2_w(int state); protected: void setup_rom_banks(); @@ -369,40 +369,40 @@ protected: uint8_t bankswitch_r(); void bankset_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(cpu0_irq); - DECLARE_WRITE_LINE_MEMBER(ic2_o1_callback); - DECLARE_WRITE_LINE_MEMBER(ic2_o2_callback); - DECLARE_WRITE_LINE_MEMBER(ic2_o3_callback); + void cpu0_irq(int state); + void ic2_o1_callback(int state); + void ic2_o2_callback(int state); + void ic2_o3_callback(int state); void pia_ic3_porta_w(uint8_t data); void pia_ic3_portb_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(pia_ic3_ca2_w); - DECLARE_WRITE_LINE_MEMBER(pia_ic3_cb2_w); + void pia_ic3_ca2_w(int state); + void pia_ic3_cb2_w(int state); void pia_ic4_porta_w(uint8_t data); void pia_ic4_portb_w(uint8_t data); uint8_t pia_ic4_portb_r(); - DECLARE_WRITE_LINE_MEMBER(pia_ic4_ca2_w); - DECLARE_WRITE_LINE_MEMBER(pia_ic4_cb2_w); + void pia_ic4_ca2_w(int state); + void pia_ic4_cb2_w(int state); uint8_t pia_ic5_porta_r(); void pia_ic5_porta_w(uint8_t data); void pia_ic5_portb_w(uint8_t data); uint8_t pia_ic5_portb_r(); - DECLARE_WRITE_LINE_MEMBER(pia_ic5_cb2_w); + void pia_ic5_cb2_w(int state); void pia_ic6_portb_w(uint8_t data); void pia_ic6_porta_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(pia_ic6_ca2_w); - DECLARE_WRITE_LINE_MEMBER(pia_ic6_cb2_w); + void pia_ic6_ca2_w(int state); + void pia_ic6_cb2_w(int state); void pia_ic7_porta_w(uint8_t data); void pia_ic7_portb_w(uint8_t data); uint8_t pia_ic7_portb_r(); - DECLARE_WRITE_LINE_MEMBER(pia_ic7_ca2_w); - DECLARE_WRITE_LINE_MEMBER(pia_ic7_cb2_w); + void pia_ic7_ca2_w(int state); + void pia_ic7_cb2_w(int state); uint8_t pia_ic8_porta_r(); void pia_ic8_portb_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(pia_ic8_ca2_w); - DECLARE_WRITE_LINE_MEMBER(pia_ic8_cb2_w); + void pia_ic8_ca2_w(int state); + void pia_ic8_cb2_w(int state); - DECLARE_WRITE_LINE_MEMBER(dataport_rxd); + void dataport_rxd(int state); uint8_t bootleg806_r(address_space &space, offs_t offset); diff --git a/src/mame/barcrest/mpu4_oki_sampled_sound.cpp b/src/mame/barcrest/mpu4_oki_sampled_sound.cpp index ca584631790..932111a8c9f 100644 --- a/src/mame/barcrest/mpu4_oki_sampled_sound.cpp +++ b/src/mame/barcrest/mpu4_oki_sampled_sound.cpp @@ -153,7 +153,7 @@ uint8_t mpu4_oki_sampled_sound::pia_gb_portb_r() return data | m_expansion_latch; } -WRITE_LINE_MEMBER(mpu4_oki_sampled_sound::pia_gb_ca2_w) +void mpu4_oki_sampled_sound::pia_gb_ca2_w(int state) { LOG("OKI RESET data = %02X\n", state); if ((m_last_reset != state) && !state) @@ -166,7 +166,7 @@ WRITE_LINE_MEMBER(mpu4_oki_sampled_sound::pia_gb_ca2_w) -WRITE_LINE_MEMBER(mpu4_oki_sampled_sound::pia_gb_cb2_w) +void mpu4_oki_sampled_sound::pia_gb_cb2_w(int state) { m_cb2_handler(state); } diff --git a/src/mame/barcrest/mpu4_oki_sampled_sound.h b/src/mame/barcrest/mpu4_oki_sampled_sound.h index 1b83ba429e8..e0fd466d898 100644 --- a/src/mame/barcrest/mpu4_oki_sampled_sound.h +++ b/src/mame/barcrest/mpu4_oki_sampled_sound.h @@ -47,8 +47,8 @@ private: void pia_gb_porta_w(uint8_t data); void pia_gb_portb_w(uint8_t data); uint8_t pia_gb_portb_r(); - DECLARE_WRITE_LINE_MEMBER(pia_gb_ca2_w); - DECLARE_WRITE_LINE_MEMBER(pia_gb_cb2_w); + void pia_gb_ca2_w(int state); + void pia_gb_cb2_w(int state); }; #endif // MAME_BARCREST_MPU4_OKI_SAMPLED_SOUND_H diff --git a/src/mame/barcrest/mpu4vid.cpp b/src/mame/barcrest/mpu4vid.cpp index 96dffe7f909..020fd7243ae 100644 --- a/src/mame/barcrest/mpu4vid.cpp +++ b/src/mame/barcrest/mpu4vid.cpp @@ -301,21 +301,21 @@ private: int8_t m_cur[2]; SCN2674_DRAW_CHARACTER_MEMBER(display_pixels); - DECLARE_WRITE_LINE_MEMBER(m6809_acia_irq); - DECLARE_WRITE_LINE_MEMBER(m68k_acia_irq); - DECLARE_WRITE_LINE_MEMBER(cpu1_ptm_irq); - DECLARE_WRITE_LINE_MEMBER(vid_o1_callback); - DECLARE_WRITE_LINE_MEMBER(vid_o2_callback); - DECLARE_WRITE_LINE_MEMBER(vid_o3_callback); + void m6809_acia_irq(int state); + void m68k_acia_irq(int state); + void cpu1_ptm_irq(int state); + void vid_o1_callback(int state); + void vid_o2_callback(int state); + void vid_o3_callback(int state); uint8_t pia_ic5_porta_track_r(); - DECLARE_WRITE_LINE_MEMBER(update_mpu68_interrupts); + void update_mpu68_interrupts(int state); uint16_t mpu4_vid_vidram_r(offs_t offset); void mpu4_vid_vidram_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); EF9369_COLOR_UPDATE(ef9369_color_update); void vidcharacteriser_w(offs_t offset, uint8_t data); uint8_t vidcharacteriser_r(offs_t offset); - DECLARE_WRITE_LINE_MEMBER(mpu_video_reset); + void mpu_video_reset(int state); void vram_w(offs_t offset, uint8_t data); uint8_t vram_r(offs_t offset); void ic3ss_vid_w(offs_t offset, uint8_t data); @@ -368,7 +368,7 @@ private: */ -WRITE_LINE_MEMBER(mpu4vid_state::update_mpu68_interrupts) +void mpu4vid_state::update_mpu68_interrupts(int state) { m_videocpu->set_input_line(1, m_m6840_irq_state ? ASSERT_LINE : CLEAR_LINE); m_videocpu->set_input_line(2, m_m6850_irq_state ? ASSERT_LINE : CLEAR_LINE); @@ -376,13 +376,13 @@ WRITE_LINE_MEMBER(mpu4vid_state::update_mpu68_interrupts) /* Communications with 6809 board */ -WRITE_LINE_MEMBER(mpu4vid_state::m6809_acia_irq) +void mpu4vid_state::m6809_acia_irq(int state) { m_acia_1->write_cts(state); m_maincpu->set_input_line(M6809_IRQ_LINE, state); } -WRITE_LINE_MEMBER(mpu4vid_state::m68k_acia_irq) +void mpu4vid_state::m68k_acia_irq(int state) { m_acia_0->write_cts(state); m_m6850_irq_state = state; @@ -390,14 +390,14 @@ WRITE_LINE_MEMBER(mpu4vid_state::m68k_acia_irq) } -WRITE_LINE_MEMBER(mpu4vid_state::cpu1_ptm_irq) +void mpu4vid_state::cpu1_ptm_irq(int state) { m_m6840_irq_state = state; update_mpu68_interrupts(1); } -WRITE_LINE_MEMBER(mpu4vid_state::vid_o1_callback) +void mpu4vid_state::vid_o1_callback(int state) { m_ptm->set_c2(state); /* this output is the clock for timer2 */ @@ -408,13 +408,13 @@ WRITE_LINE_MEMBER(mpu4vid_state::vid_o1_callback) } -WRITE_LINE_MEMBER(mpu4vid_state::vid_o2_callback) +void mpu4vid_state::vid_o2_callback(int state) { m_ptm->set_c3(state); /* this output is the clock for timer3 */ } -WRITE_LINE_MEMBER(mpu4vid_state::vid_o3_callback) +void mpu4vid_state::vid_o3_callback(int state) { m_ptm->set_c1(state); /* this output is the clock for timer1 */ } @@ -1860,7 +1860,7 @@ static INPUT_PORTS_START( v4cybcas ) INPUT_PORTS_END -WRITE_LINE_MEMBER(mpu4vid_state::mpu_video_reset) +void mpu4vid_state::mpu_video_reset(int state) { m_ptm->reset(); m_acia_1->reset(); diff --git a/src/mame/be/bebox.cpp b/src/mame/be/bebox.cpp index 9aec5606578..13fa5df8354 100644 --- a/src/mame/be/bebox.cpp +++ b/src/mame/be/bebox.cpp @@ -130,7 +130,7 @@ void bebox_state::cirrus_config(device_t *device) * *************************************/ -WRITE_LINE_MEMBER(bebox_state::bebox_keyboard_interrupt) +void bebox_state::bebox_keyboard_interrupt(int state) { bebox_set_irq_bit(16, state); m_pic8259[0]->ir1_w(state); diff --git a/src/mame/be/bebox.h b/src/mame/be/bebox.h index 80af70ec3c8..1f4da3bdbc5 100644 --- a/src/mame/be/bebox.h +++ b/src/mame/be/bebox.h @@ -76,15 +76,15 @@ private: uint16_t m_dma_offset[2][4]{}; uint8_t m_at_pages[0x10]{}; uint32_t m_scsi53c810_data[0x100 / 4]{}; - DECLARE_WRITE_LINE_MEMBER(bebox_pic8259_master_set_int_line); - DECLARE_WRITE_LINE_MEMBER(bebox_pic8259_slave_set_int_line); - DECLARE_WRITE_LINE_MEMBER(bebox_dma_hrq_changed); - DECLARE_WRITE_LINE_MEMBER(bebox_dma8237_out_eop); - DECLARE_WRITE_LINE_MEMBER(pc_dack0_w); - DECLARE_WRITE_LINE_MEMBER(pc_dack1_w); - DECLARE_WRITE_LINE_MEMBER(pc_dack2_w); - DECLARE_WRITE_LINE_MEMBER(pc_dack3_w); - DECLARE_WRITE_LINE_MEMBER(bebox_timer0_w); + void bebox_pic8259_master_set_int_line(int state); + void bebox_pic8259_slave_set_int_line(int state); + void bebox_dma_hrq_changed(int state); + void bebox_dma8237_out_eop(int state); + void pc_dack0_w(int state); + void pc_dack1_w(int state); + void pc_dack2_w(int state); + void pc_dack3_w(int state); + void bebox_timer0_w(int state); uint64_t bebox_cpu0_imask_r(); uint64_t bebox_cpu1_imask_r(); uint64_t bebox_interrupt_sources_r(); @@ -110,11 +110,11 @@ private: void scsi53c810_w(offs_t offset, uint64_t data, uint64_t mem_mask = ~0); uint64_t bb_slave_64be_r(offs_t offset, uint64_t mem_mask = ~0); - DECLARE_WRITE_LINE_MEMBER(bebox_ide_interrupt); + void bebox_ide_interrupt(int state); - DECLARE_WRITE_LINE_MEMBER(bebox_keyboard_interrupt); + void bebox_keyboard_interrupt(int state); - DECLARE_WRITE_LINE_MEMBER( fdc_interrupt ); + void fdc_interrupt(int state); uint32_t scsi_fetch(uint32_t dsp); void scsi_irq_callback(int state); diff --git a/src/mame/be/bebox_m.cpp b/src/mame/be/bebox_m.cpp index 4e65a206d46..62a7266de81 100644 --- a/src/mame/be/bebox_m.cpp +++ b/src/mame/be/bebox_m.cpp @@ -319,7 +319,7 @@ void bebox_state::bebox_set_irq_bit(unsigned int interrupt_bit, int val) * *************************************/ -WRITE_LINE_MEMBER( bebox_state::fdc_interrupt ) +void bebox_state::fdc_interrupt(int state) { bebox_set_irq_bit(13, state); m_pic8259[0]->ir6_w(state); @@ -346,12 +346,12 @@ uint64_t bebox_state::bebox_interrupt_ack_r() * *************************************************************/ -WRITE_LINE_MEMBER(bebox_state::bebox_pic8259_master_set_int_line) +void bebox_state::bebox_pic8259_master_set_int_line(int state) { bebox_set_irq_bit(5, state); } -WRITE_LINE_MEMBER(bebox_state::bebox_pic8259_slave_set_int_line) +void bebox_state::bebox_pic8259_slave_set_int_line(int state) { m_pic8259[0]->ir2_w(state); } @@ -362,7 +362,7 @@ WRITE_LINE_MEMBER(bebox_state::bebox_pic8259_slave_set_int_line) * *************************************/ -WRITE_LINE_MEMBER(bebox_state::bebox_ide_interrupt) +void bebox_state::bebox_ide_interrupt(int state) { bebox_set_irq_bit(7, state); m_pic8259[0]->ir6_w(state); @@ -507,7 +507,7 @@ uint8_t bebox_state::bebox_80000480_r() } -WRITE_LINE_MEMBER(bebox_state::bebox_dma_hrq_changed) +void bebox_state::bebox_dma_hrq_changed(int state) { m_ppc[0]->set_input_line(INPUT_LINE_HALT, state ? ASSERT_LINE : CLEAR_LINE); @@ -533,7 +533,8 @@ void bebox_state::bebox_dma_write_byte(offs_t offset, uint8_t data) prog_space.write_byte(page_offset + offset, data); } -WRITE_LINE_MEMBER(bebox_state::bebox_dma8237_out_eop){ +void bebox_state::bebox_dma8237_out_eop(int state) +{ m_smc37c78->tc_w(state); } @@ -542,10 +543,10 @@ inline void bebox_state::set_dma_channel(int channel, int state) if (!state) m_dma_channel = channel; } -WRITE_LINE_MEMBER(bebox_state::pc_dack0_w){ set_dma_channel(0, state); } -WRITE_LINE_MEMBER(bebox_state::pc_dack1_w){ set_dma_channel(1, state); } -WRITE_LINE_MEMBER(bebox_state::pc_dack2_w){ set_dma_channel(2, state); } -WRITE_LINE_MEMBER(bebox_state::pc_dack3_w){ set_dma_channel(3, state); } +void bebox_state::pc_dack0_w(int state) { set_dma_channel(0, state); } +void bebox_state::pc_dack1_w(int state) { set_dma_channel(1, state); } +void bebox_state::pc_dack2_w(int state) { set_dma_channel(2, state); } +void bebox_state::pc_dack3_w(int state) { set_dma_channel(3, state); } /************************************* * @@ -553,7 +554,7 @@ WRITE_LINE_MEMBER(bebox_state::pc_dack3_w){ set_dma_channel(3, state); } * *************************************/ -WRITE_LINE_MEMBER(bebox_state::bebox_timer0_w) +void bebox_state::bebox_timer0_w(int state) { m_pic8259[0]->ir0_w(state); } diff --git a/src/mame/beehive/microb.cpp b/src/mame/beehive/microb.cpp index 3155bf93bbf..e21c807c87e 100644 --- a/src/mame/beehive/microb.cpp +++ b/src/mame/beehive/microb.cpp @@ -53,7 +53,7 @@ protected: virtual void machine_start() override; private: - DECLARE_WRITE_LINE_MEMBER(dmac_hrq_w); + void dmac_hrq_w(int state); u8 dmac_mem_r(offs_t offset); void dmac_mem_w(offs_t offset, u8 data); I8275_DRAW_CHARACTER_MEMBER(draw_character); @@ -75,7 +75,7 @@ private: u8 m_keyline = 0U; }; -WRITE_LINE_MEMBER(microb_state::dmac_hrq_w) +void microb_state::dmac_hrq_w(int state) { m_maincpu->set_input_line(INPUT_LINE_HALT, state ? ASSERT_LINE : CLEAR_LINE); m_dmac->hlda_w(state); diff --git a/src/mame/bfm/bfcobra.cpp b/src/mame/bfm/bfcobra.cpp index 1801b2a009a..5c89a5be102 100644 --- a/src/mame/bfm/bfcobra.cpp +++ b/src/mame/bfm/bfcobra.cpp @@ -290,10 +290,10 @@ protected: void latch_w(offs_t offset, uint8_t data); uint8_t upd_r(); void upd_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(z80_acia_irq); - DECLARE_WRITE_LINE_MEMBER(m6809_data_irq); - DECLARE_WRITE_LINE_MEMBER(data_acia_tx_w); - DECLARE_WRITE_LINE_MEMBER(write_acia_clock); + void z80_acia_irq(int state); + void m6809_data_irq(int state); + void data_acia_tx_w(int state); + void write_acia_clock(int state); virtual void machine_reset() override; virtual void video_start() override; uint32_t screen_update_bfcobra(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); @@ -1572,26 +1572,26 @@ void bfcobra_state::init_ram() } -WRITE_LINE_MEMBER(bfcobra_state::z80_acia_irq) +void bfcobra_state::z80_acia_irq(int state) { m_acia_irq = state; update_irqs(); } -WRITE_LINE_MEMBER(bfcobra_state::m6809_data_irq) +void bfcobra_state::m6809_data_irq(int state) { m_audiocpu->set_input_line(M6809_IRQ_LINE, state ? ASSERT_LINE : CLEAR_LINE); } -WRITE_LINE_MEMBER(bfcobra_state::data_acia_tx_w) +void bfcobra_state::data_acia_tx_w(int state) { m_data_t = state; } -WRITE_LINE_MEMBER(bfcobra_state::write_acia_clock) +void bfcobra_state::write_acia_clock(int state) { m_acia6850_0->write_txc(state); m_acia6850_0->write_rxc(state); @@ -1808,10 +1808,10 @@ private: void output0_w(uint8_t data); uint8_t input0_r(); uint8_t input1_r(); - DECLARE_WRITE_LINE_MEMBER(z8s180_acia_irq); - DECLARE_WRITE_LINE_MEMBER(data_acia_tx_w); - DECLARE_WRITE_LINE_MEMBER(write_acia_clock); - DECLARE_WRITE_LINE_MEMBER(upd7759_generate_dreq ); + void z8s180_acia_irq(int state); + void data_acia_tx_w(int state); + void write_acia_clock(int state); + void upd7759_generate_dreq(int state); uint32_t screen_update_bfcobjam(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(timer_irq); TIMER_CALLBACK_MEMBER( scanline_callback ); @@ -2422,7 +2422,7 @@ TIMER_CALLBACK_MEMBER( bfcobjam_state::scanline_callback ) update_irqs(); } -WRITE_LINE_MEMBER(bfcobjam_state::z8s180_acia_irq) +void bfcobjam_state::z8s180_acia_irq(int state) { m_acia_irq = state; update_irqs(); @@ -2606,7 +2606,7 @@ void bfcobjam_state::upd7759_w(uint8_t data) m_upd7759_int->port_w(data); } -WRITE_LINE_MEMBER( bfcobjam_state::upd7759_generate_dreq ) +void bfcobjam_state::upd7759_generate_dreq(int state) { if( state ) { @@ -2750,7 +2750,7 @@ void bfcobjam_state::machine_reset() m_dm01->reset(); } -WRITE_LINE_MEMBER(bfcobjam_state::write_acia_clock) +void bfcobjam_state::write_acia_clock(int state) { m_acia6850_0->write_txc(state); m_acia6850_0->write_rxc(state); diff --git a/src/mame/bfm/bfm_adr2.cpp b/src/mame/bfm/bfm_adr2.cpp index fe30ec1c6fd..62d02f3ba7d 100644 --- a/src/mame/bfm/bfm_adr2.cpp +++ b/src/mame/bfm/bfm_adr2.cpp @@ -219,7 +219,7 @@ uint32_t bfm_adder2_device::screen_update(screen_device &screen, bitmap_ind16 &b } -WRITE_LINE_MEMBER(bfm_adder2_device::vbl_w) +void bfm_adder2_device::vbl_w(int state) { if (state && BIT(m_c101, 0)) { diff --git a/src/mame/bfm/bfm_adr2.h b/src/mame/bfm/bfm_adr2.h index 064ac9b8944..91fdfc478bb 100644 --- a/src/mame/bfm/bfm_adr2.h +++ b/src/mame/bfm/bfm_adr2.h @@ -64,7 +64,7 @@ private: void prg_map(address_map &map); uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(vbl_w); + void vbl_w(int state); }; // device type definition diff --git a/src/mame/bfm/bfm_bd1.cpp b/src/mame/bfm/bfm_bd1.cpp index 9e1e5dd946e..6047cedbf0e 100644 --- a/src/mame/bfm/bfm_bd1.cpp +++ b/src/mame/bfm/bfm_bd1.cpp @@ -580,10 +580,10 @@ void bfm_bd1_device::shift_clock(int state) m_sclk = state; } -WRITE_LINE_MEMBER( bfm_bd1_device::sclk ) { shift_clock(state); } -WRITE_LINE_MEMBER( bfm_bd1_device::data ) { m_data = state; } +void bfm_bd1_device::sclk(int state) { shift_clock(state); } +void bfm_bd1_device::data(int state) { m_data = state; } -WRITE_LINE_MEMBER( bfm_bd1_device::por ) +void bfm_bd1_device::por(int state) { if (!state) { diff --git a/src/mame/bfm/bfm_bd1.h b/src/mame/bfm/bfm_bd1.h index 2d0b735535e..5d21318134d 100644 --- a/src/mame/bfm/bfm_bd1.h +++ b/src/mame/bfm/bfm_bd1.h @@ -27,9 +27,9 @@ public: void shift_clock(int state); void setdata(int segdata, int data); uint16_t set_display(uint16_t segin); - DECLARE_WRITE_LINE_MEMBER( sclk ); - DECLARE_WRITE_LINE_MEMBER( data ); - DECLARE_WRITE_LINE_MEMBER( por ); + void sclk(int state); + void data(int state); + void por(int state); protected: virtual void device_start() override; diff --git a/src/mame/bfm/bfm_sc1.cpp b/src/mame/bfm/bfm_sc1.cpp index 998e642cfac..4d8c0c42b9d 100644 --- a/src/mame/bfm/bfm_sc1.cpp +++ b/src/mame/bfm/bfm_sc1.cpp @@ -150,7 +150,7 @@ public: void scorpion1_viper(machine_config &config); protected: - template DECLARE_WRITE_LINE_MEMBER(reel_optic_cb) { if (state) m_optic_pattern |= (1 << N); else m_optic_pattern &= ~(1 << N); } + template void reel_optic_cb(int state) { if (state) m_optic_pattern |= (1 << N); else m_optic_pattern &= ~(1 << N); } void bankswitch_w(uint8_t data); uint8_t irqlatch_r(); void reel12_w(uint8_t data); diff --git a/src/mame/bfm/bfm_sc2.cpp b/src/mame/bfm/bfm_sc2.cpp index d9ffdf57ca7..61fbe3a95ad 100644 --- a/src/mame/bfm/bfm_sc2.cpp +++ b/src/mame/bfm/bfm_sc2.cpp @@ -228,7 +228,7 @@ public: protected: void e2ram_init(nvram_device &nvram, void *data, size_t size); - DECLARE_WRITE_LINE_MEMBER(bfmdm01_busy); + void bfmdm01_busy(int state); void bankswitch_w(uint8_t data); void mmtr_w(uint8_t data); void mux_output_w(offs_t offset, uint8_t data); @@ -376,7 +376,7 @@ public: void init_drwho(); protected: - template DECLARE_WRITE_LINE_MEMBER(reel_optic_cb) { if (state) m_optic_pattern |= (1 << N); else m_optic_pattern &= ~(1 << N); } + template void reel_optic_cb(int state) { if (state) m_optic_pattern |= (1 << N); else m_optic_pattern &= ~(1 << N); } void reel12_w(uint8_t data); void reel34_w(uint8_t data); void reel56_w(uint8_t data); @@ -2813,7 +2813,7 @@ void bfm_sc2_state::sc3_expansion_w(offs_t offset, uint8_t data) } #endif -WRITE_LINE_MEMBER(bfm_sc2_state::bfmdm01_busy) +void bfm_sc2_state::bfmdm01_busy(int state) { Scorpion2_SetSwitchState(4,4, state?0:1); } diff --git a/src/mame/bfm/bfm_sc4.cpp b/src/mame/bfm/bfm_sc4.cpp index 83df93c11eb..85555ea8057 100644 --- a/src/mame/bfm/bfm_sc4.cpp +++ b/src/mame/bfm/bfm_sc4.cpp @@ -823,7 +823,7 @@ void sc4_state::machine_start() } -WRITE_LINE_MEMBER(sc4_state::bfm_sc4_duart_irq_handler) +void sc4_state::bfm_sc4_duart_irq_handler(int state) { // triggers after reel tests on luckb, at the start on dnd... // not sure this is right, causes some games to crash @@ -834,7 +834,7 @@ WRITE_LINE_MEMBER(sc4_state::bfm_sc4_duart_irq_handler) } } -WRITE_LINE_MEMBER(sc4_state::bfm_sc4_duart_txa) +void sc4_state::bfm_sc4_duart_txa(int state) { logerror("bfm_sc4_duart_tx\n"); } @@ -866,7 +866,7 @@ void sc4_state::bfm_sc4_duart_output_w(uint8_t data) } -WRITE_LINE_MEMBER(sc4_state::m68307_duart_txa) +void sc4_state::m68307_duart_txa(int state) { logerror("m68307_duart_tx %02x\n", state); } @@ -883,7 +883,7 @@ void sc4_state::m68307_duart_output_w(uint8_t data) } /* default dmd */ -WRITE_LINE_MEMBER(sc4_state::bfmdm01_busy) +void sc4_state::bfmdm01_busy(int state) { // Must tie back to inputs somehow! } diff --git a/src/mame/bfm/bfm_sc4.h b/src/mame/bfm/bfm_sc4.h index df79f02dda2..64833d5b637 100644 --- a/src/mame/bfm/bfm_sc4.h +++ b/src/mame/bfm/bfm_sc4.h @@ -161,7 +161,7 @@ public: int m_reel4_latch = 0; int m_reel56_latch = 0; int m_optic_pattern = 0; - template DECLARE_WRITE_LINE_MEMBER(reel_optic_cb) { if (state) m_optic_pattern |= (1 << N); else m_optic_pattern &= ~(1 << N); } + template void reel_optic_cb(int state) { if (state) m_optic_pattern |= (1 << N); else m_optic_pattern &= ~(1 << N); } int m_meterstatus = 0; @@ -173,19 +173,19 @@ public: uint8_t read_input_matrix(int row); - DECLARE_WRITE_LINE_MEMBER(bfmdm01_busy); + void bfmdm01_busy(int state); uint16_t sc4_mem_r(offs_t offset, uint16_t mem_mask = ~0); void sc4_mem_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); uint16_t sc4_cs1_r(offs_t offset, uint16_t mem_mask = ~0); - DECLARE_WRITE_LINE_MEMBER(bfm_sc4_duart_irq_handler); - DECLARE_WRITE_LINE_MEMBER(bfm_sc4_duart_txa); + void bfm_sc4_duart_irq_handler(int state); + void bfm_sc4_duart_txa(int state); uint8_t bfm_sc4_duart_input_r(); void bfm_sc4_duart_output_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(m68307_duart_txa); + void m68307_duart_txa(int state); uint8_t m68307_duart_input_r(); void m68307_duart_output_w(uint8_t data); diff --git a/src/mame/bfm/bfm_sc5.cpp b/src/mame/bfm/bfm_sc5.cpp index 4e696e3e4aa..a2fae71d02a 100644 --- a/src/mame/bfm/bfm_sc5.cpp +++ b/src/mame/bfm/bfm_sc5.cpp @@ -314,12 +314,12 @@ void bfm_sc5_state::sc5_10202F0_w(offs_t offset, uint8_t data) } -WRITE_LINE_MEMBER(bfm_sc5_state::bfm_sc5_duart_irq_handler) +void bfm_sc5_state::bfm_sc5_duart_irq_handler(int state) { logerror("bfm_sc5_duart_irq_handler\n"); } -WRITE_LINE_MEMBER(bfm_sc5_state::bfm_sc5_duart_txa) +void bfm_sc5_state::bfm_sc5_duart_txa(int state) { logerror("bfm_sc5_duart_tx\n"); } diff --git a/src/mame/bfm/bfm_sc5.h b/src/mame/bfm/bfm_sc5.h index 59e9ede898c..15101b51d90 100644 --- a/src/mame/bfm/bfm_sc5.h +++ b/src/mame/bfm/bfm_sc5.h @@ -33,8 +33,8 @@ protected: void sc5_mux1_w(offs_t offset, uint8_t data); void sc5_mux2_w(offs_t offset, uint8_t data); - DECLARE_WRITE_LINE_MEMBER(bfm_sc5_duart_irq_handler); - DECLARE_WRITE_LINE_MEMBER(bfm_sc5_duart_txa); + void bfm_sc5_duart_irq_handler(int state); + void bfm_sc5_duart_txa(int state); uint8_t bfm_sc5_duart_input_r(); void bfm_sc5_duart_output_w(uint8_t data); }; diff --git a/src/mame/bfm/bfmsys85.cpp b/src/mame/bfm/bfmsys85.cpp index d9af14ad13a..cea21677018 100644 --- a/src/mame/bfm/bfmsys85.cpp +++ b/src/mame/bfm/bfmsys85.cpp @@ -124,7 +124,7 @@ private: required_device m_meters; output_finder<256> m_lamps; - template DECLARE_WRITE_LINE_MEMBER(reel_optic_cb) { if (state) m_optic_pattern |= (1 << N); else m_optic_pattern &= ~(1 << N); } + template void reel_optic_cb(int state) { if (state) m_optic_pattern |= (1 << N); else m_optic_pattern &= ~(1 << N); } void watchdog_w(uint8_t data); uint8_t irqlatch_r(); void reel12_w(uint8_t data); @@ -139,8 +139,8 @@ private: void mux_enable_w(uint8_t data); void triac_w(uint8_t data); uint8_t triac_r(); - DECLARE_WRITE_LINE_MEMBER(sys85_data_w); - DECLARE_WRITE_LINE_MEMBER(write_acia_clock); + void sys85_data_w(int state); + void write_acia_clock(int state); int b85_find_project_string(); }; @@ -151,13 +151,13 @@ private: /////////////////////////////////////////////////////////////////////////// -WRITE_LINE_MEMBER(bfmsys85_state::sys85_data_w) +void bfmsys85_state::sys85_data_w(int state) { m_sys85_data_line_t = state; } -WRITE_LINE_MEMBER(bfmsys85_state::write_acia_clock) +void bfmsys85_state::write_acia_clock(int state) { m_acia6850_0->write_txc(state); m_acia6850_0->write_rxc(state); diff --git a/src/mame/bfm/rastersp.cpp b/src/mame/bfm/rastersp.cpp index c6d2f75eb80..85cc5e551ff 100644 --- a/src/mame/bfm/rastersp.cpp +++ b/src/mame/bfm/rastersp.cpp @@ -160,12 +160,12 @@ private: void dsp_speedup_w(uint32_t data); uint32_t ncr53c700_read(offs_t offset, uint32_t mem_mask = ~0); void ncr53c700_write(offs_t offset, uint32_t data, uint32_t mem_mask = ~0); - DECLARE_WRITE_LINE_MEMBER(scsi_irq); + void scsi_irq(int state); TIMER_CALLBACK_MEMBER(tms_timer1); TIMER_CALLBACK_MEMBER(tms_tx_timer); - DECLARE_WRITE_LINE_MEMBER(vblank_irq); - DECLARE_WRITE_LINE_MEMBER(duart_irq); + void vblank_irq(int state); + void duart_irq(int state); uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void upload_palette(uint32_t word1, uint32_t word2); @@ -206,7 +206,7 @@ public: void fbcrazy(machine_config &config); - DECLARE_READ_LINE_MEMBER(meter_pulse_r); + int meter_pulse_r(); protected: virtual void machine_reset() override; @@ -227,7 +227,7 @@ private: void dsp_map(address_map &map); TIMER_CALLBACK_MEMBER(trackball_timer); - DECLARE_WRITE_LINE_MEMBER(trackball_rts); + void trackball_rts(int state); uint8_t m_aux_port3_data; uint8_t m_trackball_ctr; @@ -607,7 +607,7 @@ void rastersp_state::update_irq(uint32_t which, uint32_t state) } -WRITE_LINE_MEMBER( rastersp_state::scsi_irq ) +void rastersp_state::scsi_irq(int state) { update_irq(IRQ_SCSI, state); @@ -619,19 +619,19 @@ WRITE_LINE_MEMBER( rastersp_state::scsi_irq ) } -WRITE_LINE_MEMBER( rastersp_state::vblank_irq ) +void rastersp_state::vblank_irq(int state) { if (state) update_irq(IRQ_VBLANK, ASSERT_LINE); } -WRITE_LINE_MEMBER( rastersp_state::duart_irq ) +void rastersp_state::duart_irq(int state) { update_irq(IRQ_UART, state); } -WRITE_LINE_MEMBER( fbcrazy_state::trackball_rts ) +void fbcrazy_state::trackball_rts(int state) { m_trackball_enabled = state; } @@ -899,7 +899,7 @@ void fbcrazy_state::aux_port4_w(offs_t offset, uint8_t data) // Bit 7 - 5p lockout } -READ_LINE_MEMBER(fbcrazy_state::meter_pulse_r) +int fbcrazy_state::meter_pulse_r() { return m_aux_port3_data & 0xbc ? 1 : 0; } diff --git a/src/mame/bmc/bmcbowl.cpp b/src/mame/bmc/bmcbowl.cpp index c38dc14a047..999f822de51 100644 --- a/src/mame/bmc/bmcbowl.cpp +++ b/src/mame/bmc/bmcbowl.cpp @@ -143,7 +143,7 @@ private: void scroll_w(uint16_t data); void via_a_out(uint8_t data); void via_b_out(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(via_ca2_out); + void via_ca2_out(int state); uint8_t dips1_r(); void input_mux_w(uint8_t data); void int_ack_w(uint8_t data); @@ -249,7 +249,7 @@ void bmcbowl_state::via_b_out(uint8_t data) //used } -WRITE_LINE_MEMBER(bmcbowl_state::via_ca2_out) +void bmcbowl_state::via_ca2_out(int state) { //used } diff --git a/src/mame/bmc/bmcpokr.cpp b/src/mame/bmc/bmcpokr.cpp index 882a50c7682..ce4f30325b9 100644 --- a/src/mame/bmc/bmcpokr.cpp +++ b/src/mame/bmc/bmcpokr.cpp @@ -47,7 +47,7 @@ public: m_palette(*this, "palette") { } - DECLARE_READ_LINE_MEMBER(hopper_r); + int hopper_r(); void bmcpokr(machine_config &config); void mjmaglmp(machine_config &config); @@ -339,7 +339,7 @@ uint16_t bmcpokr_state::dsw_r() return 0xff << 8; } -READ_LINE_MEMBER(bmcpokr_state::hopper_r) +int bmcpokr_state::hopper_r() { // motor off should clear the sense bit (I guess ticket.c should actually do this). // Otherwise a hopper bit stuck low will prevent several keys from being registered. diff --git a/src/mame/bondwell/bw12.cpp b/src/mame/bondwell/bw12.cpp index b81e7bcf380..730c8aec04d 100644 --- a/src/mame/bondwell/bw12.cpp +++ b/src/mame/bondwell/bw12.cpp @@ -96,29 +96,29 @@ TIMER_DEVICE_CALLBACK_MEMBER(bw12_state::floppy_motor_off_tick) m_motor_on = 0; } -WRITE_LINE_MEMBER(bw12_state::ls138_a0_w) +void bw12_state::ls138_a0_w(int state) { m_curbank = (m_curbank & 0x02) | state; bankswitch(); } -WRITE_LINE_MEMBER(bw12_state::ls138_a1_w) +void bw12_state::ls138_a1_w(int state) { m_curbank = (state << 1) | (m_curbank & 0x01); bankswitch(); } -WRITE_LINE_MEMBER(bw12_state::init_w) +void bw12_state::init_w(int state) { } -WRITE_LINE_MEMBER(bw12_state::motor0_w) +void bw12_state::motor0_w(int state) { m_motor0 = state; floppy_motor_on_off(); } -WRITE_LINE_MEMBER(bw12_state::motor1_w) +void bw12_state::motor1_w(int state) { m_motor1 = state; floppy_motor_on_off(); @@ -330,17 +330,17 @@ MC6845_UPDATE_ROW( bw12_state::crtc_update_row ) /* PIA6821 Interface */ -WRITE_LINE_MEMBER( bw12_state::write_centronics_busy ) +void bw12_state::write_centronics_busy(int state) { m_centronics_busy = state; } -WRITE_LINE_MEMBER( bw12_state::write_centronics_fault ) +void bw12_state::write_centronics_fault(int state) { m_centronics_fault = state; } -WRITE_LINE_MEMBER( bw12_state::write_centronics_perror ) +void bw12_state::write_centronics_perror(int state) { m_centronics_perror = state; } @@ -376,7 +376,7 @@ uint8_t bw12_state::pia_pa_r() return data; } -WRITE_LINE_MEMBER( bw12_state::pia_cb2_w ) +void bw12_state::pia_cb2_w(int state) { if (state) { @@ -392,24 +392,24 @@ WRITE_LINE_MEMBER( bw12_state::pia_cb2_w ) /* PIT8253 Interface */ -WRITE_LINE_MEMBER( bw12_state::pit_out2_w ) +void bw12_state::pit_out2_w(int state) { m_pit_out2 = state; } /* AY-5-3600-PRO-002 Interface */ -READ_LINE_MEMBER( bw12_state::ay3600_shift_r ) +int bw12_state::ay3600_shift_r() { return BIT(m_modifiers->read(), 0); } -READ_LINE_MEMBER( bw12_state::ay3600_control_r ) +int bw12_state::ay3600_control_r() { return BIT(m_modifiers->read(), 1); } -WRITE_LINE_MEMBER( bw12_state::ay3600_data_ready_w ) +void bw12_state::ay3600_data_ready_w(int state) { m_key_stb = state; diff --git a/src/mame/bondwell/bw12.h b/src/mame/bondwell/bw12.h index 72e55a57b43..496d749fada 100644 --- a/src/mame/bondwell/bw12.h +++ b/src/mame/bondwell/bw12.h @@ -68,19 +68,19 @@ public: private: void bankswitch(); - DECLARE_WRITE_LINE_MEMBER( ls138_a0_w ); - DECLARE_WRITE_LINE_MEMBER( ls138_a1_w ); - DECLARE_WRITE_LINE_MEMBER( init_w ); - DECLARE_WRITE_LINE_MEMBER( motor0_w ); - DECLARE_WRITE_LINE_MEMBER( motor1_w ); + void ls138_a0_w(int state); + void ls138_a1_w(int state); + void init_w(int state); + void motor0_w(int state); + void motor1_w(int state); uint8_t ls259_r(offs_t offset); uint8_t pia_pa_r(); - DECLARE_WRITE_LINE_MEMBER( pia_cb2_w ); - DECLARE_WRITE_LINE_MEMBER( pit_out2_w ); - DECLARE_READ_LINE_MEMBER( ay3600_shift_r ); - DECLARE_READ_LINE_MEMBER( ay3600_control_r ); - DECLARE_WRITE_LINE_MEMBER( ay3600_data_ready_w ); + void pia_cb2_w(int state); + void pit_out2_w(int state); + int ay3600_shift_r(); + int ay3600_control_r(); + void ay3600_data_ready_w(int state); MC6845_UPDATE_ROW( crtc_update_row ); void floppy_motor_on_off(); @@ -88,9 +88,9 @@ private: static void bw12_floppy_formats(format_registration &fr); static void bw14_floppy_formats(format_registration &fr); - DECLARE_WRITE_LINE_MEMBER(write_centronics_busy); - DECLARE_WRITE_LINE_MEMBER(write_centronics_fault); - DECLARE_WRITE_LINE_MEMBER(write_centronics_perror); + void write_centronics_busy(int state); + void write_centronics_fault(int state); + void write_centronics_perror(int state); void common(machine_config &config); void bw12_io(address_map &map); diff --git a/src/mame/bondwell/bw2.cpp b/src/mame/bondwell/bw2.cpp index 14f38fc75b7..fefc5deff83 100644 --- a/src/mame/bondwell/bw2.cpp +++ b/src/mame/bondwell/bw2.cpp @@ -361,7 +361,7 @@ INPUT_PORTS_END // DEVICE CONFIGURATION //************************************************************************** -WRITE_LINE_MEMBER( bw2_state::write_centronics_busy ) +void bw2_state::write_centronics_busy(int state) { m_centronics_busy = state; } @@ -468,7 +468,7 @@ uint8_t bw2_state::ppi_pc_r() // pit8253_config pit_intf //------------------------------------------------- -WRITE_LINE_MEMBER( bw2_state::mtron_w ) +void bw2_state::mtron_w(int state) { m_mtron = state; m_mfdbk = !state; @@ -480,7 +480,7 @@ WRITE_LINE_MEMBER( bw2_state::mtron_w ) // floppy_formats //------------------------------------------------- -WRITE_LINE_MEMBER( bw2_state::fdc_drq_w ) +void bw2_state::fdc_drq_w(int state) { if (state) { diff --git a/src/mame/bondwell/bw2.h b/src/mame/bondwell/bw2.h index 31656857366..4d8b47a9719 100644 --- a/src/mame/bondwell/bw2.h +++ b/src/mame/bondwell/bw2.h @@ -71,9 +71,9 @@ public: void ppi_pc_w(uint8_t data); uint8_t ppi_pc_r(); - DECLARE_WRITE_LINE_MEMBER( mtron_w ); + void mtron_w(int state); - DECLARE_WRITE_LINE_MEMBER( fdc_drq_w ); + void fdc_drq_w(int state); static void floppy_formats(format_registration &fr); // keyboard state @@ -90,7 +90,7 @@ public: optional_shared_ptr m_video_ram; void bw2_palette(palette_device &palette) const; - DECLARE_WRITE_LINE_MEMBER(write_centronics_busy); + void write_centronics_busy(int state); int m_centronics_busy; void bw2(machine_config &config); void bw2_io(address_map &map); diff --git a/src/mame/brother/lw30.cpp b/src/mame/brother/lw30.cpp index 4a312011360..bc32ce1c7c8 100644 --- a/src/mame/brother/lw30.cpp +++ b/src/mame/brother/lw30.cpp @@ -139,7 +139,7 @@ protected: void sound_stream_update(sound_stream &stream, std::vector const &inputs, std::vector &outputs) override; public: - DECLARE_WRITE_LINE_MEMBER(set_state); // enable/disable sound output + void set_state(int state); // enable/disable sound output void set_clock(uint32_t frequency); // output frequency private: @@ -216,7 +216,7 @@ void lw30_beep_device::sound_stream_update(sound_stream &stream, std::vectorset_input_line(INPUT_LINE_IRQ1, ASSERT_LINE); } -WRITE_LINE_MEMBER(lw450_state::crtc_vsync) +void lw450_state::crtc_vsync(int state) { if(state) { framecnt++; diff --git a/src/mame/brother/lw840.cpp b/src/mame/brother/lw840.cpp index 3a62ef80a04..80990ba7084 100644 --- a/src/mame/brother/lw840.cpp +++ b/src/mame/brother/lw840.cpp @@ -173,11 +173,11 @@ private: fr.add(FLOPPY_PC_FORMAT); } - DECLARE_WRITE_LINE_MEMBER(fdc_interrupt) + void fdc_interrupt(int state) { maincpu->set_input_line(INPUT_LINE_IRQ4, state ? ASSERT_LINE : CLEAR_LINE); } - DECLARE_WRITE_LINE_MEMBER(fdc_drq) + void fdc_drq(int state) { maincpu->set_input_line(H8_INPUT_LINE_DREQ0, state ? ASSERT_LINE : CLEAR_LINE); } diff --git a/src/mame/canon/cat.cpp b/src/mame/canon/cat.cpp index 15d8c86744d..8a089c941e6 100644 --- a/src/mame/canon/cat.cpp +++ b/src/mame/canon/cat.cpp @@ -295,11 +295,11 @@ private: uint32_t screen_update_cat(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(cat_duart_irq_handler); - DECLARE_WRITE_LINE_MEMBER(cat_duart_txa); - DECLARE_WRITE_LINE_MEMBER(cat_duart_txb); + void cat_duart_irq_handler(int state); + void cat_duart_txa(int state); + void cat_duart_txb(int state); void cat_duart_output(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(prn_ack_ff); + void prn_ack_ff(int state); uint16_t cat_floppy_control_r(offs_t offset); void cat_floppy_control_w(offs_t offset, uint16_t data); @@ -967,7 +967,7 @@ uint32_t cat_state::screen_update_cat(screen_device &screen, bitmap_rgb32 &bitma * The duart also will, if configured to do so, fire an int when the state * changes of the centronics /ACK pin; this is used while printing. */ -WRITE_LINE_MEMBER(cat_state::cat_duart_irq_handler) +void cat_state::cat_duart_irq_handler(int state) { #ifdef DEBUG_DUART_IRQ_HANDLER fprintf(stderr, "Duart IRQ handler called: state: %02X, vector: %06X\n", state, irqvector); @@ -975,14 +975,14 @@ WRITE_LINE_MEMBER(cat_state::cat_duart_irq_handler) m_maincpu->set_input_line(M68K_IRQ_1, state); } -WRITE_LINE_MEMBER(cat_state::cat_duart_txa) // semit sends stuff here; connects to the serial port on the back +void cat_state::cat_duart_txa(int state) // semit sends stuff here; connects to the serial port on the back { #ifdef DEBUG_DUART_TXA fprintf(stderr, "Duart TXA: data %02X\n", state); #endif } -WRITE_LINE_MEMBER(cat_state::cat_duart_txb) // memit sends stuff here; connects to the modem chip +void cat_state::cat_duart_txb(int state) // memit sends stuff here; connects to the modem chip { #ifdef DEBUG_DUART_TXB fprintf(stderr, "Duart TXB: data %02X\n", state); @@ -1025,7 +1025,7 @@ void cat_state::cat_duart_output(uint8_t data) m_speaker->level_w((data >> 3) & 1); } -WRITE_LINE_MEMBER(cat_state::prn_ack_ff) // switch the flipflop state on the rising edge of /ACK +void cat_state::prn_ack_ff(int state) // switch the flipflop state on the rising edge of /ACK { if ((m_duart_prn_ack_prev_state == 0) && (state == 1)) { diff --git a/src/mame/capcom/commando.cpp b/src/mame/capcom/commando.cpp index 3ebd5412f4c..a03ddeb68b7 100644 --- a/src/mame/capcom/commando.cpp +++ b/src/mame/capcom/commando.cpp @@ -230,7 +230,7 @@ private: TILE_GET_INFO_MEMBER(get_bg_tile_info); TILE_GET_INFO_MEMBER(get_fg_tile_info); uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(vblank_irq); + void vblank_irq(int state); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); void main_map(address_map &map); @@ -523,7 +523,7 @@ GFXDECODE_END // Interrupt Generator -WRITE_LINE_MEMBER(commando_state::vblank_irq) +void commando_state::vblank_irq(int state) { if (state) m_maincpu->set_input_line_and_vector(0, HOLD_LINE, 0xd7); // Z80 - RST 10h - VBLANK diff --git a/src/mame/capcom/cps1.h b/src/mame/capcom/cps1.h index 9a033e2899a..fc5a3ff79ed 100644 --- a/src/mame/capcom/cps1.h +++ b/src/mame/capcom/cps1.h @@ -222,7 +222,7 @@ protected: virtual void render_layers(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_cps1(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(screen_vblank_cps1); + void screen_vblank_cps1(int state); void kabuki_setup(void (*decode)(uint8_t *src, uint8_t *dst)); diff --git a/src/mame/capcom/cps1_v.cpp b/src/mame/capcom/cps1_v.cpp index 828ada85c29..9072cf6df16 100644 --- a/src/mame/capcom/cps1_v.cpp +++ b/src/mame/capcom/cps1_v.cpp @@ -3112,7 +3112,7 @@ uint32_t cps_state::screen_update_cps1(screen_device &screen, bitmap_ind16 &bitm return 0; } -WRITE_LINE_MEMBER(cps_state::screen_vblank_cps1) +void cps_state::screen_vblank_cps1(int state) { // rising edge if (state) diff --git a/src/mame/capcom/cps1bl_5205.cpp b/src/mame/capcom/cps1bl_5205.cpp index 661394a0f3d..04080206adf 100644 --- a/src/mame/capcom/cps1bl_5205.cpp +++ b/src/mame/capcom/cps1bl_5205.cpp @@ -74,7 +74,7 @@ private: void captcommb2_soundlatch_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); uint8_t captcommb2_soundlatch_r(); void captcommb2_snd_bankswitch_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(captcommb2_mux_select_w); + void captcommb2_mux_select_w(int state); void knightsb_layer_w(offs_t offset, uint16_t data); void sf2b_layer_w(offs_t offset, uint16_t data); void sf2mdt_layer_w(offs_t offset, uint16_t data); @@ -163,7 +163,7 @@ void cps1bl_5205_state::captcommb2_snd_bankswitch_w(uint8_t data) membank("bank1")->set_entry(data & 0x0f); } -WRITE_LINE_MEMBER(cps1bl_5205_state::captcommb2_mux_select_w) +void cps1bl_5205_state::captcommb2_mux_select_w(int state) { // toggle both mux select pins (and fire /nmi) // vck halved by flipflop IC186 ~2kHz diff --git a/src/mame/capcom/cps3.cpp b/src/mame/capcom/cps3.cpp index c1736e4f5af..cc3bb417099 100644 --- a/src/mame/capcom/cps3.cpp +++ b/src/mame/capcom/cps3.cpp @@ -2263,7 +2263,7 @@ static INPUT_PORTS_START( cps3_jojo) PORT_BIT( 0x00200000, IP_ACTIVE_LOW, IPT_BUTTON5 ) PORT_PLAYER(2) INPUT_PORTS_END -WRITE_LINE_MEMBER(cps3_state::vbl_interrupt) +void cps3_state::vbl_interrupt(int state) { if (state) m_maincpu->set_input_line(12, ASSERT_LINE); diff --git a/src/mame/capcom/cps3.h b/src/mame/capcom/cps3.h index d32413be652..51d4ccc7e16 100644 --- a/src/mame/capcom/cps3.h +++ b/src/mame/capcom/cps3.h @@ -168,7 +168,7 @@ private: SH2_DMA_KLUDGE_CB(dma_callback); void draw_fg_layer(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); u32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); - WRITE_LINE_MEMBER(vbl_interrupt); + void vbl_interrupt(int state); TIMER_DEVICE_CALLBACK_MEMBER(dma_interrupt); TIMER_DEVICE_CALLBACK_MEMBER(sprite_dma_cb); u16 rotate_left(u16 value, int n); diff --git a/src/mame/capcom/fcrash.cpp b/src/mame/capcom/fcrash.cpp index 28e7158096d..e2b49522ada 100644 --- a/src/mame/capcom/fcrash.cpp +++ b/src/mame/capcom/fcrash.cpp @@ -130,7 +130,7 @@ void fcrash_state::fcrash_snd_bankswitch_w(uint8_t data) membank("bank1")->set_entry(data & 0x07); } -WRITE_LINE_MEMBER(fcrash_state::m5205_int1) +void fcrash_state::m5205_int1(int state) { m_msm_1->data_w(m_sample_buffer1 & 0x0f); m_sample_buffer1 >>= 4; @@ -139,7 +139,7 @@ WRITE_LINE_MEMBER(fcrash_state::m5205_int1) m_audiocpu->pulse_input_line(INPUT_LINE_NMI, attotime::zero); } -WRITE_LINE_MEMBER(fcrash_state::m5205_int2) +void fcrash_state::m5205_int2(int state) { m_msm_2->data_w(m_sample_buffer2 & 0x0f); m_sample_buffer2 >>= 4; diff --git a/src/mame/capcom/fcrash.h b/src/mame/capcom/fcrash.h index 516d5a8a97c..ec1ad4b30c6 100644 --- a/src/mame/capcom/fcrash.h +++ b/src/mame/capcom/fcrash.h @@ -55,8 +55,8 @@ protected: void fcrash_soundlatch_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); void fcrash_snd_bankswitch_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(m5205_int1); - DECLARE_WRITE_LINE_MEMBER(m5205_int2); + void m5205_int1(int state); + void m5205_int2(int state); void fcrash_msm5205_0_data_w(uint8_t data); void fcrash_msm5205_1_data_w(uint8_t data); void cawingbl_soundlatch_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); diff --git a/src/mame/capcom/gng.cpp b/src/mame/capcom/gng.cpp index c64a0a992ad..70ed5694a66 100644 --- a/src/mame/capcom/gng.cpp +++ b/src/mame/capcom/gng.cpp @@ -89,13 +89,13 @@ private: required_device m_palette; void bankswitch_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(ym_reset_w); + void ym_reset_w(int state); uint8_t diamond_hack_r(); void fgvideoram_w(offs_t offset, uint8_t data); void bgvideoram_w(offs_t offset, uint8_t data); void bgscrollx_w(offs_t offset, uint8_t data); void bgscrolly_w(offs_t offset, uint8_t data); - DECLARE_WRITE_LINE_MEMBER(flipscreen_w); + void flipscreen_w(int state); TILE_GET_INFO_MEMBER(get_fg_tile_info); TILE_GET_INFO_MEMBER(get_bg_tile_info); uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); @@ -190,7 +190,7 @@ void gng_state::bgscrolly_w(offs_t offset, uint8_t data) } -WRITE_LINE_MEMBER(gng_state::flipscreen_w) +void gng_state::flipscreen_w(int state) { flip_screen_set(!state); } @@ -252,7 +252,7 @@ void gng_state::bankswitch_w(uint8_t data) m_mainbank->set_entry(data & 0x03); } -WRITE_LINE_MEMBER(gng_state::ym_reset_w) +void gng_state::ym_reset_w(int state) { if (!state) { diff --git a/src/mame/capcom/instantm.cpp b/src/mame/capcom/instantm.cpp index ec47f290434..c789413033f 100644 --- a/src/mame/capcom/instantm.cpp +++ b/src/mame/capcom/instantm.cpp @@ -46,7 +46,7 @@ public: private: u8 port01_r(); void port01_w(u8 data); - DECLARE_WRITE_LINE_MEMBER(clock_w); + void clock_w(int state); void main_map(address_map &map); void sub_io(address_map &map); @@ -76,7 +76,7 @@ void instantm_state::port01_w(u8 data) } // clock out the speech bytes -WRITE_LINE_MEMBER( instantm_state::clock_w ) +void instantm_state::clock_w(int state) { if (m_clock_en) m_port01 ^= 0x80; diff --git a/src/mame/capcom/kenseim.cpp b/src/mame/capcom/kenseim.cpp index f5eff4878a5..4b6e20c9b0d 100644 --- a/src/mame/capcom/kenseim.cpp +++ b/src/mame/capcom/kenseim.cpp @@ -180,9 +180,9 @@ public: DECLARE_CUSTOM_INPUT_MEMBER(cmd_1234_r); DECLARE_CUSTOM_INPUT_MEMBER(cmd_5678_r); - DECLARE_READ_LINE_MEMBER(cmd_9_r); - DECLARE_READ_LINE_MEMBER(cmd_req_r); - DECLARE_READ_LINE_MEMBER(cmd_LVm_r); + int cmd_9_r(); + int cmd_req_r(); + int cmd_LVm_r(); private: void mole_up(int side, int mole) @@ -384,17 +384,17 @@ CUSTOM_INPUT_MEMBER(kenseim_state::cmd_5678_r) return (m_to_68k_cmd_low & 0xf0) >> 4; } -READ_LINE_MEMBER(kenseim_state::cmd_9_r) +int kenseim_state::cmd_9_r() { return m_to_68k_cmd_d9; } -READ_LINE_MEMBER(kenseim_state::cmd_req_r) +int kenseim_state::cmd_req_r() { return m_to_68k_cmd_req; } -READ_LINE_MEMBER(kenseim_state::cmd_LVm_r) +int kenseim_state::cmd_LVm_r() { return m_to_68k_cmd_LVm; } diff --git a/src/mame/capcom/lwings.cpp b/src/mame/capcom/lwings.cpp index 9abf9247672..c6fad8f7b4b 100644 --- a/src/mame/capcom/lwings.cpp +++ b/src/mame/capcom/lwings.cpp @@ -106,13 +106,13 @@ void lwings_state::lwings_bankswitch_w(uint8_t data) machine().bookkeeping().coin_counter_w(0, data & 0x80); } -WRITE_LINE_MEMBER(lwings_state::lwings_interrupt) +void lwings_state::lwings_interrupt(int state) { if (state && m_nmi_mask) m_maincpu->set_input_line_and_vector(0, HOLD_LINE, 0xd7); /* Z80 - RST 10h */ } -WRITE_LINE_MEMBER(lwings_state::avengers_interrupt) +void lwings_state::avengers_interrupt(int state) { if (state && m_nmi_mask) m_maincpu->pulse_input_line(INPUT_LINE_NMI, attotime::zero); diff --git a/src/mame/capcom/lwings.h b/src/mame/capcom/lwings.h index f8634e9ee91..8191d70a862 100644 --- a/src/mame/capcom/lwings.h +++ b/src/mame/capcom/lwings.h @@ -89,8 +89,8 @@ private: DECLARE_VIDEO_START(avengersb); uint32_t screen_update_lwings(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_trojan(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(lwings_interrupt); - DECLARE_WRITE_LINE_MEMBER(avengers_interrupt); + void lwings_interrupt(int state); + void avengers_interrupt(int state); inline int is_sprite_on( uint8_t *buffered_spriteram, int offs ); void lwings_draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); void trojan_draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); diff --git a/src/mame/capcom/mitchell.cpp b/src/mame/capcom/mitchell.cpp index f743395de5b..0a99dbc8708 100644 --- a/src/mame/capcom/mitchell.cpp +++ b/src/mame/capcom/mitchell.cpp @@ -291,7 +291,7 @@ private: bool m_sample_select; void sound_bankswitch_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(adpcm_int); + void adpcm_int(int state); void mstworld2_io_map(address_map &map); void pangba_sound_map(address_map &map); @@ -1879,7 +1879,7 @@ static GFXDECODE_START( gfx_mstworld2 ) GFXDECODE_ENTRY( "sprites", 0, mstworld_spritelayout, 0, 0x40 ) GFXDECODE_END -WRITE_LINE_MEMBER(spangbl_state::adpcm_int) +void spangbl_state::adpcm_int(int state) { if (!state) return; diff --git a/src/mame/capcom/sonson.cpp b/src/mame/capcom/sonson.cpp index 02141c42598..0f4603788e5 100644 --- a/src/mame/capcom/sonson.cpp +++ b/src/mame/capcom/sonson.cpp @@ -101,11 +101,11 @@ private: // video-related tilemap_t *m_bg_tilemap = nullptr; - DECLARE_WRITE_LINE_MEMBER(sh_irqtrigger_w); + void sh_irqtrigger_w(int state); void videoram_w(offs_t offset, uint8_t data); void colorram_w(offs_t offset, uint8_t data); void scrollx_w(uint8_t data); - template WRITE_LINE_MEMBER(coin_counter_w); + template void coin_counter_w(int state); TILE_GET_INFO_MEMBER(get_bg_tile_info); void palette(palette_device &palette) const; uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); @@ -273,7 +273,7 @@ uint32_t sonson_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap // machine -WRITE_LINE_MEMBER(sonson_state::sh_irqtrigger_w) +void sonson_state::sh_irqtrigger_w(int state) { // setting bit 0 low then high triggers IRQ on the sound CPU if (state) @@ -281,7 +281,7 @@ WRITE_LINE_MEMBER(sonson_state::sh_irqtrigger_w) } template -WRITE_LINE_MEMBER(sonson_state::coin_counter_w) +void sonson_state::coin_counter_w(int state) { machine().bookkeeping().coin_counter_w(Which, state); } diff --git a/src/mame/casio/ctk2000.cpp b/src/mame/casio/ctk2000.cpp index d92908a9637..1acaf8995e7 100644 --- a/src/mame/casio/ctk2000.cpp +++ b/src/mame/casio/ctk2000.cpp @@ -49,9 +49,9 @@ public: void ctk2000(machine_config &config); DECLARE_CUSTOM_INPUT_MEMBER(lcd_r) { return m_lcdc->db_r() >> 4; } - DECLARE_WRITE_LINE_MEMBER(lcd_w) { m_lcdc->db_w(state << 4); } + void lcd_w(int state) { m_lcdc->db_w(state << 4); } - DECLARE_WRITE_LINE_MEMBER(apo_w); + void apo_w(int state); private: void ctk2000_map(address_map &map); @@ -66,7 +66,7 @@ private: required_device m_lcdc; }; -WRITE_LINE_MEMBER(ctk2000_state::apo_w) +void ctk2000_state::apo_w(int state) { logerror("apo_w: %x\n", state); /* TODO: when 0, this should turn off the LCD, speakers, etc. */ diff --git a/src/mame/casio/ctk551.cpp b/src/mame/casio/ctk551.cpp index f219706e48c..0dd5e0ac87e 100644 --- a/src/mame/casio/ctk551.cpp +++ b/src/mame/casio/ctk551.cpp @@ -227,11 +227,11 @@ public: TIMER_CALLBACK_MEMBER(nmi_clear) { m_maincpu->set_input_line(INPUT_LINE_NMI, CLEAR_LINE); } - DECLARE_WRITE_LINE_MEMBER(pwm_row_w) { m_pwm->write_my(state); } - DECLARE_WRITE_LINE_MEMBER(pwm_col_w) { m_pwm->write_mx(state ^ 0xff); } + void pwm_row_w(int state) { m_pwm->write_my(state); } + void pwm_col_w(int state) { m_pwm->write_mx(state ^ 0xff); } DECLARE_CUSTOM_INPUT_MEMBER(lcd_r) { return m_lcdc->db_r() >> 4; } - DECLARE_WRITE_LINE_MEMBER(lcd_w) + void lcd_w(int state) { m_lcd_data = state << 4; m_lcdc->db_w(m_lcd_data); @@ -243,7 +243,7 @@ public: template DECLARE_CUSTOM_INPUT_MEMBER(lcd_bit_r) { return BIT(m_lcdc->db_r(), Bit); } template - DECLARE_WRITE_LINE_MEMBER(lcd_bit_w) + void lcd_bit_w(int state) { m_lcd_data = (m_lcd_data & ~(1 << Bit)) | (state << Bit); m_lcdc->db_w(m_lcd_data); @@ -257,15 +257,15 @@ public: DECLARE_INPUT_CHANGED_MEMBER(power_w); DECLARE_INPUT_CHANGED_MEMBER(switch_power_w); - DECLARE_WRITE_LINE_MEMBER(inputs_w) { m_input_sel = state; } + void inputs_w(int state) { m_input_sel = state; } DECLARE_CUSTOM_INPUT_MEMBER(inputs_r); void dsp_data_w(uint8_t data); void dsp_cmd_w(uint8_t cmd); - DECLARE_WRITE_LINE_MEMBER(led_touch_w) { m_led_touch = state; } + void led_touch_w(int state) { m_led_touch = state; } void led_console_w(uint8_t state); - DECLARE_WRITE_LINE_MEMBER(apo_w); + void apo_w(int state); private: void ap10_map(address_map& map); @@ -299,7 +299,7 @@ private: uint8_t m_lcd_data{}; uint32_t m_dsp_data{}; - DECLARE_WRITE_LINE_MEMBER(render_w); + void render_w(int state); }; INPUT_CHANGED_MEMBER(ctk551_state::switch_w) @@ -363,7 +363,7 @@ void ctk551_state::led_console_w(uint8_t state) m_led_console[i] = !BIT(state, i); } -WRITE_LINE_MEMBER(ctk551_state::apo_w) +void ctk551_state::apo_w(int state) { logerror("apo_w: %x\n", state); /* auto power off - disable the LCD and speakers @@ -380,7 +380,7 @@ WRITE_LINE_MEMBER(ctk551_state::apo_w) } -WRITE_LINE_MEMBER(ctk551_state::render_w) +void ctk551_state::render_w(int state) { if(!state) return; diff --git a/src/mame/casio/fp1100.cpp b/src/mame/casio/fp1100.cpp index 21486724446..92ed133d3e3 100644 --- a/src/mame/casio/fp1100.cpp +++ b/src/mame/casio/fp1100.cpp @@ -90,7 +90,7 @@ private: u8 portb_r(); u8 portc_r(); void portc_w(u8 data); - DECLARE_WRITE_LINE_MEMBER(centronics_busy_w); + void centronics_busy_w(int state); INTERRUPT_GEN_MEMBER(vblank_irq); MC6845_UPDATE_ROW(crtc_update_row); TIMER_DEVICE_CALLBACK_MEMBER(kansas_w); @@ -590,7 +590,7 @@ static GFXDECODE_START( gfx_fp1100 ) GFXDECODE_ENTRY( "sub_ipl", 0x2400, chars_8x8, 0, 1 ) GFXDECODE_END -WRITE_LINE_MEMBER( fp1100_state::centronics_busy_w ) +void fp1100_state::centronics_busy_w(int state) { m_centronics_busy = state; } diff --git a/src/mame/casio/fp200.cpp b/src/mame/casio/fp200.cpp index 2e693dca4d3..56f8e0a179a 100644 --- a/src/mame/casio/fp200.cpp +++ b/src/mame/casio/fp200.cpp @@ -72,8 +72,8 @@ private: uint8_t fp200_keyb_r(offs_t offset); void fp200_keyb_w(offs_t offset, uint8_t data); - DECLARE_WRITE_LINE_MEMBER(sod_w); - DECLARE_READ_LINE_MEMBER(sid_r); + void sod_w(int state); + int sid_r(); void fp200_palette(palette_device &palette) const; void fp200_io(address_map &map); @@ -573,12 +573,12 @@ void fp200_state::fp200_palette(palette_device &palette) const palette.set_pen_color(1, 0x30, 0x38, 0x10); } -WRITE_LINE_MEMBER( fp200_state::sod_w ) +void fp200_state::sod_w(int state) { m_io_type = state; } -READ_LINE_MEMBER( fp200_state::sid_r ) +int fp200_state::sid_r() { return (ioport("KEYMOD")->read() >> m_keyb_mux) & 1; } diff --git a/src/mame/casio/pv2000.cpp b/src/mame/casio/pv2000.cpp index 479440beaac..132b3b66a46 100644 --- a/src/mame/casio/pv2000.cpp +++ b/src/mame/casio/pv2000.cpp @@ -70,7 +70,7 @@ private: uint8_t keys_hi_r(); uint8_t keys_lo_r(); uint8_t keys_mod_r(); - DECLARE_WRITE_LINE_MEMBER(pv2000_vdp_interrupt); + void pv2000_vdp_interrupt(int state); uint8_t cass_in(); void cass_out(uint8_t data); bool m_last_state = false; @@ -317,7 +317,7 @@ static INPUT_PORTS_START( pv2000 ) INPUT_PORTS_END -WRITE_LINE_MEMBER(pv2000_state::pv2000_vdp_interrupt) +void pv2000_state::pv2000_vdp_interrupt(int state) { // only if it goes up if (state && !m_last_state) diff --git a/src/mame/cce/mc1000.cpp b/src/mame/cce/mc1000.cpp index 37d0d2b7ebc..bf6734f0971 100644 --- a/src/mame/cce/mc1000.cpp +++ b/src/mame/cce/mc1000.cpp @@ -99,8 +99,8 @@ private: void printer_w(uint8_t data); void mc6845_ctrl_w(uint8_t data); void mc6847_attr_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER( fs_w ); - DECLARE_WRITE_LINE_MEMBER( hs_w ); + void fs_w(int state); + void hs_w(int state); uint8_t videoram_r(offs_t offset); void keylatch_w(uint8_t data); uint8_t keydata_r(); @@ -124,7 +124,7 @@ private: int m_vsync; uint8_t m_mc6847_attr; - DECLARE_WRITE_LINE_MEMBER(write_centronics_busy); + void write_centronics_busy(int state); int m_centronics_busy; void init_mc1000(); @@ -185,7 +185,7 @@ void mc1000_state::bankswitch() /* Read/Write Handlers */ -WRITE_LINE_MEMBER( mc1000_state::write_centronics_busy ) +void mc1000_state::write_centronics_busy(int state) { m_centronics_busy = state; } @@ -383,12 +383,12 @@ INPUT_PORTS_END /* Video */ -WRITE_LINE_MEMBER( mc1000_state::fs_w ) +void mc1000_state::fs_w(int state) { m_vsync = state; } -WRITE_LINE_MEMBER( mc1000_state::hs_w ) +void mc1000_state::hs_w(int state) { m_hsync = state; } diff --git a/src/mame/ces/galgames.cpp b/src/mame/ces/galgames.cpp index 8d11d94ead5..62be16621e3 100644 --- a/src/mame/ces/galgames.cpp +++ b/src/mame/ces/galgames.cpp @@ -92,7 +92,7 @@ public: // EEPROM u8 eeprom_r(); void eeprom_w(u8 data); - DECLARE_WRITE_LINE_MEMBER(eeprom_cs_write); + void eeprom_cs_write(int state); // PIC u8 pic_status_r(); @@ -265,7 +265,7 @@ public: // EEPROM u8 eeprom_r(); void eeprom_w(u8 data); - DECLARE_WRITE_LINE_MEMBER(eeprom_cs_write); + void eeprom_cs_write(int state); u8 get_cart() const { return m_cart; } @@ -548,7 +548,7 @@ void galgames_cart_device::eeprom_w(u8 data) m_eeprom->clk_write((data & 0x02) ? ASSERT_LINE : CLEAR_LINE); } -WRITE_LINE_MEMBER(galgames_cart_device::eeprom_cs_write) +void galgames_cart_device::eeprom_cs_write(int state) { if (!m_eeprom) return; @@ -714,7 +714,7 @@ void galgames_slot_device::eeprom_w(u8 data) { m_carts[m_cart]->eeprom_w(data); } -WRITE_LINE_MEMBER(galgames_slot_device::eeprom_cs_write) +void galgames_slot_device::eeprom_cs_write(int state) { m_carts[m_cart]->eeprom_cs_write(state); } @@ -742,7 +742,7 @@ public: m_okiram(*this, "okiram") { } - DECLARE_WRITE_LINE_MEMBER(blitter_irq_callback); + void blitter_irq_callback(int state); TIMER_DEVICE_CALLBACK_MEMBER(scanline_interrupt); u32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); @@ -780,7 +780,7 @@ protected: u8 m_palette_data[3]{}; }; -WRITE_LINE_MEMBER(galgames_state::blitter_irq_callback) +void galgames_state::blitter_irq_callback(int state) { // logerror("%s: Blitter IRQ callback state = %x\n", machine().describe_context(), state); m_maincpu->set_input_line(2, state); diff --git a/src/mame/chromatics/cgc7900.h b/src/mame/chromatics/cgc7900.h index 1a40eff933b..14f641a6c09 100644 --- a/src/mame/chromatics/cgc7900.h +++ b/src/mame/chromatics/cgc7900.h @@ -97,7 +97,7 @@ public: u16 sync_r(); u16 unmapped_r(); - template DECLARE_WRITE_LINE_MEMBER(irq) { irq_encoder(N, state); } + template void irq(int state) { irq_encoder(N, state); } void update_clut(); void draw_bitmap(screen_device *screen, bitmap_rgb32 &bitmap); diff --git a/src/mame/cinematronics/cchasm.cpp b/src/mame/cinematronics/cchasm.cpp index a67396c9923..84151200ad8 100644 --- a/src/mame/cinematronics/cchasm.cpp +++ b/src/mame/cinematronics/cchasm.cpp @@ -95,8 +95,8 @@ private: void soundlatch4_w(uint8_t data); void io_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); uint16_t io_r(offs_t offset); - DECLARE_WRITE_LINE_MEMBER(ctc_timer_1_w); - DECLARE_WRITE_LINE_MEMBER(ctc_timer_2_w); + void ctc_timer_1_w(int state); + void ctc_timer_2_w(int state); void refresh(); @@ -295,7 +295,7 @@ uint16_t cchasm_state::io_r(offs_t offset) } -WRITE_LINE_MEMBER(cchasm_state::ctc_timer_1_w) +void cchasm_state::ctc_timer_1_w(int state) { if (state) /* rising edge */ { @@ -304,7 +304,7 @@ WRITE_LINE_MEMBER(cchasm_state::ctc_timer_1_w) } } -WRITE_LINE_MEMBER(cchasm_state::ctc_timer_2_w) +void cchasm_state::ctc_timer_2_w(int state) { if (state) /* rising edge */ { diff --git a/src/mame/cinematronics/cinemat.cpp b/src/mame/cinematronics/cinemat.cpp index 71a4b00c9a9..b2ca86e1b98 100644 --- a/src/mame/cinematronics/cinemat.cpp +++ b/src/mame/cinematronics/cinemat.cpp @@ -125,7 +125,7 @@ u8 cinemat_state::coin_input_r() * *************************************/ -WRITE_LINE_MEMBER(cinemat_state::coin_reset_w) +void cinemat_state::coin_reset_w(int state) { // on the rising edge of a coin reset, clear the coin_detected flag if (state) @@ -133,7 +133,7 @@ WRITE_LINE_MEMBER(cinemat_state::coin_reset_w) } -WRITE_LINE_MEMBER(cinemat_state::mux_select_w) +void cinemat_state::mux_select_w(int state) { m_mux_select = state; } @@ -1106,7 +1106,7 @@ void cinemat_state::barrier(machine_config &config) .add_route(ALL_OUTPUTS, "mono", 1.0); } -WRITE_LINE_MEMBER(cinemat_state::speedfrk_start_led_w) +void cinemat_state::speedfrk_start_led_w(int state) { // start LED is controlled by bit 0x02 m_led = !state; diff --git a/src/mame/cinematronics/cinemat.h b/src/mame/cinematronics/cinemat.h index da1cb60de7c..e8d44cfcdbe 100644 --- a/src/mame/cinematronics/cinemat.h +++ b/src/mame/cinematronics/cinemat.h @@ -71,11 +71,11 @@ public: u8 inputs_r(offs_t offset); u8 switches_r(offs_t offset); u8 coin_input_r(); - WRITE_LINE_MEMBER(coin_reset_w); - WRITE_LINE_MEMBER(mux_select_w); + void coin_reset_w(int state); + void mux_select_w(int state); u8 speedfrk_wheel_r(offs_t offset); u8 speedfrk_gear_r(offs_t offset); - virtual DECLARE_WRITE_LINE_MEMBER(vector_control_w); + virtual void vector_control_w(int state); u8 joystick_read(); DECLARE_INPUT_CHANGED_MEMBER(coin_inserted); void init_speedfrk(); @@ -94,7 +94,7 @@ public: void armora(machine_config &config); template - DECLARE_WRITE_LINE_MEMBER(speedfrk_gear_change_w) + void speedfrk_gear_change_w(int state) { if (state) m_gear = Index; @@ -109,7 +109,7 @@ protected: virtual void machine_start() override; virtual void machine_reset() override; - DECLARE_WRITE_LINE_MEMBER(speedfrk_start_led_w); + void speedfrk_start_led_w(int state); void cinemat_nojmi_4k(machine_config &config); void cinemat_jmi_4k(machine_config &config); @@ -137,7 +137,7 @@ public: void sundance(machine_config &config); protected: - virtual DECLARE_WRITE_LINE_MEMBER(vector_control_w) override; + virtual void vector_control_w(int state) override; u8 sundance_inputs_r(offs_t offset); }; @@ -152,7 +152,7 @@ public: void init_solarq(); protected: - virtual DECLARE_WRITE_LINE_MEMBER(vector_control_w) override; + virtual void vector_control_w(int state) override; }; @@ -167,7 +167,7 @@ public: void wotwc(machine_config &config); protected: - virtual DECLARE_WRITE_LINE_MEMBER(vector_control_w) override; + virtual void vector_control_w(int state) override; u8 boxingb_dial_r(offs_t offset); }; @@ -181,7 +181,7 @@ public: protected: TIMER_CALLBACK_MEMBER(synced_sound_w); - DECLARE_WRITE_LINE_MEMBER(demon_sound4_w); + void demon_sound4_w(int state); u8 sound_porta_r(); u8 sound_portb_r(); void sound_portb_w(u8 data); @@ -213,7 +213,7 @@ public: void qb3(machine_config &config); protected: - virtual DECLARE_WRITE_LINE_MEMBER(vector_control_w) override; + virtual void vector_control_w(int state) override; u8 qb3_frame_r(); void qb3_ram_bank_w(u8 data); void qb3_sound_fifo_w(u8 data); diff --git a/src/mame/cinematronics/cinemat_a.cpp b/src/mame/cinematronics/cinemat_a.cpp index 866ed382711..4103cbe4ec6 100644 --- a/src/mame/cinematronics/cinemat_a.cpp +++ b/src/mame/cinematronics/cinemat_a.cpp @@ -322,7 +322,7 @@ TIMER_CALLBACK_MEMBER( demon_state::synced_sound_w ) } -WRITE_LINE_MEMBER(demon_state::demon_sound4_w) +void demon_state::demon_sound4_w(int state) { /* watch for a 0->1 edge on bit 4 ("shift in") to clock in the new data */ if (state) diff --git a/src/mame/cinematronics/cinemat_a.h b/src/mame/cinematronics/cinemat_a.h index 9c3fa620227..62a7c6d50c8 100644 --- a/src/mame/cinematronics/cinemat_a.h +++ b/src/mame/cinematronics/cinemat_a.h @@ -21,7 +21,7 @@ protected: virtual void device_add_mconfig(machine_config &config) override; virtual void device_start() override; - template DECLARE_WRITE_LINE_MEMBER(sound_w) { input_set(_Index, state); } + template void sound_w(int state) { input_set(Index, state); } void input_set(int bit, int state); optional_device_array m_out_input; diff --git a/src/mame/cinematronics/cinemat_v.cpp b/src/mame/cinematronics/cinemat_v.cpp index b06139807d8..61379305fc6 100644 --- a/src/mame/cinematronics/cinemat_v.cpp +++ b/src/mame/cinematronics/cinemat_v.cpp @@ -51,14 +51,14 @@ void cinemat_state::cinemat_vector_callback(int16_t sx, int16_t sy, int16_t ex, * *************************************/ -WRITE_LINE_MEMBER(cinemat_state::vector_control_w) +void cinemat_state::vector_control_w(int state) { /* color is either bright or dim, selected by the value sent to the port */ m_vector_color = state ? rgb_t(0x80,0x80,0x80) : rgb_t(0xff,0xff,0xff); } -WRITE_LINE_MEMBER(cinemat_16level_state::vector_control_w) +void cinemat_16level_state::vector_control_w(int state) { /* on the rising edge of the data value, latch bits 0-3 of the */ /* X register as the intensity */ @@ -71,7 +71,7 @@ WRITE_LINE_MEMBER(cinemat_16level_state::vector_control_w) } -WRITE_LINE_MEMBER(cinemat_64level_state::vector_control_w) +void cinemat_64level_state::vector_control_w(int state) { /* on the rising edge of the data value, latch bits 2-7 of the */ /* X register as the intensity */ @@ -85,7 +85,7 @@ WRITE_LINE_MEMBER(cinemat_64level_state::vector_control_w) } -WRITE_LINE_MEMBER(cinemat_color_state::vector_control_w) +void cinemat_color_state::vector_control_w(int state) { /* on the rising edge of the data value, latch the X register */ /* as 4-4-4 BGR values */ @@ -103,7 +103,7 @@ WRITE_LINE_MEMBER(cinemat_color_state::vector_control_w) } -WRITE_LINE_MEMBER(qb3_state::vector_control_w) +void qb3_state::vector_control_w(int state) { /* on the falling edge of the data value, remember the original X,Y values */ /* they will be restored on the rising edge; this is to simulate the fact */ diff --git a/src/mame/cinematronics/dlair.cpp b/src/mame/cinematronics/dlair.cpp index 6de5be53143..d480b9fcfb7 100644 --- a/src/mame/cinematronics/dlair.cpp +++ b/src/mame/cinematronics/dlair.cpp @@ -70,8 +70,8 @@ public: { } - DECLARE_READ_LINE_MEMBER(laserdisc_status_r); - DECLARE_READ_LINE_MEMBER(laserdisc_command_r); + int laserdisc_status_r(); + int laserdisc_command_r(); void init_fixed(); void init_variable(); @@ -130,7 +130,7 @@ private: virtual void machine_reset() override; void dleuro_palette(palette_device &palette) const; uint32_t screen_update_dleuro(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(write_speaker); + void write_speaker(int state); void dleuro_io_map(address_map &map); void dleuro_map(address_map &map); @@ -181,7 +181,7 @@ static const uint8_t led_map[16] = * *************************************/ -WRITE_LINE_MEMBER(dlair_state::write_speaker) +void dlair_state::write_speaker(int state) { m_speaker->level_w(state); } @@ -342,13 +342,13 @@ void dlair_state::led_den2_w(offs_t offset, uint8_t data) * *************************************/ -READ_LINE_MEMBER(dlair_state::laserdisc_status_r) +int dlair_state::laserdisc_status_r() { return laserdisc_status_strobe_r(); } -READ_LINE_MEMBER(dlair_state::laserdisc_command_r) +int dlair_state::laserdisc_command_r() { return (laserdisc_ready_r() == ASSERT_LINE) ? 0 : 1; } diff --git a/src/mame/cinematronics/leland_a.cpp b/src/mame/cinematronics/leland_a.cpp index 9befb2ab30d..f49f83b8915 100644 --- a/src/mame/cinematronics/leland_a.cpp +++ b/src/mame/cinematronics/leland_a.cpp @@ -98,32 +98,32 @@ * *************************************/ -WRITE_LINE_MEMBER(leland_80186_sound_device::pit0_2_w) +void leland_80186_sound_device::pit0_2_w(int state) { set_clock_line(2, state); } -WRITE_LINE_MEMBER(leland_80186_sound_device::pit1_0_w) +void leland_80186_sound_device::pit1_0_w(int state) { set_clock_line(3, state); } -WRITE_LINE_MEMBER(leland_80186_sound_device::pit1_1_w) +void leland_80186_sound_device::pit1_1_w(int state) { set_clock_line(4, state); } -WRITE_LINE_MEMBER(leland_80186_sound_device::pit1_2_w) +void leland_80186_sound_device::pit1_2_w(int state) { set_clock_line(5, state); } -WRITE_LINE_MEMBER(leland_80186_sound_device::i80186_tmr0_w) +void leland_80186_sound_device::i80186_tmr0_w(int state) { set_clock_line(6, state); } -WRITE_LINE_MEMBER(leland_80186_sound_device::i80186_tmr1_w) +void leland_80186_sound_device::i80186_tmr1_w(int state) { if (m_ext_base != nullptr) { diff --git a/src/mame/cinematronics/leland_a.h b/src/mame/cinematronics/leland_a.h index 5b72d188ec1..724d27a297e 100644 --- a/src/mame/cinematronics/leland_a.h +++ b/src/mame/cinematronics/leland_a.h @@ -34,13 +34,13 @@ public: u8 response_r(); void dac_w(offs_t offset, u16 data, u16 mem_mask = ~0); void ataxx_dac_control(offs_t offset, u16 data, u16 mem_mask = ~0); - DECLARE_WRITE_LINE_MEMBER(i80186_tmr0_w); - DECLARE_WRITE_LINE_MEMBER(i80186_tmr1_w); + void i80186_tmr0_w(int state); + void i80186_tmr1_w(int state); - DECLARE_WRITE_LINE_MEMBER(pit0_2_w); - DECLARE_WRITE_LINE_MEMBER(pit1_0_w); - DECLARE_WRITE_LINE_MEMBER(pit1_1_w); - DECLARE_WRITE_LINE_MEMBER(pit1_2_w); + void pit0_2_w(int state); + void pit1_0_w(int state); + void pit1_1_w(int state); + void pit1_2_w(int state); protected: leland_80186_sound_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock); diff --git a/src/mame/citoh/cit101.cpp b/src/mame/citoh/cit101.cpp index 12f480d6ad7..62a3d6cbe6f 100644 --- a/src/mame/citoh/cit101.cpp +++ b/src/mame/citoh/cit101.cpp @@ -105,7 +105,7 @@ private: u8 e0_latch_r(); void e0_latch_w(u8 data); - DECLARE_WRITE_LINE_MEMBER(blink_w); + void blink_w(int state); void screen_control_w(u8 data); void screen_control_101e_w(u8 data); void brightness_w(u8 data); @@ -285,7 +285,7 @@ void cit101_state::e0_latch_w(u8 data) m_e0_latch = data; } -WRITE_LINE_MEMBER(cit101_state::blink_w) +void cit101_state::blink_w(int state) { m_blink = state; } diff --git a/src/mame/citoh/cit101_kbd.cpp b/src/mame/citoh/cit101_kbd.cpp index 5d3363bdc44..3a2fee32b13 100644 --- a/src/mame/citoh/cit101_kbd.cpp +++ b/src/mame/citoh/cit101_kbd.cpp @@ -95,7 +95,7 @@ void cit101_keyboard_device::device_start() save_item(NAME(m_kbid_enabled)); } -WRITE_LINE_MEMBER(cit101_keyboard_device::write_rxd) +void cit101_keyboard_device::write_rxd(int state) { m_mcu->set_input_line(MCS48_INPUT_IRQ, state ? CLEAR_LINE : ASSERT_LINE); } diff --git a/src/mame/citoh/cit101_kbd.h b/src/mame/citoh/cit101_kbd.h index 0f71a70b8f8..442570c10aa 100644 --- a/src/mame/citoh/cit101_kbd.h +++ b/src/mame/citoh/cit101_kbd.h @@ -33,7 +33,7 @@ public: auto txd_callback() { return m_txd_callback.bind(); } // serial line input - DECLARE_WRITE_LINE_MEMBER(write_rxd); + void write_rxd(int state); protected: cit101_keyboard_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock); diff --git a/src/mame/citoh/cit220.cpp b/src/mame/citoh/cit220.cpp index 710134bce4b..df58b149b3b 100644 --- a/src/mame/citoh/cit220.cpp +++ b/src/mame/citoh/cit220.cpp @@ -45,8 +45,8 @@ public: private: virtual void machine_start() override; - DECLARE_WRITE_LINE_MEMBER(sod_w); - DECLARE_WRITE_LINE_MEMBER(cols_w); + void sod_w(int state); + void cols_w(int state); SCN2674_DRAW_CHARACTER_MEMBER(draw_character); void cit220p_mem_map(address_map &map); @@ -75,12 +75,12 @@ void cit220_state::machine_start() } -WRITE_LINE_MEMBER(cit220_state::sod_w) +void cit220_state::sod_w(int state) { // probably asserts PBREQ on SCN2674 to access memory at Exxx } -WRITE_LINE_MEMBER(cit220_state::cols_w) +void cit220_state::cols_w(int state) { if (state == m_132_cols) { diff --git a/src/mame/citoh/cit220_kbd.cpp b/src/mame/citoh/cit220_kbd.cpp index 3523e592ece..f1c40f0c9d9 100644 --- a/src/mame/citoh/cit220_kbd.cpp +++ b/src/mame/citoh/cit220_kbd.cpp @@ -45,7 +45,7 @@ void cit220p_keyboard_device::device_start() { } -WRITE_LINE_MEMBER(cit220p_keyboard_device::write_rxd) +void cit220p_keyboard_device::write_rxd(int state) { m_mcu->set_input_line(MCS48_INPUT_IRQ, state ? CLEAR_LINE : ASSERT_LINE); } diff --git a/src/mame/citoh/cit220_kbd.h b/src/mame/citoh/cit220_kbd.h index f8d14b616f9..8b0e90b54ab 100644 --- a/src/mame/citoh/cit220_kbd.h +++ b/src/mame/citoh/cit220_kbd.h @@ -26,7 +26,7 @@ public: auto txd_callback() { return m_txd_callback.bind(); } // serial line input - DECLARE_WRITE_LINE_MEMBER(write_rxd); + void write_rxd(int state); protected: // device-level overrides diff --git a/src/mame/coleco/adam.cpp b/src/mame/coleco/adam.cpp index 0fc80ecd6c4..6317e91fbff 100644 --- a/src/mame/coleco/adam.cpp +++ b/src/mame/coleco/adam.cpp @@ -913,7 +913,7 @@ INPUT_PORTS_END // TMS9928A_INTERFACE( vdc_intf ) //------------------------------------------------- -WRITE_LINE_MEMBER( adam_state::vdc_int_w ) +void adam_state::vdc_int_w(int state) { if (state && !m_vdp_nmi) { @@ -927,7 +927,7 @@ WRITE_LINE_MEMBER( adam_state::vdc_int_w ) // M6801_INTERFACE( m6801_intf ) //------------------------------------------------- -WRITE_LINE_MEMBER( adam_state::os3_w ) +void adam_state::os3_w(int state) { if (state && !m_dma) { @@ -950,12 +950,12 @@ WRITE_LINE_MEMBER( adam_state::os3_w ) } -WRITE_LINE_MEMBER( adam_state::joy1_irq_w ) +void adam_state::joy1_irq_w(int state) { // TODO } -WRITE_LINE_MEMBER( adam_state::joy2_irq_w ) +void adam_state::joy2_irq_w(int state) { // TODO } diff --git a/src/mame/coleco/adam.h b/src/mame/coleco/adam.h index 92f6534246e..f1c4391aa26 100644 --- a/src/mame/coleco/adam.h +++ b/src/mame/coleco/adam.h @@ -85,12 +85,12 @@ private: void m6801_p3_w(uint8_t data); void m6801_p4_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER( vdc_int_w ); + void vdc_int_w(int state); - DECLARE_WRITE_LINE_MEMBER( os3_w ); + void os3_w(int state); - DECLARE_WRITE_LINE_MEMBER( joy1_irq_w ); - DECLARE_WRITE_LINE_MEMBER( joy2_irq_w ); + void joy1_irq_w(int state); + void joy2_irq_w(int state); // memory state uint8_t m_mioc; diff --git a/src/mame/coleco/coleco.cpp b/src/mame/coleco/coleco.cpp index 0af7fb2cb5c..fae256d3dc6 100644 --- a/src/mame/coleco/coleco.cpp +++ b/src/mame/coleco/coleco.cpp @@ -346,7 +346,7 @@ INPUT_PORTS_END /* Interrupts */ -WRITE_LINE_MEMBER(coleco_state::coleco_vdp_interrupt) +void coleco_state::coleco_vdp_interrupt(int state) { // NMI on rising edge if (state && !m_last_nmi_state) diff --git a/src/mame/coleco/coleco.h b/src/mame/coleco/coleco.h index d264ef43703..671767017a0 100644 --- a/src/mame/coleco/coleco.h +++ b/src/mame/coleco/coleco.h @@ -53,7 +53,7 @@ public: TIMER_CALLBACK_MEMBER(paddle_irqreset_callback); TIMER_CALLBACK_MEMBER(paddle_pulse_callback); TIMER_DEVICE_CALLBACK_MEMBER(paddle_update_callback); - DECLARE_WRITE_LINE_MEMBER(coleco_vdp_interrupt); + void coleco_vdp_interrupt(int state); uint8_t coleco_paddle_read(int port, int joy_mode, uint8_t joy_status); uint8_t coleco_scan_paddles(uint8_t *joy_status0, uint8_t *joy_status1); diff --git a/src/mame/comad/zerozone.cpp b/src/mame/comad/zerozone.cpp index 1b15fc5204d..60e066e4835 100644 --- a/src/mame/comad/zerozone.cpp +++ b/src/mame/comad/zerozone.cpp @@ -105,7 +105,7 @@ private: tilemap_t *m_tilemap = nullptr; void sound_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(vblank_w); + void vblank_w(int state); void tilemap_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); void tilebank_w(uint8_t data); @@ -278,7 +278,7 @@ void zerozone_state::machine_reset() m_tilebank = 0; } -WRITE_LINE_MEMBER(zerozone_state::vblank_w) +void zerozone_state::vblank_w(int state) { // TODO: Not accurate, find vblank acknowledge if (state) diff --git a/src/mame/commodore/c128.cpp b/src/mame/commodore/c128.cpp index 98ea903657f..7a057cd3eed 100644 --- a/src/mame/commodore/c128.cpp +++ b/src/mame/commodore/c128.cpp @@ -141,19 +141,19 @@ public: uint8_t vic_videoram_r(offs_t offset); uint8_t vic_colorram_r(offs_t offset); - DECLARE_WRITE_LINE_MEMBER( mmu_z80en_w ); - DECLARE_WRITE_LINE_MEMBER( mmu_fsdir_w ); - DECLARE_READ_LINE_MEMBER( mmu_game_r ); - DECLARE_READ_LINE_MEMBER( mmu_exrom_r ); - DECLARE_READ_LINE_MEMBER( mmu_sense40_r ); + void mmu_z80en_w(int state); + void mmu_fsdir_w(int state); + int mmu_game_r(); + int mmu_exrom_r(); + int mmu_sense40_r(); void vic_k_w(uint8_t data); uint8_t sid_potx_r(); uint8_t sid_poty_r(); - DECLARE_WRITE_LINE_MEMBER( cia1_cnt_w ); - DECLARE_WRITE_LINE_MEMBER( cia1_sp_w ); + void cia1_cnt_w(int state); + void cia1_sp_w(int state); uint8_t cia1_pa_r(); void cia1_pa_w(uint8_t data); uint8_t cia1_pb_r(); @@ -165,15 +165,15 @@ public: uint8_t cpu_r(); void cpu_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER( iec_srq_w ); - DECLARE_WRITE_LINE_MEMBER( iec_data_w ); + void iec_srq_w(int state); + void iec_data_w(int state); uint8_t exp_dma_cd_r(offs_t offset); void exp_dma_cd_w(offs_t offset, uint8_t data); - DECLARE_WRITE_LINE_MEMBER( exp_dma_w ); - DECLARE_WRITE_LINE_MEMBER( exp_reset_w ); + void exp_dma_w(int state); + void exp_reset_w(int state); - DECLARE_WRITE_LINE_MEMBER( write_restore ); + void write_restore(int state); DECLARE_INPUT_CHANGED_MEMBER( caps_lock ); DECLARE_QUICKLOAD_LOAD_MEMBER(quickload_c128); @@ -181,18 +181,18 @@ public: uint8_t cia2_pb_r(); void cia2_pb_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER( write_user_pa2 ) { m_user_pa2 = state; } - DECLARE_WRITE_LINE_MEMBER( write_user_pb0 ) { if (state) m_user_pb |= 1; else m_user_pb &= ~1; } - DECLARE_WRITE_LINE_MEMBER( write_user_pb1 ) { if (state) m_user_pb |= 2; else m_user_pb &= ~2; } - DECLARE_WRITE_LINE_MEMBER( write_user_pb2 ) { if (state) m_user_pb |= 4; else m_user_pb &= ~4; } - DECLARE_WRITE_LINE_MEMBER( write_user_pb3 ) { if (state) m_user_pb |= 8; else m_user_pb &= ~8; } - DECLARE_WRITE_LINE_MEMBER( write_user_pb4 ) { if (state) m_user_pb |= 16; else m_user_pb &= ~16; } - DECLARE_WRITE_LINE_MEMBER( write_user_pb5 ) { if (state) m_user_pb |= 32; else m_user_pb &= ~32; } - DECLARE_WRITE_LINE_MEMBER( write_user_pb6 ) { if (state) m_user_pb |= 64; else m_user_pb &= ~64; } - DECLARE_WRITE_LINE_MEMBER( write_user_pb7 ) { if (state) m_user_pb |= 128; else m_user_pb &= ~128; } + void write_user_pa2(int state) { m_user_pa2 = state; } + void write_user_pb0(int state) { if (state) m_user_pb |= 1; else m_user_pb &= ~1; } + void write_user_pb1(int state) { if (state) m_user_pb |= 2; else m_user_pb &= ~2; } + void write_user_pb2(int state) { if (state) m_user_pb |= 4; else m_user_pb &= ~4; } + void write_user_pb3(int state) { if (state) m_user_pb |= 8; else m_user_pb &= ~8; } + void write_user_pb4(int state) { if (state) m_user_pb |= 16; else m_user_pb &= ~16; } + void write_user_pb5(int state) { if (state) m_user_pb |= 32; else m_user_pb &= ~32; } + void write_user_pb6(int state) { if (state) m_user_pb |= 64; else m_user_pb &= ~64; } + void write_user_pb7(int state) { if (state) m_user_pb |= 128; else m_user_pb &= ~128; } void update_cia1_flag(); - DECLARE_WRITE_LINE_MEMBER( cass_rd_w ) { m_cass_rd = state; update_cia1_flag(); } + void cass_rd_w(int state) { m_cass_rd = state; update_cia1_flag(); } // memory state int m_z80en; @@ -718,7 +718,7 @@ void c128_state::vdc_videoram_map(address_map &map) // INPUT_PORTS( c128 ) //------------------------------------------------- -WRITE_LINE_MEMBER( c128_state::write_restore ) +void c128_state::write_restore(int state) { m_nmi->in_w<1>(!state); } @@ -1042,7 +1042,7 @@ INPUT_PORTS_END // MOS8722_INTERFACE( mmu_intf ) //------------------------------------------------- -WRITE_LINE_MEMBER( c128_state::mmu_z80en_w ) +void c128_state::mmu_z80en_w(int state) { if (state) { @@ -1065,22 +1065,22 @@ WRITE_LINE_MEMBER( c128_state::mmu_z80en_w ) m_z80en = state; } -WRITE_LINE_MEMBER( c128_state::mmu_fsdir_w ) +void c128_state::mmu_fsdir_w(int state) { update_iec(); } -READ_LINE_MEMBER( c128_state::mmu_game_r ) +int c128_state::mmu_game_r() { return m_game; } -READ_LINE_MEMBER( c128_state::mmu_exrom_r ) +int c128_state::mmu_exrom_r() { return m_exrom; } -READ_LINE_MEMBER( c128_state::mmu_sense40_r ) +int c128_state::mmu_sense40_r() { return BIT(m_40_80->read(), 0); } @@ -1302,7 +1302,7 @@ void c128_state::cia1_pb_w(uint8_t data) m_vic->lp_w(BIT(data, 4)); } -WRITE_LINE_MEMBER( c128_state::cia1_cnt_w ) +void c128_state::cia1_cnt_w(int state) { m_cnt1 = state; m_user->write_4(state); @@ -1310,7 +1310,7 @@ WRITE_LINE_MEMBER( c128_state::cia1_cnt_w ) update_iec(); } -WRITE_LINE_MEMBER( c128_state::cia1_sp_w ) +void c128_state::cia1_sp_w(int state) { m_sp1 = state; m_user->write_5(state); @@ -1497,14 +1497,14 @@ inline void c128_state::update_iec() m_iec->host_srq_w(srq_out); } -WRITE_LINE_MEMBER( c128_state::iec_srq_w ) +void c128_state::iec_srq_w(int state) { m_iec_srq = state; update_iec(); update_cia1_flag(); } -WRITE_LINE_MEMBER( c128_state::iec_data_w ) +void c128_state::iec_data_w(int state) { update_iec(); } @@ -1530,14 +1530,14 @@ void c128_state::exp_dma_cd_w(offs_t offset, uint8_t data) return write_memory(offset, data, vma, ba, aec, z80io); } -WRITE_LINE_MEMBER( c128_state::exp_dma_w ) +void c128_state::exp_dma_w(int state) { m_exp_dma = state; check_interrupts(); } -WRITE_LINE_MEMBER( c128_state::exp_reset_w ) +void c128_state::exp_reset_w(int state) { if (!state) { diff --git a/src/mame/commodore/c64.cpp b/src/mame/commodore/c64.cpp index da7101b898b..8d40e5bade3 100644 --- a/src/mame/commodore/c64.cpp +++ b/src/mame/commodore/c64.cpp @@ -130,28 +130,28 @@ public: uint8_t cpu_r(); void cpu_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER( write_restore ); - DECLARE_WRITE_LINE_MEMBER( exp_dma_w ); - DECLARE_WRITE_LINE_MEMBER( exp_reset_w ); + void write_restore(int state); + void exp_dma_w(int state); + void exp_reset_w(int state); DECLARE_QUICKLOAD_LOAD_MEMBER(quickload_c64); uint8_t cia2_pb_r(); void cia2_pb_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER( write_user_pa2 ) { m_user_pa2 = state; } - DECLARE_WRITE_LINE_MEMBER( write_user_pb0 ) { if (state) m_user_pb |= 1; else m_user_pb &= ~1; } - DECLARE_WRITE_LINE_MEMBER( write_user_pb1 ) { if (state) m_user_pb |= 2; else m_user_pb &= ~2; } - DECLARE_WRITE_LINE_MEMBER( write_user_pb2 ) { if (state) m_user_pb |= 4; else m_user_pb &= ~4; } - DECLARE_WRITE_LINE_MEMBER( write_user_pb3 ) { if (state) m_user_pb |= 8; else m_user_pb &= ~8; } - DECLARE_WRITE_LINE_MEMBER( write_user_pb4 ) { if (state) m_user_pb |= 16; else m_user_pb &= ~16; } - DECLARE_WRITE_LINE_MEMBER( write_user_pb5 ) { if (state) m_user_pb |= 32; else m_user_pb &= ~32; } - DECLARE_WRITE_LINE_MEMBER( write_user_pb6 ) { if (state) m_user_pb |= 64; else m_user_pb &= ~64; } - DECLARE_WRITE_LINE_MEMBER( write_user_pb7 ) { if (state) m_user_pb |= 128; else m_user_pb &= ~128; } + void write_user_pa2(int state) { m_user_pa2 = state; } + void write_user_pb0(int state) { if (state) m_user_pb |= 1; else m_user_pb &= ~1; } + void write_user_pb1(int state) { if (state) m_user_pb |= 2; else m_user_pb &= ~2; } + void write_user_pb2(int state) { if (state) m_user_pb |= 4; else m_user_pb &= ~4; } + void write_user_pb3(int state) { if (state) m_user_pb |= 8; else m_user_pb &= ~8; } + void write_user_pb4(int state) { if (state) m_user_pb |= 16; else m_user_pb &= ~16; } + void write_user_pb5(int state) { if (state) m_user_pb |= 32; else m_user_pb &= ~32; } + void write_user_pb6(int state) { if (state) m_user_pb |= 64; else m_user_pb &= ~64; } + void write_user_pb7(int state) { if (state) m_user_pb |= 128; else m_user_pb &= ~128; } void update_cia1_flag() { m_cia1->flag_w(m_cass_rd & m_iec_srq); } - DECLARE_WRITE_LINE_MEMBER( cass_rd_w ) { m_cass_rd = state; update_cia1_flag(); } - DECLARE_WRITE_LINE_MEMBER( iec_srq_w ) { m_iec_srq = state; update_cia1_flag(); } + void cass_rd_w(int state) { m_cass_rd = state; update_cia1_flag(); } + void iec_srq_w(int state) { m_iec_srq = state; update_cia1_flag(); } // memory state int m_loram; @@ -752,7 +752,7 @@ void c64_state::vic_colorram_map(address_map &map) // INPUT_PORTS( c64 ) //------------------------------------------------- -WRITE_LINE_MEMBER( c64_state::write_restore ) +void c64_state::write_restore(int state) { m_nmi->in_w<1>(!state); } @@ -1368,7 +1368,7 @@ void c64gs_state::cpu_w(uint8_t data) // C64_EXPANSION_INTERFACE( expansion_intf ) //------------------------------------------------- -WRITE_LINE_MEMBER( c64_state::exp_dma_w ) +void c64_state::exp_dma_w(int state) { if (m_exp_dma != state) { @@ -1378,7 +1378,7 @@ WRITE_LINE_MEMBER( c64_state::exp_dma_w ) } } -WRITE_LINE_MEMBER( c64_state::exp_reset_w ) +void c64_state::exp_reset_w(int state) { if (!state) { diff --git a/src/mame/commodore/c65.cpp b/src/mame/commodore/c65.cpp index 702ad957e13..3d9b0768326 100644 --- a/src/mame/commodore/c65.cpp +++ b/src/mame/commodore/c65.cpp @@ -88,7 +88,7 @@ public: void cia0_porta_w(uint8_t data); uint8_t cia0_portb_r(); void cia0_portb_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(cia0_irq); + void cia0_irq(int state); uint8_t dummy_r(); @@ -668,7 +668,7 @@ INTERRUPT_GEN_MEMBER(c65_state::vic3_vblank_irq) // m_maincpu->set_input_line(M4510_IRQ_LINE,HOLD_LINE); } -WRITE_LINE_MEMBER(c65_state::cia0_irq) +void c65_state::cia0_irq(int state) { printf("%d IRQ\n",state); diff --git a/src/mame/commodore/cbm2.cpp b/src/mame/commodore/cbm2.cpp index a9875db04ff..dd6d763c1d7 100644 --- a/src/mame/commodore/cbm2.cpp +++ b/src/mame/commodore/cbm2.cpp @@ -178,8 +178,8 @@ public: void tpi1_pa_w(uint8_t data); uint8_t tpi1_pb_r(); void tpi1_pb_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER( tpi1_ca_w ); - DECLARE_WRITE_LINE_MEMBER( tpi1_cb_w ); + void tpi1_ca_w(int state); + void tpi1_cb_w(int state); void tpi2_pa_w(uint8_t data); void tpi2_pb_w(uint8_t data); @@ -193,7 +193,7 @@ public: void ext_tpi_pb_w(uint8_t data); void ext_tpi_pc_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER( ext_cia_irq_w ); + void ext_cia_irq_w(int state); uint8_t ext_cia_pb_r(); void ext_cia_pb_w(uint8_t data); @@ -302,8 +302,8 @@ public: uint8_t vic_videoram_r(offs_t offset); uint8_t vic_colorram_r(offs_t offset); - DECLARE_WRITE_LINE_MEMBER( tpi1_ca_w ); - DECLARE_WRITE_LINE_MEMBER( tpi1_cb_w ); + void tpi1_ca_w(int state); + void tpi1_cb_w(int state); uint8_t tpi2_pc_r(); void tpi2_pc_w(uint8_t data); @@ -1637,17 +1637,17 @@ void cbm2_state::tpi1_pb_w(uint8_t data) m_cassette->motor_w(BIT(data, 6)); } -WRITE_LINE_MEMBER( cbm2_state::tpi1_ca_w ) +void cbm2_state::tpi1_ca_w(int state) { m_graphics = state; } -WRITE_LINE_MEMBER( p500_state::tpi1_ca_w ) +void p500_state::tpi1_ca_w(int state) { m_statvid = state; } -WRITE_LINE_MEMBER( p500_state::tpi1_cb_w ) +void p500_state::tpi1_cb_w(int state) { m_vicdotsel = state; } @@ -1973,7 +1973,7 @@ void cbm2_state::ext_tpi_pc_w(uint8_t data) // MOS6526_INTERFACE( ext_cia_intf ) //------------------------------------------------- -WRITE_LINE_MEMBER( cbm2_state::ext_cia_irq_w ) +void cbm2_state::ext_cia_irq_w(int state) { m_tpi1->i3_w(!state); } diff --git a/src/mame/commodore/clcd.cpp b/src/mame/commodore/clcd.cpp index 644d089f262..6bd8069c161 100644 --- a/src/mame/commodore/clcd.cpp +++ b/src/mame/commodore/clcd.cpp @@ -428,7 +428,7 @@ public: machine().scheduler().perfect_quantum(attotime::from_usec(2000)); } - WRITE_LINE_MEMBER(write_sl) + void write_sl(int state) { if (m_key_poll != state) { @@ -452,7 +452,7 @@ public: } } - WRITE_LINE_MEMBER(via0_cb1_w) + void via0_cb1_w(int state) { int newm_key_clk = state & 1; if (m_key_clk != newm_key_clk) @@ -498,7 +498,7 @@ public: //int centronics_unknown = !BIT(data,5); } - WRITE_LINE_MEMBER(write_power_on) + void write_power_on(int state) { if (m_power_on != state) { @@ -507,7 +507,7 @@ public: } } - WRITE_LINE_MEMBER(write_power) + void write_power(int state) { if (m_power != state) { diff --git a/src/mame/commodore/pet.cpp b/src/mame/commodore/pet.cpp index a3b9e050360..e75ef63146a 100644 --- a/src/mame/commodore/pet.cpp +++ b/src/mame/commodore/pet.cpp @@ -253,15 +253,15 @@ public: void via_pa_w(uint8_t data); uint8_t via_pb_r(); void via_pb_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER( via_ca2_w ); - DECLARE_WRITE_LINE_MEMBER( via_cb2_w ); + void via_ca2_w(int state); + void via_cb2_w(int state); uint8_t pia1_pa_r(); uint8_t pia1_pb_r(); void pia1_pa_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER( pia1_ca2_w ); + void pia1_ca2_w(int state); - DECLARE_WRITE_LINE_MEMBER( user_diag_w ); + void user_diag_w(int state); MC6845_BEGIN_UPDATE( pet_begin_update ); MC6845_UPDATE_ROW( pet40_update_row ); @@ -1198,12 +1198,12 @@ void pet_state::via_pb_w(uint8_t data) m_cassette2->motor_w(BIT(data, 4)); } -WRITE_LINE_MEMBER( pet_state::via_ca2_w ) +void pet_state::via_ca2_w(int state) { m_graphic = state; } -WRITE_LINE_MEMBER( pet_state::via_cb2_w ) +void pet_state::via_cb2_w(int state) { m_via_cb2 = state; update_speaker(); @@ -1314,7 +1314,7 @@ uint8_t pet2001b_state::pia1_pb_r() return data; } -WRITE_LINE_MEMBER( pet_state::pia1_ca2_w ) +void pet_state::pia1_ca2_w(int state) { m_ieee->host_eoi_w(state); @@ -1322,7 +1322,7 @@ WRITE_LINE_MEMBER( pet_state::pia1_ca2_w ) } -WRITE_LINE_MEMBER( pet_state::user_diag_w ) +void pet_state::user_diag_w(int state) { m_user_diag = state; } diff --git a/src/mame/commodore/plus4.cpp b/src/mame/commodore/plus4.cpp index 4e32403ae32..22f88593155 100644 --- a/src/mame/commodore/plus4.cpp +++ b/src/mame/commodore/plus4.cpp @@ -115,14 +115,14 @@ protected: uint8_t ted_k_r(offs_t offset); - DECLARE_WRITE_LINE_MEMBER( write_kb0 ) { if (state) m_kb |= 1; else m_kb &= ~1; } - DECLARE_WRITE_LINE_MEMBER( write_kb1 ) { if (state) m_kb |= 2; else m_kb &= ~2; } - DECLARE_WRITE_LINE_MEMBER( write_kb2 ) { if (state) m_kb |= 4; else m_kb &= ~4; } - DECLARE_WRITE_LINE_MEMBER( write_kb3 ) { if (state) m_kb |= 8; else m_kb &= ~8; } - DECLARE_WRITE_LINE_MEMBER( write_kb4 ) { if (state) m_kb |= 16; else m_kb &= ~16; } - DECLARE_WRITE_LINE_MEMBER( write_kb5 ) { if (state) m_kb |= 32; else m_kb &= ~32; } - DECLARE_WRITE_LINE_MEMBER( write_kb6 ) { if (state) m_kb |= 64; else m_kb &= ~64; } - DECLARE_WRITE_LINE_MEMBER( write_kb7 ) { if (state) m_kb |= 128; else m_kb &= ~128; } + void write_kb0(int state) { if (state) m_kb |= 1; else m_kb &= ~1; } + void write_kb1(int state) { if (state) m_kb |= 2; else m_kb &= ~2; } + void write_kb2(int state) { if (state) m_kb |= 4; else m_kb &= ~4; } + void write_kb3(int state) { if (state) m_kb |= 8; else m_kb &= ~8; } + void write_kb4(int state) { if (state) m_kb |= 16; else m_kb &= ~16; } + void write_kb5(int state) { if (state) m_kb |= 32; else m_kb &= ~32; } + void write_kb6(int state) { if (state) m_kb |= 64; else m_kb &= ~64; } + void write_kb7(int state) { if (state) m_kb |= 128; else m_kb &= ~128; } DECLARE_QUICKLOAD_LOAD_MEMBER(quickload_c16); diff --git a/src/mame/commodore/vic10.cpp b/src/mame/commodore/vic10.cpp index 7a612bd34f6..97562266596 100644 --- a/src/mame/commodore/vic10.cpp +++ b/src/mame/commodore/vic10.cpp @@ -90,7 +90,7 @@ private: uint8_t cpu_r(); void cpu_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER( exp_reset_w ); + void exp_reset_w(int state); void vic10_mem(address_map &map); void vic_colorram_map(address_map &map); @@ -587,7 +587,7 @@ void vic10_state::cpu_w(uint8_t data) // VIC10_EXPANSION_INTERFACE( expansion_intf ) //------------------------------------------------- -WRITE_LINE_MEMBER( vic10_state::exp_reset_w ) +void vic10_state::exp_reset_w(int state) { if (state == ASSERT_LINE) { diff --git a/src/mame/commodore/vic20.cpp b/src/mame/commodore/vic20.cpp index a5b5647cb28..6510451ed9f 100644 --- a/src/mame/commodore/vic20.cpp +++ b/src/mame/commodore/vic20.cpp @@ -100,12 +100,12 @@ private: uint8_t vic_videoram_r(offs_t offset); - DECLARE_WRITE_LINE_MEMBER( write_light_pen ); - DECLARE_WRITE_LINE_MEMBER( write_user_joy0 ); - DECLARE_WRITE_LINE_MEMBER( write_user_joy1 ); - DECLARE_WRITE_LINE_MEMBER( write_user_joy2 ); - DECLARE_WRITE_LINE_MEMBER( write_user_light_pen ); - DECLARE_WRITE_LINE_MEMBER( write_user_cassette_switch ); + void write_light_pen(int state); + void write_user_joy0(int state); + void write_user_joy1(int state); + void write_user_joy2(int state); + void write_user_light_pen(int state); + void write_user_cassette_switch(int state); uint8_t via1_pa_r(); void via1_pa_w(uint8_t data); @@ -115,10 +115,10 @@ private: uint8_t via2_pb_r(); void via2_pa_w(uint8_t data); void via2_pb_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER( via2_ca2_w ); - DECLARE_WRITE_LINE_MEMBER( via2_cb2_w ); + void via2_ca2_w(int state); + void via2_cb2_w(int state); - DECLARE_WRITE_LINE_MEMBER( exp_reset_w ); + void exp_reset_w(int state); DECLARE_QUICKLOAD_LOAD_MEMBER(quickload_vc20); // keyboard state @@ -730,13 +730,13 @@ void vic20_state::via2_pb_w(uint8_t data) m_key_col = data; } -WRITE_LINE_MEMBER( vic20_state::via2_ca2_w ) +void vic20_state::via2_ca2_w(int state) { // serial clock out m_iec->host_clk_w(!state); } -WRITE_LINE_MEMBER( vic20_state::via2_cb2_w ) +void vic20_state::via2_cb2_w(int state) { // serial data out m_iec->host_data_w(!state); @@ -747,7 +747,7 @@ WRITE_LINE_MEMBER( vic20_state::via2_cb2_w ) // VIC20_EXPANSION_INTERFACE( expansion_intf ) //------------------------------------------------- -WRITE_LINE_MEMBER( vic20_state::exp_reset_w ) +void vic20_state::exp_reset_w(int state) { if (!state) { @@ -805,34 +805,34 @@ void vic20_state::machine_reset() m_user->write_3(1); } -WRITE_LINE_MEMBER(vic20_state::write_user_joy0) +void vic20_state::write_user_joy0(int state) { m_user_joy0 = state; } -WRITE_LINE_MEMBER(vic20_state::write_user_joy1) +void vic20_state::write_user_joy1(int state) { m_user_joy1 = state; } -WRITE_LINE_MEMBER(vic20_state::write_user_joy2) +void vic20_state::write_user_joy2(int state) { m_user_joy2 = state; } -WRITE_LINE_MEMBER(vic20_state::write_light_pen) +void vic20_state::write_light_pen(int state) { m_light_pen = state; m_vic->lp_w(m_light_pen && m_user_light_pen); } -WRITE_LINE_MEMBER(vic20_state::write_user_light_pen) +void vic20_state::write_user_light_pen(int state) { m_user_light_pen = state; m_vic->lp_w(m_light_pen && m_user_light_pen); } -WRITE_LINE_MEMBER(vic20_state::write_user_cassette_switch) +void vic20_state::write_user_cassette_switch(int state) { m_user_cassette_switch = state; } diff --git a/src/mame/comx/comx35.cpp b/src/mame/comx/comx35.cpp index dc6de01deee..b4cdabddca6 100644 --- a/src/mame/comx/comx35.cpp +++ b/src/mame/comx/comx35.cpp @@ -441,12 +441,12 @@ void comx35_state::check_interrupt() m_maincpu->set_input_line(COSMAC_INPUT_LINE_INT, m_cr1 || m_int); } -READ_LINE_MEMBER( comx35_state::clear_r ) +int comx35_state::clear_r() { return m_clear; } -READ_LINE_MEMBER( comx35_state::ef2_r ) +int comx35_state::ef2_r() { if (m_iden) { @@ -460,12 +460,12 @@ READ_LINE_MEMBER( comx35_state::ef2_r ) } } -READ_LINE_MEMBER( comx35_state::ef4_r ) +int comx35_state::ef4_r() { return m_exp->ef4_r() | ((m_cassette->input() > 0.0f) ? 1 : 0); } -WRITE_LINE_MEMBER( comx35_state::q_w ) +void comx35_state::q_w(int state) { m_q = state; @@ -524,7 +524,7 @@ void comx35_state::sc_w(uint8_t data) // COMX_EXPANSION_INTERFACE( expansion_intf ) //------------------------------------------------- -WRITE_LINE_MEMBER( comx35_state::irq_w ) +void comx35_state::irq_w(int state) { m_int = state; check_interrupt(); diff --git a/src/mame/comx/comx35.h b/src/mame/comx/comx35.h index 7f74ef2db03..c475e731f1d 100644 --- a/src/mame/comx/comx35.h +++ b/src/mame/comx/comx35.h @@ -77,14 +77,14 @@ private: uint8_t io_r(offs_t offset); void io_w(offs_t offset, uint8_t data); void cdp1869_w(offs_t offset, uint8_t data); - DECLARE_READ_LINE_MEMBER( clear_r ); - DECLARE_READ_LINE_MEMBER( ef2_r ); - DECLARE_READ_LINE_MEMBER( ef4_r ); - DECLARE_WRITE_LINE_MEMBER( q_w ); + int clear_r(); + int ef2_r(); + int ef4_r(); + void q_w(int state); void sc_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER( irq_w ); - DECLARE_WRITE_LINE_MEMBER( prd_w ); - DECLARE_QUICKLOAD_LOAD_MEMBER( quickload_cb ); + void irq_w(int state); + void prd_w(int state); + DECLARE_QUICKLOAD_LOAD_MEMBER(quickload_cb); void image_fread_memory(device_image_interface &image, uint16_t addr, uint32_t count); CDP1869_CHAR_RAM_READ_MEMBER(comx35_charram_r); CDP1869_CHAR_RAM_WRITE_MEMBER(comx35_charram_w); diff --git a/src/mame/comx/comx35_v.cpp b/src/mame/comx/comx35_v.cpp index dac6e8b4cda..1b86b4726fc 100644 --- a/src/mame/comx/comx35_v.cpp +++ b/src/mame/comx/comx35_v.cpp @@ -66,7 +66,7 @@ CDP1869_PCB_READ_MEMBER( comx35_state::comx35_pcb_r ) return BIT(pmd, 7); } -WRITE_LINE_MEMBER( comx35_state::prd_w ) +void comx35_state::prd_w(int state) { if ((m_prd == CLEAR_LINE) && (state == ASSERT_LINE)) { diff --git a/src/mame/concept/concept.h b/src/mame/concept/concept.h index 74704d20f26..e06663116e5 100644 --- a/src/mame/concept/concept.h +++ b/src/mame/concept/concept.h @@ -68,9 +68,9 @@ private: void via_out_a(uint8_t data); uint8_t via_in_b(); void via_out_b(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(via_out_cb2); - DECLARE_WRITE_LINE_MEMBER(via_irq_func); - DECLARE_WRITE_LINE_MEMBER(ioc_interrupt); + void via_out_cb2(int state); + void via_irq_func(int state); + void ioc_interrupt(int state); void concept_set_interrupt(int level, int state); void concept_memmap(address_map &map); diff --git a/src/mame/concept/concept_m.cpp b/src/mame/concept/concept_m.cpp index 35bc3019d3a..883f2f12f19 100644 --- a/src/mame/concept/concept_m.cpp +++ b/src/mame/concept/concept_m.cpp @@ -73,7 +73,7 @@ uint32_t concept_state::screen_update(screen_device &screen, bitmap_ind16 &bitma return 0; } -WRITE_LINE_MEMBER(concept_state::ioc_interrupt) +void concept_state::ioc_interrupt(int state) { concept_set_interrupt(IOCINT_level, state); } @@ -155,7 +155,7 @@ void concept_state::via_out_b(uint8_t data) VIA CB2: used as sound output */ -WRITE_LINE_MEMBER(concept_state::via_out_cb2) +void concept_state::via_out_cb2(int state) { // LOG(("via_out_cb2: Sound control written: data=0x%2.2x\n", state)); m_speaker->level_w(state); @@ -164,7 +164,7 @@ WRITE_LINE_MEMBER(concept_state::via_out_cb2) /* VIA irq -> 68k level 5 */ -WRITE_LINE_MEMBER(concept_state::via_irq_func) +void concept_state::via_irq_func(int state) { concept_set_interrupt(TIMINT_level, state); } diff --git a/src/mame/conitec/prof180x.cpp b/src/mame/conitec/prof180x.cpp index 3954d9df9ab..c7cc81152c6 100644 --- a/src/mame/conitec/prof180x.cpp +++ b/src/mame/conitec/prof180x.cpp @@ -82,42 +82,42 @@ void prof180x_state::write(offs_t offset, uint8_t data) } } -WRITE_LINE_MEMBER(prof180x_state::c0_flag_w) +void prof180x_state::c0_flag_w(int state) { // C0 (DATA) m_c0 = state; } -WRITE_LINE_MEMBER(prof180x_state::c1_flag_w) +void prof180x_state::c1_flag_w(int state) { // C1 (M0) m_c1 = state; } -WRITE_LINE_MEMBER(prof180x_state::c2_flag_w) +void prof180x_state::c2_flag_w(int state) { // C2 (M1) m_c2 = state; } -WRITE_LINE_MEMBER(prof180x_state::mini_flag_w) +void prof180x_state::mini_flag_w(int state) { } -WRITE_LINE_MEMBER(prof180x_state::mm0_flag_w) +void prof180x_state::mm0_flag_w(int state) { m_mm0 = state; } -WRITE_LINE_MEMBER(prof180x_state::rtc_ce_w) +void prof180x_state::rtc_ce_w(int state) { } -WRITE_LINE_MEMBER(prof180x_state::peps_flag_w) +void prof180x_state::peps_flag_w(int state) { } -WRITE_LINE_MEMBER(prof180x_state::mm1_flag_w) +void prof180x_state::mm1_flag_w(int state) { m_mm1 = state; } diff --git a/src/mame/conitec/prof180x.h b/src/mame/conitec/prof180x.h index a0fc5f96334..383fa894f37 100644 --- a/src/mame/conitec/prof180x.h +++ b/src/mame/conitec/prof180x.h @@ -38,14 +38,14 @@ private: uint8_t status1_r(); uint8_t status_r(offs_t offset); - DECLARE_WRITE_LINE_MEMBER(c0_flag_w); - DECLARE_WRITE_LINE_MEMBER(c1_flag_w); - DECLARE_WRITE_LINE_MEMBER(c2_flag_w); - DECLARE_WRITE_LINE_MEMBER(mini_flag_w); - DECLARE_WRITE_LINE_MEMBER(mm0_flag_w); - DECLARE_WRITE_LINE_MEMBER(rtc_ce_w); - DECLARE_WRITE_LINE_MEMBER(peps_flag_w); - DECLARE_WRITE_LINE_MEMBER(mm1_flag_w); + void c0_flag_w(int state); + void c1_flag_w(int state); + void c2_flag_w(int state); + void mini_flag_w(int state); + void mm0_flag_w(int state); + void rtc_ce_w(int state); + void peps_flag_w(int state); + void mm1_flag_w(int state); uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); diff --git a/src/mame/conitec/prof80.cpp b/src/mame/conitec/prof80.cpp index a557a1e1f1e..0e2a23d38e2 100644 --- a/src/mame/conitec/prof80.cpp +++ b/src/mame/conitec/prof80.cpp @@ -47,7 +47,7 @@ void prof80_state::motor(int mon) } -WRITE_LINE_MEMBER(prof80_state::ready_w) +void prof80_state::ready_w(int state) { if (m_ready != state) { @@ -58,13 +58,13 @@ WRITE_LINE_MEMBER(prof80_state::ready_w) } -WRITE_LINE_MEMBER(prof80_state::inuse_w) +void prof80_state::inuse_w(int state) { //m_floppy->inuse_w(state); } -WRITE_LINE_MEMBER(prof80_state::motor_w) +void prof80_state::motor_w(int state) { if (state) { @@ -84,7 +84,7 @@ WRITE_LINE_MEMBER(prof80_state::motor_w) } -WRITE_LINE_MEMBER(prof80_state::select_w) +void prof80_state::select_w(int state) { if (m_select != state) { @@ -94,13 +94,13 @@ WRITE_LINE_MEMBER(prof80_state::select_w) } -WRITE_LINE_MEMBER(prof80_state::mini_w) +void prof80_state::mini_w(int state) { m_fdc->set_unscaled_clock(16_MHz_XTAL / (state ? 4 : 2)); } -WRITE_LINE_MEMBER(prof80_state::mstop_w) +void prof80_state::mstop_w(int state) { if (!state) { diff --git a/src/mame/conitec/prof80.h b/src/mame/conitec/prof80.h index 61169e6b612..281394a4a2e 100644 --- a/src/mame/conitec/prof80.h +++ b/src/mame/conitec/prof80.h @@ -78,12 +78,12 @@ private: void motor(int mon); - DECLARE_WRITE_LINE_MEMBER(ready_w); - DECLARE_WRITE_LINE_MEMBER(inuse_w); - DECLARE_WRITE_LINE_MEMBER(motor_w); - DECLARE_WRITE_LINE_MEMBER(select_w); - DECLARE_WRITE_LINE_MEMBER(mini_w); - DECLARE_WRITE_LINE_MEMBER(mstop_w); + void ready_w(int state); + void inuse_w(int state); + void motor_w(int state); + void select_w(int state); + void mini_w(int state); + void mstop_w(int state); // floppy state int m_motor = 0; diff --git a/src/mame/conitec/prof80mmu.cpp b/src/mame/conitec/prof80mmu.cpp index ad26c67bfbe..e13ac1facb3 100644 --- a/src/mame/conitec/prof80mmu.cpp +++ b/src/mame/conitec/prof80mmu.cpp @@ -85,7 +85,7 @@ void prof80_mmu_device::par_w(offs_t offset, uint8_t data) // mme_w - //------------------------------------------------- -WRITE_LINE_MEMBER( prof80_mmu_device::mme_w ) +void prof80_mmu_device::mme_w(int state) { m_enabled = (state == 1); } diff --git a/src/mame/conitec/prof80mmu.h b/src/mame/conitec/prof80mmu.h index 21e2f326f9a..2a4be570e92 100644 --- a/src/mame/conitec/prof80mmu.h +++ b/src/mame/conitec/prof80mmu.h @@ -26,7 +26,7 @@ public: virtual void z80_program_map(address_map &map); void par_w(offs_t offset, uint8_t data); - DECLARE_WRITE_LINE_MEMBER( mme_w ); + void mme_w(int state); void program_map(address_map &map); protected: diff --git a/src/mame/cvs/cvs.cpp b/src/mame/cvs/cvs.cpp index 2fdbc4c92ce..a8b323cdac7 100644 --- a/src/mame/cvs/cvs.cpp +++ b/src/mame/cvs/cvs.cpp @@ -189,8 +189,8 @@ private: uint8_t huncholy_prot_r(offs_t offset); uint8_t superbik_prot_r(); uint8_t hero_prot_r(offs_t offset); - DECLARE_READ_LINE_MEMBER(speech_rom_read_bit); - DECLARE_WRITE_LINE_MEMBER(slave_cpu_interrupt); + int speech_rom_read_bit(); + void slave_cpu_interrupt(int state); uint8_t input_r(offs_t offset); void speech_rom_address_lo_w(uint8_t data); void speech_rom_address_hi_w(uint8_t data); @@ -485,7 +485,7 @@ INTERRUPT_GEN_MEMBER(cvs_state::main_cpu_interrupt) } -WRITE_LINE_MEMBER(cvs_state::slave_cpu_interrupt) +void cvs_state::slave_cpu_interrupt(int state) { m_audiocpu->set_input_line(0, state ? ASSERT_LINE : CLEAR_LINE); } @@ -529,7 +529,7 @@ uint8_t cvs_state::input_r(offs_t offset) * *************************************/ #if 0 -READ_LINE_MEMBER(cvs_state::cvs_393hz_clock_r) +int cvs_state::cvs_393hz_clock_r() { return m_393hz_clock; } @@ -651,7 +651,7 @@ void cvs_state::tms5110_pdc_w(offs_t offset, uint8_t data) } -READ_LINE_MEMBER(cvs_state::speech_rom_read_bit) +int cvs_state::speech_rom_read_bit() { // before reading the bit, clamp the address to the region length m_speech_rom_bit_address &= ((m_speech_data_rom.bytes() * 8) - 1); diff --git a/src/mame/cvs/cvs_base.cpp b/src/mame/cvs/cvs_base.cpp index f940f8b2e42..9a9690ace4b 100644 --- a/src/mame/cvs/cvs_base.cpp +++ b/src/mame/cvs/cvs_base.cpp @@ -21,7 +21,7 @@ void cvs_base_state::machine_reset() m_stars_scroll = 0; } -WRITE_LINE_MEMBER(cvs_base_state::write_s2650_flag) // TODO: remove once set_memview is available via devcb +void cvs_base_state::write_s2650_flag(int state) // TODO: remove once set_memview is available via devcb { m_ram_view.select(state); } diff --git a/src/mame/cvs/cvs_base.h b/src/mame/cvs/cvs_base.h index b62cd9224f8..fa34f480184 100644 --- a/src/mame/cvs/cvs_base.h +++ b/src/mame/cvs/cvs_base.h @@ -73,7 +73,7 @@ protected: virtual void machine_start() override ATTR_COLD; virtual void machine_reset() override ATTR_COLD; - DECLARE_WRITE_LINE_MEMBER(write_s2650_flag); + void write_s2650_flag(int state); uint8_t collision_r(); uint8_t collision_clear(); void scroll_start(); diff --git a/src/mame/cvs/galaxia.cpp b/src/mame/cvs/galaxia.cpp index d2abf99c981..7073fd39f1e 100644 --- a/src/mame/cvs/galaxia.cpp +++ b/src/mame/cvs/galaxia.cpp @@ -103,7 +103,7 @@ protected: tilemap_t *m_bg_tilemap = nullptr; template void video_w(offs_t offset, uint8_t data); - DECLARE_WRITE_LINE_MEMBER(vblank_irq); + void vblank_irq(int state); void data_map(address_map &map) ATTR_COLD; void io_map(address_map &map) ATTR_COLD; @@ -359,7 +359,7 @@ uint32_t astrowar_state::screen_update(screen_device &screen, bitmap_ind16 &bitm // machine -WRITE_LINE_MEMBER(galaxia_state::vblank_irq) +void galaxia_state::vblank_irq(int state) { if (state) { diff --git a/src/mame/cvs/quasar.cpp b/src/mame/cvs/quasar.cpp index 10cff2e64be..999ede89689 100644 --- a/src/mame/cvs/quasar.cpp +++ b/src/mame/cvs/quasar.cpp @@ -80,7 +80,7 @@ private: void bullet_w(offs_t offset, uint8_t data); void sh_command_w(uint8_t data); uint8_t sh_command_r(); - DECLARE_READ_LINE_MEMBER(audio_t1_r); + int audio_t1_r(); void palette(palette_device &palette) const ATTR_COLD; uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); @@ -334,7 +334,7 @@ uint8_t quasar_state::sh_command_r() return m_soundlatch->read() + (m_dsw[2]->read() & 0x30); } -READ_LINE_MEMBER(quasar_state::audio_t1_r) +int quasar_state::audio_t1_r() { return (m_soundlatch->read() == 0); } diff --git a/src/mame/dai/dai_snd.cpp b/src/mame/dai/dai_snd.cpp index 52334c699f8..4c61ec57e01 100644 --- a/src/mame/dai/dai_snd.cpp +++ b/src/mame/dai/dai_snd.cpp @@ -96,19 +96,19 @@ void dai_sound_device::set_volume(offs_t offset, uint8_t data) // PIT callbacks //------------------------------------------------- -WRITE_LINE_MEMBER(dai_sound_device::set_input_ch0) +void dai_sound_device::set_input_ch0(int state) { m_mixer_channel->update(); m_dai_input[0] = state; } -WRITE_LINE_MEMBER(dai_sound_device::set_input_ch1) +void dai_sound_device::set_input_ch1(int state) { m_mixer_channel->update(); m_dai_input[1] = state; } -WRITE_LINE_MEMBER(dai_sound_device::set_input_ch2) +void dai_sound_device::set_input_ch2(int state) { m_mixer_channel->update(); m_dai_input[2] = state; diff --git a/src/mame/dai/dai_snd.h b/src/mame/dai/dai_snd.h index c91630218ce..dbf827b125a 100644 --- a/src/mame/dai/dai_snd.h +++ b/src/mame/dai/dai_snd.h @@ -18,9 +18,9 @@ public: // construction/destruction dai_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = 0); - DECLARE_WRITE_LINE_MEMBER(set_input_ch0); - DECLARE_WRITE_LINE_MEMBER(set_input_ch1); - DECLARE_WRITE_LINE_MEMBER(set_input_ch2); + void set_input_ch0(int state); + void set_input_ch1(int state); + void set_input_ch2(int state); void set_volume(offs_t offset, uint8_t data); protected: diff --git a/src/mame/dataeast/backfire.cpp b/src/mame/dataeast/backfire.cpp index 812cbeda521..6588835677e 100644 --- a/src/mame/dataeast/backfire.cpp +++ b/src/mame/dataeast/backfire.cpp @@ -63,7 +63,7 @@ private: virtual void video_start() override; uint32_t screen_update_left(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_right(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(vbl_interrupt); + void vbl_interrupt(int state); void irq_ack_w(uint32_t data); void descramble_sound(); DECO16IC_BANK_CB_MEMBER(bank_callback); @@ -327,7 +327,7 @@ static GFXDECODE_START( gfx_backfire ) GFXDECODE_END -WRITE_LINE_MEMBER(backfire_state::vbl_interrupt) +void backfire_state::vbl_interrupt(int state) { if (state) m_maincpu->set_input_line(ARM_IRQ_LINE, ASSERT_LINE); diff --git a/src/mame/dataeast/battlera.cpp b/src/mame/dataeast/battlera.cpp index 4145e0b46a3..9bc076af9cb 100644 --- a/src/mame/dataeast/battlera.cpp +++ b/src/mame/dataeast/battlera.cpp @@ -146,7 +146,7 @@ private: uint8_t control_data_r(); void adpcm_data_w(uint8_t data); void adpcm_reset_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(adpcm_int); + void adpcm_int(int state); uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); @@ -211,7 +211,7 @@ void battlera_state::main_portmap(address_map &map) /******************************************************************************/ -WRITE_LINE_MEMBER(battlera_state::adpcm_int) +void battlera_state::adpcm_int(int state) { m_msm->data_w(m_msm5205next >> 4); m_msm5205next <<= 4; diff --git a/src/mame/dataeast/brkthru.cpp b/src/mame/dataeast/brkthru.cpp index 451d4f75568..052d82a4983 100644 --- a/src/mame/dataeast/brkthru.cpp +++ b/src/mame/dataeast/brkthru.cpp @@ -212,7 +212,7 @@ private: TILE_GET_INFO_MEMBER(get_fg_tile_info); void palette(palette_device &palette) const; uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(vblank_irq); + void vblank_irq(int state); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect, int prio); void brkthru_main_map(address_map &map); @@ -740,7 +740,7 @@ void brkthru_state::machine_reset() m_nmi_mask = 0; } -WRITE_LINE_MEMBER(brkthru_state::vblank_irq) +void brkthru_state::vblank_irq(int state) { if (state && m_nmi_mask) m_maincpu->pulse_input_line(INPUT_LINE_NMI, attotime::zero); diff --git a/src/mame/dataeast/cntsteer.cpp b/src/mame/dataeast/cntsteer.cpp index 64fe6766cf0..afa1e7e008f 100644 --- a/src/mame/dataeast/cntsteer.cpp +++ b/src/mame/dataeast/cntsteer.cpp @@ -125,10 +125,10 @@ public: void zerotrgt_palette(palette_device &palette) const; uint32_t screen_update_cntsteer(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_zerotrgt(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(subcpu_vblank_irq); + void subcpu_vblank_irq(int state); INTERRUPT_GEN_MEMBER(sound_interrupt); - void zerotrgt_draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); - void cntsteer_draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); + void zerotrgt_draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); + void cntsteer_draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); void zerotrgt_rearrange_gfx( int romsize, int romarea ); void cntsteer(machine_config &config); void zerotrgt(machine_config &config); @@ -664,7 +664,7 @@ void cntsteer_state::nmimask_w(uint8_t data) m_nmimask = data & 0x80; } -WRITE_LINE_MEMBER(cntsteer_state::subcpu_vblank_irq) +void cntsteer_state::subcpu_vblank_irq(int state) { // TODO: hack for bus request: DP is enabled with 0xff only during POST, and disabled once that critical operations are performed. // That's my best guess so far about how Slave is supposed to stop execution on Master CPU, the lack of any realistic write diff --git a/src/mame/dataeast/dblewing.cpp b/src/mame/dataeast/dblewing.cpp index 4b2d8451bbc..237f7b8eacd 100644 --- a/src/mame/dataeast/dblewing.cpp +++ b/src/mame/dataeast/dblewing.cpp @@ -122,7 +122,7 @@ private: required_device m_sprgen; uint8_t irq_latch_r(); - DECLARE_WRITE_LINE_MEMBER(soundlatch_irq_w); + void soundlatch_irq_w(int state); uint32_t screen_update_dblewing(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); DECO16IC_BANK_CB_MEMBER(bank_callback); @@ -173,7 +173,7 @@ void dblewing_state::wf_protection_region_0_104_w(offs_t offset, uint16_t data, m_deco104->write_data( deco146_addr, data, mem_mask, cs ); } -WRITE_LINE_MEMBER( dblewing_state::soundlatch_irq_w ) +void dblewing_state::soundlatch_irq_w(int state) { m_soundlatch_pending = bool(state); } diff --git a/src/mame/dataeast/dec0.cpp b/src/mame/dataeast/dec0.cpp index 890a99f4dfb..4976673ba07 100644 --- a/src/mame/dataeast/dec0.cpp +++ b/src/mame/dataeast/dec0.cpp @@ -1881,7 +1881,7 @@ void dec0_automat_state::sound_bankswitch_w(uint8_t data) m_soundbank->set_entry(data & 7); } -WRITE_LINE_MEMBER(dec0_automat_state::msm1_vclk_cb) +void dec0_automat_state::msm1_vclk_cb(int state) { if (!state) return; @@ -1891,7 +1891,7 @@ WRITE_LINE_MEMBER(dec0_automat_state::msm1_vclk_cb) m_audiocpu->set_input_line(INPUT_LINE_NMI, m_adpcm_toggle[0]); } -WRITE_LINE_MEMBER(dec0_automat_state::msm2_vclk_cb) +void dec0_automat_state::msm2_vclk_cb(int state) { if (!state) return; diff --git a/src/mame/dataeast/dec0.h b/src/mame/dataeast/dec0.h index 6febf5a8588..0ed570bfd73 100644 --- a/src/mame/dataeast/dec0.h +++ b/src/mame/dataeast/dec0.h @@ -252,8 +252,8 @@ private: COMBINE_DATA(&m_automat_scroll_regs[offset]); } void sound_bankswitch_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(msm1_vclk_cb); - DECLARE_WRITE_LINE_MEMBER(msm2_vclk_cb); + void msm1_vclk_cb(int state); + void msm2_vclk_cb(int state); virtual void machine_start() override; diff --git a/src/mame/dataeast/dec8.cpp b/src/mame/dataeast/dec8.cpp index 354a47b4061..421dc094ed9 100644 --- a/src/mame/dataeast/dec8.cpp +++ b/src/mame/dataeast/dec8.cpp @@ -69,7 +69,7 @@ void dec8_state::dec8_mxc06_karn_buffer_spriteram_w(uint8_t data) } /* Only used by ghostb, gondo, garyoret, other games can control buffering */ -WRITE_LINE_MEMBER(dec8_state::screen_vblank_dec8) +void dec8_state::screen_vblank_dec8(int state) { // rising edge if (state) @@ -216,7 +216,7 @@ void dec8_state::dec8_sound_w(uint8_t data) m_m6502_timer->adjust(m_audiocpu->cycles_to_attotime(3)); } -WRITE_LINE_MEMBER(csilver_state::csilver_adpcm_int) +void csilver_state::csilver_adpcm_int(int state) { m_toggle ^= 1; if (m_toggle) @@ -1763,7 +1763,7 @@ GFXDECODE_END /******************************************************************************/ /* Coins generate NMI's */ -WRITE_LINE_MEMBER(dec8_state::oscar_coin_irq) +void dec8_state::oscar_coin_irq(int state) { if (state && !m_coin_state) m_maincpu->set_input_line(INPUT_LINE_NMI, ASSERT_LINE); @@ -1775,7 +1775,7 @@ void dec8_state::oscar_coin_clear_w(uint8_t data) m_maincpu->set_input_line(INPUT_LINE_NMI, CLEAR_LINE); } -WRITE_LINE_MEMBER(dec8_state::shackled_coin_irq) +void dec8_state::shackled_coin_irq(int state) { if (state && !m_coin_state) m_mcu->set_input_line(MCS51_INT0_LINE, ASSERT_LINE); diff --git a/src/mame/dataeast/dec8.h b/src/mame/dataeast/dec8.h index 81ad310fec0..2d155fa62c7 100644 --- a/src/mame/dataeast/dec8.h +++ b/src/mame/dataeast/dec8.h @@ -189,10 +189,10 @@ private: uint32_t screen_update_oscar(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_srdarwin(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_cobracom(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(screen_vblank_dec8); - DECLARE_WRITE_LINE_MEMBER(oscar_coin_irq); + void screen_vblank_dec8(int state); + void oscar_coin_irq(int state); void oscar_coin_clear_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(shackled_coin_irq); + void shackled_coin_irq(int state); void srdarwin_draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect, bitmap_ind8 &primap); void gondo_colpri_cb(u32 &colour, u32 &pri_mask); void cobracom_colpri_cb(u32 &colour, u32 &pri_mask); @@ -240,7 +240,7 @@ private: void csilver_sound_bank_w(uint8_t data); void csilver_mcu_to_main_w(uint8_t data); uint8_t csilver_adpcm_reset_r(); - DECLARE_WRITE_LINE_MEMBER(csilver_adpcm_int); + void csilver_adpcm_int(int state); void csilver_map(address_map &map); void csilver_s_map(address_map &map); diff --git a/src/mame/dataeast/deco156.cpp b/src/mame/dataeast/deco156.cpp index 837df667acf..44fa3d28fee 100644 --- a/src/mame/dataeast/deco156.cpp +++ b/src/mame/dataeast/deco156.cpp @@ -58,8 +58,8 @@ private: void hvysmsh_oki_0_bank_w(uint32_t data); virtual void video_start() override; uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(vblank_interrupt); - void descramble_sound( const char *tag ); + void vblank_interrupt(int state); + void descramble_sound(const char *tag); DECO16IC_BANK_CB_MEMBER(bank_callback); DECOSPR_PRIORITY_CB_MEMBER(pri_callback); @@ -291,7 +291,7 @@ GFXDECODE_END /**********************************************************************************/ -WRITE_LINE_MEMBER(deco156_state::vblank_interrupt) +void deco156_state::vblank_interrupt(int state) { m_maincpu->set_input_line(ARM_IRQ_LINE, state ? HOLD_LINE : CLEAR_LINE); } diff --git a/src/mame/dataeast/deco32.cpp b/src/mame/dataeast/deco32.cpp index 71017ed6008..c7726ecfc85 100644 --- a/src/mame/dataeast/deco32.cpp +++ b/src/mame/dataeast/deco32.cpp @@ -794,7 +794,7 @@ LC7535_VOLUME_CHANGED( dragngun_state::volume_gun_changed ) m_oki[2]->set_output_gain(ALL_OUTPUTS, m_vol_gun->normalize(attenuation_left)); } -WRITE_LINE_MEMBER( nslasher_state::tattass_sound_irq_w ) +void nslasher_state::tattass_sound_irq_w(int state) { if (state) { diff --git a/src/mame/dataeast/deco32.h b/src/mame/dataeast/deco32.h index 4ef33f700b7..3b5d37e730f 100644 --- a/src/mame/dataeast/deco32.h +++ b/src/mame/dataeast/deco32.h @@ -193,7 +193,7 @@ private: void sprite1_color_bank_w(u8 data); void sprite2_color_bank_w(u8 data); void tattass_control_w(offs_t offset, u32 data, u32 mem_mask = ~0); - DECLARE_WRITE_LINE_MEMBER(tattass_sound_irq_w); + void tattass_sound_irq_w(int state); u16 nslasher_debug_r(); virtual void video_start() override; diff --git a/src/mame/dataeast/deco_irq.cpp b/src/mame/dataeast/deco_irq.cpp index f164e481444..7ef90cb0750 100644 --- a/src/mame/dataeast/deco_irq.cpp +++ b/src/mame/dataeast/deco_irq.cpp @@ -221,19 +221,19 @@ u8 deco_irq_device::status_r() return data; } -WRITE_LINE_MEMBER( deco_irq_device::lightgun1_trigger_w ) +void deco_irq_device::lightgun1_trigger_w(int state) { if (state) m_lightgun_latch = m_lightgun1_cb(); } -WRITE_LINE_MEMBER( deco_irq_device::lightgun2_trigger_w ) +void deco_irq_device::lightgun2_trigger_w(int state) { if (state) m_lightgun_latch = m_lightgun2_cb(); } -WRITE_LINE_MEMBER( deco_irq_device::lightgun_irq_ack_w ) +void deco_irq_device::lightgun_irq_ack_w(int state) { m_lightgun_irq = false; m_lightgun_irq_cb(CLEAR_LINE); diff --git a/src/mame/dataeast/deco_irq.h b/src/mame/dataeast/deco_irq.h index 3c25ff8e753..a7acf2dbafb 100644 --- a/src/mame/dataeast/deco_irq.h +++ b/src/mame/dataeast/deco_irq.h @@ -48,9 +48,9 @@ public: void raster_irq_ack(); - DECLARE_WRITE_LINE_MEMBER(lightgun1_trigger_w); - DECLARE_WRITE_LINE_MEMBER(lightgun2_trigger_w); - DECLARE_WRITE_LINE_MEMBER(lightgun_irq_ack_w); + void lightgun1_trigger_w(int state); + void lightgun2_trigger_w(int state); + void lightgun_irq_ack_w(int state); protected: // device-level overrides diff --git a/src/mame/dataeast/deco_ld.cpp b/src/mame/dataeast/deco_ld.cpp index d1218f82ffb..4699565d20e 100644 --- a/src/mame/dataeast/deco_ld.cpp +++ b/src/mame/dataeast/deco_ld.cpp @@ -141,7 +141,7 @@ public: void rblaster(machine_config &config); - DECLARE_READ_LINE_MEMBER(begas_vblank_r); + int begas_vblank_r(); DECLARE_INPUT_CHANGED_MEMBER(coin_inserted); protected: @@ -321,7 +321,7 @@ void deco_ld_state::rblaster_sound_map(address_map &map) map(0xe000, 0xffff).rom(); } -READ_LINE_MEMBER( deco_ld_state::begas_vblank_r ) +int deco_ld_state::begas_vblank_r() { return m_screen->vpos() >= 240*2; } diff --git a/src/mame/dataeast/deco_mlc.h b/src/mame/dataeast/deco_mlc.h index 81e33683cea..6fc191722f2 100644 --- a/src/mame/dataeast/deco_mlc.h +++ b/src/mame/dataeast/deco_mlc.h @@ -90,7 +90,7 @@ private: void sh96_protection_region_0_146_w(offs_t offset, u16 data, u16 mem_mask = ~0); u32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(screen_vblank_mlc); + void screen_vblank_mlc(int state); TIMER_DEVICE_CALLBACK_MEMBER(interrupt_gen); void draw_sprites( const rectangle &cliprect, int scanline, u32* dest, u8* pri); void drawgfxzoomline(u32* dest, u8* pri,const rectangle &clip,gfx_element *gfx, diff --git a/src/mame/dataeast/deco_mlc_v.cpp b/src/mame/dataeast/deco_mlc_v.cpp index 1c3781522d1..63b92d99b7f 100644 --- a/src/mame/dataeast/deco_mlc_v.cpp +++ b/src/mame/dataeast/deco_mlc_v.cpp @@ -532,7 +532,7 @@ void deco_mlc_state::draw_sprites(const rectangle &cliprect, int scanline, u32* } } -WRITE_LINE_MEMBER(deco_mlc_state::screen_vblank_mlc) +void deco_mlc_state::screen_vblank_mlc(int state) { // rising edge if (state) diff --git a/src/mame/dataeast/firetrap.cpp b/src/mame/dataeast/firetrap.cpp index cdd8f40a617..b26fc7e7062 100644 --- a/src/mame/dataeast/firetrap.cpp +++ b/src/mame/dataeast/firetrap.cpp @@ -265,7 +265,7 @@ private: void palette(palette_device &palette) const; uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(adpcm_int); + void adpcm_int(int state); void sound_map(address_map &map); }; @@ -661,7 +661,7 @@ void base_state::sound_bankselect_w(uint8_t data) m_audiobank->set_entry(data & 0x01); } -WRITE_LINE_MEMBER(base_state::adpcm_int) +void base_state::adpcm_int(int state) { if (state) { diff --git a/src/mame/dataeast/kchamp.cpp b/src/mame/dataeast/kchamp.cpp index ecd567af884..e3eefe55517 100644 --- a/src/mame/dataeast/kchamp.cpp +++ b/src/mame/dataeast/kchamp.cpp @@ -77,14 +77,14 @@ IO ports and memory map changes. Dip switches differ too. * VS Version * ********************/ -WRITE_LINE_MEMBER(kchamp_state::nmi_enable_w) +void kchamp_state::nmi_enable_w(int state) { m_nmi_enable = state; if (!m_nmi_enable) m_maincpu->set_input_line(INPUT_LINE_NMI, CLEAR_LINE); } -WRITE_LINE_MEMBER(kchamp_state::sound_reset_w) +void kchamp_state::sound_reset_w(int state) { m_audiocpu->set_input_line(INPUT_LINE_RESET, state ? CLEAR_LINE : ASSERT_LINE); if (!state) @@ -354,13 +354,13 @@ static GFXDECODE_START( gfx_kchamp ) GFXDECODE_END -WRITE_LINE_MEMBER(kchamp_state::vblank_irq) +void kchamp_state::vblank_irq(int state) { if (state && m_nmi_enable) m_maincpu->set_input_line(INPUT_LINE_NMI, ASSERT_LINE); } -WRITE_LINE_MEMBER(kchamp_state::msmint) +void kchamp_state::msmint(int state) { if (!state) return; diff --git a/src/mame/dataeast/kchamp.h b/src/mame/dataeast/kchamp.h index 62cb8bfd6c4..7ddf91a789b 100644 --- a/src/mame/dataeast/kchamp.h +++ b/src/mame/dataeast/kchamp.h @@ -71,13 +71,13 @@ private: required_device m_palette; required_device m_soundlatch; - DECLARE_WRITE_LINE_MEMBER(nmi_enable_w); - DECLARE_WRITE_LINE_MEMBER(sound_reset_w); + void nmi_enable_w(int state); + void sound_reset_w(int state); uint8_t sound_reset_r(); void kc_sound_control_w(offs_t offset, uint8_t data); void kchamp_videoram_w(offs_t offset, uint8_t data); void kchamp_colorram_w(offs_t offset, uint8_t data); - DECLARE_WRITE_LINE_MEMBER(flipscreen_w); + void flipscreen_w(int state); void sound_control_w(u8 data); TILE_GET_INFO_MEMBER(get_bg_tile_info); virtual void machine_reset() override; @@ -87,12 +87,12 @@ private: DECLARE_MACHINE_START(kchamp); uint32_t screen_update_kchampvs(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_kchamp(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(vblank_irq); + void vblank_irq(int state); INTERRUPT_GEN_MEMBER(sound_int); - void kchamp_draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); - void kchampvs_draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); + void kchamp_draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); + void kchampvs_draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); void decrypt_code(); - DECLARE_WRITE_LINE_MEMBER(msmint); + void msmint(int state); void decrypted_opcodes_map(address_map &map); void kchamp_io_map(address_map &map); void kchamp_map(address_map &map); diff --git a/src/mame/dataeast/kchamp_v.cpp b/src/mame/dataeast/kchamp_v.cpp index 2aab806866a..76532b4459f 100644 --- a/src/mame/dataeast/kchamp_v.cpp +++ b/src/mame/dataeast/kchamp_v.cpp @@ -37,7 +37,7 @@ void kchamp_state::kchamp_colorram_w(offs_t offset, uint8_t data) m_bg_tilemap->mark_tile_dirty(offset); } -WRITE_LINE_MEMBER(kchamp_state::flipscreen_w) +void kchamp_state::flipscreen_w(int state) { flip_screen_set(state); } diff --git a/src/mame/dataeast/lemmings.h b/src/mame/dataeast/lemmings.h index fb8927a191f..850b17ef8b2 100644 --- a/src/mame/dataeast/lemmings.h +++ b/src/mame/dataeast/lemmings.h @@ -63,7 +63,7 @@ private: virtual void machine_start() override; virtual void video_start() override; uint32_t screen_update_lemmings(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(screen_vblank_lemmings); + void screen_vblank_lemmings(int state); void lemmings_copy_bitmap(bitmap_rgb32& bitmap, int* xscroll, int* yscroll, const rectangle& cliprect); uint16_t lem_protection_region_0_146_r(offs_t offset); diff --git a/src/mame/dataeast/lemmings_v.cpp b/src/mame/dataeast/lemmings_v.cpp index 04a232e740b..22fb247d181 100644 --- a/src/mame/dataeast/lemmings_v.cpp +++ b/src/mame/dataeast/lemmings_v.cpp @@ -53,7 +53,7 @@ void lemmings_state::video_start() save_pointer(NAME(m_sprite_triple_buffer[1]), 0x800/2, 1); } -WRITE_LINE_MEMBER(lemmings_state::screen_vblank_lemmings) +void lemmings_state::screen_vblank_lemmings(int state) { // rising edge if (state) diff --git a/src/mame/dataeast/liberate.cpp b/src/mame/dataeast/liberate.cpp index e8bd9ead34a..1622d69d9d5 100644 --- a/src/mame/dataeast/liberate.cpp +++ b/src/mame/dataeast/liberate.cpp @@ -676,7 +676,7 @@ GFXDECODE_END * *************************************/ -WRITE_LINE_MEMBER(liberate_state::deco16_interrupt) +void liberate_state::deco16_interrupt(int state) { if (state) { @@ -695,7 +695,7 @@ WRITE_LINE_MEMBER(liberate_state::deco16_interrupt) } #if 0 -WRITE_LINE_MEMBER(liberate_state::prosport_interrupt) +void liberate_state::prosport_interrupt(int state) { /* ??? */ if (state) diff --git a/src/mame/dataeast/liberate.h b/src/mame/dataeast/liberate.h index 560fc36a4e6..6c1eb00ae31 100644 --- a/src/mame/dataeast/liberate.h +++ b/src/mame/dataeast/liberate.h @@ -97,11 +97,11 @@ private: uint32_t screen_update_prosport(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_boomrang(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_prosoccr(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(deco16_interrupt); - void liberate_draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); - void prosport_draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); - void boomrang_draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect, int pri ); - void prosoccr_draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); + void deco16_interrupt(int state); + void liberate_draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); + void prosport_draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); + void boomrang_draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect, int pri); + void prosoccr_draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); void deco16_io_map(address_map &map); void decrypted_opcodes_map(address_map &map); void liberatb_map(address_map &map); diff --git a/src/mame/dataeast/pcktgal.cpp b/src/mame/dataeast/pcktgal.cpp index d970e43b5bd..12dfe5c5d93 100644 --- a/src/mame/dataeast/pcktgal.cpp +++ b/src/mame/dataeast/pcktgal.cpp @@ -81,7 +81,7 @@ private: void sound_w(uint8_t data); void adpcm_data_w(uint8_t data); uint8_t sound_unk_r(); - DECLARE_WRITE_LINE_MEMBER(adpcm_int); + void adpcm_int(int state); void palette(palette_device &palette) const; uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); @@ -193,7 +193,7 @@ void pcktgal_state::sound_w(uint8_t data) } -WRITE_LINE_MEMBER(pcktgal_state::adpcm_int) +void pcktgal_state::adpcm_int(int state) { m_msm->data_w(m_msm5205next >> 4); m_msm5205next <<= 4; diff --git a/src/mame/dataeast/pktgaldx.cpp b/src/mame/dataeast/pktgaldx.cpp index 1ed0fd67fb6..37f14735c10 100644 --- a/src/mame/dataeast/pktgaldx.cpp +++ b/src/mame/dataeast/pktgaldx.cpp @@ -94,7 +94,7 @@ protected: void oki_bank_w(uint16_t data); - DECLARE_WRITE_LINE_MEMBER(vblank_w); + void vblank_w(int state); void vblank_ack_w(uint16_t data); }; @@ -260,7 +260,7 @@ void pktgaldx_state::protection_region_f_104_w(offs_t offset, uint16_t data, uin m_deco104->write_data(real_address & 0x7fff, data, mem_mask, cs); } -WRITE_LINE_MEMBER(base_state::vblank_w) +void base_state::vblank_w(int state) { if (state) m_maincpu->set_input_line(6, ASSERT_LINE); diff --git a/src/mame/dataeast/simpl156.cpp b/src/mame/dataeast/simpl156.cpp index 49e27614f5e..8e0bb46d66f 100644 --- a/src/mame/dataeast/simpl156.cpp +++ b/src/mame/dataeast/simpl156.cpp @@ -343,7 +343,7 @@ static GFXDECODE_START( gfx_simpl156 ) GFXDECODE_ENTRY( "gfx2", 0, tile_16x16_layout, 0x200, 32 ) /* Sprites (16x16) */ GFXDECODE_END -WRITE_LINE_MEMBER(simpl156_state::vblank_interrupt) +void simpl156_state::vblank_interrupt(int state) { m_maincpu->set_input_line(ARM_IRQ_LINE, state ? HOLD_LINE : CLEAR_LINE); } diff --git a/src/mame/dataeast/simpl156.h b/src/mame/dataeast/simpl156.h index 033a2fd1d00..3cf681bd526 100644 --- a/src/mame/dataeast/simpl156.h +++ b/src/mame/dataeast/simpl156.h @@ -71,7 +71,7 @@ private: virtual void video_start() override; u32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(vblank_interrupt); + void vblank_interrupt(int state); void base_map(address_map &map); void chainrec_map(address_map &map); diff --git a/src/mame/dataeast/supbtime.cpp b/src/mame/dataeast/supbtime.cpp index 60ef66c8a25..85248ffb025 100644 --- a/src/mame/dataeast/supbtime.cpp +++ b/src/mame/dataeast/supbtime.cpp @@ -150,7 +150,7 @@ void supbtime_state::sound_map(address_map &map) // VIDEO //************************************************************************** -WRITE_LINE_MEMBER( supbtime_state::vblank_w ) +void supbtime_state::vblank_w(int state) { if (state) m_maincpu->set_input_line(M68K_IRQ_6, ASSERT_LINE); diff --git a/src/mame/dataeast/supbtime.h b/src/mame/dataeast/supbtime.h index bb1dd75647b..ef0b91d675d 100644 --- a/src/mame/dataeast/supbtime.h +++ b/src/mame/dataeast/supbtime.h @@ -40,7 +40,7 @@ public: void init_tumblep(); private: - DECLARE_WRITE_LINE_MEMBER(vblank_w); + void vblank_w(int state); uint16_t vblank_ack_r(); uint32_t screen_update_common(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, bool use_offsets); uint32_t screen_update_chinatwn(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); diff --git a/src/mame/ddr/bcs3.cpp b/src/mame/ddr/bcs3.cpp index 44d79fdf601..f5ad5f5dad5 100644 --- a/src/mame/ddr/bcs3.cpp +++ b/src/mame/ddr/bcs3.cpp @@ -118,8 +118,8 @@ private: u8 keyboard_r(offs_t offset); u8 video_r(offs_t offset); u8 zx_r(); - DECLARE_WRITE_LINE_MEMBER(ctc_z0_w); - DECLARE_WRITE_LINE_MEMBER(ctc_z1_w); + void ctc_z0_w(int state); + void ctc_z1_w(int state); u32 screen_update_bcs3(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); u32 screen_update_bcs3a(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); @@ -369,7 +369,7 @@ static GFXDECODE_START( gfx_bcs3 ) GFXDECODE_ENTRY( "chargen", 0x0000, bcs3_charlayout, 0, 1 ) GFXDECODE_END -WRITE_LINE_MEMBER( bcs3_state::ctc_z0_w ) +void bcs3_state::ctc_z0_w(int state) { m_ctc->trg1(state); if (state && m_cass) @@ -381,7 +381,7 @@ WRITE_LINE_MEMBER( bcs3_state::ctc_z0_w ) // The manual says the cassette pulses come from here, but // it's total silence during cassette saving. -WRITE_LINE_MEMBER( bcs3_state::ctc_z1_w ) +void bcs3_state::ctc_z1_w(int state) { m_ctc->trg2(state); } diff --git a/src/mame/ddr/c80.cpp b/src/mame/ddr/c80.cpp index d6105f039c1..1a938167c55 100644 --- a/src/mame/ddr/c80.cpp +++ b/src/mame/ddr/c80.cpp @@ -107,7 +107,7 @@ private: uint8_t pio1_pa_r(); void pio1_pa_w(uint8_t data); void pio1_pb_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER( pio1_brdy_w ); + void pio1_brdy_w(int state); /* keyboard state */ u8 m_keylatch = 0; @@ -274,7 +274,7 @@ void c80_state::pio1_pb_w(uint8_t data) m_keylatch = data; } -WRITE_LINE_MEMBER( c80_state::pio1_brdy_w ) +void c80_state::pio1_brdy_w(int state) { m_pio1_brdy = state ? 0 : 0x10; diff --git a/src/mame/ddr/huebler.cpp b/src/mame/ddr/huebler.cpp index a6984ac46fc..2924a44bf2a 100644 --- a/src/mame/ddr/huebler.cpp +++ b/src/mame/ddr/huebler.cpp @@ -262,11 +262,11 @@ uint32_t amu880_state::screen_update(screen_device &screen, bitmap_rgb32 &bitmap /* Z80-CTC Interface */ -WRITE_LINE_MEMBER(amu880_state::ctc_z0_w) +void amu880_state::ctc_z0_w(int state) { } -WRITE_LINE_MEMBER(amu880_state::ctc_z2_w) +void amu880_state::ctc_z2_w(int state) { /* cassette clock @ 39kHz */ if (state) @@ -296,7 +296,7 @@ WRITE_LINE_MEMBER(amu880_state::ctc_z2_w) /* Z80-SIO Interface */ -WRITE_LINE_MEMBER(amu880_state::cassette_w) +void amu880_state::cassette_w(int state) { m_cassbit = state; } diff --git a/src/mame/ddr/huebler.h b/src/mame/ddr/huebler.h index 5a04ad6f0cd..da84104179b 100644 --- a/src/mame/ddr/huebler.h +++ b/src/mame/ddr/huebler.h @@ -72,9 +72,9 @@ private: // video state TIMER_DEVICE_CALLBACK_MEMBER(keyboard_tick); - DECLARE_WRITE_LINE_MEMBER(ctc_z0_w); - DECLARE_WRITE_LINE_MEMBER(ctc_z2_w); - DECLARE_WRITE_LINE_MEMBER(cassette_w); + void ctc_z0_w(int state); + void ctc_z2_w(int state); + void cassette_w(int state); void amu880_io(address_map &map); void amu880_mem(address_map &map); diff --git a/src/mame/ddr/jtc.cpp b/src/mame/ddr/jtc.cpp index 34f3e906fe9..151b0dcd06e 100644 --- a/src/mame/ddr/jtc.cpp +++ b/src/mame/ddr/jtc.cpp @@ -61,7 +61,7 @@ protected: void p3_w(u8 data); DECLARE_QUICKLOAD_LOAD_MEMBER(quickload_cb); int m_centronics_busy = 0; - DECLARE_WRITE_LINE_MEMBER(write_centronics_busy); + void write_centronics_busy(int state); required_device m_maincpu; required_device m_ram; required_device m_cassette; @@ -143,7 +143,7 @@ void jtc_state::p2_w(u8 data) m_centronics->write_strobe(BIT(data, 5)); } -DECLARE_WRITE_LINE_MEMBER( jtc_state::write_centronics_busy ) +void jtc_state::write_centronics_busy(int state) { m_centronics_busy = state; } diff --git a/src/mame/ddr/kc.h b/src/mame/ddr/kc.h index ced5fbe3a58..9c60c50f74a 100644 --- a/src/mame/ddr/kc.h +++ b/src/mame/ddr/kc.h @@ -126,17 +126,17 @@ protected: // PIO callback uint8_t pio_porta_r(); uint8_t pio_portb_r(); - DECLARE_WRITE_LINE_MEMBER( pio_ardy_cb); - DECLARE_WRITE_LINE_MEMBER( pio_brdy_cb); + void pio_ardy_cb(int state); + void pio_brdy_cb(int state); void pio_porta_w(uint8_t data); virtual void pio_portb_w(uint8_t data); // CTC callback - DECLARE_WRITE_LINE_MEMBER( ctc_zc0_callback ); - DECLARE_WRITE_LINE_MEMBER( ctc_zc1_callback ); + void ctc_zc0_callback(int state); + void ctc_zc1_callback(int state); // keyboard - DECLARE_WRITE_LINE_MEMBER( keyboard_cb ); + void keyboard_cb(int state); // cassette void update_cassette(int state); @@ -147,7 +147,7 @@ protected: void tapeout_update(); virtual uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER( video_toggle_blink_state ); + void video_toggle_blink_state(int state); void video_draw_8_pixels(bitmap_ind16 &bitmap, int x, int y, uint8_t colour_byte, uint8_t gfx_byte); void kc85_palette(palette_device &palette) const ATTR_COLD; @@ -183,7 +183,7 @@ protected: uint8_t m_speaker_level = 0U; // CTC callback - DECLARE_WRITE_LINE_MEMBER( ctc_zc0_callback ); + void ctc_zc0_callback(int state); // sound virtual void speaker_update(); diff --git a/src/mame/ddr/kc_m.cpp b/src/mame/ddr/kc_m.cpp index c543999579b..d2f6d3306bc 100644 --- a/src/mame/ddr/kc_m.cpp +++ b/src/mame/ddr/kc_m.cpp @@ -677,20 +677,20 @@ uint8_t kc85_4_state::kc85_4_86_r() /* callback for ardy output from PIO */ /* used in KC85/4 & KC85/3 cassette interface */ -WRITE_LINE_MEMBER( kc_state::pio_ardy_cb) +void kc_state::pio_ardy_cb(int state) { m_ardy = state & 0x01; } /* callback for brdy output from PIO */ /* used in KC85/4 & KC85/3 keyboard interface */ -WRITE_LINE_MEMBER( kc_state::pio_brdy_cb) +void kc_state::pio_brdy_cb(int state) { m_brdy = state & 0x01; } /* used in cassette write -> K0 */ -WRITE_LINE_MEMBER( kc_state::ctc_zc0_callback ) +void kc_state::ctc_zc0_callback(int state) { if (state) { @@ -700,7 +700,7 @@ WRITE_LINE_MEMBER( kc_state::ctc_zc0_callback ) } } -WRITE_LINE_MEMBER( kc85_3_state::ctc_zc0_callback ) +void kc85_3_state::ctc_zc0_callback(int state) { if (state) { @@ -712,7 +712,7 @@ WRITE_LINE_MEMBER( kc85_3_state::ctc_zc0_callback ) } /* used in cassette write -> K1 */ -WRITE_LINE_MEMBER( kc_state::ctc_zc1_callback) +void kc_state::ctc_zc1_callback(int state) { if (state) { @@ -772,7 +772,7 @@ void kc_state::tapeout_update() } /* keyboard callback */ -WRITE_LINE_MEMBER( kc_state::keyboard_cb ) +void kc_state::keyboard_cb(int state) { m_z80pio->strobe_b(state & m_brdy); @@ -863,7 +863,7 @@ void kc_state::kc85_palette(palette_device &palette) const } /* set new blink state */ -WRITE_LINE_MEMBER( kc_state::video_toggle_blink_state ) +void kc_state::video_toggle_blink_state(int state) { if (state) { diff --git a/src/mame/ddr/lc80.cpp b/src/mame/ddr/lc80.cpp index 09329bf7d02..fd6bcb656ec 100644 --- a/src/mame/ddr/lc80.cpp +++ b/src/mame/ddr/lc80.cpp @@ -111,10 +111,10 @@ private: void lc80_2_mem(address_map &map); void lc80_io(address_map &map); - DECLARE_WRITE_LINE_MEMBER(halt_w) { m_halt_led = state; } - DECLARE_WRITE_LINE_MEMBER(ctc_z0_w); - DECLARE_WRITE_LINE_MEMBER(ctc_z1_w); - DECLARE_WRITE_LINE_MEMBER(ctc_z2_w); + void halt_w(int state) { m_halt_led = state; } + void ctc_z0_w(int state); + void ctc_z1_w(int state); + void ctc_z2_w(int state); void pio1_pa_w(u8 data); u8 pio1_pb_r(); void pio1_pb_w(u8 data); @@ -218,15 +218,15 @@ INPUT_PORTS_END // Z80-CTC Interface -WRITE_LINE_MEMBER(lc80_state::ctc_z0_w) +void lc80_state::ctc_z0_w(int state) { } -WRITE_LINE_MEMBER(lc80_state::ctc_z1_w) +void lc80_state::ctc_z1_w(int state) { } -WRITE_LINE_MEMBER(lc80_state::ctc_z2_w) +void lc80_state::ctc_z2_w(int state) { } diff --git a/src/mame/ddr/nanos.cpp b/src/mame/ddr/nanos.cpp index 7cd15310752..2626461464b 100644 --- a/src/mame/ddr/nanos.cpp +++ b/src/mame/ddr/nanos.cpp @@ -63,11 +63,11 @@ protected: private: void tc_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(ctc_z0_w); - DECLARE_WRITE_LINE_MEMBER(ctc_z1_w); - DECLARE_WRITE_LINE_MEMBER(ctc_z2_w); + void ctc_z0_w(int state); + void ctc_z1_w(int state); + void ctc_z2_w(int state); TIMER_DEVICE_CALLBACK_MEMBER(keyboard_callback); - DECLARE_WRITE_LINE_MEMBER(z80daisy_interrupt); + void z80daisy_interrupt(int state); uint8_t port_a_r(); uint8_t port_b_r(); void port_b_w(uint8_t data); @@ -119,21 +119,21 @@ void nanos_state::tc_w(uint8_t data) /* Z80-CTC Interface */ -WRITE_LINE_MEMBER(nanos_state::ctc_z0_w) +void nanos_state::ctc_z0_w(int state) { } -WRITE_LINE_MEMBER(nanos_state::ctc_z1_w) +void nanos_state::ctc_z1_w(int state) { } -WRITE_LINE_MEMBER(nanos_state::ctc_z2_w) +void nanos_state::ctc_z2_w(int state) { } /* Z80-SIO Interface */ -WRITE_LINE_MEMBER(nanos_state::z80daisy_interrupt) +void nanos_state::z80daisy_interrupt(int state) { m_maincpu->set_input_line(INPUT_LINE_IRQ0, state); } diff --git a/src/mame/ddr/pcm.cpp b/src/mame/ddr/pcm.cpp index b89a7d1fe01..6f8822ad0ae 100644 --- a/src/mame/ddr/pcm.cpp +++ b/src/mame/ddr/pcm.cpp @@ -91,9 +91,9 @@ public: private: u8 port85_r(); - DECLARE_WRITE_LINE_MEMBER( port82_w ); - void port85_w(u8); - void port94_w(u8); + void port82_w(int state); + void port85_w(u8 data); + void port94_w(u8 data); u32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void io_map(address_map &map); @@ -116,7 +116,7 @@ private: }; -WRITE_LINE_MEMBER( pcm_state::port82_w ) +void pcm_state::port82_w(int state) { if (state) { diff --git a/src/mame/ddr/poly880.cpp b/src/mame/ddr/poly880.cpp index ed349417c3c..1cc0c3b584c 100644 --- a/src/mame/ddr/poly880.cpp +++ b/src/mame/ddr/poly880.cpp @@ -95,8 +95,8 @@ private: void poly880s_mem(address_map &map); void cldig_w(u8 data); - DECLARE_WRITE_LINE_MEMBER(ctc_z0_w); - DECLARE_WRITE_LINE_MEMBER(ctc_z1_w); + void ctc_z0_w(int state); + void ctc_z1_w(int state); void pio1_pa_w(u8 data); u8 pio1_pb_r(); void pio1_pb_w(u8 data); @@ -195,7 +195,7 @@ INPUT_PORTS_END // Z80-CTC Interface -WRITE_LINE_MEMBER(poly880_state::ctc_z0_w) +void poly880_state::ctc_z0_w(int state) { // SEND if (!m_nmi && state) @@ -205,7 +205,7 @@ WRITE_LINE_MEMBER(poly880_state::ctc_z0_w) } } -WRITE_LINE_MEMBER(poly880_state::ctc_z1_w) +void poly880_state::ctc_z1_w(int state) { } diff --git a/src/mame/ddr/polyplay.cpp b/src/mame/ddr/polyplay.cpp index da20f5911c8..355190c65bd 100644 --- a/src/mame/ddr/polyplay.cpp +++ b/src/mame/ddr/polyplay.cpp @@ -158,7 +158,7 @@ INTERRUPT_GEN_MEMBER(polyplay_state::nmi_handler) } /* I/O Port handling */ -WRITE_LINE_MEMBER(polyplay_state::ctc_zc2_w) +void polyplay_state::ctc_zc2_w(int state) { //osd_printf_verbose("ctc_z2_w: %02x\n", state); } diff --git a/src/mame/ddr/polyplay.h b/src/mame/ddr/polyplay.h index f3ab4b31ae4..ce150d562db 100644 --- a/src/mame/ddr/polyplay.h +++ b/src/mame/ddr/polyplay.h @@ -50,9 +50,9 @@ private: INTERRUPT_GEN_MEMBER(nmi_handler); /* devices */ - DECLARE_WRITE_LINE_MEMBER(ctc_zc0_w); - DECLARE_WRITE_LINE_MEMBER(ctc_zc1_w); - DECLARE_WRITE_LINE_MEMBER(ctc_zc2_w); + void ctc_zc0_w(int state); + void ctc_zc1_w(int state); + void ctc_zc2_w(int state); uint8_t pio_porta_r(); void pio_porta_w(uint8_t data); diff --git a/src/mame/ddr/polyplay_a.cpp b/src/mame/ddr/polyplay_a.cpp index 6fa266d3cb4..980f1259bbf 100644 --- a/src/mame/ddr/polyplay_a.cpp +++ b/src/mame/ddr/polyplay_a.cpp @@ -14,7 +14,7 @@ #include "emu.h" #include "polyplay.h" -WRITE_LINE_MEMBER(polyplay_state::ctc_zc0_w) +void polyplay_state::ctc_zc0_w(int state) { if (state) { @@ -23,7 +23,7 @@ WRITE_LINE_MEMBER(polyplay_state::ctc_zc0_w) } } -WRITE_LINE_MEMBER(polyplay_state::ctc_zc1_w) +void polyplay_state::ctc_zc1_w(int state) { if (state) { diff --git a/src/mame/dec/decioga.cpp b/src/mame/dec/decioga.cpp index 26e4d12d4aa..1f8b915dac1 100644 --- a/src/mame/dec/decioga.cpp +++ b/src/mame/dec/decioga.cpp @@ -110,7 +110,7 @@ void dec_ioga_device::dmaptr_w(offs_t offset, u32 data, u32 mem_mask) LOGMASKED(LOG_DMA, "DECIOGA: %08x to DMA pointer %x (addr %x)\n", data, offset/4, offset*4); } -WRITE_LINE_MEMBER(dec_ioga_device::rtc_irq_w) +void dec_ioga_device::rtc_irq_w(int state) { if (state == ASSERT_LINE) { @@ -119,7 +119,7 @@ WRITE_LINE_MEMBER(dec_ioga_device::rtc_irq_w) recalc_irq(); } -WRITE_LINE_MEMBER(dec_ioga_device::lance_irq_w) +void dec_ioga_device::lance_irq_w(int state) { if (state == ASSERT_LINE) { @@ -132,7 +132,7 @@ WRITE_LINE_MEMBER(dec_ioga_device::lance_irq_w) recalc_irq(); } -WRITE_LINE_MEMBER(dec_ioga_device::scc0_irq_w) +void dec_ioga_device::scc0_irq_w(int state) { if (state == ASSERT_LINE) { @@ -145,7 +145,7 @@ WRITE_LINE_MEMBER(dec_ioga_device::scc0_irq_w) recalc_irq(); } -WRITE_LINE_MEMBER(dec_ioga_device::scc1_irq_w) +void dec_ioga_device::scc1_irq_w(int state) { if (state == ASSERT_LINE) { diff --git a/src/mame/dec/decioga.h b/src/mame/dec/decioga.h index 90300d4f624..e901e5de52b 100644 --- a/src/mame/dec/decioga.h +++ b/src/mame/dec/decioga.h @@ -20,10 +20,10 @@ public: void map(address_map &map); // irq inputs - DECLARE_WRITE_LINE_MEMBER(rtc_irq_w); - DECLARE_WRITE_LINE_MEMBER(lance_irq_w); - DECLARE_WRITE_LINE_MEMBER(scc0_irq_w); - DECLARE_WRITE_LINE_MEMBER(scc1_irq_w); + void rtc_irq_w(int state); + void lance_irq_w(int state); + void scc0_irq_w(int state); + void scc1_irq_w(int state); // multiplex irq output auto irq_out() { return m_irq_out_cb.bind(); } diff --git a/src/mame/dec/decmate2.cpp b/src/mame/dec/decmate2.cpp index fb56ab5cb6b..cd343835246 100644 --- a/src/mame/dec/decmate2.cpp +++ b/src/mame/dec/decmate2.cpp @@ -111,24 +111,24 @@ protected: private: u32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(vint_w); + void vint_w(int state); void lxmar_w(offs_t offset, u16 data); void lxpar_w(offs_t offset, u16 data); void lxdar_w(offs_t offset, u16 data); void wsr_w(u16 data); u16 cprom_switch_r(offs_t offset); - DECLARE_WRITE_LINE_MEMBER(pc278_ioclr_w); - DECLARE_WRITE_LINE_MEMBER(pc238_ioclr_w); - - DECLARE_WRITE_LINE_MEMBER(keyboard_dr_w); - DECLARE_WRITE_LINE_MEMBER(keyboard_dr_ff_w); - DECLARE_WRITE_LINE_MEMBER(keyboard_tbre_w); - DECLARE_WRITE_LINE_MEMBER(keyboard_tbre_ff_w); - DECLARE_WRITE_LINE_MEMBER(printer_dr_w); - DECLARE_WRITE_LINE_MEMBER(printer_dr_ff_w); - DECLARE_WRITE_LINE_MEMBER(printer_tbre_w); - DECLARE_WRITE_LINE_MEMBER(printer_tbre_ff_w); + void pc278_ioclr_w(int state); + void pc238_ioclr_w(int state); + + void keyboard_dr_w(int state); + void keyboard_dr_ff_w(int state); + void keyboard_tbre_w(int state); + void keyboard_tbre_ff_w(int state); + void printer_dr_w(int state); + void printer_dr_ff_w(int state); + void printer_tbre_w(int state); + void printer_tbre_ff_w(int state); u8 kbdrflg_devctl_r(); void kbdrflg_set_w(u16 data); void kbdrflg_clear_w(u16 data); @@ -296,7 +296,7 @@ u32 decmate2_state::screen_update(screen_device &screen, bitmap_rgb32 &bitmap, c return 0; } -WRITE_LINE_MEMBER(decmate2_state::vint_w) +void decmate2_state::vint_w(int state) { // TODO: synchronize m_vint = state; @@ -353,7 +353,7 @@ u16 decmate2_state::cprom_switch_r(offs_t offset) } } -WRITE_LINE_MEMBER(decmate2_state::pc278_ioclr_w) +void decmate2_state::pc278_ioclr_w(int state) { if (!state) { @@ -366,7 +366,7 @@ WRITE_LINE_MEMBER(decmate2_state::pc278_ioclr_w) } } -WRITE_LINE_MEMBER(decmate2_state::pc238_ioclr_w) +void decmate2_state::pc238_ioclr_w(int state) { if (!state) { @@ -375,48 +375,48 @@ WRITE_LINE_MEMBER(decmate2_state::pc238_ioclr_w) } } -WRITE_LINE_MEMBER(decmate2_state::keyboard_dr_w) +void decmate2_state::keyboard_dr_w(int state) { m_kbd_rflg = state; } -WRITE_LINE_MEMBER(decmate2_state::keyboard_dr_ff_w) +void decmate2_state::keyboard_dr_ff_w(int state) { // TODO: edge trigger if (state) m_kbd_rflg = true; } -WRITE_LINE_MEMBER(decmate2_state::keyboard_tbre_w) +void decmate2_state::keyboard_tbre_w(int state) { m_kbd_tflg = state; } -WRITE_LINE_MEMBER(decmate2_state::keyboard_tbre_ff_w) +void decmate2_state::keyboard_tbre_ff_w(int state) { // TODO: edge trigger if (state) m_kbd_tflg = true; } -WRITE_LINE_MEMBER(decmate2_state::printer_dr_w) +void decmate2_state::printer_dr_w(int state) { m_prt_rflg = state; } -WRITE_LINE_MEMBER(decmate2_state::printer_dr_ff_w) +void decmate2_state::printer_dr_ff_w(int state) { // TODO: edge trigger if (state) m_prt_rflg = true; } -WRITE_LINE_MEMBER(decmate2_state::printer_tbre_w) +void decmate2_state::printer_tbre_w(int state) { m_prt_tflg = state; } -WRITE_LINE_MEMBER(decmate2_state::printer_tbre_ff_w) +void decmate2_state::printer_tbre_ff_w(int state) { // TODO: edge trigger if (state) diff --git a/src/mame/dec/dectalk.cpp b/src/mame/dec/dectalk.cpp index 363af6faeaf..96a295b69dd 100644 --- a/src/mame/dec/dectalk.cpp +++ b/src/mame/dec/dectalk.cpp @@ -293,7 +293,7 @@ private: required_device m_duart; required_device m_nvram; required_device m_dac; - DECLARE_WRITE_LINE_MEMBER(duart_txa); + void duart_txa(int state); uint8_t duart_input(); void duart_output(uint8_t data); uint8_t nvram_recall(offs_t offset); @@ -308,7 +308,7 @@ private: void spc_latch_outfifo_error_stats(uint16_t data); uint16_t spc_infifo_data_r(); void spc_outfifo_data_w(uint16_t data); - DECLARE_READ_LINE_MEMBER(spc_semaphore_r); + int spc_semaphore_r(); virtual void machine_start() override; TIMER_CALLBACK_MEMBER(outfifo_read_cb); emu_timer *m_outfifo_read_timer = nullptr; @@ -316,7 +316,7 @@ private: void clear_all_fifos(); void dsp_semaphore_w(bool state); uint16_t dsp_outfifo_r(); - DECLARE_WRITE_LINE_MEMBER(dectalk_reset); + void dectalk_reset(int state); void m68k_mem(address_map &map); void tms32010_io(address_map &map); @@ -343,7 +343,7 @@ void dectalk_state::duart_output(uint8_t data) #endif } -WRITE_LINE_MEMBER(dectalk_state::duart_txa) +void dectalk_state::duart_txa(int state) { //TODO: this needs to be plumbed so it shows up optionally on a second terminal somehow, or connects to diserial // it is the second 'alternate' serial connection on the DTC-01, used for a serial passthru and other stuff. @@ -419,7 +419,7 @@ uint16_t dectalk_state::dsp_outfifo_r ( ) } /* Machine reset and friends: stuff that needs setting up which IS directly affected by reset */ -WRITE_LINE_MEMBER(dectalk_state::dectalk_reset) +void dectalk_state::dectalk_reset(int state) { m_hack_self_test_is_second_read = false; // hack // stuff that is DIRECTLY affected by the RESET line @@ -730,7 +730,7 @@ void dectalk_state::spc_outfifo_data_w(uint16_t data) //outfifo_check(); // outfifo check should only be done in the audio 10khz polling function } -READ_LINE_MEMBER(dectalk_state::spc_semaphore_r)// Return state of d-latch 74ls74 @ E64 'lower half' in d0 which indicates whether infifo is readable +int dectalk_state::spc_semaphore_r()// Return state of d-latch 74ls74 @ E64 'lower half' in d0 which indicates whether infifo is readable { #ifdef SPC_LOG_DSP //logerror("dsp: read infifo semaphore, returned %d\n", m_infifo_semaphore); // commented due to extreme annoyance factor diff --git a/src/mame/dec/dtc03.cpp b/src/mame/dec/dtc03.cpp index 87796ee979c..b882c717761 100644 --- a/src/mame/dec/dtc03.cpp +++ b/src/mame/dec/dtc03.cpp @@ -86,9 +86,9 @@ private: void dac_w(uint16_t data); uint16_t dsp_dma_r(); void dsp_dma_w(uint16_t data); - DECLARE_READ_LINE_MEMBER(bio_line_r); - DECLARE_WRITE_LINE_MEMBER(dsp_clock_w); - DECLARE_WRITE_LINE_MEMBER(epci_txrx_clock_w); + int bio_line_r(); + void dsp_clock_w(int state); + void epci_txrx_clock_w(int state); void ctl_w(uint16_t data); }; @@ -125,7 +125,7 @@ void dtc03_state::dsp_dma_w(uint16_t data) //m_dsp_dma = data; } -READ_LINE_MEMBER(dtc03_state::bio_line_r) +int dtc03_state::bio_line_r() { // TODO: reading the bio line doesn't cause any direct external effects so this is wrong //if(m_bio == ASSERT_LINE) @@ -162,7 +162,7 @@ void dtc03_state::ctl_w(u16 data) \---------------- DM button */ -WRITE_LINE_MEMBER(dtc03_state::dsp_clock_w) +void dtc03_state::dsp_clock_w(int state) { #if 0 if (((m_ctl&0x2000) && state)) @@ -181,7 +181,7 @@ WRITE_LINE_MEMBER(dtc03_state::dsp_clock_w) //m_dsp->set_input_line(0, ((m_ctl&0x2000) && state) ? ASSERT_LINE : CLEAR_LINE)); // TMS32010 INT } -WRITE_LINE_MEMBER(dtc03_state::epci_txrx_clock_w) +void dtc03_state::epci_txrx_clock_w(int state) { m_epci->txc_w(state); m_epci->rxc_w(state); diff --git a/src/mame/dec/pdp1.cpp b/src/mame/dec/pdp1.cpp index 08edf3d8dde..d1ce702f299 100644 --- a/src/mame/dec/pdp1.cpp +++ b/src/mame/dec/pdp1.cpp @@ -1472,7 +1472,7 @@ void pdp1_state::iot_cks(int op2, int nac, int mb, int &io, int ac) } template -WRITE_LINE_MEMBER(pdp1_state::io_status_w) +void pdp1_state::io_status_w(int state) { if (state) m_io_status |= Mask; diff --git a/src/mame/dec/pdp1.h b/src/mame/dec/pdp1.h index 1683f0972ee..9be010751ea 100644 --- a/src/mame/dec/pdp1.h +++ b/src/mame/dec/pdp1.h @@ -422,7 +422,7 @@ public: virtual void video_start() override; void pdp1_palette(palette_device &palette) const; uint32_t screen_update_pdp1(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(screen_vblank_pdp1); + void screen_vblank_pdp1(int state); INTERRUPT_GEN_MEMBER(pdp1_interrupt); TIMER_CALLBACK_MEMBER(dpy_callback); void pdp1_machine_stop(); @@ -442,7 +442,7 @@ public: void pdp1_draw_lightpen(bitmap_ind16 &bitmap); void pdp1_lightpen(); - template DECLARE_WRITE_LINE_MEMBER(io_status_w); + template void io_status_w(int state); void pdp1(machine_config &config); void pdp1_map(address_map &map); diff --git a/src/mame/dec/pdp1_v.cpp b/src/mame/dec/pdp1_v.cpp index a80f52f06e7..7167ad2c1a4 100644 --- a/src/mame/dec/pdp1_v.cpp +++ b/src/mame/dec/pdp1_v.cpp @@ -51,7 +51,7 @@ void pdp1_state::video_start() } -WRITE_LINE_MEMBER(pdp1_state::screen_vblank_pdp1) +void pdp1_state::screen_vblank_pdp1(int state) { // rising edge if (state) diff --git a/src/mame/dec/rainbow.cpp b/src/mame/dec/rainbow.cpp index 50debf7ac77..f9c73cf14ef 100644 --- a/src/mame/dec/rainbow.cpp +++ b/src/mame/dec/rainbow.cpp @@ -523,7 +523,7 @@ protected: void rtc_w(offs_t offset, uint8_t data); uint8_t read_video_ram_r(offs_t offset); - DECLARE_WRITE_LINE_MEMBER(video_interrupt); + void video_interrupt(int state); uint8_t diagnostic_r(); void diagnostic_w(uint8_t data); @@ -543,18 +543,18 @@ protected: uint8_t hd_status_69_r(); // EXTRA REGISTER 0x69 (R/- 8088) - DECLARE_WRITE_LINE_MEMBER(bundle_irq); - DECLARE_WRITE_LINE_MEMBER(hdc_bdrq); // BUFFER DATA REQUEST (FROM WD) - DECLARE_WRITE_LINE_MEMBER(hdc_bcr); // BUFFER COUNTER RESET (FROM WD) + void bundle_irq(int state); + void hdc_bdrq(int state); // BUFFER DATA REQUEST (FROM WD) + void hdc_bcr(int state); // BUFFER COUNTER RESET (FROM WD) - DECLARE_WRITE_LINE_MEMBER(hdc_step); - DECLARE_WRITE_LINE_MEMBER(hdc_direction); + void hdc_step(int state); + void hdc_direction(int state); - DECLARE_WRITE_LINE_MEMBER(hdc_read_sector); - DECLARE_WRITE_LINE_MEMBER(hdc_write_sector); + void hdc_read_sector(int state); + void hdc_write_sector(int state); - DECLARE_READ_LINE_MEMBER(hdc_drive_ready); - DECLARE_READ_LINE_MEMBER(hdc_write_fault); + int hdc_drive_ready(); + int hdc_write_fault(); uint8_t corvus_status_r(); @@ -571,19 +571,19 @@ protected: uint8_t z80_diskstatus_r(); void z80_diskcontrol_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(kbd_tx); - DECLARE_WRITE_LINE_MEMBER(kbd_rxready_w); - DECLARE_WRITE_LINE_MEMBER(kbd_txready_w); + void kbd_tx(int state); + void kbd_rxready_w(int state); + void kbd_txready_w(int state); uint8_t rtc_reset(); uint8_t rtc_enable(); - DECLARE_WRITE_LINE_MEMBER(mpsc_irq); + void mpsc_irq(int state); void comm_bitrate_w(uint8_t data); void printer_bitrate_w(uint8_t data); void bitrate_counter_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(dbrg_fr_w); - DECLARE_WRITE_LINE_MEMBER(dbrg_ft_w); + void dbrg_fr_w(int state); + void dbrg_ft_w(int state); void GDC_EXTRA_REGISTER_w(offs_t offset, uint8_t data); uint8_t GDC_EXTRA_REGISTER_r(offs_t offset); @@ -598,7 +598,7 @@ protected: UPD7220_DISPLAY_PIXELS_MEMBER( hgdc_display_pixels ); uint16_t vram_r(offs_t offset); void vram_w(offs_t offset, uint16_t data); - DECLARE_WRITE_LINE_MEMBER(GDC_vblank_irq); + void GDC_vblank_irq(int state); void rainbowz80_io(address_map &map); void rainbowz80_mem(address_map &map); @@ -768,7 +768,7 @@ private: void ext_ram_w(offs_t offset, uint8_t data); uint8_t rtc_r(offs_t offset); - DECLARE_WRITE_LINE_MEMBER(irq_hi_w); + void irq_hi_w(int state); uint8_t system_parameter_r(); }; @@ -790,7 +790,7 @@ private: void ext_ram_w(offs_t offset, uint8_t data); uint8_t rtc_r(offs_t offset); - DECLARE_WRITE_LINE_MEMBER(irq_hi_w); + void irq_hi_w(int state); uint8_t system_parameter_r(); }; @@ -1385,7 +1385,7 @@ void rainbow_base_state::update_mpsc_irq() raise_8088_irq(IRQ_COMM_PTR_INTR_L); } -WRITE_LINE_MEMBER(rainbow_base_state::mpsc_irq) +void rainbow_base_state::mpsc_irq(int state) { m_mpsc_irq = state; update_mpsc_irq(); @@ -1420,12 +1420,12 @@ void rainbow_base_state::printer_bitrate_w(uint8_t data) logerror(" - CLOCK (0 = internal): %02x", data & 8); } -WRITE_LINE_MEMBER(rainbow_base_state::dbrg_fr_w) +void rainbow_base_state::dbrg_fr_w(int state) { m_mpsc->rxca_w(state); } -WRITE_LINE_MEMBER(rainbow_base_state::dbrg_ft_w) +void rainbow_base_state::dbrg_ft_w(int state) { m_mpsc->txca_w(state); } @@ -1723,7 +1723,7 @@ static uint32_t get_and_print_lbasector(device_t *device, const hard_disk_file:: } // READ SECTOR (on BCS 1 -> 0 transition) -WRITE_LINE_MEMBER(rainbow_base_state::hdc_read_sector) +void rainbow_base_state::hdc_read_sector(int state) { static int last_state; int read_status = 1; @@ -1787,7 +1787,7 @@ WRITE_LINE_MEMBER(rainbow_base_state::hdc_read_sector) // ...IF WRITE_GATE (WG) TRANSITS FROM 1 -> 0 // NO PROVISIONS for sector sizes != 512 or MULTIPLE DRIVES (> 0) !!! -WRITE_LINE_MEMBER(rainbow_base_state::hdc_write_sector) +void rainbow_base_state::hdc_write_sector(int state) { int success = 0; static int wg_last; @@ -2053,7 +2053,7 @@ uint8_t rainbow_base_state::hd_status_69_r() } // TREAT SIGNALS FROM / TO CONTROLLER -WRITE_LINE_MEMBER(rainbow_base_state::hdc_step) +void rainbow_base_state::hdc_step(int state) { m_hdc_step_latch = true; @@ -2061,23 +2061,23 @@ WRITE_LINE_MEMBER(rainbow_base_state::hdc_step) switch_off_timer->adjust(attotime::from_msec(500)); } -WRITE_LINE_MEMBER(rainbow_base_state::hdc_direction) +void rainbow_base_state::hdc_direction(int state) { m_hdc_direction = state; // (0 = OUT) } -READ_LINE_MEMBER(rainbow_base_state::hdc_drive_ready) +int rainbow_base_state::hdc_drive_ready() { return m_hdc_drive_ready; } -READ_LINE_MEMBER(rainbow_base_state::hdc_write_fault) +int rainbow_base_state::hdc_write_fault() { return m_hdc_write_fault; } // Buffer counter reset when BCR goes from 0 -> 1 -WRITE_LINE_MEMBER(rainbow_base_state::hdc_bcr) +void rainbow_base_state::hdc_bcr(int state) { static int bcr_state; if (bcr_state == 0 && state == 1) @@ -2097,7 +2097,7 @@ void rainbow_base_state::hdc_buffer_counter_reset() // On a WRITE / FORMAT command, signal goes high when the WD1010 // chip is READY TO ACCESS the information in the sector buffer. -WRITE_LINE_MEMBER(rainbow_base_state::hdc_bdrq) +void rainbow_base_state::hdc_bdrq(int state) { static int old_state; // logerror("BDRQ - BUFFER DATA REQUEST OBTAINED: %u\n", state); @@ -2130,7 +2130,7 @@ void rainbow_base_state::update_bundle_irq() } } -WRITE_LINE_MEMBER(rainbow_base_state::bundle_irq) +void rainbow_base_state::bundle_irq(int state) { m_bdl_irq = state; update_bundle_irq(); @@ -2532,7 +2532,7 @@ IRQ_CALLBACK_MEMBER(rainbow_base_state::irq_callback) // NEC7220 Vsync IRQ ***************************************** GDC // VERIFY: SCROLL_MAP & COLOR_MAP are updated at the next VSYNC (not immediately)... Are there more registers? -WRITE_LINE_MEMBER(rainbow_base_state::GDC_vblank_irq) +void rainbow_base_state::GDC_vblank_irq(int state) { // VERIFICATION NEEDED: IRQ raised before or after new palette loaded...? if (m_gdc_mode_register & GDC_MODE_ENABLE_VSYNC_IRQ) // 0x40 @@ -2624,7 +2624,7 @@ WRITE_LINE_MEMBER(rainbow_base_state::GDC_vblank_irq) } // 7220 vblank IRQ -WRITE_LINE_MEMBER(rainbow_base_state::video_interrupt) +void rainbow_base_state::video_interrupt(int state) { if (state == ASSERT_LINE) raise_8088_irq(IRQ_8088_VBL); @@ -2775,18 +2775,18 @@ void rainbow_base_state::update_kbd_irq() lower_8088_irq(IRQ_8088_KBD); } -WRITE_LINE_MEMBER(rainbow_base_state::kbd_tx) +void rainbow_base_state::kbd_tx(int state) { m_lk201->rx_w(state); } -WRITE_LINE_MEMBER(rainbow_base_state::kbd_rxready_w) +void rainbow_base_state::kbd_rxready_w(int state) { m_kbd_rx_ready = (state == 1) ? true : false; update_kbd_irq(); } -WRITE_LINE_MEMBER(rainbow_base_state::kbd_txready_w) +void rainbow_base_state::kbd_txready_w(int state) { m_kbd_tx_ready = (state == 1) ? true : false; update_kbd_irq(); @@ -2800,13 +2800,13 @@ TIMER_DEVICE_CALLBACK_MEMBER(rainbow_base_state::hd_motor_tick) m_hdc_index_latch = true; // HDC drive index signal (not working ?) } -WRITE_LINE_MEMBER(rainbow_modela_state::irq_hi_w) +void rainbow_modela_state::irq_hi_w(int state) { m_irq_high = 0; } // on 100-B, DTR from the keyboard 8051 controls bit 7 of IRQ vectors -WRITE_LINE_MEMBER(rainbow_modelb_state::irq_hi_w) +void rainbow_modelb_state::irq_hi_w(int state) { m_irq_high = (state == ASSERT_LINE) ? 0x80 : 0; } diff --git a/src/mame/dec/vk100.cpp b/src/mame/dec/vk100.cpp index c81b00b33ad..19add4c626e 100644 --- a/src/mame/dec/vk100.cpp +++ b/src/mame/dec/vk100.cpp @@ -217,10 +217,10 @@ private: uint8_t SYSTAT_B(); TIMER_CALLBACK_MEMBER(execute_vg); - DECLARE_WRITE_LINE_MEMBER(crtc_vsync); - DECLARE_WRITE_LINE_MEMBER(i8251_rxrdy_int); - DECLARE_WRITE_LINE_MEMBER(i8251_txrdy_int); - [[maybe_unused]] DECLARE_WRITE_LINE_MEMBER(i8251_rts); + void crtc_vsync(int state); + void i8251_rxrdy_int(int state); + void i8251_txrdy_int(int state); + [[maybe_unused]] void i8251_rts(int state); uint8_t vram_read(); uint8_t vram_attr_read(); MC6845_UPDATE_ROW(crtc_update_row); @@ -970,23 +970,23 @@ void vk100_state::machine_start() //m_i8251_sync_timer = timer_alloc(FUNC(vk100_state::i8251_sync), this); } -WRITE_LINE_MEMBER(vk100_state::crtc_vsync) +void vk100_state::crtc_vsync(int state) { m_maincpu->set_input_line(I8085_RST75_LINE, state? ASSERT_LINE : CLEAR_LINE); m_vsync = state; } -WRITE_LINE_MEMBER(vk100_state::i8251_rxrdy_int) +void vk100_state::i8251_rxrdy_int(int state) { m_maincpu->set_input_line(I8085_RST65_LINE, state?ASSERT_LINE:CLEAR_LINE); } -WRITE_LINE_MEMBER(vk100_state::i8251_txrdy_int) +void vk100_state::i8251_txrdy_int(int state) { m_maincpu->set_input_line(I8085_RST55_LINE, state?ASSERT_LINE:CLEAR_LINE); } -WRITE_LINE_MEMBER(vk100_state::i8251_rts) +void vk100_state::i8251_rts(int state) { logerror("callback: RTS state changed to %d\n", state); // TODO: only change this during loopback mode! diff --git a/src/mame/dec/vt240.cpp b/src/mame/dec/vt240.cpp index 707f603c030..5411594c624 100644 --- a/src/mame/dec/vt240.cpp +++ b/src/mame/dec/vt240.cpp @@ -65,12 +65,12 @@ private: required_ioport m_monitor; optional_device m_lk201; - DECLARE_WRITE_LINE_MEMBER(write_keyboard_clock); - DECLARE_WRITE_LINE_MEMBER(i8085_rdy_w); - DECLARE_WRITE_LINE_MEMBER(lben_w); - DECLARE_WRITE_LINE_MEMBER(tx_w); - DECLARE_WRITE_LINE_MEMBER(t11_reset_w); - DECLARE_READ_LINE_MEMBER(i8085_sid_r); + void write_keyboard_clock(int state); + void i8085_rdy_w(int state); + void lben_w(int state); + void tx_w(int state); + void t11_reset_w(int state); + int i8085_sid_r(); uint8_t i8085_comm_r(offs_t offset); void i8085_comm_w(offs_t offset, uint8_t data); uint8_t t11_comm_r(); @@ -105,9 +105,9 @@ private: virtual void machine_reset() override; UPD7220_DISPLAY_PIXELS_MEMBER(hgdc_draw); void irq_encoder(int irq, int state); - DECLARE_WRITE_LINE_MEMBER(irq7_w); - DECLARE_WRITE_LINE_MEMBER(irq9_w); - DECLARE_WRITE_LINE_MEMBER(irq13_w); + void irq7_w(int state); + void irq9_w(int state); + void irq13_w(int state); uint8_t m_i8085_out, m_t11_out, m_i8085_rdy, m_t11; uint8_t m_mem_map[16]; @@ -146,33 +146,33 @@ void vt240_state::irq_encoder(int irq, int state) m_maincpu->set_input_line(t11_device::CP0_LINE, (i & 1) ? ASSERT_LINE : CLEAR_LINE); } -WRITE_LINE_MEMBER(vt240_state::irq7_w) +void vt240_state::irq7_w(int state) { irq_encoder(7, state); } -WRITE_LINE_MEMBER(vt240_state::irq9_w) +void vt240_state::irq9_w(int state) { irq_encoder(9, state); } -WRITE_LINE_MEMBER(vt240_state::irq13_w) +void vt240_state::irq13_w(int state) { irq_encoder(13, state); } -WRITE_LINE_MEMBER(vt240_state::write_keyboard_clock) +void vt240_state::write_keyboard_clock(int state) { m_i8251->write_txc(state); m_i8251->write_rxc(state); } -WRITE_LINE_MEMBER(vt240_state::lben_w) +void vt240_state::lben_w(int state) { m_lb = state ? false : true; } -WRITE_LINE_MEMBER(vt240_state::t11_reset_w) +void vt240_state::t11_reset_w(int state) { if(state == ASSERT_LINE) { @@ -183,7 +183,7 @@ WRITE_LINE_MEMBER(vt240_state::t11_reset_w) } } -WRITE_LINE_MEMBER(vt240_state::tx_w) +void vt240_state::tx_w(int state) { if(m_lb) m_i8251->write_rxd(state); @@ -191,13 +191,13 @@ WRITE_LINE_MEMBER(vt240_state::tx_w) m_lk201->rx_w(state); } -WRITE_LINE_MEMBER(vt240_state::i8085_rdy_w) +void vt240_state::i8085_rdy_w(int state) { irq_encoder(3, state ? CLEAR_LINE : ASSERT_LINE); m_i8085_rdy = state; } -READ_LINE_MEMBER(vt240_state::i8085_sid_r) +int vt240_state::i8085_sid_r() { return m_t11 ? CLEAR_LINE : ASSERT_LINE; } diff --git a/src/mame/dec/vt52.cpp b/src/mame/dec/vt52.cpp index b38da49129c..e9aad759143 100644 --- a/src/mame/dec/vt52.cpp +++ b/src/mame/dec/vt52.cpp @@ -51,7 +51,7 @@ public: void vt52(machine_config &config); - DECLARE_WRITE_LINE_MEMBER(break_w); + void break_w(int state); DECLARE_INPUT_CHANGED_MEMBER(data_sw_changed); protected: @@ -62,13 +62,13 @@ private: void update_serial_settings(); u8 key_r(offs_t offset); - DECLARE_WRITE_LINE_MEMBER(baud_9600_w); + void baud_9600_w(int state); void vert_count_w(u8 data); void uart_xd_w(u8 data); void gated_serial_output(bool state); - DECLARE_WRITE_LINE_MEMBER(serial_out_w); - DECLARE_WRITE_LINE_MEMBER(rec_data_w); - DECLARE_READ_LINE_MEMBER(xrdy_eoc_r); + void serial_out_w(int state); + void rec_data_w(int state); + int xrdy_eoc_r(); u8 chargen_r(offs_t offset); void rom_1k(address_map &map); @@ -132,7 +132,7 @@ u8 vt52_state::key_r(offs_t offset) return !BIT(~m_keys[offset & 7]->read() & 0x3ff, (offset & 0170) >> 3); } -WRITE_LINE_MEMBER(vt52_state::baud_9600_w) +void vt52_state::baud_9600_w(int state) { u16 baud = m_baud_sw->read(); if (!BIT(baud, 13)) @@ -207,7 +207,7 @@ void vt52_state::gated_serial_output(bool state) m_uart->write_si(state); } -WRITE_LINE_MEMBER(vt52_state::serial_out_w) +void vt52_state::serial_out_w(int state) { if (m_serial_out != state) { @@ -217,13 +217,13 @@ WRITE_LINE_MEMBER(vt52_state::serial_out_w) } } -WRITE_LINE_MEMBER(vt52_state::break_w) +void vt52_state::break_w(int state) { if (m_serial_out) gated_serial_output(state); } -WRITE_LINE_MEMBER(vt52_state::rec_data_w) +void vt52_state::rec_data_w(int state) { m_rec_data = state; @@ -235,7 +235,7 @@ WRITE_LINE_MEMBER(vt52_state::rec_data_w) } } -READ_LINE_MEMBER(vt52_state::xrdy_eoc_r) +int vt52_state::xrdy_eoc_r() { return m_uart->tbmt_r() && m_uart->eoc_r(); } diff --git a/src/mame/dec/vtvideo.cpp b/src/mame/dec/vtvideo.cpp index eecfd80fb5f..5b567c7f23e 100644 --- a/src/mame/dec/vtvideo.cpp +++ b/src/mame/dec/vtvideo.cpp @@ -229,7 +229,7 @@ void vt100_video_device::recompute_parameters() LOG("(RECOMPUTE) * LINEDOUBLER *\n"); } -READ_LINE_MEMBER(vt100_video_device::lba7_r) +int vt100_video_device::lba7_r() { return m_lba7; } diff --git a/src/mame/dec/vtvideo.h b/src/mame/dec/vtvideo.h index 075f6ee7b0f..4175384ba68 100644 --- a/src/mame/dec/vtvideo.h +++ b/src/mame/dec/vtvideo.h @@ -30,7 +30,7 @@ public: template void set_chargen(T &&tag) { m_char_rom.set_tag(std::forward(tag)); } - DECLARE_READ_LINE_MEMBER(lba7_r); + int lba7_r(); void dc012_w(offs_t offset, uint8_t data); void dc011_w(uint8_t data); void brightness_w(uint8_t data); diff --git a/src/mame/dgrm/pokechmp.cpp b/src/mame/dgrm/pokechmp.cpp index 8b54a5fdc52..136d52e09ca 100644 --- a/src/mame/dgrm/pokechmp.cpp +++ b/src/mame/dgrm/pokechmp.cpp @@ -94,7 +94,7 @@ private: void oki_bank_w(uint8_t data); void videoram_w(offs_t offset, uint8_t data); void flipscreen_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(sound_irq); + void sound_irq(int state); TILE_GET_INFO_MEMBER(get_bg_tile_info); uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); @@ -338,7 +338,7 @@ OKI M6295 (an AD65 on this board, note pin 7 is low): 1.5mhz */ -WRITE_LINE_MEMBER(pokechmp_state::sound_irq) +void pokechmp_state::sound_irq(int state) { // VBLANK is probably not the source of this interrupt if (state) diff --git a/src/mame/dms/dms86.cpp b/src/mame/dms/dms86.cpp index 68d55b7c64e..5033d14cda6 100644 --- a/src/mame/dms/dms86.cpp +++ b/src/mame/dms/dms86.cpp @@ -52,7 +52,7 @@ public: { } void dms86(machine_config &config); - DECLARE_WRITE_LINE_MEMBER(nmi_w); + void nmi_w(int state); protected: virtual void machine_start() override; @@ -75,7 +75,7 @@ private: }; -WRITE_LINE_MEMBER(dms86_state::nmi_w) +void dms86_state::nmi_w(int state) { m_maincpu->set_input_line(INPUT_LINE_NMI, state); } diff --git a/src/mame/dynax/ddenlovr.cpp b/src/mame/dynax/ddenlovr.cpp index 2c643c4617c..d08a4b2c8ba 100644 --- a/src/mame/dynax/ddenlovr.cpp +++ b/src/mame/dynax/ddenlovr.cpp @@ -209,7 +209,7 @@ public: void init_rongrong(); - DECLARE_READ_LINE_MEMBER(blitter_irq_r); + int blitter_irq_r(); DECLARE_CUSTOM_INPUT_MEMBER(ddenlovj_blitter_r); DECLARE_CUSTOM_INPUT_MEMBER(nettoqc_special_r); DECLARE_CUSTOM_INPUT_MEMBER(mjflove_blitter_r); @@ -239,12 +239,12 @@ protected: uint32_t screen_update_ddenlovr(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); private: - DECLARE_WRITE_LINE_MEMBER(ddenlovr_irq); - DECLARE_WRITE_LINE_MEMBER(mjflove_irq); - DECLARE_WRITE_LINE_MEMBER(mjflove_rtc_irq); - DECLARE_WRITE_LINE_MEMBER(ddenlovr_blitter_irq); - DECLARE_WRITE_LINE_MEMBER(ddenlovr_blitter_irq_ack_w); - DECLARE_WRITE_LINE_MEMBER(mjflove_blitter_irq); + void ddenlovr_irq(int state); + void mjflove_irq(int state); + void mjflove_rtc_irq(int state); + void ddenlovr_blitter_irq(int state); + void ddenlovr_blitter_irq_ack_w(int state); + void mjflove_blitter_irq(int state); protected: void ddenlovr_bgcolor_w(uint8_t data); @@ -268,8 +268,8 @@ protected: void ddenlovr_select2_w(uint8_t data); private: - DECLARE_WRITE_LINE_MEMBER(ddenlovr_coincounter_0_w); - DECLARE_WRITE_LINE_MEMBER(ddenlovr_coincounter_1_w); + void ddenlovr_coincounter_0_w(int state); + void ddenlovr_coincounter_1_w(int state); void rongrong_coincounter_w(uint8_t data); uint8_t rongrong_input2_r(); uint16_t quiz365_input2_r(); @@ -324,8 +324,8 @@ private: uint16_t akamaru_protection1_r(); void akamaru_protection1_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); uint16_t akamaru_protection2_r(); - DECLARE_WRITE_LINE_MEMBER(akamaru_dsw1_sel_w); - DECLARE_WRITE_LINE_MEMBER(akamaru_dsw2_sel_w); + void akamaru_dsw1_sel_w(int state); + void akamaru_dsw2_sel_w(int state); uint16_t akamaru_dsw_r(); uint16_t akamaru_blitter_r(); uint16_t akamaru_e0010d_r(); @@ -348,8 +348,8 @@ private: void seljan2_palette_w(offs_t offset, uint8_t data); void quizchq_oki_bank_w(uint8_t data); void ddenlovr_oki_bank_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(quiz365_oki_bank1_w); - DECLARE_WRITE_LINE_MEMBER(quiz365_oki_bank2_w); + void quiz365_oki_bank1_w(int state); + void quiz365_oki_bank2_w(int state); protected: void ddenlovr_select_w(uint8_t data); private: @@ -528,21 +528,21 @@ private: DECLARE_VIDEO_START(mmpanic); DECLARE_MACHINE_START(funkyfig); - DECLARE_WRITE_LINE_MEMBER(mmpanic_irq); - DECLARE_WRITE_LINE_MEMBER(mmpanic_rtc_irq); - DECLARE_WRITE_LINE_MEMBER(funkyfig_sound_irq); + void mmpanic_irq(int state); + void mmpanic_rtc_irq(int state); + void funkyfig_sound_irq(int state); uint8_t magic_r(); void mmpanic_rombank_w(uint8_t data); void mmpanic_blitter2_w(offs_t offset, uint8_t data); - DECLARE_WRITE_LINE_MEMBER(mmpanic_blitter_irq); + void mmpanic_blitter_irq(int state); void mmpanic_leds_w(uint8_t data); void mmpanic_leds2_w(uint8_t data); void mmpanic_lockout_w(uint8_t data); uint8_t mmpanic_link_r(); uint8_t funkyfig_busy_r(); void funkyfig_blitter_w(offs_t offset, uint8_t data); - DECLARE_WRITE_LINE_MEMBER(funkyfig_blitter_irq); + void funkyfig_blitter_irq(int state); void funkyfig_rombank_w(uint8_t data); uint8_t funkyfig_dsw_r(); uint8_t funkyfig_coin_r(); @@ -1678,7 +1678,7 @@ void ddenlovr_state::ddenlovr_blitter_w(offs_t offset, uint8_t data) } -WRITE_LINE_MEMBER(ddenlovr_state::ddenlovr_blitter_irq) +void ddenlovr_state::ddenlovr_blitter_irq(int state) { if (state && m_ddenlovr_blitter_irq_enable) { @@ -1687,7 +1687,7 @@ WRITE_LINE_MEMBER(ddenlovr_state::ddenlovr_blitter_irq) } } -WRITE_LINE_MEMBER(ddenlovr_state::ddenlovr_blitter_irq_ack_w) +void ddenlovr_state::ddenlovr_blitter_irq_ack_w(int state) { if (state) { @@ -1857,17 +1857,17 @@ uint32_t ddenlovr_state::screen_update_ddenlovr(screen_device &screen, bitmap_rg return 0; } -READ_LINE_MEMBER(ddenlovr_state::blitter_irq_r) +int ddenlovr_state::blitter_irq_r() { return m_ddenlovr_blitter_irq_flag; } -WRITE_LINE_MEMBER(ddenlovr_state::ddenlovr_coincounter_0_w) +void ddenlovr_state::ddenlovr_coincounter_0_w(int state) { machine().bookkeeping().coin_counter_w(0, state); } -WRITE_LINE_MEMBER(ddenlovr_state::ddenlovr_coincounter_1_w) +void ddenlovr_state::ddenlovr_coincounter_1_w(int state) { machine().bookkeeping().coin_counter_w(1, state); } @@ -1944,13 +1944,13 @@ void ddenlovr_state::ddenlovr_oki_bank_w(uint8_t data) m_oki->set_rom_bank(data & 7); } -WRITE_LINE_MEMBER(ddenlovr_state::quiz365_oki_bank1_w) +void ddenlovr_state::quiz365_oki_bank1_w(int state) { m_okibank = (m_okibank & 2) | state; m_oki->set_rom_bank(m_okibank); } -WRITE_LINE_MEMBER(ddenlovr_state::quiz365_oki_bank2_w) +void ddenlovr_state::quiz365_oki_bank2_w(int state) { m_okibank = (m_okibank & 1) | (state << 1); m_oki->set_rom_bank(m_okibank); @@ -2494,7 +2494,7 @@ void mmpanic_state::mmpanic_blitter2_w(offs_t offset, uint8_t data) blitter_w(1, offset, data); } -WRITE_LINE_MEMBER(mmpanic_state::mmpanic_blitter_irq) +void mmpanic_state::mmpanic_blitter_irq(int state) { if (state) m_maincpu->set_input_line_and_vector(0, HOLD_LINE, 0xdf); // Z80 - RST 18 @@ -2640,7 +2640,7 @@ void mmpanic_state::funkyfig_blitter_w(offs_t offset, uint8_t data) blitter_w_funkyfig(0, offset, data); } -WRITE_LINE_MEMBER(mmpanic_state::funkyfig_blitter_irq) +void mmpanic_state::funkyfig_blitter_irq(int state) { if (0) // this vector looks wrong m_maincpu->set_input_line_and_vector(0, HOLD_LINE, 0xe0); // Z80 @@ -3811,12 +3811,12 @@ uint16_t ddenlovr_state::akamaru_protection2_r() return 0x55; } -WRITE_LINE_MEMBER(ddenlovr_state::akamaru_dsw1_sel_w) +void ddenlovr_state::akamaru_dsw1_sel_w(int state) { m_dsw_sel = (m_dsw_sel & 2) | state; } -WRITE_LINE_MEMBER(ddenlovr_state::akamaru_dsw2_sel_w) +void ddenlovr_state::akamaru_dsw2_sel_w(int state) { m_dsw_sel = (m_dsw_sel & 1) | (state << 1); } @@ -9813,7 +9813,7 @@ MACHINE_START_MEMBER(ddenlovr_state,sryudens) Don Den Lover Vol.1 ***************************************************************************/ -WRITE_LINE_MEMBER(ddenlovr_state::ddenlovr_irq) +void ddenlovr_state::ddenlovr_irq(int state) { if (state) m_maincpu->set_input_line(M68K_IRQ_1, HOLD_LINE); @@ -10010,7 +10010,7 @@ void ddenlovr_state::rongrong(machine_config &config) RST 20 is from the link device? */ -WRITE_LINE_MEMBER(mmpanic_state::mmpanic_irq) +void mmpanic_state::mmpanic_irq(int state) { if (!state) return; @@ -10026,7 +10026,7 @@ WRITE_LINE_MEMBER(mmpanic_state::mmpanic_irq) } -WRITE_LINE_MEMBER(mmpanic_state::mmpanic_rtc_irq) +void mmpanic_state::mmpanic_rtc_irq(int state) { if (state) m_maincpu->set_input_line_and_vector(0, HOLD_LINE, 0xdf); // Z80 - RST 18, clock @@ -10236,7 +10236,7 @@ void hanakanz_state::mjchuuka(machine_config &config) } -WRITE_LINE_MEMBER(mmpanic_state::funkyfig_sound_irq) +void mmpanic_state::funkyfig_sound_irq(int state) { if (state) m_soundcpu->set_input_line(0, HOLD_LINE); // NMI by main cpu @@ -10502,7 +10502,7 @@ void ddenlovr_state::mjmyornt(machine_config &config) } -WRITE_LINE_MEMBER(ddenlovr_state::mjflove_irq) +void ddenlovr_state::mjflove_irq(int state) { if (state) { @@ -10511,7 +10511,7 @@ WRITE_LINE_MEMBER(ddenlovr_state::mjflove_irq) } } -WRITE_LINE_MEMBER(ddenlovr_state::mjflove_rtc_irq) +void ddenlovr_state::mjflove_rtc_irq(int state) { if (state) { @@ -10520,7 +10520,7 @@ WRITE_LINE_MEMBER(ddenlovr_state::mjflove_rtc_irq) } } -WRITE_LINE_MEMBER(ddenlovr_state::mjflove_blitter_irq) +void ddenlovr_state::mjflove_blitter_irq(int state) { if (0) // ??? m_maincpu->set_input_line(0, HOLD_LINE); diff --git a/src/mame/dynax/dynax.cpp b/src/mame/dynax/dynax.cpp index 789e5374277..1453eb612a2 100644 --- a/src/mame/dynax/dynax.cpp +++ b/src/mame/dynax/dynax.cpp @@ -107,7 +107,7 @@ TODO: /* It runs in IM 0, thus needs an opcode on the data bus */ -WRITE_LINE_MEMBER(dynax_state::sprtmtch_blitter_irq_w) +void dynax_state::sprtmtch_blitter_irq_w(int state) { if (state && m_blitter_irq_mask) m_mainirq->rst4_w(1); @@ -118,14 +118,14 @@ void dynax_state::dynax_vblank_ack_w(uint8_t data) m_mainirq->rst2_w(0); } -WRITE_LINE_MEMBER(dynax_state::blitter_ack_w) +void dynax_state::blitter_ack_w(int state) { m_blitter_irq_mask = state; if (!m_blitter_irq_mask) m_mainirq->rst4_w(0); } -WRITE_LINE_MEMBER(dynax_state::sprtmtch_vblank_w) +void dynax_state::sprtmtch_vblank_w(int state) { if (state) m_mainirq->rst2_w(1); @@ -142,33 +142,33 @@ void jantouki_state::jantouki_vblank_ack_w(uint8_t data) m_mainirq->rst4_w(0); } -WRITE_LINE_MEMBER(jantouki_state::jantouki_blitter_irq_w) +void jantouki_state::jantouki_blitter_irq_w(int state) { if (state && m_blitter_irq_mask) m_mainirq->rst1_w(1); } -WRITE_LINE_MEMBER(jantouki_state::jantouki_blitter_ack_w) +void jantouki_state::jantouki_blitter_ack_w(int state) { m_blitter_irq_mask = state; if (!m_blitter_irq_mask) m_mainirq->rst1_w(0); } -WRITE_LINE_MEMBER(jantouki_state::jantouki_blitter2_irq_w) +void jantouki_state::jantouki_blitter2_irq_w(int state) { if (state && m_blitter2_irq_mask) m_mainirq->rst2_w(1); } -WRITE_LINE_MEMBER(jantouki_state::jantouki_blitter2_ack_w) +void jantouki_state::jantouki_blitter2_ack_w(int state) { m_blitter2_irq_mask = state; if (!m_blitter2_irq_mask) m_mainirq->rst2_w(0); } -WRITE_LINE_MEMBER(jantouki_state::jantouki_vblank_w) +void jantouki_state::jantouki_vblank_w(int state) { if (state) { @@ -200,12 +200,12 @@ void jantouki_state::jantouki_sound_vblank_ack_w(uint8_t data) Sports Match ***************************************************************************/ -WRITE_LINE_MEMBER(dynax_state::coincounter_0_w) +void dynax_state::coincounter_0_w(int state) { machine().bookkeeping().coin_counter_w(0, state); } -WRITE_LINE_MEMBER(dynax_state::coincounter_1_w) +void dynax_state::coincounter_1_w(int state) { machine().bookkeeping().coin_counter_w(1, state); } @@ -312,7 +312,7 @@ void dynax_adpcm_state::nanajign_palette_update(offs_t offset) } -WRITE_LINE_MEMBER(dynax_adpcm_state::adpcm_int) +void dynax_adpcm_state::adpcm_int(int state) { m_msm->data_w(m_msm5205next >> 4); m_msm5205next <<= 4; @@ -326,7 +326,7 @@ WRITE_LINE_MEMBER(dynax_adpcm_state::adpcm_int) } } -WRITE_LINE_MEMBER(jantouki_state::adpcm_int_cpu1) +void jantouki_state::adpcm_int_cpu1(int state) { m_msm->data_w(m_msm5205next >> 4); m_msm5205next <<= 4; @@ -351,7 +351,7 @@ void dynax_adpcm_state::adpcm_reset_w(uint8_t data) m_msm->reset_w(~data & 1); } -WRITE_LINE_MEMBER(dynax_adpcm_state::adpcm_reset_kludge_w) +void dynax_adpcm_state::adpcm_reset_kludge_w(int state) { m_resetkludge = state; } @@ -546,12 +546,12 @@ void dynax_adpcm_state::hnoridur_io_map(address_map &map) Hana Jingi ***************************************************************************/ -WRITE_LINE_MEMBER(dynax_adpcm_state::hjingi_lockout_w) +void dynax_adpcm_state::hjingi_lockout_w(int state) { machine().bookkeeping().coin_lockout_w(0, !state); } -WRITE_LINE_MEMBER(dynax_adpcm_state::hjingi_hopper_w) +void dynax_adpcm_state::hjingi_hopper_w(int state) { m_hopper = state; } @@ -1205,13 +1205,13 @@ void dynax_state::tenkai_show_6c() // popmessage("%02x %02x", m_tenkai_6c, m_tenkai_70); } -WRITE_LINE_MEMBER(dynax_state::tenkai_6c_w) +void dynax_state::tenkai_6c_w(int state) { m_tenkai_6c = state; tenkai_show_6c(); } -WRITE_LINE_MEMBER(dynax_state::tenkai_70_w) +void dynax_state::tenkai_70_w(int state) { m_tenkai_70 = state; tenkai_show_6c(); @@ -4516,7 +4516,7 @@ void dynax_state::sprtmtch(machine_config &config) Mahjong Friday ***************************************************************************/ -WRITE_LINE_MEMBER(dynax_state::mjfriday_vblank_w) +void dynax_state::mjfriday_vblank_w(int state) { if (state) m_maincpu->set_input_line(0, HOLD_LINE); @@ -4850,13 +4850,13 @@ void dynax_adpcm_state::neruton(machine_config &config) Mahjong Tenkaigen ***************************************************************************/ -WRITE_LINE_MEMBER(dynax_state::tenkai_blitter_irq_w) +void dynax_state::tenkai_blitter_irq_w(int state) { if (state && m_blitter_irq_mask) m_maincpu->set_input_line(INPUT_LINE_IRQ0, ASSERT_LINE); } -WRITE_LINE_MEMBER(dynax_state::tenkai_blitter_ack_w) +void dynax_state::tenkai_blitter_ack_w(int state) { m_blitter_irq_mask = state; diff --git a/src/mame/dynax/dynax.h b/src/mame/dynax/dynax.h index cd8d80ac47f..170a44235c7 100644 --- a/src/mame/dynax/dynax.h +++ b/src/mame/dynax/dynax.h @@ -47,12 +47,12 @@ public: void mjdialq2(machine_config &config); void sprtmtch(machine_config &config); - DECLARE_WRITE_LINE_MEMBER(blitter_ack_w); - DECLARE_WRITE_LINE_MEMBER(sprtmtch_blitter_irq_w); - DECLARE_WRITE_LINE_MEMBER(sprtmtch_vblank_w); - DECLARE_WRITE_LINE_MEMBER(layer_half_w); - DECLARE_WRITE_LINE_MEMBER(layer_half2_w); - DECLARE_WRITE_LINE_MEMBER(flipscreen_w); + void blitter_ack_w(int state); + void sprtmtch_blitter_irq_w(int state); + void sprtmtch_vblank_w(int state); + void layer_half_w(int state); + void layer_half2_w(int state); + void flipscreen_w(int state); void hnoridur_blit_pixel_w(offs_t offset, uint8_t data); void dynax_blit_scrollx_w(uint8_t data); @@ -86,15 +86,15 @@ protected: // Nothing below here is used by ddenlovr.cpp // TODO: further decouple dynax.cpp and ddenlovr.cpp - DECLARE_WRITE_LINE_MEMBER(coincounter_0_w); - DECLARE_WRITE_LINE_MEMBER(coincounter_1_w); + void coincounter_0_w(int state); + void coincounter_1_w(int state); uint8_t ret_ff(); uint8_t hanamai_keyboard_0_r(); uint8_t hanamai_keyboard_1_r(); void hanamai_keyboard_w(uint8_t data); void dynax_rombank_w(uint8_t data); void dynax_blit_palette23_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(blit_palbank_w); + void blit_palbank_w(int state); void dynax_blit_backpen_w(uint8_t data); void dynax_blit_palette01_w(uint8_t data); void dynax_layer_enable_w(uint8_t data); @@ -162,8 +162,8 @@ private: void tenkai_p8_w(uint8_t data); uint8_t tenkai_p8_r(); void ougonhai_p7_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(tenkai_6c_w); - DECLARE_WRITE_LINE_MEMBER(tenkai_70_w); + void tenkai_6c_w(int state); + void tenkai_70_w(int state); void tenkai_blit_romregion_w(uint8_t data); uint8_t gekisha_keyboard_0_r(); uint8_t gekisha_keyboard_1_r(); @@ -172,10 +172,10 @@ private: void tenkai_blit_dest_w(uint8_t data); void tenkai_blit_palette01_w(uint8_t data); void tenkai_blit_palette23_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(mjdialq2_blit_dest0_w); - DECLARE_WRITE_LINE_MEMBER(mjdialq2_blit_dest1_w); - DECLARE_WRITE_LINE_MEMBER(mjdialq2_layer0_enable_w); - DECLARE_WRITE_LINE_MEMBER(mjdialq2_layer1_enable_w); + void mjdialq2_blit_dest0_w(int state); + void mjdialq2_blit_dest1_w(int state); + void mjdialq2_layer0_enable_w(int state); + void mjdialq2_layer1_enable_w(int state); void drgpunch_blit_pixel_w(offs_t offset, uint8_t data); void mjdialq2_blit_pixel_w(offs_t offset, uint8_t data); void tenkai_blit_scrollx_w(uint8_t data); @@ -185,14 +185,14 @@ private: uint32_t screen_update_sprtmtch(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_mjdialq2(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(mjfriday_vblank_w); + void mjfriday_vblank_w(int state); void tenkai_update_rombank(); void tenkai_dswsel_w(uint8_t data); uint8_t tenkai_dsw_r(); - DECLARE_WRITE_LINE_MEMBER(tenkai_blitter_irq_w); - DECLARE_WRITE_LINE_MEMBER(tenkai_blitter_ack_w); + void tenkai_blitter_irq_w(int state); + void tenkai_blitter_ack_w(int state); DECLARE_MACHINE_START(sprtmtch); DECLARE_VIDEO_START(sprtmtch); DECLARE_VIDEO_START(mjdialq2); @@ -273,8 +273,8 @@ private: void nanajign_palette_lo_w(offs_t offset, uint8_t data); void nanajign_palette_hi_w(offs_t offset, uint8_t data); void nanajign_palette_update(offs_t offset); - DECLARE_WRITE_LINE_MEMBER(hjingi_lockout_w); - DECLARE_WRITE_LINE_MEMBER(hjingi_hopper_w); + void hjingi_lockout_w(int state); + void hjingi_hopper_w(int state); uint8_t hjingi_hopper_bit(); uint8_t hjingi_keyboard_0_r(); uint8_t hjingi_keyboard_1_r(); @@ -290,8 +290,8 @@ private: void hanamai_priority_w(uint8_t data); void mjembase_priority_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(adpcm_int); - DECLARE_WRITE_LINE_MEMBER(adpcm_reset_kludge_w); + void adpcm_int(int state); + void adpcm_reset_kludge_w(int state); DECLARE_MACHINE_START(hanamai); DECLARE_MACHINE_START(hjingi); @@ -370,11 +370,11 @@ private: int m_toggle_cpu1 = 0; void jantouki_vblank_ack_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(jantouki_blitter_ack_w); - DECLARE_WRITE_LINE_MEMBER(jantouki_blitter_irq_w); - DECLARE_WRITE_LINE_MEMBER(jantouki_blitter2_ack_w); - DECLARE_WRITE_LINE_MEMBER(jantouki_blitter2_irq_w); - DECLARE_WRITE_LINE_MEMBER(jantouki_vblank_w); + void jantouki_blitter_ack_w(int state); + void jantouki_blitter_irq_w(int state); + void jantouki_blitter2_ack_w(int state); + void jantouki_blitter2_irq_w(int state); + void jantouki_vblank_w(int state); void jantouki_sound_vblank_ack_w(uint8_t data); void jantouki_sound_rombank_w(uint8_t data); uint8_t jantouki_soundlatch_ack_r(); @@ -387,7 +387,7 @@ private: void dynax_blit2_dest_w(uint8_t data); void dynax_blit_palette45_w(uint8_t data); void dynax_blit_palette67_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(blit2_palbank_w); + void blit2_palbank_w(int state); void jantouki_blit_pixel_w(offs_t offset, uint8_t data); void jantouki_blit2_pixel_w(offs_t offset, uint8_t data); void dynax_blit2_scrollx_w(uint8_t data); @@ -400,7 +400,7 @@ private: void jantouki_copylayer(bitmap_ind16 &bitmap, const rectangle &cliprect, int i, int y); - DECLARE_WRITE_LINE_MEMBER(adpcm_int_cpu1); + void adpcm_int_cpu1(int state); DECLARE_VIDEO_START(jantouki); diff --git a/src/mame/dynax/dynax_v.cpp b/src/mame/dynax/dynax_v.cpp index 02dec5eb646..e870f691a8f 100644 --- a/src/mame/dynax/dynax_v.cpp +++ b/src/mame/dynax/dynax_v.cpp @@ -189,13 +189,13 @@ void jantouki_state::dynax_blit_palette67_w(uint8_t data) /* Layers Palettes (High Bits) */ -WRITE_LINE_MEMBER(dynax_state::blit_palbank_w) +void dynax_state::blit_palbank_w(int state) { m_blit_palbank = state; LOG("PB=%d ", state); } -WRITE_LINE_MEMBER(jantouki_state::blit2_palbank_w) +void jantouki_state::blit2_palbank_w(int state) { m_blit2_palbank = state; LOG("PB'=%d ", state); @@ -209,7 +209,7 @@ void dynax_adpcm_state::hnoridur_palbank_w(uint8_t data) /* Which half of the layers to write to (interleaved games only) */ -WRITE_LINE_MEMBER(dynax_state::layer_half_w) +void dynax_state::layer_half_w(int state) { m_hanamai_layer_half = !state; LOG("H=%d ", state); @@ -217,20 +217,20 @@ WRITE_LINE_MEMBER(dynax_state::layer_half_w) /* Write to both halves of the layers (interleaved games only) */ -WRITE_LINE_MEMBER(dynax_state::layer_half2_w) +void dynax_state::layer_half2_w(int state) { m_hnoridur_layer_half2 = !state; LOG("H2=%d ", state); } -WRITE_LINE_MEMBER(dynax_state::mjdialq2_blit_dest0_w) +void dynax_state::mjdialq2_blit_dest0_w(int state) { m_blit_dest &= ~1; if (!state) m_blit_dest |= 1; } -WRITE_LINE_MEMBER(dynax_state::mjdialq2_blit_dest1_w) +void dynax_state::mjdialq2_blit_dest1_w(int state) { m_blit_dest &= ~2; if (!state) @@ -252,14 +252,14 @@ void jantouki_state::jantouki_layer_enable_w(offs_t offset, uint8_t data) m_layer_enable |= 1; } -WRITE_LINE_MEMBER(dynax_state::mjdialq2_layer0_enable_w) +void dynax_state::mjdialq2_layer0_enable_w(int state) { m_layer_enable &= ~1; if (!state) m_layer_enable |= 1; } -WRITE_LINE_MEMBER(dynax_state::mjdialq2_layer1_enable_w) +void dynax_state::mjdialq2_layer1_enable_w(int state) { m_layer_enable &= ~2; if (!state) @@ -267,7 +267,7 @@ WRITE_LINE_MEMBER(dynax_state::mjdialq2_layer1_enable_w) } -WRITE_LINE_MEMBER(dynax_state::flipscreen_w) +void dynax_state::flipscreen_w(int state) { m_flipscreen = state; LOG("F=%d ", state); diff --git a/src/mame/dynax/hnayayoi.cpp b/src/mame/dynax/hnayayoi.cpp index e45b692d051..ad7b0ddcf14 100644 --- a/src/mame/dynax/hnayayoi.cpp +++ b/src/mame/dynax/hnayayoi.cpp @@ -121,16 +121,16 @@ private: void dynax_blitter_rev1_start_w(uint8_t data); void dynax_blitter_rev1_clear_w(uint8_t data); void palbank_w(offs_t offset, uint8_t data); - DECLARE_WRITE_LINE_MEMBER(coin_counter_w); - DECLARE_WRITE_LINE_MEMBER(nmi_enable_w); - DECLARE_WRITE_LINE_MEMBER(nmi_clock_w); + void coin_counter_w(int state); + void nmi_enable_w(int state); + void nmi_clock_w(int state); DECLARE_VIDEO_START(untoucha); MC6845_UPDATE_ROW(hnayayoi_update_row); MC6845_UPDATE_ROW(untoucha_update_row); void common_vh_start(int num_pixmaps); void copy_pixel(int x, int y, int pen); void draw_layer_interleaved(bitmap_rgb32 &bitmap, const rectangle &cliprect, uint16_t row, uint16_t y, uint8_t x_count, int left_pixmap, int right_pixmap, int palbase, bool transp); - DECLARE_WRITE_LINE_MEMBER(irqhandler); + void irqhandler(int state); void hnayayoi_map(address_map &map); void hnayayoi_io_map(address_map &map); @@ -406,13 +406,13 @@ void hnayayoi_state::keyboard_w(uint8_t data) } -WRITE_LINE_MEMBER(hnayayoi_state::coin_counter_w) +void hnayayoi_state::coin_counter_w(int state) { machine().bookkeeping().coin_counter_w(0, state); } -WRITE_LINE_MEMBER(hnayayoi_state::nmi_enable_w) +void hnayayoi_state::nmi_enable_w(int state) { m_nmi_enable = state; if (!state) @@ -420,7 +420,7 @@ WRITE_LINE_MEMBER(hnayayoi_state::nmi_enable_w) } -WRITE_LINE_MEMBER(hnayayoi_state::nmi_clock_w) +void hnayayoi_state::nmi_clock_w(int state) { if (m_nmi_enable) m_maincpu->set_input_line(INPUT_LINE_NMI, state); @@ -923,7 +923,7 @@ INPUT_PORTS_END -WRITE_LINE_MEMBER(hnayayoi_state::irqhandler) +void hnayayoi_state::irqhandler(int state) { LOGIRQ("irq"); // m_maincpu->set_input_line(0, state ? ASSERT_LINE : CLEAR_LINE); diff --git a/src/mame/dynax/realbrk.h b/src/mame/dynax/realbrk.h index 97e5cb795f6..ccddb9da950 100644 --- a/src/mame/dynax/realbrk.h +++ b/src/mame/dynax/realbrk.h @@ -86,7 +86,7 @@ private: u32 screen_update_dai2kaku(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); template void draw_sprites(bitmap_ind16 &bitmap,const rectangle &cliprect, bitmap_ind8 &priority); - DECLARE_WRITE_LINE_MEMBER(vblank_irq); + void vblank_irq(int state); void base_mem(address_map &map); void dai2kaku_mem(address_map &map); void pkgnsh_mem(address_map &map); diff --git a/src/mame/eaca/cgenie.cpp b/src/mame/eaca/cgenie.cpp index b56c2235fa5..5c08d0389d8 100644 --- a/src/mame/eaca/cgenie.cpp +++ b/src/mame/eaca/cgenie.cpp @@ -71,8 +71,8 @@ public: uint8_t keyboard_r(offs_t offset); DECLARE_INPUT_CHANGED_MEMBER(rst_callback); - DECLARE_WRITE_LINE_MEMBER(rs232_rx_w); - DECLARE_WRITE_LINE_MEMBER(rs232_dcd_w); + void rs232_rx_w(int state); + void rs232_dcd_w(int state); void cgenie(machine_config &config); void cgenie_io(address_map &map); @@ -279,12 +279,12 @@ uint8_t cgenie_state::control_r() return data; } -WRITE_LINE_MEMBER( cgenie_state::rs232_rx_w ) +void cgenie_state::rs232_rx_w(int state) { m_rs232_rx = state; } -WRITE_LINE_MEMBER( cgenie_state::rs232_dcd_w ) +void cgenie_state::rs232_dcd_w(int state) { m_rs232_dcd = state; } diff --git a/src/mame/edevices/fantland.cpp b/src/mame/edevices/fantland.cpp index a49c322b0a2..e4e1715937c 100644 --- a/src/mame/edevices/fantland.cpp +++ b/src/mame/edevices/fantland.cpp @@ -334,7 +334,7 @@ void borntofi_state::msm5205_w(offs_t offset, uint8_t data) } template -WRITE_LINE_MEMBER(borntofi_state::adpcm_int) +void borntofi_state::adpcm_int(int state) { if (!m_adpcm_playing[Voice]) return; @@ -793,7 +793,7 @@ void fantland_state::machine_reset() m_nmi_enable = 0; } -WRITE_LINE_MEMBER(fantland_state::vblank_irq) +void fantland_state::vblank_irq(int state) { if (state && BIT(m_nmi_enable, 3)) m_maincpu->pulse_input_line(INPUT_LINE_NMI, attotime::zero); @@ -842,7 +842,7 @@ void fantland_state::fantland(machine_config &config) } -WRITE_LINE_MEMBER(fantland_state::galaxygn_sound_irq) +void fantland_state::galaxygn_sound_irq(int state) { m_audiocpu->set_input_line_and_vector(0, state ? ASSERT_LINE : CLEAR_LINE, 0x80/4); // I8088 } diff --git a/src/mame/edevices/fantland.h b/src/mame/edevices/fantland.h index d34d813909f..f8dc7b17154 100644 --- a/src/mame/edevices/fantland.h +++ b/src/mame/edevices/fantland.h @@ -55,7 +55,7 @@ protected: virtual void machine_start() override; virtual void machine_reset() override; uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(vblank_irq); + void vblank_irq(int state); void draw_sprites(bitmap_ind16 &bitmap,const rectangle &cliprect); private: @@ -63,7 +63,7 @@ private: uint8_t spriteram2_r(offs_t offset); void spriteram_w(offs_t offset, uint8_t data, uint8_t mem_mask = ~0); void spriteram2_w(offs_t offset, uint8_t data, uint8_t mem_mask = ~0); - DECLARE_WRITE_LINE_MEMBER(galaxygn_sound_irq); + void galaxygn_sound_irq(int state); INTERRUPT_GEN_MEMBER(fantland_sound_irq); void fantland_map(address_map &map); void fantland_sound_iomap(address_map &map); @@ -104,7 +104,7 @@ private: void msm5205_w(offs_t offset, uint8_t data); virtual void machine_start() override; virtual void machine_reset() override; - template DECLARE_WRITE_LINE_MEMBER(adpcm_int); + template void adpcm_int(int state); void adpcm_start(int voice); void adpcm_stop(int voice); void main_map(address_map &map); diff --git a/src/mame/edevices/pzletime.cpp b/src/mame/edevices/pzletime.cpp index a613c729f79..571908c43ec 100644 --- a/src/mame/edevices/pzletime.cpp +++ b/src/mame/edevices/pzletime.cpp @@ -49,7 +49,7 @@ public: void pzletime(machine_config &config); - DECLARE_READ_LINE_MEMBER(ticket_status_r); + int ticket_status_r(); private: /* memory pointers */ @@ -214,7 +214,7 @@ void pzletime_state::oki_bank_w(uint16_t data) m_oki->set_rom_bank(data & 0x3); } -READ_LINE_MEMBER(pzletime_state::ticket_status_r) +int pzletime_state::ticket_status_r() { return (m_ticket && !(m_screen->frame_number() % 128)); } diff --git a/src/mame/efo/cidelsa.cpp b/src/mame/efo/cidelsa.cpp index d6d48a242a5..e9a7f80bdf3 100644 --- a/src/mame/efo/cidelsa.cpp +++ b/src/mame/efo/cidelsa.cpp @@ -5,12 +5,12 @@ /* CDP1802 Interface */ -READ_LINE_MEMBER( cidelsa_state::clear_r ) +int cidelsa_state::clear_r() { return m_reset; } -WRITE_LINE_MEMBER( cidelsa_state::q_w ) +void cidelsa_state::q_w(int state) { m_cdp1802_q = state; } @@ -207,7 +207,7 @@ void draco_state::draco_sound_map(address_map &map) /* Input Ports */ -READ_LINE_MEMBER( cidelsa_state::cdp1869_pcb_r ) +int cidelsa_state::cdp1869_pcb_r() { return m_cdp1869_pcb; } diff --git a/src/mame/efo/cidelsa.h b/src/mame/efo/cidelsa.h index 034f0cfaf10..462cea68db8 100644 --- a/src/mame/efo/cidelsa.h +++ b/src/mame/efo/cidelsa.h @@ -51,11 +51,11 @@ public: void destryer_out1_w(uint8_t data); void altair_out1_w(uint8_t data); - DECLARE_READ_LINE_MEMBER( clear_r ); + int clear_r(); - DECLARE_WRITE_LINE_MEMBER( q_w ); - DECLARE_WRITE_LINE_MEMBER( prd_w ); - DECLARE_READ_LINE_MEMBER( cdp1869_pcb_r ); + void q_w(int state); + void prd_w(int state); + int cdp1869_pcb_r(); CDP1869_CHAR_RAM_READ_MEMBER(cidelsa_charram_r); CDP1869_CHAR_RAM_WRITE_MEMBER(cidelsa_charram_w); diff --git a/src/mame/efo/cidelsa_v.cpp b/src/mame/efo/cidelsa_v.cpp index 27d25096a5a..a4ccd5b9523 100644 --- a/src/mame/efo/cidelsa_v.cpp +++ b/src/mame/efo/cidelsa_v.cpp @@ -93,7 +93,7 @@ CDP1869_PCB_READ_MEMBER( draco_state::draco_pcb_r ) /* Predisplay Changed Handler */ -WRITE_LINE_MEMBER( cidelsa_state::prd_w ) +void cidelsa_state::prd_w(int state) { /* invert PRD signal */ m_maincpu->set_input_line(COSMAC_INPUT_LINE_INT, state ? CLEAR_LINE : ASSERT_LINE); diff --git a/src/mame/efo/nightmare.cpp b/src/mame/efo/nightmare.cpp index b36cbbb40bd..f2aa418f9bb 100644 --- a/src/mame/efo/nightmare.cpp +++ b/src/mame/efo/nightmare.cpp @@ -238,10 +238,10 @@ protected: TIMER_CALLBACK_MEMBER(clear_reset); - DECLARE_READ_LINE_MEMBER( clear_r ); - DECLARE_READ_LINE_MEMBER( ef1_r ); - DECLARE_READ_LINE_MEMBER( ef2_r ); - DECLARE_WRITE_LINE_MEMBER( q_w ); + int clear_r(); + int ef1_r(); + int ef2_r(); + void q_w(int state); void ic10_w(uint8_t data); void unkout_w(uint8_t data); @@ -284,17 +284,17 @@ void nightmare_state::machine_reset() /* CDP1802 Interface */ -READ_LINE_MEMBER( nightmare_state::clear_r ) +int nightmare_state::clear_r() { return m_reset; } -WRITE_LINE_MEMBER( nightmare_state::q_w ) +void nightmare_state::q_w(int state) { m_eeprom->write_clock(state); } -READ_LINE_MEMBER( nightmare_state::ef1_r ) +int nightmare_state::ef1_r() { //EEPROM Inv ??? @@ -302,7 +302,7 @@ READ_LINE_MEMBER( nightmare_state::ef1_r ) } -READ_LINE_MEMBER( nightmare_state::ef2_r ) +int nightmare_state::ef2_r() { //EEPROM Dq data read; return m_eeprom->read_data(); diff --git a/src/mame/elektor/elekscmp.cpp b/src/mame/elektor/elekscmp.cpp index 6fa7b3d8fb2..47d047b0bf9 100644 --- a/src/mame/elektor/elekscmp.cpp +++ b/src/mame/elektor/elekscmp.cpp @@ -53,7 +53,7 @@ private: u8 keyboard_r(); void hex_display_w(offs_t offset, u8 data); - DECLARE_READ_LINE_MEMBER(cass_r); + int cass_r(); TIMER_DEVICE_CALLBACK_MEMBER(kansas_r); TIMER_DEVICE_CALLBACK_MEMBER(kansas_w); u8 convert_key(u8 data); @@ -145,7 +145,7 @@ TIMER_DEVICE_CALLBACK_MEMBER( elekscmp_state::kansas_w ) m_cass->output(BIT(m_cass_data[3], 1) ? -1.0 : +1.0); // 1200Hz } -READ_LINE_MEMBER( elekscmp_state::cass_r ) +int elekscmp_state::cass_r() { return m_cassinbit; } diff --git a/src/mame/ensoniq/esq5505.cpp b/src/mame/ensoniq/esq5505.cpp index 519ea695126..c23550a2565 100644 --- a/src/mame/ensoniq/esq5505.cpp +++ b/src/mame/ensoniq/esq5505.cpp @@ -235,7 +235,7 @@ public: void init_denib(); DECLARE_INPUT_CHANGED_MEMBER(key_stroke); - DECLARE_WRITE_LINE_MEMBER(esq5505_otis_irq); + void esq5505_otis_irq(int state); protected: virtual void machine_start() override; @@ -260,9 +260,9 @@ private: uint16_t analog_r(); void analog_w(offs_t offset, uint16_t data); - DECLARE_WRITE_LINE_MEMBER(duart_irq_handler); - DECLARE_WRITE_LINE_MEMBER(duart_tx_a); - DECLARE_WRITE_LINE_MEMBER(duart_tx_b); + void duart_irq_handler(int state); + void duart_tx_a(int state); + void duart_tx_b(int state); void duart_output(uint8_t data); void es5505_clock_changed(u32 data); @@ -288,7 +288,7 @@ private: uint16_t m_analog_values[8]; //dmac - DECLARE_WRITE_LINE_MEMBER(dma_irq); + void dma_irq(int state); }; void esq5505_state::floppy_formats(format_registration &fr) @@ -461,7 +461,7 @@ void esq5505_state::sq1_map(address_map &map) map(0xff0000, 0xffffff).ram().share("osram"); } -WRITE_LINE_MEMBER(esq5505_state::esq5505_otis_irq) +void esq5505_state::esq5505_otis_irq(int state) { m_otis_irq_state = (state != 0); update_irq_to_maincpu(); @@ -483,7 +483,7 @@ uint16_t esq5505_state::analog_r() return m_analog_values[m_duart_io & 7]; } -WRITE_LINE_MEMBER(esq5505_state::duart_irq_handler) +void esq5505_state::duart_irq_handler(int state) { // printf("\nDUART IRQ: state %d vector %d\n", state, vector); if (state == ASSERT_LINE) @@ -553,17 +553,17 @@ void esq5505_state::duart_output(uint8_t data) } // MIDI send -WRITE_LINE_MEMBER(esq5505_state::duart_tx_a) +void esq5505_state::duart_tx_a(int state) { m_mdout->write_txd(state); } -WRITE_LINE_MEMBER(esq5505_state::duart_tx_b) +void esq5505_state::duart_tx_b(int state) { m_panel->rx_w(state); } -WRITE_LINE_MEMBER(esq5505_state::dma_irq) +void esq5505_state::dma_irq(int state) { if (state != CLEAR_LINE) { diff --git a/src/mame/ensoniq/esqasr.cpp b/src/mame/ensoniq/esqasr.cpp index 19828eeaed3..dc19fba853f 100644 --- a/src/mame/ensoniq/esqasr.cpp +++ b/src/mame/ensoniq/esqasr.cpp @@ -77,7 +77,7 @@ private: virtual void machine_start() override; virtual void machine_reset() override; - DECLARE_WRITE_LINE_MEMBER(esq5506_otto_irq); + void esq5506_otto_irq(int state); u16 esq5506_read_adc(); void es5506_clock_changed(u32 data); @@ -106,7 +106,7 @@ void esqasr_state::asrx_map(address_map &map) map(0x0be00000, 0x0befffff).ram(); } -WRITE_LINE_MEMBER(esqasr_state::esq5506_otto_irq) +void esqasr_state::esq5506_otto_irq(int state) { } diff --git a/src/mame/ensoniq/esqkt.cpp b/src/mame/ensoniq/esqkt.cpp index b1806799506..5aea0700491 100644 --- a/src/mame/ensoniq/esqkt.cpp +++ b/src/mame/ensoniq/esqkt.cpp @@ -134,16 +134,16 @@ private: required_device m_sq1panel; required_device m_mdout; - DECLARE_WRITE_LINE_MEMBER(duart_irq_handler); - DECLARE_WRITE_LINE_MEMBER(duart_tx_a); - DECLARE_WRITE_LINE_MEMBER(duart_tx_b); + void duart_irq_handler(int state); + void duart_tx_a(int state); + void duart_tx_b(int state); void duart_output(u8 data); u16 *m_rom = nullptr, *m_ram = nullptr; u8 m_duart_io = 0; bool m_bCalibSecondByte = false; // only set to false on machine_reset()? - DECLARE_WRITE_LINE_MEMBER(esq5506_otto_irq); + void esq5506_otto_irq(int state); u16 esq5506_read_adc(); void es5506_clock_changed(u32 data); void kt_map(address_map &map); @@ -188,7 +188,7 @@ void esqkt_state::ts_map(address_map &map) map(0xff0000, 0xffffff).ram(); } -WRITE_LINE_MEMBER(esqkt_state::esq5506_otto_irq) +void esqkt_state::esq5506_otto_irq(int state) { #if 0 // 5505/06 IRQ generation needs (more) work m_maincpu->set_input_line(1, state); @@ -227,7 +227,7 @@ void esqkt_state::es5506_clock_changed(u32 data) m_pump->set_unscaled_clock(data); } -WRITE_LINE_MEMBER(esqkt_state::duart_irq_handler) +void esqkt_state::duart_irq_handler(int state) { m_maincpu->set_input_line(M68K_IRQ_3, state); } @@ -239,12 +239,12 @@ void esqkt_state::duart_output(u8 data) // printf("DUART output: %02x (PC=%x)\n", data, m_maincpu->pc()); } -WRITE_LINE_MEMBER(esqkt_state::duart_tx_a) +void esqkt_state::duart_tx_a(int state) { m_mdout->write_txd(state); } -WRITE_LINE_MEMBER(esqkt_state::duart_tx_b) +void esqkt_state::duart_tx_b(int state) { m_sq1panel->rx_w(state); } diff --git a/src/mame/ensoniq/esqmr.cpp b/src/mame/ensoniq/esqmr.cpp index 332459e5f69..78788a66eb9 100644 --- a/src/mame/ensoniq/esqmr.cpp +++ b/src/mame/ensoniq/esqmr.cpp @@ -233,10 +233,10 @@ private: virtual void machine_reset() override; - DECLARE_WRITE_LINE_MEMBER(esq5506_otto_irq); + void esq5506_otto_irq(int state); u16 esq5506_read_adc(); - DECLARE_WRITE_LINE_MEMBER(duart_tx_a); - DECLARE_WRITE_LINE_MEMBER(duart_tx_b); + void duart_tx_a(int state); + void duart_tx_b(int state); void mr_map(address_map &map); }; @@ -254,17 +254,17 @@ void esqmr_state::mr_map(address_map &map) map(0x00de0000, 0x00de003f).rw("ensoniq2", FUNC(es5506_device::read), FUNC(es5506_device::write)); } -WRITE_LINE_MEMBER(esqmr_state::duart_tx_a) +void esqmr_state::duart_tx_a(int state) { //m_mdout->write_txd(state); } -WRITE_LINE_MEMBER(esqmr_state::duart_tx_b) +void esqmr_state::duart_tx_b(int state) { m_panel->rx_w(state); } -WRITE_LINE_MEMBER(esqmr_state::esq5506_otto_irq) +void esqmr_state::esq5506_otto_irq(int state) { } diff --git a/src/mame/enterprise/ep64.cpp b/src/mame/enterprise/ep64.cpp index 447e6c59d30..e67e953d95c 100644 --- a/src/mame/enterprise/ep64.cpp +++ b/src/mame/enterprise/ep64.cpp @@ -224,7 +224,7 @@ private: uint8_t m_key; - DECLARE_WRITE_LINE_MEMBER(write_centronics_busy); + void write_centronics_busy(int state); int m_centronics_busy; void dave_128k_mem(address_map &map); void dave_64k_mem(address_map &map); @@ -292,7 +292,7 @@ void ep64_state::wr0_w(uint8_t data) m_cassette2->change_state(BIT(data, 7) ? CASSETTE_MOTOR_ENABLED : CASSETTE_MOTOR_DISABLED, CASSETTE_MASK_MOTOR); } -WRITE_LINE_MEMBER( ep64_state::write_centronics_busy ) +void ep64_state::write_centronics_busy(int state) { m_centronics_busy = state; } diff --git a/src/mame/entex/advision.cpp b/src/mame/entex/advision.cpp index 436d34f3d94..f57364b7b0e 100644 --- a/src/mame/entex/advision.cpp +++ b/src/mame/entex/advision.cpp @@ -104,10 +104,10 @@ private: u32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); void av_control_w(u8 data); - DECLARE_WRITE_LINE_MEMBER(vblank); + void vblank(int state); TIMER_DEVICE_CALLBACK_MEMBER(led_update); TIMER_DEVICE_CALLBACK_MEMBER(led_off); - DECLARE_READ_LINE_MEMBER(vsync_r); + int vsync_r(); TIMER_CALLBACK_MEMBER(sound_cmd_sync); u8 sound_cmd_r(); @@ -196,7 +196,7 @@ void advision_state::av_control_w(u8 data) machine().scheduler().synchronize(timer_expired_delegate(FUNC(advision_state::sound_cmd_sync), this), data >> 4); } -WRITE_LINE_MEMBER(advision_state::vblank) +void advision_state::vblank(int state) { if (!state && (m_screen->frame_number() & 3) == 0) { @@ -236,7 +236,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(advision_state::led_off) m_video_enable = false; } -READ_LINE_MEMBER(advision_state::vsync_r) +int advision_state::vsync_r() { // T1: mirror sync pulse (half rotation) return (m_mirror_sync->enabled()) ? 0 : 1; diff --git a/src/mame/eolith/eolith_speedup.cpp b/src/mame/eolith/eolith_speedup.cpp index 7b2ccb3c52a..51cda7ca898 100644 --- a/src/mame/eolith/eolith_speedup.cpp +++ b/src/mame/eolith/eolith_speedup.cpp @@ -104,7 +104,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(eolith_e1_speedup_state_base::eolith_speedup) m_speedup_vblank = 1; } -READ_LINE_MEMBER(eolith_e1_speedup_state_base::speedup_vblank_r) +int eolith_e1_speedup_state_base::speedup_vblank_r() { // printf("%s:eolith speedup_read data %02x\n",machine().describe_context().c_str(), m_speedup_vblank); @@ -113,7 +113,7 @@ READ_LINE_MEMBER(eolith_e1_speedup_state_base::speedup_vblank_r) } // StealSee doesn't use interrupts, just the vblank -READ_LINE_MEMBER(eolith_e1_speedup_state_base::stealsee_speedup_vblank_r) +int eolith_e1_speedup_state_base::stealsee_speedup_vblank_r() { int pc = m_maincpu->pc(); diff --git a/src/mame/eolith/eolith_speedup.h b/src/mame/eolith/eolith_speedup.h index a72885b83a7..2fcf983c6a5 100644 --- a/src/mame/eolith/eolith_speedup.h +++ b/src/mame/eolith/eolith_speedup.h @@ -21,8 +21,8 @@ public: { } - DECLARE_READ_LINE_MEMBER(speedup_vblank_r); - DECLARE_READ_LINE_MEMBER(stealsee_speedup_vblank_r); + int speedup_vblank_r(); + int stealsee_speedup_vblank_r(); protected: void speedup_read(); diff --git a/src/mame/eolith/ghosteo.cpp b/src/mame/eolith/ghosteo.cpp index e10cac07d26..6f775078a98 100644 --- a/src/mame/eolith/ghosteo.cpp +++ b/src/mame/eolith/ghosteo.cpp @@ -145,9 +145,9 @@ private: void s3c2410_nand_address_w(uint8_t data); uint8_t s3c2410_nand_data_r(); void s3c2410_nand_data_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(s3c2410_i2c_scl_w ); - DECLARE_READ_LINE_MEMBER(s3c2410_i2c_sda_r ); - DECLARE_WRITE_LINE_MEMBER(s3c2410_i2c_sda_w ); + void s3c2410_i2c_scl_w(int state); + int s3c2410_i2c_sda_r(); + void s3c2410_i2c_sda_w(int state); void bballoon_map(address_map &map) ATTR_COLD; void touryuu_map(address_map &map) ATTR_COLD; }; @@ -394,13 +394,13 @@ void ghosteo_state::s3c2410_nand_data_w(uint8_t data) // I2C -WRITE_LINE_MEMBER(ghosteo_state::s3c2410_i2c_scl_w ) +void ghosteo_state::s3c2410_i2c_scl_w(int state) { // logerror( "s3c2410_i2c_scl_w %d\n", state ? 1 : 0); m_i2cmem->write_scl(state); } -READ_LINE_MEMBER(ghosteo_state::s3c2410_i2c_sda_r ) +int ghosteo_state::s3c2410_i2c_sda_r() { int state; state = m_i2cmem->read_sda(); @@ -408,7 +408,7 @@ READ_LINE_MEMBER(ghosteo_state::s3c2410_i2c_sda_r ) return state; } -WRITE_LINE_MEMBER(ghosteo_state::s3c2410_i2c_sda_w ) +void ghosteo_state::s3c2410_i2c_sda_w(int state) { // logerror( "s3c2410_i2c_sda_w %d\n", state ? 1 : 0); m_i2cmem->write_sda(state); diff --git a/src/mame/epoch/scv.cpp b/src/mame/epoch/scv.cpp index 2e1a0b950b0..3c080552040 100644 --- a/src/mame/epoch/scv.cpp +++ b/src/mame/epoch/scv.cpp @@ -48,7 +48,7 @@ private: uint8_t portb_r(); uint8_t portc_r(); void portc_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(upd1771_ack_w); + void upd1771_ack_w(int state); void scv_palette(palette_device &palette) const; uint32_t screen_update_scv(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); @@ -577,7 +577,7 @@ uint32_t scv_state::screen_update_scv(screen_device &screen, bitmap_ind16 &bitma } -WRITE_LINE_MEMBER( scv_state::upd1771_ack_w ) +void scv_state::upd1771_ack_w(int state) { m_maincpu->set_input_line(UPD7810_INTF1, (state) ? ASSERT_LINE : CLEAR_LINE); } diff --git a/src/mame/epson/hx20.cpp b/src/mame/epson/hx20.cpp index 35566d46ae7..33550bfd26e 100644 --- a/src/mame/epson/hx20.cpp +++ b/src/mame/epson/hx20.cpp @@ -795,7 +795,7 @@ INPUT_PORTS_END // mc146818_interface rtc_intf //------------------------------------------------- -WRITE_LINE_MEMBER( hx20_state::rtc_irq_w ) +void hx20_state::rtc_irq_w(int state) { m_rtc_irq = state; diff --git a/src/mame/epson/hx20.h b/src/mame/epson/hx20.h index 80cd408c849..cb87f0e74a7 100644 --- a/src/mame/epson/hx20.h +++ b/src/mame/epson/hx20.h @@ -90,10 +90,10 @@ private: uint8_t slave_p4_r(); void slave_p4_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER( rtc_irq_w ); + void rtc_irq_w(int state); - DECLARE_WRITE_LINE_MEMBER( sio_rx_w ) { m_sio_rx = state; } - DECLARE_WRITE_LINE_MEMBER( sio_pin_w ) { m_sio_pin = state; } + void sio_rx_w(int state) { m_sio_rx = state; } + void sio_pin_w(int state) { m_sio_pin = state; } DECLARE_DEVICE_IMAGE_LOAD_MEMBER( optrom_load ); uint8_t optrom_r(offs_t offset); diff --git a/src/mame/epson/px4.cpp b/src/mame/epson/px4.cpp index e2ce0e0638c..dad6ce9ebe8 100644 --- a/src/mame/epson/px4.cpp +++ b/src/mame/epson/px4.cpp @@ -132,16 +132,16 @@ protected: TIMER_DEVICE_CALLBACK_MEMBER( upd7508_1sec_callback ); // serial - DECLARE_WRITE_LINE_MEMBER( sio_rx_w ); - DECLARE_WRITE_LINE_MEMBER( sio_pin_w ); - DECLARE_WRITE_LINE_MEMBER( rs232_rx_w ); - DECLARE_WRITE_LINE_MEMBER( rs232_dcd_w ); - DECLARE_WRITE_LINE_MEMBER( rs232_dsr_w ); - DECLARE_WRITE_LINE_MEMBER( rs232_cts_w ); + void sio_rx_w(int state); + void sio_pin_w(int state); + void rs232_rx_w(int state); + void rs232_dcd_w(int state); + void rs232_dsr_w(int state); + void rs232_cts_w(int state); // centronics - DECLARE_WRITE_LINE_MEMBER( centronics_busy_w ) { m_centronics_busy = state; } - DECLARE_WRITE_LINE_MEMBER( centronics_perror_w ) { m_centronics_perror = state; } + void centronics_busy_w(int state) { m_centronics_busy = state; } + void centronics_perror_w(int state) { m_centronics_perror = state; } void px4_io(address_map &map); void px4_mem(address_map &map); @@ -189,7 +189,7 @@ protected: void gapnit_interrupt(); - DECLARE_WRITE_LINE_MEMBER( serial_rx_w ); + void serial_rx_w(int state); void txd_w(int data); void install_rom_capsule(address_space &space, int size, uint8_t *mem); @@ -807,40 +807,40 @@ void px4_state::spur_w(uint8_t data) // GAPNIO //************************************************************************** -WRITE_LINE_MEMBER( px4_state::serial_rx_w ) +void px4_state::serial_rx_w(int state) { m_serial_rx = state; device_serial_interface::rx_w(state); } -WRITE_LINE_MEMBER( px4_state::sio_rx_w ) +void px4_state::sio_rx_w(int state) { if (!BIT(m_swr, 3) && BIT(m_swr, 2)) serial_rx_w(state); } -WRITE_LINE_MEMBER( px4_state::sio_pin_w ) +void px4_state::sio_pin_w(int state) { m_sio_pin = state; } -WRITE_LINE_MEMBER( px4_state::rs232_rx_w ) +void px4_state::rs232_rx_w(int state) { if (BIT(m_swr, 3)) serial_rx_w(state); } -WRITE_LINE_MEMBER( px4_state::rs232_dcd_w ) +void px4_state::rs232_dcd_w(int state) { m_rs232_dcd = state; } -WRITE_LINE_MEMBER( px4_state::rs232_dsr_w ) +void px4_state::rs232_dsr_w(int state) { m_artsr |= !state << 7; } -WRITE_LINE_MEMBER( px4_state::rs232_cts_w ) +void px4_state::rs232_cts_w(int state) { m_rs232_cts = state; } diff --git a/src/mame/epson/qx10.cpp b/src/mame/epson/qx10.cpp index fe7d5007c59..50aef384636 100644 --- a/src/mame/epson/qx10.cpp +++ b/src/mame/epson/qx10.cpp @@ -117,12 +117,12 @@ private: void qx10_18_w(uint8_t data); void prom_sel_w(uint8_t data); void cmos_sel_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER( qx10_upd765_interrupt ); + void qx10_upd765_interrupt(int state); void update_fdd_motor(uint8_t state); void fdd_motor_w(uint8_t data); uint8_t qx10_30_r(); void zoom_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER( tc_w ); + void tc_w(int state); void sqw_out(uint8_t state); uint8_t mc146818_r(offs_t offset); void mc146818_w(offs_t offset, uint8_t data); @@ -144,15 +144,15 @@ private: void centronics_select_handler(uint8_t state); void centronics_sense_handler(uint8_t state); - DECLARE_WRITE_LINE_MEMBER(keyboard_clk); - DECLARE_WRITE_LINE_MEMBER(keyboard_irq); - DECLARE_WRITE_LINE_MEMBER(speaker_freq); - DECLARE_WRITE_LINE_MEMBER(speaker_duration); + void keyboard_clk(int state); + void keyboard_irq(int state); + void speaker_freq(int state); + void speaker_duration(int state); DECLARE_QUICKLOAD_LOAD_MEMBER(quickload_cb); void qx10_palette(palette_device &palette) const; - DECLARE_WRITE_LINE_MEMBER(dma_hrq_changed); + void dma_hrq_changed(int state); UPD7220_DISPLAY_PIXELS_MEMBER( hgdc_display_pixels ); UPD7220_DRAW_TEXT_LINE_MEMBER( hgdc_draw_text ); @@ -473,7 +473,7 @@ static void qx10_floppies(device_slot_interface &device) device.option_add("525dd", FLOPPY_525_DD); } -WRITE_LINE_MEMBER( qx10_state::qx10_upd765_interrupt ) +void qx10_state::qx10_upd765_interrupt(int state) { m_fdcint = state; @@ -563,13 +563,13 @@ void qx10_state::portc_w(uint8_t data) /* DMA8237 */ -WRITE_LINE_MEMBER(qx10_state::dma_hrq_changed) +void qx10_state::dma_hrq_changed(int state) { /* Assert HLDA */ m_dma_1->hack_w(state); } -WRITE_LINE_MEMBER( qx10_state::tc_w ) +void qx10_state::tc_w(int state) { /* floppy terminal count */ m_fdc->tc_w(!state); @@ -633,13 +633,13 @@ uint8_t qx10_state::mc146818_r(offs_t offset) return m_rtc->read(!offset); } -WRITE_LINE_MEMBER(qx10_state::keyboard_irq) +void qx10_state::keyboard_irq(int state) { m_scc->m1_r(); // always set m_pic_m->ir4_w(state); } -WRITE_LINE_MEMBER(qx10_state::keyboard_clk) +void qx10_state::keyboard_clk(int state) { // clock keyboard too m_kbd->clk_w(state); @@ -647,13 +647,13 @@ WRITE_LINE_MEMBER(qx10_state::keyboard_clk) m_scc->txca_w(state); } -WRITE_LINE_MEMBER(qx10_state::speaker_duration) +void qx10_state::speaker_duration(int state) { m_pit1_out0 = state; update_speaker(); } -WRITE_LINE_MEMBER(qx10_state::speaker_freq) +void qx10_state::speaker_freq(int state) { m_spkr_freq = state; update_speaker(); diff --git a/src/mame/ericsson/eispc.cpp b/src/mame/ericsson/eispc.cpp index 8011d2defc6..d1dafb05af7 100644 --- a/src/mame/ericsson/eispc.cpp +++ b/src/mame/ericsson/eispc.cpp @@ -147,15 +147,15 @@ private: required_device m_isabus; // DMA - DECLARE_WRITE_LINE_MEMBER(dma_tc_w); - DECLARE_WRITE_LINE_MEMBER(dreq0_ck_w); - DECLARE_WRITE_LINE_MEMBER( epc_dma_hrq_changed ); - DECLARE_WRITE_LINE_MEMBER( epc_dma8237_out_eop ); + void dma_tc_w(int state); + void dreq0_ck_w(int state); + void epc_dma_hrq_changed(int state); + void epc_dma8237_out_eop(int state); uint8_t epc_dma_read_byte(offs_t offset); void epc_dma_write_byte(offs_t offset, uint8_t data); template uint8_t epc_dma8237_io_r(offs_t offset); template void epc_dma8237_io_w(offs_t offset, uint8_t data); - template DECLARE_WRITE_LINE_MEMBER(epc_dack_w); + template void epc_dack_w(int state); required_device m_dma8237a; uint8_t m_dma_segment[4]; uint8_t m_dma_active; @@ -190,7 +190,7 @@ private: // Interrupt Controller required_device m_pic8259; - DECLARE_WRITE_LINE_MEMBER(int_w); + void int_w(int state); uint8_t m_nmi_enabled; uint8_t m_8087_int = 0; uint8_t m_parer_int = 0; @@ -201,7 +201,7 @@ private: required_device m_pit8253; // Speaker - DECLARE_WRITE_LINE_MEMBER(speaker_ck_w); + void speaker_ck_w(int state); required_device m_speaker; bool m_pc4; bool m_pc5; @@ -583,7 +583,7 @@ void epc_state::epc_dma8237_io_w(offs_t offset, uint8_t data) } template -WRITE_LINE_MEMBER(epc_state::epc_dack_w) +void epc_state::epc_dack_w(int state) { LOGDMA("epc_dack_w: %d - %d\n", Channel, state); @@ -605,7 +605,7 @@ WRITE_LINE_MEMBER(epc_state::epc_dack_w) } } -WRITE_LINE_MEMBER(epc_state::dma_tc_w) +void epc_state::dma_tc_w(int state) { m_tc = (state == ASSERT_LINE); for (int channel = 0; channel < 4; channel++) @@ -628,7 +628,7 @@ WRITE_LINE_MEMBER(epc_state::dma_tc_w) } } -WRITE_LINE_MEMBER(epc_state::dreq0_ck_w) +void epc_state::dreq0_ck_w(int state) { if (state && !m_dreq0_ck && !BIT(m_dma_active, 0)) m_dma8237a->dreq0_w(1); @@ -636,7 +636,7 @@ WRITE_LINE_MEMBER(epc_state::dreq0_ck_w) m_dreq0_ck = state; } -WRITE_LINE_MEMBER(epc_state::speaker_ck_w) +void epc_state::speaker_ck_w(int state) { m_pc5 = state; m_pc4 = (m_ppi_portb & 0x02) && state ? 1 : 0; @@ -753,7 +753,7 @@ void epc_state::ppi_portb_w(uint8_t data) } } -WRITE_LINE_MEMBER(epc_state::int_w) +void epc_state::int_w(int state) { if (m_int != state) { @@ -973,7 +973,7 @@ void epc_state::update_nmi() } } -WRITE_LINE_MEMBER( epc_state::epc_dma_hrq_changed ) +void epc_state::epc_dma_hrq_changed(int state) { LOGDMA("epc_dma_hrq_changed %d\n", state); diff --git a/src/mame/ericsson/eispc_kb.cpp b/src/mame/ericsson/eispc_kb.cpp index 2a47c0c9e7a..b86092de8bd 100644 --- a/src/mame/ericsson/eispc_kb.cpp +++ b/src/mame/ericsson/eispc_kb.cpp @@ -261,18 +261,18 @@ eispc_keyboard_device::eispc_keyboard_device( { } -WRITE_LINE_MEMBER(eispc_keyboard_device::rxd_w) +void eispc_keyboard_device::rxd_w(int state) { LOGBITS("KBD bit presented: %d\n", state); m_rxd_high = CLEAR_LINE != state; } -WRITE_LINE_MEMBER(eispc_keyboard_device::hold_w) +void eispc_keyboard_device::hold_w(int state) { m_hold = CLEAR_LINE == state; } -WRITE_LINE_MEMBER(eispc_keyboard_device::rst_line_w) +void eispc_keyboard_device::rst_line_w(int state) { if (state == CLEAR_LINE) { diff --git a/src/mame/ericsson/eispc_kb.h b/src/mame/ericsson/eispc_kb.h index 16af62455c8..10726924ebb 100644 --- a/src/mame/ericsson/eispc_kb.h +++ b/src/mame/ericsson/eispc_kb.h @@ -20,9 +20,9 @@ public: eispc_keyboard_device(machine_config const &mconfig, char const *tag, device_t *owner, uint32_t clock = 0); DECLARE_INPUT_CHANGED_MEMBER(key); - DECLARE_WRITE_LINE_MEMBER(rxd_w); - DECLARE_WRITE_LINE_MEMBER(hold_w); - DECLARE_WRITE_LINE_MEMBER(rst_line_w); + void rxd_w(int state); + void hold_w(int state); + void rst_line_w(int state); protected: virtual void device_start() override; diff --git a/src/mame/excellent/lastbank.cpp b/src/mame/excellent/lastbank.cpp index 8216892c7a8..0f80c608bac 100644 --- a/src/mame/excellent/lastbank.cpp +++ b/src/mame/excellent/lastbank.cpp @@ -56,7 +56,7 @@ private: required_device m_oki; required_device m_essnd; - DECLARE_WRITE_LINE_MEMBER(screen_vblank); + void screen_vblank(int state); uint8_t m_mux_data = 0; uint8_t m_sound_flags = 0; @@ -80,7 +80,7 @@ void lastbank_state::machine_start() save_item(NAME(m_sound_flags)); } -WRITE_LINE_MEMBER(lastbank_state::screen_vblank) +void lastbank_state::screen_vblank(int state) { if (state) { diff --git a/src/mame/exidy/carpolo.h b/src/mame/exidy/carpolo.h index d64af4fc889..f85f94aa91c 100644 --- a/src/mame/exidy/carpolo.h +++ b/src/mame/exidy/carpolo.h @@ -119,22 +119,22 @@ private: void timer_interrupt_clear_w(uint8_t data); void carpolo_palette(palette_device &palette) const; uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(screen_vblank); - DECLARE_WRITE_LINE_MEMBER(coin1_interrupt_clear_w); - DECLARE_WRITE_LINE_MEMBER(coin2_interrupt_clear_w); - DECLARE_WRITE_LINE_MEMBER(coin3_interrupt_clear_w); - DECLARE_WRITE_LINE_MEMBER(coin4_interrupt_clear_w); + void screen_vblank(int state); + void coin1_interrupt_clear_w(int state); + void coin2_interrupt_clear_w(int state); + void coin3_interrupt_clear_w(int state); + void coin4_interrupt_clear_w(int state); void pia_0_port_a_w(uint8_t data); void pia_0_port_b_w(uint8_t data); uint8_t pia_0_port_b_r(); uint8_t pia_1_port_a_r(); uint8_t pia_1_port_b_r(); - DECLARE_WRITE_LINE_MEMBER(ttl7474_2s_1_q_cb); - DECLARE_WRITE_LINE_MEMBER(ttl7474_2s_2_q_cb); - DECLARE_WRITE_LINE_MEMBER(ttl7474_2u_1_q_cb); - DECLARE_WRITE_LINE_MEMBER(ttl7474_2u_2_q_cb); - DECLARE_WRITE_LINE_MEMBER(ls153_za_w); - DECLARE_WRITE_LINE_MEMBER(ls153_zb_w); + void ttl7474_2s_1_q_cb(int state); + void ttl7474_2s_2_q_cb(int state); + void ttl7474_2u_1_q_cb(int state); + void ttl7474_2u_2_q_cb(int state); + void ls153_za_w(int state); + void ls153_zb_w(int state); void ttl74148_3s_cb(uint8_t data); diff --git a/src/mame/exidy/carpolo_m.cpp b/src/mame/exidy/carpolo_m.cpp index 1cb6d984301..e33083b2f8d 100644 --- a/src/mame/exidy/carpolo_m.cpp +++ b/src/mame/exidy/carpolo_m.cpp @@ -64,25 +64,25 @@ void carpolo_state::ttl74148_3s_cb(uint8_t data) /* the outputs of the flip-flops are connected to the priority encoder */ -WRITE_LINE_MEMBER(carpolo_state::ttl7474_2s_1_q_cb) +void carpolo_state::ttl7474_2s_1_q_cb(int state) { m_ttl74148_3s->input_line_w(COIN1_PRIORITY_LINE, state); m_ttl74148_3s->update(); } -WRITE_LINE_MEMBER(carpolo_state::ttl7474_2s_2_q_cb) +void carpolo_state::ttl7474_2s_2_q_cb(int state) { m_ttl74148_3s->input_line_w(COIN2_PRIORITY_LINE, state); m_ttl74148_3s->update(); } -WRITE_LINE_MEMBER(carpolo_state::ttl7474_2u_1_q_cb) +void carpolo_state::ttl7474_2u_1_q_cb(int state) { m_ttl74148_3s->input_line_w(COIN3_PRIORITY_LINE, state); m_ttl74148_3s->update(); } -WRITE_LINE_MEMBER(carpolo_state::ttl7474_2u_2_q_cb) +void carpolo_state::ttl7474_2u_2_q_cb(int state) { m_ttl74148_3s->input_line_w(COIN4_PRIORITY_LINE, state); m_ttl74148_3s->update(); @@ -260,22 +260,22 @@ void carpolo_state::timer_tick() // FIXME: Remove trampolines -WRITE_LINE_MEMBER(carpolo_state::coin1_interrupt_clear_w) +void carpolo_state::coin1_interrupt_clear_w(int state) { m_ttl7474_2s_1->clear_w(state); } -WRITE_LINE_MEMBER(carpolo_state::coin2_interrupt_clear_w) +void carpolo_state::coin2_interrupt_clear_w(int state) { m_ttl7474_2s_2->clear_w(state); } -WRITE_LINE_MEMBER(carpolo_state::coin3_interrupt_clear_w) +void carpolo_state::coin3_interrupt_clear_w(int state) { m_ttl7474_2u_1->clear_w(state); } -WRITE_LINE_MEMBER(carpolo_state::coin4_interrupt_clear_w) +void carpolo_state::coin4_interrupt_clear_w(int state) { m_ttl7474_2u_2->clear_w(state); } @@ -323,12 +323,12 @@ void carpolo_state::timer_interrupt_clear_w(uint8_t data) * *************************************/ -WRITE_LINE_MEMBER( carpolo_state::ls153_za_w ) +void carpolo_state::ls153_za_w(int state) { m_ls153_za = state; } -WRITE_LINE_MEMBER( carpolo_state::ls153_zb_w ) +void carpolo_state::ls153_zb_w(int state) { m_ls153_zb = state; } diff --git a/src/mame/exidy/carpolo_v.cpp b/src/mame/exidy/carpolo_v.cpp index 5cbc19801d4..fcf3df27f9f 100644 --- a/src/mame/exidy/carpolo_v.cpp +++ b/src/mame/exidy/carpolo_v.cpp @@ -501,7 +501,7 @@ int carpolo_state::check_sprite_border_collision(uint8_t x1, uint8_t y1, int cod } -WRITE_LINE_MEMBER(carpolo_state::screen_vblank) +void carpolo_state::screen_vblank(int state) { // rising edge if (state) diff --git a/src/mame/exidy/exidy440.cpp b/src/mame/exidy/exidy440.cpp index 87517fd8493..b7079b8ff66 100644 --- a/src/mame/exidy/exidy440.cpp +++ b/src/mame/exidy/exidy440.cpp @@ -268,13 +268,13 @@ INPUT_CHANGED_MEMBER(exidy440_state::coin_inserted) * *************************************/ -READ_LINE_MEMBER(exidy440_state::firq_beam_r) +int exidy440_state::firq_beam_r() { return m_firq_beam; } -READ_LINE_MEMBER(exidy440_state::firq_vblank_r) +int exidy440_state::firq_vblank_r() { return m_firq_vblank; } diff --git a/src/mame/exidy/exidy440.h b/src/mame/exidy/exidy440.h index c7003e9aace..2ba19536247 100644 --- a/src/mame/exidy/exidy440.h +++ b/src/mame/exidy/exidy440.h @@ -31,8 +31,8 @@ public: m_palette(*this, "palette") { } - DECLARE_READ_LINE_MEMBER(firq_beam_r); - DECLARE_READ_LINE_MEMBER(firq_vblank_r); + int firq_beam_r(); + int firq_vblank_r(); DECLARE_CUSTOM_INPUT_MEMBER(hitnmiss_button1_r); DECLARE_INPUT_CHANGED_MEMBER(coin_inserted); void init_showdown(); @@ -62,7 +62,7 @@ protected: void draw_sprites(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int scroll_offset, int check_collision); void update_screen(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int scroll_offset, int check_collision); uint32_t screen_update_exidy440(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(vblank_interrupt_w); + void vblank_interrupt_w(int state); TIMER_CALLBACK_MEMBER(delayed_sound_command_w); TIMER_CALLBACK_MEMBER(beam_firq_callback); TIMER_CALLBACK_MEMBER(collide_firq_callback); diff --git a/src/mame/exidy/exidy440_a.cpp b/src/mame/exidy/exidy440_a.cpp index 82c5a225334..0ad11f3cfd5 100644 --- a/src/mame/exidy/exidy440_a.cpp +++ b/src/mame/exidy/exidy440_a.cpp @@ -279,7 +279,7 @@ void exidy440_sound_device::sound_volume_w(offs_t offset, uint8_t data) * *************************************/ -WRITE_LINE_MEMBER(exidy440_sound_device::sound_interrupt_w) +void exidy440_sound_device::sound_interrupt_w(int state) { if (state) m_audiocpu->set_input_line(M6809_IRQ_LINE, ASSERT_LINE); @@ -290,7 +290,7 @@ void exidy440_sound_device::sound_interrupt_clear_w(uint8_t data) m_audiocpu->set_input_line(M6809_IRQ_LINE, CLEAR_LINE); } -WRITE_LINE_MEMBER(exidy440_sound_device::sound_reset_w) +void exidy440_sound_device::sound_reset_w(int state) { m_audiocpu->set_input_line(INPUT_LINE_RESET, state); } diff --git a/src/mame/exidy/exidy440_a.h b/src/mame/exidy/exidy440_a.h index ff144d0761a..088bec1ec11 100644 --- a/src/mame/exidy/exidy440_a.h +++ b/src/mame/exidy/exidy440_a.h @@ -19,8 +19,8 @@ public: void exidy440_sound_command(uint8_t param); uint8_t exidy440_sound_command_ack(); - DECLARE_WRITE_LINE_MEMBER(sound_interrupt_w); - DECLARE_WRITE_LINE_MEMBER(sound_reset_w); + void sound_interrupt_w(int state); + void sound_reset_w(int state); protected: // device-level overrides diff --git a/src/mame/exidy/exidy440_v.cpp b/src/mame/exidy/exidy440_v.cpp index fb746f3b68c..7f3eb5519aa 100644 --- a/src/mame/exidy/exidy440_v.cpp +++ b/src/mame/exidy/exidy440_v.cpp @@ -230,7 +230,7 @@ void exidy440_state::exidy440_update_firq() } -WRITE_LINE_MEMBER(exidy440_state::vblank_interrupt_w) +void exidy440_state::vblank_interrupt_w(int state) { /* set the FIRQ line on a VBLANK */ if (state) diff --git a/src/mame/exidy/starfire.cpp b/src/mame/exidy/starfire.cpp index 6f7a3ce6195..dd56105573a 100644 --- a/src/mame/exidy/starfire.cpp +++ b/src/mame/exidy/starfire.cpp @@ -147,17 +147,17 @@ void fireone_state::music_w(offs_t offset, uint8_t data) m_pit->write(offset, data); } -WRITE_LINE_MEMBER(fireone_state::music_a_out_cb) +void fireone_state::music_a_out_cb(int state) { m_music_a->write(state); } -WRITE_LINE_MEMBER(fireone_state::music_b_out_cb) +void fireone_state::music_b_out_cb(int state) { m_music_b->write(state); } -WRITE_LINE_MEMBER(fireone_state::music_c_out_cb) +void fireone_state::music_c_out_cb(int state) { m_music_c->write(state); } diff --git a/src/mame/exidy/starfire.h b/src/mame/exidy/starfire.h index 374b2fe1cb1..79ef4647e69 100644 --- a/src/mame/exidy/starfire.h +++ b/src/mame/exidy/starfire.h @@ -169,9 +169,9 @@ private: required_device m_pit; required_ioport_array<2> m_controls; - DECLARE_WRITE_LINE_MEMBER(music_a_out_cb); - DECLARE_WRITE_LINE_MEMBER(music_b_out_cb); - DECLARE_WRITE_LINE_MEMBER(music_c_out_cb); + void music_a_out_cb(int state); + void music_b_out_cb(int state); + void music_c_out_cb(int state); virtual uint8_t input_r(offs_t offset) override; virtual void sound_w(offs_t offset, uint8_t data) override; diff --git a/src/mame/exidy/vertigo.h b/src/mame/exidy/vertigo.h index d9dbe8432b7..9565ce1f81d 100644 --- a/src/mame/exidy/vertigo.h +++ b/src/mame/exidy/vertigo.h @@ -41,7 +41,7 @@ public: void vertigo(machine_config &config); private: - DECLARE_WRITE_LINE_MEMBER(adc_eoc_w); + void adc_eoc_w(int state); uint16_t vertigo_io_convert(offs_t offset); uint16_t vertigo_coin_r(); void vertigo_wsot_w(uint16_t data); @@ -50,8 +50,8 @@ private: void vertigo_motor_w(uint16_t data); INTERRUPT_GEN_MEMBER(vertigo_interrupt); TIMER_CALLBACK_MEMBER(sound_command_w); - DECLARE_WRITE_LINE_MEMBER(v_irq4_w); - DECLARE_WRITE_LINE_MEMBER(v_irq3_w); + void v_irq4_w(int state); + void v_irq3_w(int state); void update_irq(uint8_t data); virtual void machine_start() override; diff --git a/src/mame/exidy/vertigo_m.cpp b/src/mame/exidy/vertigo_m.cpp index 99c5b59d7ce..795ae46a5fe 100644 --- a/src/mame/exidy/vertigo_m.cpp +++ b/src/mame/exidy/vertigo_m.cpp @@ -38,7 +38,7 @@ void vertigo_state::update_irq_encoder(int line, int state) } -WRITE_LINE_MEMBER(vertigo_state::v_irq4_w) +void vertigo_state::v_irq4_w(int state) { update_irq_encoder(INPUT_LINE_IRQ4, state); vertigo_vproc(m_maincpu->attotime_to_cycles(machine().time() - m_irq4_time), state); @@ -46,7 +46,7 @@ WRITE_LINE_MEMBER(vertigo_state::v_irq4_w) } -WRITE_LINE_MEMBER(vertigo_state::v_irq3_w) +void vertigo_state::v_irq3_w(int state) { m_custom->sound_interrupt_w(state); @@ -61,7 +61,7 @@ WRITE_LINE_MEMBER(vertigo_state::v_irq3_w) * *************************************/ -WRITE_LINE_MEMBER( vertigo_state::adc_eoc_w ) +void vertigo_state::adc_eoc_w(int state) { update_irq_encoder(INPUT_LINE_IRQ2, state ? ASSERT_LINE : CLEAR_LINE); } diff --git a/src/mame/facit/facit4440.cpp b/src/mame/facit/facit4440.cpp index 3f701d57cc0..a30792c317e 100644 --- a/src/mame/facit/facit4440.cpp +++ b/src/mame/facit/facit4440.cpp @@ -76,7 +76,7 @@ private: void control_6000_w(u8 data); void control_a000_w(u8 data); - DECLARE_WRITE_LINE_MEMBER(vsync_w); + void vsync_w(int state); MC6845_UPDATE_ROW(update_row); @@ -148,7 +148,7 @@ u8 facit4440_state::misc_status_r() return status; } -WRITE_LINE_MEMBER(facit4440_state::vsync_w) +void facit4440_state::vsync_w(int state) { if (state && BIT(m_control_latch[0], 5)) m_maincpu->set_input_line(INPUT_LINE_NMI, ASSERT_LINE); diff --git a/src/mame/fairlight/cmi.cpp b/src/mame/fairlight/cmi.cpp index c774ae3b709..969cbbf479c 100644 --- a/src/mame/fairlight/cmi.cpp +++ b/src/mame/fairlight/cmi.cpp @@ -230,14 +230,14 @@ public: void init_cmi2x(); // CPU card - DECLARE_WRITE_LINE_MEMBER(q133_acia_irq); + void q133_acia_irq(int state); void i8214_cpu1_w(u8 data); void i8214_cpu2_w(u8 data); - DECLARE_WRITE_LINE_MEMBER(maincpu2_irq0_w); - DECLARE_WRITE_LINE_MEMBER(i8214_1_int_w); - DECLARE_WRITE_LINE_MEMBER(i8214_2_int_w); - DECLARE_WRITE_LINE_MEMBER(i8214_3_int_w); - DECLARE_WRITE_LINE_MEMBER(i8214_3_enlg); + void maincpu2_irq0_w(int state); + void i8214_1_int_w(int state); + void i8214_2_int_w(int state); + void i8214_3_int_w(int state); + void i8214_3_enlg(int state); u8 shared_ram_r(offs_t offset); void shared_ram_w(offs_t offset, u8 data); template u8 perr_r(offs_t offset); @@ -256,7 +256,7 @@ public: void q133_1_porta_w(u8 data); void q133_1_portb_w(u8 data); - DECLARE_WRITE_LINE_MEMBER(cmi_iix_vblank); + void cmi_iix_vblank(int state); IRQ_CALLBACK_MEMBER(cpu1_interrupt_callback); IRQ_CALLBACK_MEMBER(cpu2_interrupt_callback); @@ -282,9 +282,9 @@ public: [[maybe_unused]] u8 tvt_r(); [[maybe_unused]] void tvt_w(u8 data); - DECLARE_WRITE_LINE_MEMBER(pia_q219_irqa); - DECLARE_WRITE_LINE_MEMBER(pia_q219_irqb); - DECLARE_WRITE_LINE_MEMBER(ptm_q219_irq); + void pia_q219_irqa(int state); + void pia_q219_irqb(int state); + void ptm_q219_irq(int state); u32 screen_update_cmi2x(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); // Memory mapping @@ -307,14 +307,14 @@ public: // MIDI/SMPTE void midi_dma_w(offs_t offset, u16 data, u16 mem_mask = ~0); u16 midi_dma_r(offs_t offset); - DECLARE_WRITE_LINE_MEMBER(midi_ptm0_c3_w); + void midi_ptm0_c3_w(int state); void midi_latch_w(u8 data); // Floppy void fdc_w(offs_t offset, u8 data); u8 fdc_r(offs_t offset); - DECLARE_WRITE_LINE_MEMBER(wd1791_irq); - DECLARE_WRITE_LINE_MEMBER(wd1791_drq); + void wd1791_irq(int state); + void wd1791_drq(int state); // Master card u8 cmi02_r(offs_t offset); @@ -323,19 +323,19 @@ public: u8 cmi02_chsel_r(); void master_tune_w(u8 data); u8 master_tune_r(); - DECLARE_WRITE_LINE_MEMBER(cmi02_ptm_irq); - DECLARE_WRITE_LINE_MEMBER(cmi02_ptm_o2); - DECLARE_WRITE_LINE_MEMBER(cmi02_pia2_irqa_w); - DECLARE_WRITE_LINE_MEMBER(cmi02_pia2_cb2_w); + void cmi02_ptm_irq(int state); + void cmi02_ptm_o2(int state); + void cmi02_pia2_irqa_w(int state); + void cmi02_pia2_cb2_w(int state); u8 cmi07_r(); void cmi07_w(u8 data); - DECLARE_WRITE_LINE_MEMBER(msm5832_irq_w); - DECLARE_WRITE_LINE_MEMBER(cmi07_irq); - DECLARE_WRITE_LINE_MEMBER(q133_acia_clock); + void msm5832_irq_w(int state); + void cmi07_irq(int state); + void q133_acia_clock(int state); - template DECLARE_WRITE_LINE_MEMBER(channel_irq); + template void channel_irq(int state); void cmi2x(machine_config &config); void cmi07cpu_map(address_map &map); @@ -1040,7 +1040,7 @@ u16 cmi_state::midi_dma_r(offs_t offset) return data; } -WRITE_LINE_MEMBER(cmi_state::midi_ptm0_c3_w) +void cmi_state::midi_ptm0_c3_w(int state) { m_midi_ptm[1]->set_clock(0, state); m_midi_ptm[1]->set_clock(1, state); @@ -1262,7 +1262,7 @@ u8 cmi_state::cmi07_r() return 0xff; } -WRITE_LINE_MEMBER( cmi_state::q133_acia_irq ) +void cmi_state::q133_acia_irq(int state) { set_interrupt(CPU_1, IRQ_ACINT_LEVEL, state ? ASSERT_LINE : CLEAR_LINE); } @@ -1434,7 +1434,7 @@ void cmi_state::fdc_dma_transfer() m_fdc_dma_cnt.w.l++; } -WRITE_LINE_MEMBER( cmi_state::wd1791_irq ) +void cmi_state::wd1791_irq(int state) { if (state) { @@ -1451,7 +1451,7 @@ WRITE_LINE_MEMBER( cmi_state::wd1791_irq ) } } -WRITE_LINE_MEMBER( cmi_state::wd1791_drq ) +void cmi_state::wd1791_drq(int state) { m_fdc_drq = state; if (state) @@ -1505,25 +1505,25 @@ u8 cmi_state::cmi02_chsel_r() return m_cmi02_pia_chsel; } -WRITE_LINE_MEMBER( cmi_state::cmi02_ptm_irq ) +void cmi_state::cmi02_ptm_irq(int state) { m_cmi02_ptm_irq = state; set_interrupt(CPU_1, IRQ_TIMINT_LEVEL, m_cmi02_ptm_irq ? ASSERT_LINE : CLEAR_LINE); } -WRITE_LINE_MEMBER( cmi_state::cmi02_ptm_o2 ) +void cmi_state::cmi02_ptm_o2(int state) { m_cmi02_ptm->set_c1(state); m_cmi02_ptm->set_c3(state); } -WRITE_LINE_MEMBER( cmi_state::cmi02_pia2_irqa_w ) +void cmi_state::cmi02_pia2_irqa_w(int state) { LOG("%s: cmi02_pia2_irqa_w: %d\n", machine().describe_context(), state); set_interrupt(CPU_2, IRQ_ADINT_LEVEL, state ? ASSERT_LINE : CLEAR_LINE); } -WRITE_LINE_MEMBER( cmi_state::cmi02_pia2_cb2_w ) +void cmi_state::cmi02_pia2_cb2_w(int state) { LOG("%s: cmi02_pia2_cb2_w: %d\n", machine().describe_context(), state); m_cmi02_pia[1]->ca1_w(1); @@ -1625,7 +1625,7 @@ void cmi_state::cmi02_w(offs_t offset, u8 data) } template -WRITE_LINE_MEMBER(cmi_state::channel_irq) +void cmi_state::channel_irq(int state) { if (Channel == 0) { @@ -1715,7 +1715,7 @@ void cmi_state::aic_ad565_lsb_w(u8 data) * *************************************/ -WRITE_LINE_MEMBER( cmi_state::ptm_q219_irq ) +void cmi_state::ptm_q219_irq(int state) { set_interrupt(CPU_2, IRQ_RINT_LEVEL, state); } @@ -1786,13 +1786,13 @@ void cmi_state::set_interrupt(int cpunum, int level, int state) } } -WRITE_LINE_MEMBER( cmi_state::maincpu2_irq0_w ) +void cmi_state::maincpu2_irq0_w(int state) { LOG("%s: maincpu2_irq0_w: %d\n", machine().describe_context(), state); set_interrupt(CPU_2, 0 ^ 7, state ? ASSERT_LINE : CLEAR_LINE); } -WRITE_LINE_MEMBER( cmi_state::i8214_1_int_w ) +void cmi_state::i8214_1_int_w(int state) { LOG("%s: i8214_1_int_w %d%s\n", machine().describe_context(), state, state ? ", setting IRQ merger bit 0" : ""); if (state) @@ -1803,14 +1803,14 @@ WRITE_LINE_MEMBER( cmi_state::i8214_1_int_w ) } } -WRITE_LINE_MEMBER( cmi_state::i8214_2_int_w ) +void cmi_state::i8214_2_int_w(int state) { LOG("%s: i8214_2_int_w: %d\n", machine().describe_context(), state); if (state) m_maincpu2->set_input_line(M6809_IRQ_LINE, ASSERT_LINE); } -WRITE_LINE_MEMBER( cmi_state::i8214_3_int_w ) +void cmi_state::i8214_3_int_w(int state) { LOG("%s: i8214_3_int_w %d%s\n", machine().describe_context(), state, state ? ", setting IRQ merger bit 1" : ""); if (state) @@ -1824,18 +1824,18 @@ WRITE_LINE_MEMBER( cmi_state::i8214_3_int_w ) } -WRITE_LINE_MEMBER( cmi_state::i8214_3_enlg ) +void cmi_state::i8214_3_enlg(int state) { // Not needed? // m_hp_int = state; } -WRITE_LINE_MEMBER( cmi_state::pia_q219_irqa ) +void cmi_state::pia_q219_irqa(int state) { set_interrupt(CPU_2, IRQ_TOUCHINT_LEVEL, state); } -WRITE_LINE_MEMBER( cmi_state::pia_q219_irqb ) +void cmi_state::pia_q219_irqb(int state) { set_interrupt(CPU_2, IRQ_PENINT_LEVEL, state); } @@ -1889,18 +1889,18 @@ void cmi_state::q133_1_portb_w(u8 data) //static int kbd_to_cmi; //static int cmi_to_kbd; -WRITE_LINE_MEMBER( cmi_state::q133_acia_clock ) +void cmi_state::q133_acia_clock(int state) { for (auto &acia : m_q133_acia) acia->write_rxc(state); } -WRITE_LINE_MEMBER( cmi_state::msm5832_irq_w ) +void cmi_state::msm5832_irq_w(int state) { set_interrupt(CPU_2, IRQ_RTCINT_LEVEL, state ? ASSERT_LINE : CLEAR_LINE); } -WRITE_LINE_MEMBER( cmi_state::cmi07_irq ) +void cmi_state::cmi07_irq(int state) { m_cmi07cpu->set_input_line(INPUT_LINE_IRQ0, state ? ASSERT_LINE : CLEAR_LINE); } @@ -2011,7 +2011,7 @@ void cmi_state::machine_start() m_msm5832->cs_w(1); } -WRITE_LINE_MEMBER( cmi_state::cmi_iix_vblank ) +void cmi_state::cmi_iix_vblank(int state) { if (state) { diff --git a/src/mame/fairlight/cmi_ankbd.cpp b/src/mame/fairlight/cmi_ankbd.cpp index f66d061def7..de7bedb6a43 100644 --- a/src/mame/fairlight/cmi_ankbd.cpp +++ b/src/mame/fairlight/cmi_ankbd.cpp @@ -57,22 +57,22 @@ u8 cmi_alphanumeric_keyboard_device::col_r() } } -WRITE_LINE_MEMBER( cmi_alphanumeric_keyboard_device::rxd_w ) +void cmi_alphanumeric_keyboard_device::rxd_w(int state) { m_pia->cb2_w(state); } -WRITE_LINE_MEMBER( cmi_alphanumeric_keyboard_device::cts_w ) +void cmi_alphanumeric_keyboard_device::cts_w(int state) { m_pia->ca1_w(state); } -WRITE_LINE_MEMBER( cmi_alphanumeric_keyboard_device::txd_w ) +void cmi_alphanumeric_keyboard_device::txd_w(int state) { m_txd_handler(state); } -WRITE_LINE_MEMBER( cmi_alphanumeric_keyboard_device::rts_w ) +void cmi_alphanumeric_keyboard_device::rts_w(int state) { m_rts_handler(state); } diff --git a/src/mame/fairlight/cmi_ankbd.h b/src/mame/fairlight/cmi_ankbd.h index c931007d220..19cf5c58eb2 100644 --- a/src/mame/fairlight/cmi_ankbd.h +++ b/src/mame/fairlight/cmi_ankbd.h @@ -21,8 +21,8 @@ public: auto txd_handler() { return m_txd_handler.bind(); } auto rts_handler() { return m_rts_handler.bind(); } - DECLARE_WRITE_LINE_MEMBER( rxd_w ); - DECLARE_WRITE_LINE_MEMBER( cts_w ); + void rxd_w(int state); + void cts_w(int state); protected: virtual const tiny_rom_entry *device_rom_region() const override; @@ -33,8 +33,8 @@ protected: private: u8 col_r(); - DECLARE_WRITE_LINE_MEMBER( txd_w ); - DECLARE_WRITE_LINE_MEMBER( rts_w ); + void txd_w(int state); + void rts_w(int state); void alphakeys_map(address_map &map); diff --git a/src/mame/fairlight/cmi_mkbd.cpp b/src/mame/fairlight/cmi_mkbd.cpp index a8986e3aae3..bf6327a38c9 100644 --- a/src/mame/fairlight/cmi_mkbd.cpp +++ b/src/mame/fairlight/cmi_mkbd.cpp @@ -140,7 +140,7 @@ void cmi_music_keyboard_device::cmi10_u20_b_w(u8 data) { } -READ_LINE_MEMBER( cmi_music_keyboard_device::cmi10_u20_cb1_r ) +int cmi_music_keyboard_device::cmi10_u20_cb1_r() { int bk = m_cmi10_pia_u20->a_output(); int bit = 0; @@ -153,7 +153,7 @@ READ_LINE_MEMBER( cmi_music_keyboard_device::cmi10_u20_cb1_r ) return !bit; } -WRITE_LINE_MEMBER( cmi_music_keyboard_device::cmi10_u20_cb2_w ) +void cmi_music_keyboard_device::cmi10_u20_cb2_w(int state) { uint8_t data = m_cmi10_pia_u20->a_output() & 0x7f; uint8_t b_port = m_cmi10_pia_u20->b_output(); @@ -187,7 +187,7 @@ template void cmi_music_keyboard_device::update_dp(offs_t offset, u } /* Begin Conversion */ -WRITE_LINE_MEMBER( cmi_music_keyboard_device::cmi10_u21_cb2_w ) +void cmi_music_keyboard_device::cmi10_u21_cb2_w(int state) { // if 0 // state = state; @@ -300,7 +300,7 @@ u8 cmi_music_keyboard_device::cmi10_u21_a_r() #endif } -WRITE_LINE_MEMBER( cmi_music_keyboard_device::kbd_acia_int ) +void cmi_music_keyboard_device::kbd_acia_int(int state) { m_kbd_acia_irq = state; @@ -310,7 +310,7 @@ WRITE_LINE_MEMBER( cmi_music_keyboard_device::kbd_acia_int ) m_cpu->set_input_line(INPUT_LINE_IRQ0, CLEAR_LINE); } -WRITE_LINE_MEMBER( cmi_music_keyboard_device::cmi_acia_int ) +void cmi_music_keyboard_device::cmi_acia_int(int state) { m_cmi_acia_irq = state; @@ -320,42 +320,42 @@ WRITE_LINE_MEMBER( cmi_music_keyboard_device::cmi_acia_int ) m_cpu->set_input_line(INPUT_LINE_IRQ0, CLEAR_LINE); } -WRITE_LINE_MEMBER( cmi_music_keyboard_device::cmi_txd_w ) +void cmi_music_keyboard_device::cmi_txd_w(int state) { m_cmi_txd(state); } -WRITE_LINE_MEMBER( cmi_music_keyboard_device::cmi_rts_w ) +void cmi_music_keyboard_device::cmi_rts_w(int state) { m_cmi_rts(state); } -WRITE_LINE_MEMBER( cmi_music_keyboard_device::cmi_rxd_w ) +void cmi_music_keyboard_device::cmi_rxd_w(int state) { m_acia_cmi->write_rxd(state); } -WRITE_LINE_MEMBER( cmi_music_keyboard_device::cmi_cts_w ) +void cmi_music_keyboard_device::cmi_cts_w(int state) { m_acia_cmi->write_cts(state); } -WRITE_LINE_MEMBER( cmi_music_keyboard_device::kbd_txd_w ) +void cmi_music_keyboard_device::kbd_txd_w(int state) { m_kbd_txd(state); } -WRITE_LINE_MEMBER( cmi_music_keyboard_device::kbd_rts_w ) +void cmi_music_keyboard_device::kbd_rts_w(int state) { m_kbd_rts(state); } -WRITE_LINE_MEMBER( cmi_music_keyboard_device::kbd_rxd_w ) +void cmi_music_keyboard_device::kbd_rxd_w(int state) { m_acia_kbd->write_rxd(state); } -WRITE_LINE_MEMBER( cmi_music_keyboard_device::kbd_cts_w ) +void cmi_music_keyboard_device::kbd_cts_w(int state) { m_acia_kbd->write_cts(state); } diff --git a/src/mame/fairlight/cmi_mkbd.h b/src/mame/fairlight/cmi_mkbd.h index 6edfa4d4ca2..a76e2e7edf7 100644 --- a/src/mame/fairlight/cmi_mkbd.h +++ b/src/mame/fairlight/cmi_mkbd.h @@ -25,10 +25,10 @@ public: auto kbd_txd_handler() { return m_kbd_txd.bind(); } auto kbd_rts_handler() { return m_kbd_rts.bind(); } - DECLARE_WRITE_LINE_MEMBER( cmi_rxd_w ); - DECLARE_WRITE_LINE_MEMBER( cmi_cts_w ); - DECLARE_WRITE_LINE_MEMBER( kbd_rxd_w ); - DECLARE_WRITE_LINE_MEMBER( kbd_cts_w ); + void cmi_rxd_w(int state); + void cmi_cts_w(int state); + void kbd_rxd_w(int state); + void kbd_cts_w(int state); DECLARE_INPUT_CHANGED_MEMBER(key_changed); @@ -127,20 +127,20 @@ private: void cmi10_u20_a_w(u8 data); void cmi10_u20_b_w(u8 data); - DECLARE_READ_LINE_MEMBER( cmi10_u20_cb1_r ); - DECLARE_WRITE_LINE_MEMBER( cmi10_u20_cb2_w ); - DECLARE_WRITE_LINE_MEMBER( cmi10_u21_cb2_w ); + int cmi10_u20_cb1_r(); + void cmi10_u20_cb2_w(int state); + void cmi10_u21_cb2_w(int state); u8 cmi10_u21_a_r(); u32 get_key_for_indices(int mux, int module, int key); - DECLARE_WRITE_LINE_MEMBER( kbd_acia_int ); - DECLARE_WRITE_LINE_MEMBER( cmi_acia_int ); + void kbd_acia_int(int state); + void cmi_acia_int(int state); - DECLARE_WRITE_LINE_MEMBER( cmi_txd_w ); - DECLARE_WRITE_LINE_MEMBER( cmi_rts_w ); - DECLARE_WRITE_LINE_MEMBER( kbd_txd_w ); - DECLARE_WRITE_LINE_MEMBER( kbd_rts_w ); + void cmi_txd_w(int state); + void cmi_rts_w(int state); + void kbd_txd_w(int state); + void kbd_rts_w(int state); template void update_dp(offs_t offset, u16 data); diff --git a/src/mame/fidelity/card.cpp b/src/mame/fidelity/card.cpp index 341a60af47d..949f3bdca4e 100644 --- a/src/mame/fidelity/card.cpp +++ b/src/mame/fidelity/card.cpp @@ -240,8 +240,8 @@ private: void speech_w(u8 data); void mcu_p1_w(u8 data); u8 mcu_p2_r(); - DECLARE_READ_LINE_MEMBER(mcu_t0_r); - DECLARE_READ_LINE_MEMBER(mcu_t1_r); + int mcu_t0_r(); + int mcu_t1_r(); template void ioexp_port_w(uint8_t data); }; @@ -347,13 +347,13 @@ u8 card_state::mcu_p2_r() return data ^ 0xf0; } -READ_LINE_MEMBER(card_state::mcu_t0_r) +int card_state::mcu_t0_r() { // T0: card scanner light sensor (1=white, 0=black/none) return m_barcode & 1; } -READ_LINE_MEMBER(card_state::mcu_t1_r) +int card_state::mcu_t1_r() { // T1: xtal / 4 (do *2 for high-low transitions) return (machine().time().as_ticks(5_MHz_XTAL / 4 * 2)) & 1; diff --git a/src/mame/fidelity/csc.cpp b/src/mame/fidelity/csc.cpp index 68a79f0268f..4c24b5db8e1 100644 --- a/src/mame/fidelity/csc.cpp +++ b/src/mame/fidelity/csc.cpp @@ -277,12 +277,12 @@ protected: void pia0_pa_w(u8 data); void pia0_pb_w(u8 data); u8 pia0_pa_r(); - DECLARE_WRITE_LINE_MEMBER(pia0_ca2_w); - DECLARE_WRITE_LINE_MEMBER(pia0_cb2_w); + void pia0_ca2_w(int state); + void pia0_cb2_w(int state); void pia1_pa_w(u8 data); void pia1_pb_w(u8 data); u8 pia1_pb_r(); - DECLARE_WRITE_LINE_MEMBER(pia1_ca2_w); + void pia1_ca2_w(int state); u8 m_led_data = 0; u8 m_7seg_data = 0; @@ -438,7 +438,7 @@ void csc_state::pia0_pb_w(u8 data) update_display(); } -WRITE_LINE_MEMBER(csc_state::pia0_cb2_w) +void csc_state::pia0_cb2_w(int state) { // 7442 A2 m_inp_mux = (m_inp_mux & ~4) | (state ? 4 : 0); @@ -446,7 +446,7 @@ WRITE_LINE_MEMBER(csc_state::pia0_cb2_w) update_sound(); } -WRITE_LINE_MEMBER(csc_state::pia0_ca2_w) +void csc_state::pia0_ca2_w(int state) { // 7442 A3 m_inp_mux = (m_inp_mux & ~8) | (state ? 8 : 0); @@ -496,7 +496,7 @@ u8 csc_state::pia1_pb_r() return data | (*m_language << 6 & 0xc0); } -WRITE_LINE_MEMBER(csc_state::pia1_ca2_w) +void csc_state::pia1_ca2_w(int state) { // printer? } diff --git a/src/mame/fidelity/eldorado.cpp b/src/mame/fidelity/eldorado.cpp index 05ced9c0afa..03604573ebc 100644 --- a/src/mame/fidelity/eldorado.cpp +++ b/src/mame/fidelity/eldorado.cpp @@ -61,7 +61,7 @@ private: void mux_w(u8 data); u8 mux_r(); void control_w(u8 data); - DECLARE_READ_LINE_MEMBER(t0_r); + int t0_r(); u8 input_r(); bool m_kp_select = false; @@ -113,7 +113,7 @@ void eldorado_state::control_w(u8 data) m_kp_select = !bool(data & 0x80); } -READ_LINE_MEMBER(eldorado_state::t0_r) +int eldorado_state::t0_r() { // T0: P27 return m_kp_select ? 0 : 1; diff --git a/src/mame/fidelity/sc6.cpp b/src/mame/fidelity/sc6.cpp index 02daf626fb4..441d3fae22a 100644 --- a/src/mame/fidelity/sc6.cpp +++ b/src/mame/fidelity/sc6.cpp @@ -134,8 +134,8 @@ private: u8 read_inputs(); u8 input_r(); - DECLARE_READ_LINE_MEMBER(input6_r); - DECLARE_READ_LINE_MEMBER(input7_r); + int input6_r(); + int input7_r(); u8 m_led_select = 0; u8 m_inp_mux = 0; @@ -207,13 +207,13 @@ u8 sc6_state::input_r() return (read_inputs() & 0x3f) | 0xc0; } -READ_LINE_MEMBER(sc6_state::input6_r) +int sc6_state::input6_r() { // T0: multiplexed inputs bit 6 return read_inputs() >> 6 & 1; } -READ_LINE_MEMBER(sc6_state::input7_r) +int sc6_state::input7_r() { // T1: multiplexed inputs bit 7 return read_inputs() >> 7 & 1; diff --git a/src/mame/force/fccpu30.cpp b/src/mame/force/fccpu30.cpp index 5b67d6bd1ea..64333d572ab 100644 --- a/src/mame/force/fccpu30.cpp +++ b/src/mame/force/fccpu30.cpp @@ -283,7 +283,7 @@ private: /* Interrupt support */ void cpu_space_map(address_map &map); - DECLARE_WRITE_LINE_MEMBER(fga_irq_callback); + void fga_irq_callback(int state); uint8_t fga_irq_state = 0; // int fga_irq_vector = 0; int fga_irq_level = 0; @@ -623,7 +623,7 @@ void cpu30_state::vme_a16_w(uint16_t data){ } #endif -WRITE_LINE_MEMBER(cpu30_state::fga_irq_callback) +void cpu30_state::fga_irq_callback(int state) { LOGINT("%s(%02x)\n", FUNCNAME, state); diff --git a/src/mame/force/force68k.cpp b/src/mame/force/force68k.cpp index 8c7c948d015..cb4e57e2f4a 100644 --- a/src/mame/force/force68k.cpp +++ b/src/mame/force/force68k.cpp @@ -174,30 +174,30 @@ private: void vme_a24_w(uint16_t data); uint16_t vme_a16_r(); void vme_a16_w(uint16_t data); - virtual void machine_start () override; - virtual void machine_reset () override; + virtual void machine_start() override; + virtual void machine_reset() override; // Clocks void write_acia_clocks(int id, int state); - DECLARE_WRITE_LINE_MEMBER (write_f1_clock){ write_acia_clocks(mc14411_device::TIMER_F1, state); } - DECLARE_WRITE_LINE_MEMBER (write_f3_clock){ write_acia_clocks(mc14411_device::TIMER_F3, state); } - DECLARE_WRITE_LINE_MEMBER (write_f5_clock){ write_acia_clocks(mc14411_device::TIMER_F5, state); } - DECLARE_WRITE_LINE_MEMBER (write_f7_clock){ write_acia_clocks(mc14411_device::TIMER_F7, state); } - DECLARE_WRITE_LINE_MEMBER (write_f8_clock){ write_acia_clocks(mc14411_device::TIMER_F8, state); } - DECLARE_WRITE_LINE_MEMBER (write_f9_clock){ write_acia_clocks(mc14411_device::TIMER_F9, state); } - DECLARE_WRITE_LINE_MEMBER (write_f11_clock){ write_acia_clocks(mc14411_device::TIMER_F11, state); } - DECLARE_WRITE_LINE_MEMBER (write_f13_clock){ write_acia_clocks(mc14411_device::TIMER_F13, state); } - DECLARE_WRITE_LINE_MEMBER (write_f15_clock){ write_acia_clocks(mc14411_device::TIMER_F15, state); } + void write_f1_clock(int state) { write_acia_clocks(mc14411_device::TIMER_F1, state); } + void write_f3_clock(int state) { write_acia_clocks(mc14411_device::TIMER_F3, state); } + void write_f5_clock(int state) { write_acia_clocks(mc14411_device::TIMER_F5, state); } + void write_f7_clock(int state) { write_acia_clocks(mc14411_device::TIMER_F7, state); } + void write_f8_clock(int state) { write_acia_clocks(mc14411_device::TIMER_F8, state); } + void write_f9_clock(int state) { write_acia_clocks(mc14411_device::TIMER_F9, state); } + void write_f11_clock(int state) { write_acia_clocks(mc14411_device::TIMER_F11, state); } + void write_f13_clock(int state) { write_acia_clocks(mc14411_device::TIMER_F13, state); } + void write_f15_clock(int state) { write_acia_clocks(mc14411_device::TIMER_F15, state); } // Centronics printer interface - DECLARE_WRITE_LINE_MEMBER (centronics_ack_w); - DECLARE_WRITE_LINE_MEMBER (centronics_busy_w); - DECLARE_WRITE_LINE_MEMBER (centronics_perror_w); - DECLARE_WRITE_LINE_MEMBER (centronics_select_w); + void centronics_ack_w(int state); + void centronics_busy_w(int state); + void centronics_perror_w(int state); + void centronics_select_w(int state); // User EPROM/SRAM slot(s) std::pair force68k_load_cart(device_image_interface &image, generic_slot_device *slot); - DECLARE_DEVICE_IMAGE_LOAD_MEMBER (exp1_load) { return force68k_load_cart(image, m_cart); } + DECLARE_DEVICE_IMAGE_LOAD_MEMBER(exp1_load) { return force68k_load_cart(image, m_cart); } uint16_t read16_rom(offs_t offset); void force68k_mem(address_map &map); @@ -334,7 +334,7 @@ INPUT_PORTS_END /* Centronics ACK handler * The centronics ack signal is expected by the ROM to arrive at H1 input line */ -WRITE_LINE_MEMBER (force68k_state::centronics_ack_w) +void force68k_state::centronics_ack_w(int state) { LOG("%s(%d)\n", FUNCNAME, state); m_centronics_ack = state; @@ -344,7 +344,8 @@ WRITE_LINE_MEMBER (force68k_state::centronics_ack_w) /* Centronics BUSY handler * The centronics busy signal is not used by the ROM driver afaik */ -WRITE_LINE_MEMBER (force68k_state::centronics_busy_w){ +void force68k_state::centronics_busy_w(int state) +{ LOG("%s(%d)\n", FUNCNAME, state); m_centronics_busy = state; } @@ -352,7 +353,8 @@ WRITE_LINE_MEMBER (force68k_state::centronics_busy_w){ /* Centronics PERROR handler * The centronics perror signal is not used by the ROM driver afaik */ -WRITE_LINE_MEMBER (force68k_state::centronics_perror_w){ +void force68k_state::centronics_perror_w(int state) +{ LOG("%s(%d)\n", FUNCNAME, state); m_centronics_perror = state; } @@ -360,7 +362,8 @@ WRITE_LINE_MEMBER (force68k_state::centronics_perror_w){ /* Centronics SELECT handler * The centronics select signal is expected by the ROM on Port B bit 0 */ -WRITE_LINE_MEMBER (force68k_state::centronics_select_w){ +void force68k_state::centronics_select_w(int state) +{ LOG("%s(%d)\n", FUNCNAME, state); m_centronics_select = state; m_pit->portb_setbit (0, state); diff --git a/src/mame/fujitsu/fm7.cpp b/src/mame/fujitsu/fm7.cpp index 61bf8f427c8..20b4055d8a8 100644 --- a/src/mame/fujitsu/fm7.cpp +++ b/src/mame/fujitsu/fm7.cpp @@ -380,12 +380,12 @@ void fm77_state::init_en_w(address_space &space, uint8_t data) * Main CPU: I/O ports 0xfd18 - 0xfd1f * Floppy Disk Controller (MB8877A) */ -WRITE_LINE_MEMBER(fm7_state::fdc_intrq_w) +void fm7_state::fdc_intrq_w(int state) { m_fdc_irq_flag = state; } -WRITE_LINE_MEMBER(fm7_state::fdc_drq_w) +void fm7_state::fdc_drq_w(int state) { m_fdc_drq_flag = state; } @@ -710,22 +710,22 @@ void fm77_state::av_key_encoder_w(offs_t offset, uint8_t data) } } -WRITE_LINE_MEMBER(fm7_state::write_centronics_busy) +void fm7_state::write_centronics_busy(int state) { m_centronics_busy = state; } -WRITE_LINE_MEMBER(fm7_state::write_centronics_fault) +void fm7_state::write_centronics_fault(int state) { m_centronics_fault = state; } -WRITE_LINE_MEMBER(fm7_state::write_centronics_ack) +void fm7_state::write_centronics_ack(int state) { m_centronics_ack = state; } -WRITE_LINE_MEMBER(fm7_state::write_centronics_perror) +void fm7_state::write_centronics_perror(int state) { m_centronics_perror = state; } @@ -1237,7 +1237,7 @@ IRQ_CALLBACK_MEMBER(fm7_state::sub_irq_ack) return -1; } -WRITE_LINE_MEMBER(fm77_state::av_fmirq) +void fm77_state::av_fmirq(int state) { if(state == 1) { diff --git a/src/mame/fujitsu/fm7.h b/src/mame/fujitsu/fm7.h index f708591bd51..ab23c0582ec 100644 --- a/src/mame/fujitsu/fm7.h +++ b/src/mame/fujitsu/fm7.h @@ -147,8 +147,8 @@ protected: DECLARE_MACHINE_START(fm7); DECLARE_MACHINE_START(fm16); - DECLARE_WRITE_LINE_MEMBER(fdc_intrq_w); - DECLARE_WRITE_LINE_MEMBER(fdc_drq_w); + void fdc_intrq_w(int state); + void fdc_drq_w(int state); uint8_t subintf_r(); void subintf_w(uint8_t data); @@ -192,10 +192,10 @@ protected: IRQ_CALLBACK_MEMBER(irq_ack); IRQ_CALLBACK_MEMBER(sub_irq_ack); - DECLARE_WRITE_LINE_MEMBER(write_centronics_busy); - DECLARE_WRITE_LINE_MEMBER(write_centronics_fault); - DECLARE_WRITE_LINE_MEMBER(write_centronics_ack); - DECLARE_WRITE_LINE_MEMBER(write_centronics_perror); + void write_centronics_busy(int state); + void write_centronics_fault(int state); + void write_centronics_ack(int state); + void write_centronics_perror(int state); uint32_t screen_update_fm7(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); @@ -338,7 +338,7 @@ protected: TIMER_CALLBACK_MEMBER(av_alu_task_end); TIMER_CALLBACK_MEMBER(av_vsync); - DECLARE_WRITE_LINE_MEMBER(av_fmirq); + void av_fmirq(int state); void av_analog_palette_w(offs_t offset, uint8_t data); uint8_t av_video_flags_r(); diff --git a/src/mame/fujitsu/fmtowns.cpp b/src/mame/fujitsu/fmtowns.cpp index f381eb91467..29f60722c03 100644 --- a/src/mame/fujitsu/fmtowns.cpp +++ b/src/mame/fujitsu/fmtowns.cpp @@ -489,7 +489,7 @@ void towns_state::towns_dma_w(offs_t offset, uint8_t data) * Floppy Disc Controller (MB8877A) */ -WRITE_LINE_MEMBER( towns_state::mb8877a_irq_w ) +void towns_state::mb8877a_irq_w(int state) { if(m_towns_fdc_irq6mask == 0) state = 0; @@ -497,7 +497,7 @@ WRITE_LINE_MEMBER( towns_state::mb8877a_irq_w ) if(IRQ_LOG) logerror("PIC: IRQ6 (FDC) set to %i\n",state); } -WRITE_LINE_MEMBER( towns_state::mb8877a_drq_w ) +void towns_state::mb8877a_drq_w(int state) { m_dma[0]->dmarq(state, 0); } @@ -1724,41 +1724,41 @@ void towns_state::towns_rtc_select_w(uint8_t data) m_rtc->address_write_w(BIT(data, 0)); } -WRITE_LINE_MEMBER(towns_state::rtc_d0_w) +void towns_state::rtc_d0_w(int state) { m_rtc_d = (m_rtc_d & ~1) | (state ? 1 : 0); } -WRITE_LINE_MEMBER(towns_state::rtc_d1_w) +void towns_state::rtc_d1_w(int state) { m_rtc_d = (m_rtc_d & ~2) | (state ? 2 : 0); } -WRITE_LINE_MEMBER(towns_state::rtc_d2_w) +void towns_state::rtc_d2_w(int state) { m_rtc_d = (m_rtc_d & ~4) | (state ? 4 : 0); } -WRITE_LINE_MEMBER(towns_state::rtc_d3_w) +void towns_state::rtc_d3_w(int state) { m_rtc_d = (m_rtc_d & ~8) | (state ? 8 : 0); } -WRITE_LINE_MEMBER(towns_state::rtc_busy_w) +void towns_state::rtc_busy_w(int state) { // active low output m_rtc_busy = !state; } // SCSI controller - I/O ports 0xc30 and 0xc32 -WRITE_LINE_MEMBER(towns_state::towns_scsi_irq) +void towns_state::towns_scsi_irq(int state) { m_pic_slave->ir0_w(state); if(IRQ_LOG) logerror("PIC: IRQ8 (SCSI) set to %i\n",state); } -WRITE_LINE_MEMBER(towns_state::towns_scsi_drq) +void towns_state::towns_scsi_drq(int state) { m_dma[0]->dmarq(state, 1); // SCSI HDs use channel 1 } @@ -1836,7 +1836,7 @@ uint8_t towns_state::towns_41ff_r() } // YM3438 interrupt (IRQ 13) -WRITE_LINE_MEMBER(towns_state::towns_fm_irq) +void towns_state::towns_fm_irq(int state) { if(state) { @@ -1867,7 +1867,7 @@ RF5C68_SAMPLE_END_CB_MEMBER(towns_state::towns_pcm_irq) } } -WRITE_LINE_MEMBER(towns_state::towns_pit_out0_changed) +void towns_state::towns_pit_out0_changed(int state) { m_pit_out0 = state; @@ -1882,7 +1882,7 @@ WRITE_LINE_MEMBER(towns_state::towns_pit_out0_changed) m_pic_master->ir0_w(m_timer0 || m_timer1); } -WRITE_LINE_MEMBER(towns_state::towns_pit_out1_changed) +void towns_state::towns_pit_out1_changed(int state) { m_pit_out1 = state; @@ -1897,13 +1897,13 @@ WRITE_LINE_MEMBER(towns_state::towns_pit_out1_changed) m_pic_master->ir0_w(m_timer0 || m_timer1); } -WRITE_LINE_MEMBER( towns_state::pit_out2_changed ) +void towns_state::pit_out2_changed(int state) { m_pit_out2 = state ? 1 : 0; m_speaker->level_w(speaker_get_spk()); } -WRITE_LINE_MEMBER( towns_state::pit2_out1_changed ) +void towns_state::pit2_out1_changed(int state) { m_i8251->write_rxc(state); m_i8251->write_txc(state); @@ -1940,26 +1940,26 @@ uint8_t towns_state::towns_serial_r(offs_t offset) } } -WRITE_LINE_MEMBER( towns_state::towns_serial_irq ) +void towns_state::towns_serial_irq(int state) { m_serial_irq_source = state ? 0x01 : 0x00; m_pic_master->ir2_w(state); popmessage("Serial IRQ state: %i\n",state); } -WRITE_LINE_MEMBER( towns_state::towns_rxrdy_irq ) +void towns_state::towns_rxrdy_irq(int state) { if(m_serial_irq_enable & RXRDY_IRQ_ENABLE) towns_serial_irq(state); } -WRITE_LINE_MEMBER( towns_state::towns_txrdy_irq ) +void towns_state::towns_txrdy_irq(int state) { if(m_serial_irq_enable & TXRDY_IRQ_ENABLE) towns_serial_irq(state); } -WRITE_LINE_MEMBER( towns_state::towns_syndet_irq ) +void towns_state::towns_syndet_irq(int state) { if(m_serial_irq_enable & SYNDET_IRQ_ENABLE) towns_serial_irq(state); diff --git a/src/mame/fujitsu/fmtowns.h b/src/mame/fujitsu/fmtowns.h index f9cfb1ed2ac..525d7c384f0 100644 --- a/src/mame/fujitsu/fmtowns.h +++ b/src/mame/fujitsu/fmtowns.h @@ -167,8 +167,8 @@ protected: static void floppy_formats(format_registration &fr); - DECLARE_WRITE_LINE_MEMBER(towns_scsi_irq); - DECLARE_WRITE_LINE_MEMBER(towns_scsi_drq); + void towns_scsi_irq(int state); + void towns_scsi_drq(int state); private: /* devices */ @@ -334,22 +334,22 @@ private: uint8_t towns_spriteram_r(offs_t offset); void towns_spriteram_w(offs_t offset, uint8_t data); - DECLARE_WRITE_LINE_MEMBER(mb8877a_irq_w); - DECLARE_WRITE_LINE_MEMBER(mb8877a_drq_w); - DECLARE_WRITE_LINE_MEMBER(pit_out2_changed); + void mb8877a_irq_w(int state); + void mb8877a_drq_w(int state); + void pit_out2_changed(int state); - DECLARE_WRITE_LINE_MEMBER(towns_serial_irq); - DECLARE_WRITE_LINE_MEMBER(towns_rxrdy_irq); - DECLARE_WRITE_LINE_MEMBER(towns_txrdy_irq); - DECLARE_WRITE_LINE_MEMBER(towns_syndet_irq); + void towns_serial_irq(int state); + void towns_rxrdy_irq(int state); + void towns_txrdy_irq(int state); + void towns_syndet_irq(int state); uint8_t towns_serial_r(offs_t offset); void towns_serial_w(offs_t offset, uint8_t data); - DECLARE_WRITE_LINE_MEMBER(rtc_d0_w); - DECLARE_WRITE_LINE_MEMBER(rtc_d1_w); - DECLARE_WRITE_LINE_MEMBER(rtc_d2_w); - DECLARE_WRITE_LINE_MEMBER(rtc_d3_w); - DECLARE_WRITE_LINE_MEMBER(rtc_busy_w); + void rtc_d0_w(int state); + void rtc_d1_w(int state); + void rtc_d2_w(int state); + void rtc_d3_w(int state); + void rtc_busy_w(int state); RF5C68_SAMPLE_END_CB_MEMBER(towns_pcm_irq); @@ -384,11 +384,11 @@ private: TIMER_CALLBACK_MEMBER(towns_cdrom_read_byte); TIMER_CALLBACK_MEMBER(towns_vblank_end); TIMER_CALLBACK_MEMBER(draw_sprites); - DECLARE_WRITE_LINE_MEMBER(towns_pit_out0_changed); - DECLARE_WRITE_LINE_MEMBER(towns_pit_out1_changed); - DECLARE_WRITE_LINE_MEMBER(pit2_out1_changed); + void towns_pit_out0_changed(int state); + void towns_pit_out1_changed(int state); + void pit2_out1_changed(int state); uint8_t get_slave_ack(offs_t offset); - DECLARE_WRITE_LINE_MEMBER(towns_fm_irq); + void towns_fm_irq(int state); void towns_sprite_start(); void towns_crtc_refresh_mode(); void towns_update_kanji_offset(); diff --git a/src/mame/funworld/funworld.cpp b/src/mame/funworld/funworld.cpp index 8b140dd0502..20ca698c77b 100644 --- a/src/mame/funworld/funworld.cpp +++ b/src/mame/funworld/funworld.cpp @@ -822,7 +822,7 @@ void funworld_state::funworld_lamp_b_w(uint8_t data) // popmessage("Lamps B: %02X", data); } -WRITE_LINE_MEMBER(funworld_state::pia1_ca2_w) +void funworld_state::pia1_ca2_w(int state) { // TAB and Impera games are writing 0x01 constantly, and 0x00 with each screen change. // This line is tied to some sort of reset circuitery. diff --git a/src/mame/funworld/funworld.h b/src/mame/funworld/funworld.h index 434054457a8..21117f3eebb 100644 --- a/src/mame/funworld/funworld.h +++ b/src/mame/funworld/funworld.h @@ -68,7 +68,7 @@ protected: private: uint8_t questions_r(offs_t offset); void question_bank_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(pia1_ca2_w); + void pia1_ca2_w(int state); uint8_t funquiz_ay8910_a_r(); uint8_t funquiz_ay8910_b_r(); diff --git a/src/mame/fuuki/fuukifg3.h b/src/mame/fuuki/fuukifg3.h index 5ced217a235..ea370111c1e 100644 --- a/src/mame/fuuki/fuukifg3.h +++ b/src/mame/fuuki/fuukifg3.h @@ -69,7 +69,7 @@ private: void tile_cb(u32 &code); void colpri_cb(u32 &colour, u32 &pri_mask); u32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(screen_vblank); + void screen_vblank(int state); void draw_layer(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, u8 i, int flag, u8 pri, u8 primask = 0xff); /* devices */ diff --git a/src/mame/fuuki/fuukifg3_v.cpp b/src/mame/fuuki/fuukifg3_v.cpp index 6c9bec8c064..f972a062ef5 100644 --- a/src/mame/fuuki/fuukifg3_v.cpp +++ b/src/mame/fuuki/fuukifg3_v.cpp @@ -214,7 +214,7 @@ u32 fuuki32_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, co return 0; } -WRITE_LINE_MEMBER(fuuki32_state::screen_vblank) +void fuuki32_state::screen_vblank(int state) { // rising edge if (state) diff --git a/src/mame/gaelco/bigkarnk_ms.cpp b/src/mame/gaelco/bigkarnk_ms.cpp index b42a08ff572..b360189ab69 100644 --- a/src/mame/gaelco/bigkarnk_ms.cpp +++ b/src/mame/gaelco/bigkarnk_ms.cpp @@ -365,7 +365,7 @@ private: tilemap_t *m_bg_tilemap2 = nullptr; tilemap_t *m_bg_tilemap3 = nullptr; - DECLARE_WRITE_LINE_MEMBER(splash_msm5205_int); + void splash_msm5205_int(int state); void splash_adpcm_data_w(uint8_t data); void splash_adpcm_control_w(uint8_t data); int m_adpcm_data = 0; @@ -678,7 +678,7 @@ void bigkarnk_ms_state::splash_adpcm_control_w(uint8_t data) m_soundrom->set_bank(bank & 0xf); } -WRITE_LINE_MEMBER(bigkarnk_ms_state::splash_msm5205_int) +void bigkarnk_ms_state::splash_msm5205_int(int state) { m_msm->data_w(m_adpcm_data >> 4); m_adpcm_data = (m_adpcm_data << 4) & 0xf0; diff --git a/src/mame/gaelco/gaelco.cpp b/src/mame/gaelco/gaelco.cpp index 69aa5f08bad..b4a713dccd5 100644 --- a/src/mame/gaelco/gaelco.cpp +++ b/src/mame/gaelco/gaelco.cpp @@ -109,22 +109,22 @@ Year Game PCB NOTES * *************************************/ -WRITE_LINE_MEMBER(gaelco_state::coin1_lockout_w) +void gaelco_state::coin1_lockout_w(int state) { machine().bookkeeping().coin_lockout_w(0, state); } -WRITE_LINE_MEMBER(gaelco_state::coin2_lockout_w) +void gaelco_state::coin2_lockout_w(int state) { machine().bookkeeping().coin_lockout_w(1, state); } -WRITE_LINE_MEMBER(gaelco_state::coin1_counter_w) +void gaelco_state::coin1_counter_w(int state) { machine().bookkeeping().coin_counter_w(0, state); } -WRITE_LINE_MEMBER(gaelco_state::coin2_counter_w) +void gaelco_state::coin2_counter_w(int state) { machine().bookkeeping().coin_counter_w(1, state); } diff --git a/src/mame/gaelco/gaelco.h b/src/mame/gaelco/gaelco.h index 47c1738b9a4..dd82fe7c238 100644 --- a/src/mame/gaelco/gaelco.h +++ b/src/mame/gaelco/gaelco.h @@ -57,10 +57,10 @@ private: /* video-related */ tilemap_t *m_tilemap[2]{}; - DECLARE_WRITE_LINE_MEMBER(coin1_lockout_w); - DECLARE_WRITE_LINE_MEMBER(coin2_lockout_w); - DECLARE_WRITE_LINE_MEMBER(coin1_counter_w); - DECLARE_WRITE_LINE_MEMBER(coin2_counter_w); + void coin1_lockout_w(int state); + void coin2_lockout_w(int state); + void coin1_counter_w(int state); + void coin2_counter_w(int state); void oki_bankswitch_w(uint8_t data); void vram_encrypted_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); void encrypted_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); diff --git a/src/mame/gaelco/gaelco2.cpp b/src/mame/gaelco/gaelco2.cpp index 789b4bb1b44..bf8ee63a91d 100644 --- a/src/mame/gaelco/gaelco2.cpp +++ b/src/mame/gaelco/gaelco2.cpp @@ -2241,13 +2241,13 @@ ROM_END ***************************************************************************/ template -READ_LINE_MEMBER(wrally2_state::wrally2_analog_bit_r) +int wrally2_state::wrally2_analog_bit_r() { return (m_analog_ports[N] >> 7) & 0x01; } -WRITE_LINE_MEMBER(wrally2_state::wrally2_adc_clk) +void wrally2_state::wrally2_adc_clk(int state) { /* a zero/one combo is written here to clock the next analog port bit */ if (!state) @@ -2258,7 +2258,7 @@ WRITE_LINE_MEMBER(wrally2_state::wrally2_adc_clk) } -WRITE_LINE_MEMBER(wrally2_state::wrally2_adc_cs) +void wrally2_state::wrally2_adc_cs(int state) { /* a zero is written here to read the analog ports, and a one is written when finished */ if (!state) diff --git a/src/mame/gaelco/gaelco2.h b/src/mame/gaelco/gaelco2.h index b40fb0b2d9e..15fedb09ff4 100644 --- a/src/mame/gaelco/gaelco2.h +++ b/src/mame/gaelco/gaelco2.h @@ -45,8 +45,8 @@ public: void init_wrally2(); void init_play2000(); - DECLARE_WRITE_LINE_MEMBER(coin1_counter_w); - DECLARE_WRITE_LINE_MEMBER(coin2_counter_w); + void coin1_counter_w(int state); + void coin2_counter_w(int state); DECLARE_VIDEO_START(gaelco2); DECLARE_VIDEO_START(gaelco2_dual); @@ -75,8 +75,8 @@ private: void shareram_w(offs_t offset, u8 data); u8 shareram_r(offs_t offset); void alighunt_coin_w(u16 data); - DECLARE_WRITE_LINE_MEMBER(coin3_counter_w); - DECLARE_WRITE_LINE_MEMBER(coin4_counter_w); + void coin3_counter_w(int state); + void coin4_counter_w(int state); u16 snowboar_protection_r(); void snowboar_protection_w(offs_t offset, u16 data, u16 mem_mask = ~0); template TILE_GET_INFO_MEMBER(get_tile_info); @@ -156,7 +156,7 @@ public: void wrally2(machine_config &config); - template DECLARE_READ_LINE_MEMBER(wrally2_analog_bit_r); + template int wrally2_analog_bit_r(); private: required_ioport m_analog0; @@ -164,7 +164,7 @@ private: uint8_t m_analog_ports[2]{}; - DECLARE_WRITE_LINE_MEMBER(wrally2_adc_clk); - DECLARE_WRITE_LINE_MEMBER(wrally2_adc_cs); + void wrally2_adc_clk(int state); + void wrally2_adc_cs(int state); void wrally2_map(address_map &map); }; diff --git a/src/mame/gaelco/gaelco2_m.cpp b/src/mame/gaelco/gaelco2_m.cpp index cb2223358ca..4d753049b9b 100644 --- a/src/mame/gaelco/gaelco2_m.cpp +++ b/src/mame/gaelco/gaelco2_m.cpp @@ -189,22 +189,22 @@ void gaelco2_state::wrally2_latch_w(offs_t offset, u16 data) m_mainlatch->write_bit(offset >> 2, BIT(data, 0)); } -WRITE_LINE_MEMBER(gaelco2_state::coin1_counter_w) +void gaelco2_state::coin1_counter_w(int state) { machine().bookkeeping().coin_counter_w(0, state); } -WRITE_LINE_MEMBER(gaelco2_state::coin2_counter_w) +void gaelco2_state::coin2_counter_w(int state) { machine().bookkeeping().coin_counter_w(1, state); } -WRITE_LINE_MEMBER(gaelco2_state::coin3_counter_w) +void gaelco2_state::coin3_counter_w(int state) { machine().bookkeeping().coin_counter_w(2, state); } -WRITE_LINE_MEMBER(gaelco2_state::coin4_counter_w) +void gaelco2_state::coin4_counter_w(int state) { machine().bookkeeping().coin_counter_w(3, state); } diff --git a/src/mame/gaelco/gaelco3d.cpp b/src/mame/gaelco/gaelco3d.cpp index 925d8bf8da3..fe6902bc62f 100644 --- a/src/mame/gaelco/gaelco3d.cpp +++ b/src/mame/gaelco/gaelco3d.cpp @@ -160,7 +160,7 @@ REF. 970429 #define LOG 0 -WRITE_LINE_MEMBER(gaelco3d_state::ser_irq) +void gaelco3d_state::ser_irq(int state) { if (state) m_maincpu->set_input_line(6, ASSERT_LINE); @@ -307,13 +307,13 @@ void gaelco3d_state::sound_status_w(uint16_t data) *************************************/ template -READ_LINE_MEMBER(gaelco3d_state::analog_bit_r) +int gaelco3d_state::analog_bit_r() { return (m_analog_ports[N] >> 7) & 0x01; } -WRITE_LINE_MEMBER(gaelco3d_state::analog_port_clock_w) +void gaelco3d_state::analog_port_clock_w(int state) { // A zero/one combo is written here to clock the next analog port bit if (!state) @@ -326,7 +326,7 @@ WRITE_LINE_MEMBER(gaelco3d_state::analog_port_clock_w) } -WRITE_LINE_MEMBER(gaelco3d_state::analog_port_latch_w) +void gaelco3d_state::analog_port_latch_w(int state) { // A zero is written here to read the analog ports, and a one is written when finished if (!state) @@ -339,12 +339,12 @@ WRITE_LINE_MEMBER(gaelco3d_state::analog_port_latch_w) } template -READ_LINE_MEMBER(gaelco3d_state::fp_analog_bit_r) +int gaelco3d_state::fp_analog_bit_r() { return (m_fp_analog_ports[N] >> m_fp_clock) & 1; } -WRITE_LINE_MEMBER(gaelco3d_state::fp_analog_clock_w) +void gaelco3d_state::fp_analog_clock_w(int state) { if (state != m_fp_state) { @@ -414,7 +414,7 @@ void gaelco3d_state::tms_iack_w(offs_t offset, uint8_t data) * *************************************/ -WRITE_LINE_MEMBER(gaelco3d_state::tms_reset_w) +void gaelco3d_state::tms_reset_w(int state) { /* this is set to 0 while data is uploaded, then set to $ffff after it is done. It does not ever appear to be touched after that */ @@ -424,7 +424,7 @@ WRITE_LINE_MEMBER(gaelco3d_state::tms_reset_w) } -WRITE_LINE_MEMBER(gaelco3d_state::tms_irq_w) +void gaelco3d_state::tms_irq_w(int state) { /* This is written twice, 0,1, in quick succession. Done after uploading, and after modifying the comm area */ @@ -434,7 +434,7 @@ WRITE_LINE_MEMBER(gaelco3d_state::tms_irq_w) } -WRITE_LINE_MEMBER(gaelco3d_state::tms_control3_w) +void gaelco3d_state::tms_control3_w(int state) { if (LOG) logerror("%06X:tms_control3_w = %d\n", m_maincpu->pc(), state); @@ -641,19 +641,19 @@ void gaelco3d_state::adsp_tx_callback(offs_t offset, uint32_t data) *************************************/ -WRITE_LINE_MEMBER(gaelco3d_state::radikalb_lamp_w) +void gaelco3d_state::radikalb_lamp_w(int state) { // Arbitrary data written logerror("%06X:unknown_127_w = %d\n", m_maincpu->pc(), state); } -WRITE_LINE_MEMBER(gaelco3d_state::unknown_137_w) +void gaelco3d_state::unknown_137_w(int state) { // Only written $00 or $ff logerror("%06X:unknown_137_w = %d\n", m_maincpu->pc(), state); } -WRITE_LINE_MEMBER(gaelco3d_state::unknown_13a_w) +void gaelco3d_state::unknown_13a_w(int state) { // Only written $0000 or $0001 logerror("%06X:unknown_13a_w = %04X\n", m_maincpu->pc(), state); diff --git a/src/mame/gaelco/gaelco3d.h b/src/mame/gaelco/gaelco3d.h index cd638d7bdff..14603042697 100644 --- a/src/mame/gaelco/gaelco3d.h +++ b/src/mame/gaelco/gaelco3d.h @@ -57,8 +57,8 @@ public: void gaelco3d2(machine_config &config); void gaelco3d(machine_config &config); - template DECLARE_READ_LINE_MEMBER(analog_bit_r); - template DECLARE_READ_LINE_MEMBER(fp_analog_bit_r); + template int analog_bit_r(); + template int fp_analog_bit_r(); private: virtual void machine_start() override; @@ -145,23 +145,23 @@ private: void irq_ack_w(uint16_t data); uint16_t sound_status_r(offs_t offset, uint16_t mem_mask = ~0); void sound_status_w(uint16_t data); - DECLARE_WRITE_LINE_MEMBER(analog_port_clock_w); - DECLARE_WRITE_LINE_MEMBER(analog_port_latch_w); + void analog_port_clock_w(int state); + void analog_port_latch_w(int state); uint32_t tms_m68k_ram_r(offs_t offset); void tms_m68k_ram_w(offs_t offset, uint32_t data); void tms_iack_w(offs_t offset, uint8_t data); - DECLARE_WRITE_LINE_MEMBER(tms_reset_w); - DECLARE_WRITE_LINE_MEMBER(tms_irq_w); - DECLARE_WRITE_LINE_MEMBER(tms_control3_w); + void tms_reset_w(int state); + void tms_irq_w(int state); + void tms_control3_w(int state); void adsp_control_w(offs_t offset, uint16_t data); void adsp_rombank_w(offs_t offset, uint16_t data); - DECLARE_WRITE_LINE_MEMBER(radikalb_lamp_w); - DECLARE_WRITE_LINE_MEMBER(unknown_137_w); - DECLARE_WRITE_LINE_MEMBER(unknown_13a_w); + void radikalb_lamp_w(int state); + void unknown_137_w(int state); + void unknown_13a_w(int state); void gaelco3d_render_w(uint32_t data); void gaelco3d_paletteram_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); void gaelco3d_paletteram_020_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0); - DECLARE_WRITE_LINE_MEMBER(ser_irq); + void ser_irq(int state); uint16_t eeprom_data_r(offs_t offset, uint16_t mem_mask = ~0); DECLARE_MACHINE_RESET(gaelco3d2); @@ -171,7 +171,7 @@ private: TIMER_DEVICE_CALLBACK_MEMBER(adsp_autobuffer_irq); void gaelco3d_render(screen_device &screen); void adsp_tx_callback(offs_t offset, uint32_t data); - DECLARE_WRITE_LINE_MEMBER(fp_analog_clock_w); + void fp_analog_clock_w(int state); void adsp_data_map(address_map &map); void adsp_program_map(address_map &map); diff --git a/src/mame/gaelco/gaelco3d_m.cpp b/src/mame/gaelco/gaelco3d_m.cpp index 6edc2d15ff2..2beb3df53c8 100644 --- a/src/mame/gaelco/gaelco3d_m.cpp +++ b/src/mame/gaelco/gaelco3d_m.cpp @@ -347,7 +347,7 @@ TIMER_CALLBACK_MEMBER( gaelco_serial_device::link_cb ) -WRITE_LINE_MEMBER(gaelco_serial_device::irq_enable) +void gaelco_serial_device::irq_enable(int state) { LOGMSG(("???? irq enable %d\n", state)); } @@ -398,14 +398,14 @@ uint8_t gaelco_serial_device::data_r() return ret; } -WRITE_LINE_MEMBER(gaelco_serial_device::unknown_w) +void gaelco_serial_device::unknown_w(int state) { std::lock_guard guard(m_mutex); LOGMSG(("???? unknown serial access %d\n", state)); } -WRITE_LINE_MEMBER(gaelco_serial_device::rts_w) +void gaelco_serial_device::rts_w(int state) { std::lock_guard guard(m_mutex); @@ -419,7 +419,7 @@ WRITE_LINE_MEMBER(gaelco_serial_device::rts_w) } } -WRITE_LINE_MEMBER(gaelco_serial_device::tr_w) +void gaelco_serial_device::tr_w(int state) { LOGMSG(("set transmit %d\n", data)); std::lock_guard guard(m_mutex); diff --git a/src/mame/gaelco/gaelco3d_m.h b/src/mame/gaelco/gaelco3d_m.h index d599834c917..ab68906d6cc 100644 --- a/src/mame/gaelco/gaelco3d_m.h +++ b/src/mame/gaelco/gaelco3d_m.h @@ -30,9 +30,9 @@ public: uint8_t status_r(); void data_w(uint8_t data); uint8_t data_r(); - DECLARE_WRITE_LINE_MEMBER(rts_w); + void rts_w(int state); /* Set to 1 during transmit, 0 for receive */ - DECLARE_WRITE_LINE_MEMBER(tr_w); + void tr_w(int state); /* Big questions marks, related to serial i/o */ @@ -40,11 +40,11 @@ public: /* Not used in surfplnt, but in radikalb * Set at beginning of transfer sub, cleared at end */ - DECLARE_WRITE_LINE_MEMBER(unknown_w); + void unknown_w(int state); /* only used in radikalb, set at beginning of receive isr, cleared at end */ - DECLARE_WRITE_LINE_MEMBER(irq_enable); + void irq_enable(int state); protected: // device-level overrides diff --git a/src/mame/gaelco/glass.cpp b/src/mame/gaelco/glass.cpp index 02ed4882e68..915eb05708e 100644 --- a/src/mame/gaelco/glass.cpp +++ b/src/mame/gaelco/glass.cpp @@ -88,8 +88,8 @@ private: void blitter_w(uint16_t data); void vram_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); - template DECLARE_WRITE_LINE_MEMBER(coin_lockout_w); - template DECLARE_WRITE_LINE_MEMBER(coin_counter_w); + template void coin_lockout_w(int state); + template void coin_counter_w(int state); template TILE_GET_INFO_MEMBER(get_tile_info); uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); @@ -326,13 +326,13 @@ void glass_state::coin_w(offs_t offset, uint16_t data) } template -WRITE_LINE_MEMBER(glass_state::coin_lockout_w) +void glass_state::coin_lockout_w(int state) { machine().bookkeeping().coin_lockout_w(Which, !state); } template -WRITE_LINE_MEMBER(glass_state::coin_counter_w) +void glass_state::coin_counter_w(int state) { machine().bookkeeping().coin_counter_w(Which, state); } diff --git a/src/mame/gaelco/mastboy.cpp b/src/mame/gaelco/mastboy.cpp index 12c823bf5fc..587c0fa03d7 100644 --- a/src/mame/gaelco/mastboy.cpp +++ b/src/mame/gaelco/mastboy.cpp @@ -500,14 +500,14 @@ private: void vram_w(offs_t offset, uint8_t data); void bank_w(uint8_t data); void msm5205_data_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(irq0_ack_w); + void irq0_ack_w(int state); uint8_t port_38_read(); uint8_t nmi_read(); - DECLARE_WRITE_LINE_MEMBER(adpcm_int); + void adpcm_int(int state); uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(vblank_irq); + void vblank_irq(int state); void bank_c000_map(address_map &map); void mastboy_io_map(address_map &map); void mastboy_map(address_map &map); @@ -595,7 +595,7 @@ void mastboy_state::msm5205_data_w(uint8_t data) m_m5205_next = data; } -WRITE_LINE_MEMBER(mastboy_state::adpcm_int) +void mastboy_state::adpcm_int(int state) { m_msm->data_w(m_m5205_next); m_m5205_next >>= 4; @@ -608,13 +608,13 @@ WRITE_LINE_MEMBER(mastboy_state::adpcm_int) // Interrupt Handling -WRITE_LINE_MEMBER(mastboy_state::irq0_ack_w) +void mastboy_state::irq0_ack_w(int state) { if (state) m_maincpu->set_input_line(0, CLEAR_LINE); } -WRITE_LINE_MEMBER(mastboy_state::vblank_irq) +void mastboy_state::vblank_irq(int state) { if (state && m_outlatch->q0_r() == 1) m_maincpu->set_input_line(0, ASSERT_LINE); diff --git a/src/mame/gaelco/splash.cpp b/src/mame/gaelco/splash.cpp index f77d91f2a82..49f7479c9fe 100644 --- a/src/mame/gaelco/splash.cpp +++ b/src/mame/gaelco/splash.cpp @@ -55,22 +55,22 @@ More notes about Funny Strip protection issues at the bottom of source file (ini #include "screen.h" #include "speaker.h" -WRITE_LINE_MEMBER(splash_state::coin1_lockout_w) +void splash_state::coin1_lockout_w(int state) { machine().bookkeeping().coin_lockout_w(0, !state); } -WRITE_LINE_MEMBER(splash_state::coin2_lockout_w) +void splash_state::coin2_lockout_w(int state) { machine().bookkeeping().coin_lockout_w(1, !state); } -WRITE_LINE_MEMBER(splash_state::coin1_counter_w) +void splash_state::coin1_counter_w(int state) { machine().bookkeeping().coin_counter_w(0, state); } -WRITE_LINE_MEMBER(splash_state::coin2_counter_w) +void splash_state::coin2_counter_w(int state) { machine().bookkeeping().coin_counter_w(1, state); } @@ -103,7 +103,7 @@ void splash_state::splash_adpcm_control_w(uint8_t data) m_msm->reset_w(!BIT(data, 0)); } -WRITE_LINE_MEMBER(splash_state::splash_msm5205_int) +void splash_state::splash_msm5205_int(int state) { m_msm->data_w(m_adpcm_data >> 4); m_adpcm_data = (m_adpcm_data << 4) & 0xf0; @@ -147,7 +147,7 @@ void splash_state::roldfrog_vblank_ack_w(uint8_t data) } -WRITE_LINE_MEMBER(splash_state::ym_irq) +void splash_state::ym_irq(int state) { m_sound_irq = state; roldfrog_update_irq(); @@ -660,7 +660,7 @@ void splash_state::roldfrog(machine_config &config) ymsnd.add_route(3, "mono", 1.0); } -WRITE_LINE_MEMBER(funystrp_state::adpcm_int1) +void funystrp_state::adpcm_int1(int state) { if (m_snd_interrupt_enable1 || m_msm_toggle1 == 1) { @@ -675,7 +675,7 @@ WRITE_LINE_MEMBER(funystrp_state::adpcm_int1) } } -WRITE_LINE_MEMBER(funystrp_state::adpcm_int2) +void funystrp_state::adpcm_int2(int state) { if (m_snd_interrupt_enable2 || m_msm_toggle2 == 1) { diff --git a/src/mame/gaelco/splash.h b/src/mame/gaelco/splash.h index ab546c5f857..94c02640d37 100644 --- a/src/mame/gaelco/splash.h +++ b/src/mame/gaelco/splash.h @@ -70,13 +70,13 @@ protected: // common void vram_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); - DECLARE_WRITE_LINE_MEMBER(coin1_lockout_w); - DECLARE_WRITE_LINE_MEMBER(coin2_lockout_w); - DECLARE_WRITE_LINE_MEMBER(coin1_counter_w); - DECLARE_WRITE_LINE_MEMBER(coin2_counter_w); + void coin1_lockout_w(int state); + void coin2_lockout_w(int state); + void coin1_counter_w(int state); + void coin2_counter_w(int state); // splash specific - DECLARE_WRITE_LINE_MEMBER(splash_msm5205_int); + void splash_msm5205_int(int state); void splash_adpcm_data_w(uint8_t data); void splash_adpcm_control_w(uint8_t data); @@ -84,7 +84,7 @@ protected: uint16_t roldfrog_bombs_r(); void roldfrog_vblank_ack_w(uint8_t data); uint8_t roldfrog_unk_r(); - DECLARE_WRITE_LINE_MEMBER(ym_irq); + void ym_irq(int state); //roldfrog and funystrp specific void sound_bank_w(uint8_t data); @@ -142,8 +142,8 @@ private: void msm1_interrupt_w(uint8_t data); void msm2_interrupt_w(uint8_t data); void msm2_data_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(adpcm_int1); - DECLARE_WRITE_LINE_MEMBER(adpcm_int2); + void adpcm_int1(int state); + void adpcm_int2(int state); void protection_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); uint16_t protection_r(offs_t offset); void eeprom_w(uint8_t data); diff --git a/src/mame/gaelco/splash_ms.cpp b/src/mame/gaelco/splash_ms.cpp index 7f23ed17a87..0e9608b7fb1 100644 --- a/src/mame/gaelco/splash_ms.cpp +++ b/src/mame/gaelco/splash_ms.cpp @@ -96,7 +96,7 @@ private: void sub_rambankselect_w(uint8_t data); void sub_rombankselect_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(splash_msm5205_int); + void splash_msm5205_int(int state); void splash_adpcm_data_w(uint8_t data); void splash_adpcm_control_w(uint8_t data); int m_adpcm_data = 0; @@ -434,7 +434,7 @@ void splashms_state::splash_adpcm_control_w(uint8_t data) m_msm->reset_w(BIT(data, 7)); } -WRITE_LINE_MEMBER(splashms_state::splash_msm5205_int) +void splashms_state::splash_msm5205_int(int state) { m_msm->data_w(m_adpcm_data >> 4); m_adpcm_data = (m_adpcm_data << 4) & 0xf0; diff --git a/src/mame/gaelco/targeth.cpp b/src/mame/gaelco/targeth.cpp index c91b0d10b14..8469889ea22 100644 --- a/src/mame/gaelco/targeth.cpp +++ b/src/mame/gaelco/targeth.cpp @@ -107,7 +107,7 @@ protected: private: void oki_bankswitch_w(uint8_t data); void output_latch_w(offs_t offset, uint16_t data); - template DECLARE_WRITE_LINE_MEMBER(coin_counter_w); + template void coin_counter_w(int state); void shareram_w(offs_t offset, uint8_t data); uint8_t shareram_r(offs_t offset); @@ -314,7 +314,7 @@ void targeth_state::output_latch_w(offs_t offset, uint16_t data) } template -WRITE_LINE_MEMBER(targeth_state::coin_counter_w) +void targeth_state::coin_counter_w(int state) { machine().bookkeeping().coin_counter_w(Which, state); } diff --git a/src/mame/gaelco/thoop2.cpp b/src/mame/gaelco/thoop2.cpp index 35335aae554..ade3b3d2ebe 100644 --- a/src/mame/gaelco/thoop2.cpp +++ b/src/mame/gaelco/thoop2.cpp @@ -98,8 +98,8 @@ protected: private: void oki_bankswitch_w(uint8_t data); - template DECLARE_WRITE_LINE_MEMBER(coin_lockout_w); - template DECLARE_WRITE_LINE_MEMBER(coin_counter_w); + template void coin_lockout_w(int state); + template void coin_counter_w(int state); void vram_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); void shareram_w(offs_t offset, uint8_t data); @@ -348,13 +348,13 @@ void thoop2_state::oki_bankswitch_w(uint8_t data) } template -WRITE_LINE_MEMBER(thoop2_state::coin_lockout_w) +void thoop2_state::coin_lockout_w(int state) { machine().bookkeeping().coin_lockout_w(Which, !state); } template -WRITE_LINE_MEMBER(thoop2_state::coin_counter_w) +void thoop2_state::coin_counter_w(int state) { machine().bookkeeping().coin_counter_w(Which, state); } diff --git a/src/mame/gaelco/wrally.cpp b/src/mame/gaelco/wrally.cpp index 110f99f6926..47361db1f05 100644 --- a/src/mame/gaelco/wrally.cpp +++ b/src/mame/gaelco/wrally.cpp @@ -167,7 +167,7 @@ public: void wrally(machine_config &config); - template DECLARE_READ_LINE_MEMBER(analog_bit_r); + template int analog_bit_r(); protected: virtual void machine_start() override; @@ -177,13 +177,13 @@ private: uint8_t shareram_r(offs_t offset); void shareram_w(offs_t offset, uint8_t data); void vram_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); - DECLARE_WRITE_LINE_MEMBER(flipscreen_w); + void flipscreen_w(int state); void okim6295_bankswitch_w(uint8_t data); - template DECLARE_WRITE_LINE_MEMBER(coin_counter_w); - template DECLARE_WRITE_LINE_MEMBER(coin_lockout_w); + template void coin_counter_w(int state); + template void coin_lockout_w(int state); - DECLARE_WRITE_LINE_MEMBER(adc_clk); - DECLARE_WRITE_LINE_MEMBER(adc_en); + void adc_clk(int state); + void adc_en(int state); template TILE_GET_INFO_MEMBER(get_tile_info); @@ -342,7 +342,7 @@ void wrally_state::vram_w(offs_t offset, uint16_t data, uint16_t mem_mask) m_tilemap[(offset & 0x1fff) >> 12]->mark_tile_dirty(((offset << 1) & 0x1fff) >> 2); } -WRITE_LINE_MEMBER(wrally_state::flipscreen_w) +void wrally_state::flipscreen_w(int state) { flip_screen_set(state); } @@ -353,25 +353,25 @@ void wrally_state::okim6295_bankswitch_w(uint8_t data) } template -WRITE_LINE_MEMBER(wrally_state::coin_counter_w) +void wrally_state::coin_counter_w(int state) { machine().bookkeeping().coin_counter_w(Which, state); } template -WRITE_LINE_MEMBER(wrally_state::coin_lockout_w) +void wrally_state::coin_lockout_w(int state) { machine().bookkeeping().coin_lockout_w(Which, !state); } // the following methods have been pilfered from gaelco2.cpp (wrally2). They seem to work fine for wrally, too template -READ_LINE_MEMBER(wrally_state::analog_bit_r) +int wrally_state::analog_bit_r() { return (m_analog_ports[N] >> 7) & 0x01; } -WRITE_LINE_MEMBER(wrally_state::adc_clk) +void wrally_state::adc_clk(int state) { // a zero/one combo is written here to clock the next analog port bit if (!state) @@ -381,7 +381,7 @@ WRITE_LINE_MEMBER(wrally_state::adc_clk) } } -WRITE_LINE_MEMBER(wrally_state::adc_en) +void wrally_state::adc_en(int state) { // a zero is written here to read the analog ports, and a one is written when finished if (!state) diff --git a/src/mame/galaxian/fastfred.cpp b/src/mame/galaxian/fastfred.cpp index ed52f16697c..be27e83eb93 100644 --- a/src/mame/galaxian/fastfred.cpp +++ b/src/mame/galaxian/fastfred.cpp @@ -144,7 +144,7 @@ MACHINE_START_MEMBER(fastfred_state,imago) m_gfxdecode->gfx(1)->set_source(m_imago_sprites); } -WRITE_LINE_MEMBER(fastfred_state::imago_dma_irq_w) +void fastfred_state::imago_dma_irq_w(int state) { m_maincpu->set_input_line(0, state ? ASSERT_LINE : CLEAR_LINE); } @@ -177,7 +177,7 @@ uint8_t fastfred_state::imago_sprites_offset_r(offs_t offset) return 0xff; //not really used } -WRITE_LINE_MEMBER(fastfred_state::nmi_mask_w) +void fastfred_state::nmi_mask_w(int state) { m_nmi_mask = state; if (!m_nmi_mask) @@ -598,7 +598,7 @@ static GFXDECODE_START( gfx_imago ) GFXDECODE_ENTRY( "gfx4", 0, gfx_8x8x1, 0x140, 1 ) GFXDECODE_END -WRITE_LINE_MEMBER(fastfred_state::vblank_irq) +void fastfred_state::vblank_irq(int state) { if (state && m_nmi_mask) m_maincpu->set_input_line(INPUT_LINE_NMI, ASSERT_LINE); diff --git a/src/mame/galaxian/fastfred.h b/src/mame/galaxian/fastfred.h index 3b1c075ae1f..b0408878270 100644 --- a/src/mame/galaxian/fastfred.h +++ b/src/mame/galaxian/fastfred.h @@ -68,29 +68,29 @@ private: uint8_t flyboy_custom2_io_r(offs_t offset); uint8_t jumpcoas_custom_io_r(offs_t offset); uint8_t boggy84_custom_io_r(offs_t offset); - DECLARE_WRITE_LINE_MEMBER(imago_dma_irq_w); + void imago_dma_irq_w(int state); void imago_sprites_bank_w(uint8_t data); void imago_sprites_dma_w(offs_t offset, uint8_t data); uint8_t imago_sprites_offset_r(offs_t offset); - DECLARE_WRITE_LINE_MEMBER(nmi_mask_w); + void nmi_mask_w(int state); void sound_nmi_mask_w(uint8_t data); void fastfred_videoram_w(offs_t offset, uint8_t data); void fastfred_attributes_w(offs_t offset, uint8_t data); - DECLARE_WRITE_LINE_MEMBER(charbank1_w); - DECLARE_WRITE_LINE_MEMBER(charbank2_w); - DECLARE_WRITE_LINE_MEMBER(colorbank1_w); - DECLARE_WRITE_LINE_MEMBER(colorbank2_w); - DECLARE_WRITE_LINE_MEMBER(flip_screen_x_w); - DECLARE_WRITE_LINE_MEMBER(flip_screen_y_w); + void charbank1_w(int state); + void charbank2_w(int state); + void colorbank1_w(int state); + void colorbank2_w(int state); + void flip_screen_x_w(int state); + void flip_screen_y_w(int state); void imago_fg_videoram_w(offs_t offset, uint8_t data); - DECLARE_WRITE_LINE_MEMBER(imago_charbank_w); + void imago_charbank_w(int state); TILE_GET_INFO_MEMBER(get_tile_info); TILE_GET_INFO_MEMBER(imago_get_tile_info_bg); TILE_GET_INFO_MEMBER(imago_get_tile_info_fg); TILE_GET_INFO_MEMBER(imago_get_tile_info_web); - DECLARE_WRITE_LINE_MEMBER(vblank_irq); + void vblank_irq(int state); INTERRUPT_GEN_MEMBER(sound_timer_irq); virtual void machine_start() override; diff --git a/src/mame/galaxian/fastfred_v.cpp b/src/mame/galaxian/fastfred_v.cpp index bd757ba207e..75a2e8301f2 100644 --- a/src/mame/galaxian/fastfred_v.cpp +++ b/src/mame/galaxian/fastfred_v.cpp @@ -140,7 +140,7 @@ void fastfred_state::fastfred_attributes_w(offs_t offset, uint8_t data) } -WRITE_LINE_MEMBER(fastfred_state::charbank1_w) +void fastfred_state::charbank1_w(int state) { uint16_t new_data = (m_charbank & 0x0200) | (state << 8); @@ -152,7 +152,7 @@ WRITE_LINE_MEMBER(fastfred_state::charbank1_w) } } -WRITE_LINE_MEMBER(fastfred_state::charbank2_w) +void fastfred_state::charbank2_w(int state) { uint16_t new_data = (m_charbank & 0x0100) | (state << 9); @@ -165,7 +165,7 @@ WRITE_LINE_MEMBER(fastfred_state::charbank2_w) } -WRITE_LINE_MEMBER(fastfred_state::colorbank1_w) +void fastfred_state::colorbank1_w(int state) { uint8_t new_data = (m_colorbank & 0x10) | (state << 3); @@ -177,7 +177,7 @@ WRITE_LINE_MEMBER(fastfred_state::colorbank1_w) } } -WRITE_LINE_MEMBER(fastfred_state::colorbank2_w) +void fastfred_state::colorbank2_w(int state) { uint8_t new_data = (m_colorbank & 0x08) | (state << 4); @@ -191,14 +191,14 @@ WRITE_LINE_MEMBER(fastfred_state::colorbank2_w) -WRITE_LINE_MEMBER(fastfred_state::flip_screen_x_w) +void fastfred_state::flip_screen_x_w(int state) { flip_screen_x_set(state); m_bg_tilemap->set_flip((flip_screen_x() ? TILEMAP_FLIPX : 0) | (flip_screen_y() ? TILEMAP_FLIPY : 0)); } -WRITE_LINE_MEMBER(fastfred_state::flip_screen_y_w) +void fastfred_state::flip_screen_y_w(int state) { flip_screen_y_set(state); @@ -314,7 +314,7 @@ void fastfred_state::imago_fg_videoram_w(offs_t offset, uint8_t data) m_fg_tilemap->mark_tile_dirty(offset); } -WRITE_LINE_MEMBER(fastfred_state::imago_charbank_w) +void fastfred_state::imago_charbank_w(int state) { if (m_charbank != state) { diff --git a/src/mame/galaxian/galaxian.cpp b/src/mame/galaxian/galaxian.cpp index 6edbca312b2..3dcdc7bea98 100644 --- a/src/mame/galaxian/galaxian.cpp +++ b/src/mame/galaxian/galaxian.cpp @@ -758,7 +758,7 @@ TODO: * *************************************/ -WRITE_LINE_MEMBER(galaxian_state::vblank_interrupt_w) +void galaxian_state::vblank_interrupt_w(int state) { // interrupt line is clocked at VBLANK // a flip-flop at 6F is held in the preset state based on the NMI ON signal @@ -1014,7 +1014,7 @@ uint8_t galaxian_state::theend_protection_r() } template -READ_LINE_MEMBER(galaxian_state::theend_protection_alt_r) +int galaxian_state::theend_protection_alt_r() { /* Handled by a custom IC. Holds two bits derived from the upper bit of @@ -1398,7 +1398,7 @@ void zigzagb_state::ay8910_w(offs_t offset, uint8_t data) *************************************/ template -READ_LINE_MEMBER(galaxian_state::azurian_port_r) +int galaxian_state::azurian_port_r() { return (ioport("FAKE")->read() >> N) & 1; } @@ -1423,14 +1423,14 @@ void kingball_state::machine_start() } -READ_LINE_MEMBER(kingball_state::muxbit_r) +int kingball_state::muxbit_r() { // multiplex the service mode switch with a speech DIP switch return BIT(m_mux_port->read(), m_speech_dip); } -READ_LINE_MEMBER(kingball_state::noise_r) +int kingball_state::noise_r() { /* bit 5 is the NOISE line from the sound circuit. The code just verifies that it's working, doesn't actually use return value, so we can just use @@ -6404,7 +6404,7 @@ INPUT_PORTS_END // ckongs coinage DIPs are spread across two input ports template -READ_LINE_MEMBER(galaxian_state::ckongs_coinage_r) +int galaxian_state::ckongs_coinage_r() { return (m_ckong_coinage->read() & Mask) ? 1 : 0; } diff --git a/src/mame/galaxian/galaxian.h b/src/mame/galaxian/galaxian.h index e5a25217adb..b85b685fdc3 100644 --- a/src/mame/galaxian/galaxian.h +++ b/src/mame/galaxian/galaxian.h @@ -107,7 +107,7 @@ public: void scramble_background_green_w(uint8_t data); void scramble_background_blue_w(uint8_t data); void galaxian_gfxbank_w(offs_t offset, uint8_t data); - template DECLARE_READ_LINE_MEMBER(azurian_port_r); + template int azurian_port_r(); void irq_enable_w(uint8_t data); void start_lamp_w(offs_t offset, uint8_t data); void coin_lock_w(uint8_t data); @@ -120,7 +120,7 @@ public: void theend_ppi8255_w(offs_t offset, uint8_t data); void theend_protection_w(uint8_t data); uint8_t theend_protection_r(); - template DECLARE_READ_LINE_MEMBER(theend_protection_alt_r); + template int theend_protection_alt_r(); void explorer_sound_control_w(uint8_t data); uint8_t frogger_ppi8255_r(offs_t offset); void frogger_ppi8255_w(offs_t offset, uint8_t data); @@ -203,7 +203,7 @@ public: void galaxian_palette(palette_device &palette); void eagle_palette(palette_device &palette); uint32_t screen_update_galaxian(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(vblank_interrupt_w); + void vblank_interrupt_w(int state); TIMER_DEVICE_CALLBACK_MEMBER(checkmaj_irq0_gen); TIMER_DEVICE_CALLBACK_MEMBER(scramble_stars_blink_timer); TIMER_DEVICE_CALLBACK_MEMBER(timefgtr_scanline); @@ -320,7 +320,7 @@ public: void bigkonggx(machine_config &config); template CUSTOM_INPUT_MEMBER(ckongg_coinage_r); - template DECLARE_READ_LINE_MEMBER(ckongs_coinage_r); + template int ckongs_coinage_r(); protected: // machine configuration helpers @@ -593,8 +593,8 @@ public: { } - DECLARE_READ_LINE_MEMBER(muxbit_r); - DECLARE_READ_LINE_MEMBER(noise_r); + int muxbit_r(); + int noise_r(); void kingball(machine_config &config); diff --git a/src/mame/galaxian/galaxold.cpp b/src/mame/galaxian/galaxold.cpp index caad315e73d..451f2549199 100644 --- a/src/mame/galaxian/galaxold.cpp +++ b/src/mame/galaxian/galaxold.cpp @@ -594,7 +594,7 @@ void galaxold_state::bullsdrtg_data_map(address_map &map) // Lives Dips are spread across two input ports template -READ_LINE_MEMBER(galaxold_state::vpool_lives_r) +int galaxold_state::vpool_lives_r() { switch (Mask) { @@ -933,7 +933,7 @@ static INPUT_PORTS_START( scrambleo ) INPUT_PORTS_END template -READ_LINE_MEMBER(galaxold_state::_4in1_fake_port_r) +int galaxold_state::_4in1_fake_port_r() { static const char *const portnames[] = { "FAKE1", "FAKE2", "FAKE3", "FAKE4" }; diff --git a/src/mame/galaxian/galaxold.h b/src/mame/galaxian/galaxold.h index 2051f3e9404..3eb94fff5ff 100644 --- a/src/mame/galaxian/galaxold.h +++ b/src/mame/galaxian/galaxold.h @@ -144,11 +144,11 @@ public: void galaxold_gfxbank_w(offs_t offset, uint8_t data); void dambustr_bg_split_line_w(uint8_t data); void dambustr_bg_color_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(galaxold_7474_9m_2_q_callback); - DECLARE_WRITE_LINE_MEMBER(galaxold_7474_9m_1_callback); + void galaxold_7474_9m_2_q_callback(int state); + void galaxold_7474_9m_1_callback(int state); uint8_t rescueb_a002_r() { return 0xfc; } - template DECLARE_READ_LINE_MEMBER(_4in1_fake_port_r); - template DECLARE_READ_LINE_MEMBER(vpool_lives_r); + template int _4in1_fake_port_r(); + template int vpool_lives_r(); template DECLARE_CUSTOM_INPUT_MEMBER(dkongjrm_coinage_r); void init_bullsdrtg(); diff --git a/src/mame/galaxian/galaxold_m.cpp b/src/mame/galaxian/galaxold_m.cpp index 4c8421b8e5c..e18f0241ede 100644 --- a/src/mame/galaxian/galaxold_m.cpp +++ b/src/mame/galaxian/galaxold_m.cpp @@ -20,14 +20,14 @@ uint8_t galaxold_state::hunchbkg_intack() } /* FIXME: remove trampoline */ -WRITE_LINE_MEMBER(galaxold_state::galaxold_7474_9m_2_q_callback) +void galaxold_state::galaxold_7474_9m_2_q_callback(int state) { /* Q bar clocks the other flip-flop, Q is VBLANK (not visible to the CPU) */ m_7474_9m_1->clock_w(state); } -WRITE_LINE_MEMBER(galaxold_state::galaxold_7474_9m_1_callback) +void galaxold_state::galaxold_7474_9m_1_callback(int state) { /* Q goes to the NMI line */ m_maincpu->set_input_line(m_irq_line, state ? CLEAR_LINE : ASSERT_LINE); diff --git a/src/mame/galaxian/scobra.cpp b/src/mame/galaxian/scobra.cpp index 20eec3a2ae8..c9e9e5a6b70 100644 --- a/src/mame/galaxian/scobra.cpp +++ b/src/mame/galaxian/scobra.cpp @@ -69,7 +69,7 @@ public: void hustlerb(machine_config &config); void rescuefe(machine_config &config); - template DECLARE_READ_LINE_MEMBER(stratgyx_coinage_r); + template int stratgyx_coinage_r(); private: uint8_t scobra_soundram_r(offs_t offset); @@ -405,7 +405,7 @@ void scobra_state::hustlerb_sound_io_map(address_map &map) /* stratgyx coinage DIPs are spread across two input ports */ template -READ_LINE_MEMBER(scobra_state::stratgyx_coinage_r) +int scobra_state::stratgyx_coinage_r() { return (ioport("IN4")->read() & Mask) ? 1 : 0; } diff --git a/src/mame/galaxian/scramble.h b/src/mame/galaxian/scramble.h index 2f3306a6c83..7bff8cdc56d 100644 --- a/src/mame/galaxian/scramble.h +++ b/src/mame/galaxian/scramble.h @@ -87,7 +87,7 @@ public: void init_billiard(); DECLARE_MACHINE_RESET(scramble); DECLARE_MACHINE_RESET(explorer); - DECLARE_WRITE_LINE_MEMBER(scramble_sh_7474_q_callback); + void scramble_sh_7474_q_callback(int state); uint8_t mariner_protection_1_r(); uint8_t mariner_protection_2_r(); uint8_t triplep_pip_r(); diff --git a/src/mame/galaxian/scramble_a.cpp b/src/mame/galaxian/scramble_a.cpp index 35b11032d2e..cafa8adc1b5 100644 --- a/src/mame/galaxian/scramble_a.cpp +++ b/src/mame/galaxian/scramble_a.cpp @@ -106,7 +106,7 @@ IRQ_CALLBACK_MEMBER(scramble_state::scramble_sh_irq_callback) return 0xff; } -WRITE_LINE_MEMBER(scramble_state::scramble_sh_7474_q_callback) +void scramble_state::scramble_sh_7474_q_callback(int state) { /* the Q bar is connected to the Z80's INT line. But since INT is complemented, */ /* we need to complement Q bar */ diff --git a/src/mame/gameplan/gameplan.cpp b/src/mame/gameplan/gameplan.cpp index d339842f5e6..54a26df8fc7 100644 --- a/src/mame/gameplan/gameplan.cpp +++ b/src/mame/gameplan/gameplan.cpp @@ -111,7 +111,7 @@ uint8_t gameplan_state::io_port_r() } -WRITE_LINE_MEMBER(gameplan_state::coin_w) +void gameplan_state::coin_w(int state) { machine().bookkeeping().coin_counter_w(0, ~state & 1); } @@ -124,7 +124,7 @@ WRITE_LINE_MEMBER(gameplan_state::coin_w) * *************************************/ -WRITE_LINE_MEMBER(gameplan_state::audio_reset_w) +void gameplan_state::audio_reset_w(int state) { m_audiocpu->set_input_line(INPUT_LINE_RESET, state ? CLEAR_LINE : ASSERT_LINE); @@ -142,7 +142,7 @@ void gameplan_state::audio_cmd_w(uint8_t data) } -WRITE_LINE_MEMBER(gameplan_state::audio_trigger_w) +void gameplan_state::audio_trigger_w(int state) { m_riot->porta_in_set(state << 7, 0x80); } @@ -155,7 +155,7 @@ WRITE_LINE_MEMBER(gameplan_state::audio_trigger_w) * *************************************/ -WRITE_LINE_MEMBER(gameplan_state::r6532_irq) +void gameplan_state::r6532_irq(int state) { m_audiocpu->set_input_line(0, state); if (state == ASSERT_LINE) diff --git a/src/mame/gameplan/gameplan.h b/src/mame/gameplan/gameplan.h index 3e8ff26ab9e..357de4b3d35 100644 --- a/src/mame/gameplan/gameplan.h +++ b/src/mame/gameplan/gameplan.h @@ -58,7 +58,7 @@ protected: void video_data_w(uint8_t data); void gameplan_video_command_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(video_command_trigger_w); + void video_command_trigger_w(int state); uint32_t screen_update_gameplan(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); private: @@ -82,11 +82,11 @@ private: void io_select_w(uint8_t data); uint8_t io_port_r(); - DECLARE_WRITE_LINE_MEMBER(coin_w); - DECLARE_WRITE_LINE_MEMBER(audio_reset_w); + void coin_w(int state); + void audio_reset_w(int state); void audio_cmd_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(audio_trigger_w); - DECLARE_WRITE_LINE_MEMBER(r6532_irq); + void audio_trigger_w(int state); + void r6532_irq(int state); uint32_t screen_update_leprechn(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); TIMER_CALLBACK_MEMBER(clear_screen_done_callback); @@ -119,8 +119,8 @@ private: required_region_ptr m_questions_region; uint8_t question_r(offs_t offset); - DECLARE_WRITE_LINE_MEMBER(coin_w); - DECLARE_WRITE_LINE_MEMBER(misc_w); + void coin_w(int state); + void misc_w(int state); void cpu_map(address_map &map); }; diff --git a/src/mame/gameplan/gameplan_v.cpp b/src/mame/gameplan/gameplan_v.cpp index 6621e504a1d..544d5e11f4a 100644 --- a/src/mame/gameplan/gameplan_v.cpp +++ b/src/mame/gameplan/gameplan_v.cpp @@ -144,7 +144,7 @@ TIMER_CALLBACK_MEMBER(gameplan_state::clear_screen_done_callback) } -WRITE_LINE_MEMBER(gameplan_state::video_command_trigger_w) +void gameplan_state::video_command_trigger_w(int state) { if (state == 0) { diff --git a/src/mame/gameplan/toratora.cpp b/src/mame/gameplan/toratora.cpp index 3932871c1d1..086cbe0ef38 100644 --- a/src/mame/gameplan/toratora.cpp +++ b/src/mame/gameplan/toratora.cpp @@ -85,15 +85,15 @@ private: void clear_tv_w(uint8_t data); uint8_t timer_r(); void clear_timer_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(cb2_u2_w); + void cb2_u2_w(int state); void port_b_u1_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(main_cpu_irq); + void main_cpu_irq(int state); void sn1_port_a_u3_w(uint8_t data); void sn1_port_b_u3_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(sn1_ca2_u3_w); + void sn1_ca2_u3_w(int state); void sn2_port_a_u2_w(uint8_t data); void sn2_port_b_u2_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(sn2_ca2_u2_w); + void sn2_ca2_u2_w(int state); virtual void machine_start() override; virtual void machine_reset() override; uint32_t screen_update_toratora(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); @@ -109,7 +109,7 @@ private: * *************************************/ -WRITE_LINE_MEMBER(toratora_state::cb2_u2_w) +void toratora_state::cb2_u2_w(int state) { logerror("DIP tristate %sactive\n",(state & 1) ? "in" : ""); } @@ -176,7 +176,7 @@ void toratora_state::port_b_u1_w(uint8_t data) * *************************************/ -WRITE_LINE_MEMBER(toratora_state::main_cpu_irq) +void toratora_state::main_cpu_irq(int state) { int combined_state = m_pia_u1->irq_a_state() | m_pia_u1->irq_b_state(); @@ -262,7 +262,7 @@ void toratora_state::sn1_port_b_u3_w(uint8_t data) } -WRITE_LINE_MEMBER(toratora_state::sn1_ca2_u3_w) +void toratora_state::sn1_ca2_u3_w(int state) { m_sn1->vco_w(state); } @@ -301,7 +301,7 @@ void toratora_state::sn2_port_b_u2_w(uint8_t data) } -WRITE_LINE_MEMBER(toratora_state::sn2_ca2_u2_w) +void toratora_state::sn2_ca2_u2_w(int state) { m_sn2->vco_w(state); } diff --git a/src/mame/gameplan/trvquest.cpp b/src/mame/gameplan/trvquest.cpp index 446a420ef27..9644c1016ee 100644 --- a/src/mame/gameplan/trvquest.cpp +++ b/src/mame/gameplan/trvquest.cpp @@ -52,12 +52,12 @@ uint8_t trvquest_state::question_r(offs_t offset) return m_questions_region[*m_question * 0x2000 + offset]; } -WRITE_LINE_MEMBER(trvquest_state::coin_w) +void trvquest_state::coin_w(int state) { machine().bookkeeping().coin_counter_w(0, ~state & 1); } -WRITE_LINE_MEMBER(trvquest_state::misc_w) +void trvquest_state::misc_w(int state) { // data & 1 -> led on/off ? } diff --git a/src/mame/grundy/newbrain.cpp b/src/mame/grundy/newbrain.cpp index c16fd92d0c1..95e5755457f 100644 --- a/src/mame/grundy/newbrain.cpp +++ b/src/mame/grundy/newbrain.cpp @@ -536,7 +536,7 @@ void newbrain_state::cop_d_w(uint8_t data) // k1_w - //------------------------------------------------- -WRITE_LINE_MEMBER( newbrain_state::k1_w ) +void newbrain_state::k1_w(int state) { LOGMASKED(LOG_VFD, "%s %s SO %u\n", machine().time().as_string(), machine().describe_context(), state); @@ -548,7 +548,7 @@ WRITE_LINE_MEMBER( newbrain_state::k1_w ) // k2_w - //------------------------------------------------- -WRITE_LINE_MEMBER( newbrain_state::k2_w ) +void newbrain_state::k2_w(int state) { LOGMASKED(LOG_VFD, "%s %s SK %u\n", machine().time().as_string(), machine().describe_context(), state); @@ -569,7 +569,7 @@ int newbrain_state::tpin() return (m_cassette1->input() > +0.04) || (m_cassette2->input() > +0.04); } -READ_LINE_MEMBER( newbrain_state::tdi_r ) +int newbrain_state::tdi_r() { return tpin() ^ m_cop_tdo; } diff --git a/src/mame/grundy/newbrain.h b/src/mame/grundy/newbrain.h index f0da527fe61..1fb7c2c9965 100644 --- a/src/mame/grundy/newbrain.h +++ b/src/mame/grundy/newbrain.h @@ -83,9 +83,9 @@ private: uint8_t cop_g_r(); void cop_d_w(uint8_t data); uint8_t cop_in_r(); - DECLARE_WRITE_LINE_MEMBER( k2_w ); - DECLARE_READ_LINE_MEMBER( tdi_r ); - DECLARE_WRITE_LINE_MEMBER( k1_w ); + void k2_w(int state); + int tdi_r(); + void k1_w(int state); void check_interrupt(); void clclk(); diff --git a/src/mame/handheld/monty.cpp b/src/mame/handheld/monty.cpp index 9c932ba3ca4..fd453d3108b 100644 --- a/src/mame/handheld/monty.cpp +++ b/src/mame/handheld/monty.cpp @@ -55,7 +55,7 @@ public: , m_inputs(*this, "IN.%u", 0) { } - DECLARE_WRITE_LINE_MEMBER(key_pressed); + void key_pressed(int state); void monty(machine_config &config); void mmonty(machine_config &config); @@ -79,7 +79,7 @@ private: void control_w(offs_t offset, u8 data); void lcd_w(offs_t offset, u8 data) { m_lcd[m_lcd_cs]->write(offset, data); } u8 input_r(offs_t offset); - DECLARE_WRITE_LINE_MEMBER(halt_changed) { m_halt = state; } + void halt_changed(int state) { m_halt = state; } u64 m_lcd_data[32] = { }; int m_lcd_cs = 0; @@ -138,7 +138,7 @@ u8 monty_state::input_r(offs_t offset) return ~data; } -WRITE_LINE_MEMBER(monty_state::key_pressed) +void monty_state::key_pressed(int state) { if (state && m_halt) m_maincpu->pulse_input_line(INPUT_LINE_RESET, attotime::zero); diff --git a/src/mame/handheld/rzone.cpp b/src/mame/handheld/rzone.cpp index fe252bcad85..32ad8aed948 100644 --- a/src/mame/handheld/rzone.cpp +++ b/src/mame/handheld/rzone.cpp @@ -68,11 +68,11 @@ private: int m_sclock = 0; TIMER_DEVICE_CALLBACK_MEMBER(led_off_callback) { m_led_out = m_led_pin ? 1 : 0; } - DECLARE_WRITE_LINE_MEMBER(led_w); - DECLARE_WRITE_LINE_MEMBER(audio_w); - DECLARE_WRITE_LINE_MEMBER(sctrl_w); - DECLARE_WRITE_LINE_MEMBER(sclock_w); - DECLARE_READ_LINE_MEMBER(sdata_r); + void led_w(int state); + void audio_w(int state); + void sctrl_w(int state); + void sclock_w(int state); + int sdata_r(); void t1_write_r(u8 data); void t1_write_s(u8 data); @@ -107,7 +107,7 @@ void rzone_state::machine_start() // console -WRITE_LINE_MEMBER(rzone_state::led_w) +void rzone_state::led_w(int state) { // LED: enable backlight if (state) @@ -120,13 +120,13 @@ WRITE_LINE_MEMBER(rzone_state::led_w) m_led_pin = state; } -WRITE_LINE_MEMBER(rzone_state::audio_w) +void rzone_state::audio_w(int state) { // Audio: speaker out m_speaker->level_w(state ? 1 : 0); } -WRITE_LINE_MEMBER(rzone_state::sctrl_w) +void rzone_state::sctrl_w(int state) { // SCTRL: 74165 SH/LD: reload inputs while low if (!state || !m_sctrl) @@ -135,7 +135,7 @@ WRITE_LINE_MEMBER(rzone_state::sctrl_w) m_sctrl = state; } -WRITE_LINE_MEMBER(rzone_state::sclock_w) +void rzone_state::sclock_w(int state) { // SCLOCK: 74165 CLK: shift inputs on rising edge when 74165 SH/LD is high if (m_sctrl && !m_sclock && state) @@ -144,7 +144,7 @@ WRITE_LINE_MEMBER(rzone_state::sclock_w) m_sclock = state; } -READ_LINE_MEMBER(rzone_state::sdata_r) +int rzone_state::sdata_r() { // SDATA: 74165 Q sctrl_w(m_sctrl); // reload inputs if needed diff --git a/src/mame/heathkit/et3400.cpp b/src/mame/heathkit/et3400.cpp index ba4b22dea92..50c2094ebd6 100644 --- a/src/mame/heathkit/et3400.cpp +++ b/src/mame/heathkit/et3400.cpp @@ -51,8 +51,8 @@ public: void et3400(machine_config &config); - DECLARE_WRITE_LINE_MEMBER(reset_key_w); - DECLARE_WRITE_LINE_MEMBER(segment_test_w); + void reset_key_w(int state); + void segment_test_w(int state); private: @@ -149,7 +149,7 @@ void et3400_state::mem_map(address_map &map) map(0xfc00, 0xffff).rom().region("roms", 0x1000); } -WRITE_LINE_MEMBER(et3400_state::reset_key_w) +void et3400_state::reset_key_w(int state) { // delivered through MC6875 (or 74LS241 on ET-3400A) m_maincpu->set_input_line(INPUT_LINE_RESET, state ? CLEAR_LINE : ASSERT_LINE); @@ -159,7 +159,7 @@ WRITE_LINE_MEMBER(et3400_state::reset_key_w) m_pia->reset(); } -WRITE_LINE_MEMBER(et3400_state::segment_test_w) +void et3400_state::segment_test_w(int state) { for (int d = 0; d < 6; d++) m_displatch[d]->clear_w(state); diff --git a/src/mame/heathkit/h8.cpp b/src/mame/heathkit/h8.cpp index f4eb2532c4d..cdbdad15c0a 100644 --- a/src/mame/heathkit/h8.cpp +++ b/src/mame/heathkit/h8.cpp @@ -89,7 +89,7 @@ private: void portf0_w(u8 data); void portf1_w(u8 data); void h8_status_callback(u8 data); - DECLARE_WRITE_LINE_MEMBER(h8_inte_callback); + void h8_inte_callback(int state); TIMER_DEVICE_CALLBACK_MEMBER(h8_irq_pulse); TIMER_DEVICE_CALLBACK_MEMBER(kansas_r); TIMER_DEVICE_CALLBACK_MEMBER(kansas_w); @@ -282,7 +282,7 @@ void h8_state::machine_start() save_item(NAME(m_cassold)); } -WRITE_LINE_MEMBER( h8_state::h8_inte_callback ) +void h8_state::h8_inte_callback(int state) { // operate the ION LED m_ion_led = !state; diff --git a/src/mame/heathkit/tlb.cpp b/src/mame/heathkit/tlb.cpp index cc12456e949..ee13efb3e8c 100644 --- a/src/mame/heathkit/tlb.cpp +++ b/src/mame/heathkit/tlb.cpp @@ -240,17 +240,17 @@ uint8_t heath_tlb_device::kbd_flags_r() return rv; } -READ_LINE_MEMBER(heath_tlb_device::mm5740_shift_r) +int heath_tlb_device::mm5740_shift_r() { return ((m_kbspecial->read() ^ 0x120) & 0x120) ? ASSERT_LINE : CLEAR_LINE; } -READ_LINE_MEMBER(heath_tlb_device::mm5740_control_r) +int heath_tlb_device::mm5740_control_r() { return ((m_kbspecial->read() ^ 0x10) & 0x10) ? ASSERT_LINE: CLEAR_LINE; } -WRITE_LINE_MEMBER(heath_tlb_device::mm5740_data_ready_w) +void heath_tlb_device::mm5740_data_ready_w(int state) { if (state == ASSERT_LINE) { @@ -694,7 +694,7 @@ void heath_tlb_device::serial_out_b(uint8_t data) m_write_sd(data); } -WRITE_LINE_MEMBER(heath_tlb_device::cb1_w) +void heath_tlb_device::cb1_w(int state) { m_ace->rx_w(state); } diff --git a/src/mame/heathkit/tlb.h b/src/mame/heathkit/tlb.h index 56c7959a0ad..7ebe322b3b9 100644 --- a/src/mame/heathkit/tlb.h +++ b/src/mame/heathkit/tlb.h @@ -28,7 +28,7 @@ public: // interface routines auto serial_data_callback() { return m_write_sd.bind(); } - DECLARE_WRITE_LINE_MEMBER(cb1_w); + void cb1_w(int state); protected: heath_tlb_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock = 0); @@ -55,9 +55,9 @@ private: void serial_out_b(uint8_t data); - DECLARE_READ_LINE_MEMBER(mm5740_shift_r); - DECLARE_READ_LINE_MEMBER(mm5740_control_r); - DECLARE_WRITE_LINE_MEMBER(mm5740_data_ready_w); + int mm5740_shift_r(); + int mm5740_control_r(); + void mm5740_data_ready_w(int state); MC6845_UPDATE_ROW(crtc_update_row); diff --git a/src/mame/hec2hrp/hec2hrp.h b/src/mame/hec2hrp/hec2hrp.h index bed1490b2bc..7a5c44e4569 100644 --- a/src/mame/hec2hrp/hec2hrp.h +++ b/src/mame/hec2hrp/hec2hrp.h @@ -170,8 +170,8 @@ private: uint32_t screen_update_hec2hrp(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); TIMER_CALLBACK_MEMBER(cassette_clock); - DECLARE_WRITE_LINE_MEMBER( disc2_fdc_interrupt ); - DECLARE_WRITE_LINE_MEMBER( disc2_fdc_dma_irq ); + void disc2_fdc_interrupt(int state); + void disc2_fdc_dma_irq(int state); void update_state(int Adresse, int Value ); void init_sn76477(); diff --git a/src/mame/hec2hrp/hec2hrp_m.cpp b/src/mame/hec2hrp/hec2hrp_m.cpp index fc7554a8bd3..b5c35adeab0 100644 --- a/src/mame/hec2hrp/hec2hrp_m.cpp +++ b/src/mame/hec2hrp/hec2hrp_m.cpp @@ -876,14 +876,14 @@ void hec2hrp_state::hector_audio(machine_config &config) // Interrupt management /* upd765 INT is connected to Z80 interrupt, with RNMI hardware authorization */ -WRITE_LINE_MEMBER( hec2hrp_state::disc2_fdc_interrupt ) +void hec2hrp_state::disc2_fdc_interrupt(int state) { m_irq_current_state = state; m_disc2cpu->set_input_line(INPUT_LINE_IRQ0, state && m_hector_disc2_rnmi ? ASSERT_LINE : CLEAR_LINE); } /* upd765 DRQ is connected to Z80 NMI, with RNMI hardware authorization */ -WRITE_LINE_MEMBER( hec2hrp_state::disc2_fdc_dma_irq ) +void hec2hrp_state::disc2_fdc_dma_irq(int state) { m_nmi_current_state = state; m_disc2cpu->set_input_line(INPUT_LINE_NMI, state && m_hector_disc2_rnmi ? ASSERT_LINE : CLEAR_LINE); diff --git a/src/mame/hegenerglaser/brikett.cpp b/src/mame/hegenerglaser/brikett.cpp index f25fca06615..131152731b0 100644 --- a/src/mame/hegenerglaser/brikett.cpp +++ b/src/mame/hegenerglaser/brikett.cpp @@ -147,12 +147,12 @@ private: // I/O handlers INTERRUPT_GEN_MEMBER(interrupt); - DECLARE_READ_LINE_MEMBER(clear_r); + int clear_r(); u8 input_r(offs_t offset); u8 sound_r(); void esb_w(u8 data); - DECLARE_READ_LINE_MEMBER(esb_r); + int esb_r(); TIMER_DEVICE_CALLBACK_MEMBER(speaker_off) { m_dac->write(0); } @@ -202,7 +202,7 @@ INTERRUPT_GEN_MEMBER(brikett_state::interrupt) m_maincpu->set_input_line(COSMAC_INPUT_LINE_INT, HOLD_LINE); } -READ_LINE_MEMBER(brikett_state::clear_r) +int brikett_state::clear_r() { // CLEAR low + WAIT high resets cpu int ret = (m_reset) ? 0 : 1; @@ -265,7 +265,7 @@ void brikett_state::esb_w(u8 data) m_led_pwm->matrix(~m_esb_row, m_esb_led); } -READ_LINE_MEMBER(brikett_state::esb_r) +int brikett_state::esb_r() { // EF1: read chessboard sensor if (m_board && m_inputs[5].read_safe(0)) diff --git a/src/mame/hegenerglaser/mm1.cpp b/src/mame/hegenerglaser/mm1.cpp index 056799280c8..409192d9774 100644 --- a/src/mame/hegenerglaser/mm1.cpp +++ b/src/mame/hegenerglaser/mm1.cpp @@ -91,11 +91,11 @@ private: // I/O handlers void update_display(); - DECLARE_READ_LINE_MEMBER(clear_r); + int clear_r(); void sound_w(u8 data); void unknown_w(u8 data); void keypad_w(u8 data); - template DECLARE_READ_LINE_MEMBER(keypad_r); + template int keypad_r(); bool m_reset = false; u8 m_kp_mux = 0; @@ -119,7 +119,7 @@ void mm1_state::machine_reset() I/O *******************************************************************************/ -READ_LINE_MEMBER(mm1_state::clear_r) +int mm1_state::clear_r() { // CLEAR low + WAIT high resets cpu int ret = (m_reset) ? 0 : 1; @@ -145,7 +145,7 @@ void mm1_state::keypad_w(u8 data) } template -READ_LINE_MEMBER(mm1_state::keypad_r) +int mm1_state::keypad_r() { // EF3,EF4: multiplexed inputs (keypad) return (m_inputs[N]->read() & m_kp_mux) ? 1 : 0; diff --git a/src/mame/hitachi/bml3.cpp b/src/mame/hitachi/bml3.cpp index 537bddf9bc6..3a709ba4885 100644 --- a/src/mame/hitachi/bml3.cpp +++ b/src/mame/hitachi/bml3.cpp @@ -125,8 +125,8 @@ private: void firq_mask_w(u8 data); uint8_t firq_status_r(); void relay_w(u8 data); - DECLARE_WRITE_LINE_MEMBER(acia_rts_w); - DECLARE_WRITE_LINE_MEMBER(acia_irq_w); + void acia_rts_w(int state); + void acia_irq_w(int state); MC6845_UPDATE_ROW(crtc_update_row); @@ -873,12 +873,12 @@ void bml3_state::piaA_w(uint8_t data) m_bankg.disable(); } -WRITE_LINE_MEMBER( bml3_state::acia_rts_w ) +void bml3_state::acia_rts_w(int state) { logerror("%02x TAPE RTS\n",state); } -WRITE_LINE_MEMBER( bml3_state::acia_irq_w ) +void bml3_state::acia_irq_w(int state) { logerror("%02x TAPE IRQ\n",state); } diff --git a/src/mame/homebrew/phunsy.cpp b/src/mame/homebrew/phunsy.cpp index 1807fd30344..9b36d1dda9f 100644 --- a/src/mame/homebrew/phunsy.cpp +++ b/src/mame/homebrew/phunsy.cpp @@ -66,8 +66,8 @@ private: void phunsy_ctrl_w(uint8_t data); void phunsy_data_w(uint8_t data); void kbd_put(u8 data); - DECLARE_READ_LINE_MEMBER(cass_r); - DECLARE_WRITE_LINE_MEMBER(cass_w); + int cass_r(); + void cass_w(int state); DECLARE_QUICKLOAD_LOAD_MEMBER(quickload_cb); void phunsy_palette(palette_device &palette) const; uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); @@ -87,12 +87,12 @@ private: }; -WRITE_LINE_MEMBER( phunsy_state::cass_w ) +void phunsy_state::cass_w(int state) { m_cass->output(state ? -1.0 : +1.0); } -READ_LINE_MEMBER(phunsy_state::cass_r) +int phunsy_state::cass_r() { return (m_cass->input() > 0.03) ? 0 : 1; } diff --git a/src/mame/homebrew/ravens.cpp b/src/mame/homebrew/ravens.cpp index f539d267122..cb8bf2baf3f 100644 --- a/src/mame/homebrew/ravens.cpp +++ b/src/mame/homebrew/ravens.cpp @@ -92,8 +92,8 @@ public: { } protected: - DECLARE_READ_LINE_MEMBER(cass_r); - DECLARE_WRITE_LINE_MEMBER(cass_w); + int cass_r(); + void cass_w(int state); DECLARE_QUICKLOAD_LOAD_MEMBER(quickload_cb); void mem_map(address_map &map); required_device m_maincpu; @@ -151,12 +151,12 @@ private: required_device m_terminal; }; -WRITE_LINE_MEMBER( ravens_base::cass_w ) +void ravens_base::cass_w(int state) { m_cass->output(state ? -1.0 : +1.0); } -READ_LINE_MEMBER( ravens_base::cass_r ) +int ravens_base::cass_r() { return (m_cass->input() > 0.03) ? 1 : 0; } diff --git a/src/mame/homebrew/sitcom.cpp b/src/mame/homebrew/sitcom.cpp index c1b6d1608d0..4fa8f46540c 100644 --- a/src/mame/homebrew/sitcom.cpp +++ b/src/mame/homebrew/sitcom.cpp @@ -78,8 +78,8 @@ protected: void sitcom_io(address_map &map); template void update_ds(offs_t offset, uint16_t data) { m_digits[(D << 2) | offset] = data; } - DECLARE_WRITE_LINE_MEMBER(update_rxd) { m_rxd = bool(state); } - DECLARE_READ_LINE_MEMBER(sid_line) { return m_rxd ? 1 : 0; } + void update_rxd(int state) { m_rxd = bool(state); } + int sid_line() { return m_rxd ? 1 : 0; } static void sitcom_null_modem(device_t *device) { @@ -113,7 +113,7 @@ public: { } - DECLARE_READ_LINE_MEMBER(shutter_r); + int shutter_r(); DECLARE_INPUT_CHANGED_MEMBER(update_shutter); DECLARE_INPUT_CHANGED_MEMBER(update_speed); @@ -263,7 +263,7 @@ void sitcom_timer_state::update_ppi_pb(uint8_t data) m_test_led = BIT(data, 5); } -READ_LINE_MEMBER( sitcom_timer_state::shutter_r ) +int sitcom_timer_state::shutter_r() { return m_shutter ? 0 : 1; } diff --git a/src/mame/homelab/homelab.cpp b/src/mame/homelab/homelab.cpp index 895dcfff412..b56a9db1d08 100644 --- a/src/mame/homelab/homelab.cpp +++ b/src/mame/homelab/homelab.cpp @@ -106,7 +106,7 @@ public: void homelab3(machine_config &config); void brailab4(machine_config &config); - DECLARE_READ_LINE_MEMBER(cass3_r); + int cass3_r(); protected: virtual void machine_start() override; @@ -184,7 +184,7 @@ void homelab3_state::portff_w(u8 data) m_bank1->set_entry(0); } -READ_LINE_MEMBER( homelab3_state::cass3_r ) +int homelab3_state::cass3_r() { return (m_cass->input() > 0.03); } diff --git a/src/mame/hp/hp16500.cpp b/src/mame/hp/hp16500.cpp index ac4191f33a6..28089a7b86f 100644 --- a/src/mame/hp/hp16500.cpp +++ b/src/mame/hp/hp16500.cpp @@ -103,8 +103,8 @@ private: void pal_b_w(uint8_t data); void maskval_w(uint16_t data); - DECLARE_WRITE_LINE_MEMBER(irq_2); - DECLARE_WRITE_LINE_MEMBER(vsync_changed); + void irq_2(int state); + void vsync_changed(int state); MC6845_UPDATE_ROW(crtc_update_row); MC6845_UPDATE_ROW(crtc_update_row_1650); @@ -137,7 +137,7 @@ void hp16500_state::vbl_ack16_w(uint16_t data) m_maincpu->set_input_line(M68K_IRQ_1, CLEAR_LINE); } -WRITE_LINE_MEMBER( hp16500_state::vsync_changed ) +void hp16500_state::vsync_changed(int state) { if (state) { @@ -219,7 +219,7 @@ void hp16500_state::maskval_w(uint16_t data) m_mask = (data & 0xff) ^ 0xff; } -WRITE_LINE_MEMBER(hp16500_state::irq_2) +void hp16500_state::irq_2(int state) { m_maincpu->set_input_line(M68K_IRQ_2, state); } diff --git a/src/mame/hp/hp2620.cpp b/src/mame/hp/hp2620.cpp index 853994f3f93..8593383f96e 100644 --- a/src/mame/hp/hp2620.cpp +++ b/src/mame/hp/hp2620.cpp @@ -54,8 +54,8 @@ private: u32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(nlrc_w); - DECLARE_WRITE_LINE_MEMBER(bell_w); + void nlrc_w(int state); + void bell_w(int state); void io_map(address_map &map); void mem_map(address_map &map); @@ -139,7 +139,7 @@ void hp2620_state::ennmi_w(offs_t offset, u8 data) m_nmigate->in_w<0>(BIT(offset, 0)); } -WRITE_LINE_MEMBER(hp2620_state::nlrc_w) +void hp2620_state::nlrc_w(int state) { // clock input for LS175 at U59 if (state) @@ -148,7 +148,7 @@ WRITE_LINE_MEMBER(hp2620_state::nlrc_w) // TODO: shift keyboard response into m_key_status } -WRITE_LINE_MEMBER(hp2620_state::bell_w) +void hp2620_state::bell_w(int state) { m_bell->level_w(state); } diff --git a/src/mame/hp/hp2640.cpp b/src/mame/hp/hp2640.cpp index 150921db303..edac038ae04 100644 --- a/src/mame/hp/hp2640.cpp +++ b/src/mame/hp/hp2640.cpp @@ -214,12 +214,12 @@ protected: uint8_t async_status_r(); void async_control_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(async_dav_w); - DECLARE_WRITE_LINE_MEMBER(async_txd_w); + void async_dav_w(int state); + void async_txd_w(int state); TIMER_DEVICE_CALLBACK_MEMBER(timer_beep_exp); - DECLARE_WRITE_LINE_MEMBER(tape_irq_w); + void tape_irq_w(int state); uint8_t poll_r(); @@ -566,12 +566,12 @@ void hp2640_base_state::async_control_w(uint8_t data) update_async_control(data); } -WRITE_LINE_MEMBER(hp2640_base_state::async_dav_w) +void hp2640_base_state::async_dav_w(int state) { update_async_irq(); } -WRITE_LINE_MEMBER(hp2640_base_state::async_txd_w) +void hp2640_base_state::async_txd_w(int state) { m_rs232->write_txd(!BIT(m_async_control , 6) && m_uart->so_r()); } @@ -581,7 +581,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(hp2640_base_state::timer_beep_exp) m_beep->set_state(0); } -WRITE_LINE_MEMBER(hp2640_base_state::tape_irq_w) +void hp2640_base_state::tape_irq_w(int state) { m_tape_irq = state; update_irq(); diff --git a/src/mame/hp/hp48.h b/src/mame/hp/hp48.h index a471d137082..bb234ed2b25 100644 --- a/src/mame/hp/hp48.h +++ b/src/mame/hp/hp48.h @@ -118,7 +118,7 @@ private: void reset_modules(); /* memory controller */ - DECLARE_WRITE_LINE_MEMBER(mem_reset); + void mem_reset(int state); void mem_config(uint32_t data); void mem_unconfig(uint32_t data); uint32_t mem_id(); @@ -131,7 +131,7 @@ private: void reg_out(uint32_t data); /* keyboard interrupt system */ - DECLARE_WRITE_LINE_MEMBER(rsi); + void rsi(int state); void hp48_common(machine_config &config); void hp48(address_map &map); diff --git a/src/mame/hp/hp48_m.cpp b/src/mame/hp/hp48_m.cpp index fb4f09354d2..aacd4da08ae 100644 --- a/src/mame/hp/hp48_m.cpp +++ b/src/mame/hp/hp48_m.cpp @@ -217,7 +217,7 @@ TIMER_CALLBACK_MEMBER(hp48_state::kbd_cb) } /* RSI opcode */ -WRITE_LINE_MEMBER( hp48_state::rsi ) +void hp48_state::rsi(int state) { LOG("%s %f hp48_state::rsi\n", machine().describe_context(), machine().time().as_double()); @@ -755,7 +755,7 @@ void hp48_state::reset_modules() /* RESET opcode */ -WRITE_LINE_MEMBER( hp48_state::mem_reset ) +void hp48_state::mem_reset(int state) { LOG("%s %f hp48_state::mem_reset\n", machine().describe_context(), machine().time().as_double()); reset_modules(); diff --git a/src/mame/hp/hp64k.cpp b/src/mame/hp/hp64k.cpp index f51a348b77c..afcc96e3e77 100644 --- a/src/mame/hp/hp64k.cpp +++ b/src/mame/hp/hp64k.cpp @@ -188,8 +188,8 @@ private: uint8_t hp64k_crtc_filter(uint8_t data); void hp64k_crtc_w(offs_t offset, uint16_t data); - DECLARE_WRITE_LINE_MEMBER(hp64k_crtc_drq_w); - DECLARE_WRITE_LINE_MEMBER(hp64k_crtc_vrtc_w); + void hp64k_crtc_drq_w(int state); + void hp64k_crtc_vrtc_w(int state); I8275_DRAW_CHARACTER_MEMBER(crtc_display_pixels); @@ -212,38 +212,38 @@ private: uint16_t hp64k_flp_r(offs_t offset); void hp64k_flp_w(offs_t offset, uint16_t data); - DECLARE_WRITE_LINE_MEMBER(hp64k_flp_drq_w); - DECLARE_WRITE_LINE_MEMBER(hp64k_flp_intrq_w); + void hp64k_flp_drq_w(int state); + void hp64k_flp_intrq_w(int state); void hp64k_update_floppy_dma(void); void hp64k_update_floppy_irq(void); void hp64k_update_drv_ctrl(void); - DECLARE_WRITE_LINE_MEMBER(hp64k_floppy0_rdy); - DECLARE_WRITE_LINE_MEMBER(hp64k_floppy1_rdy); + void hp64k_floppy0_rdy(int state); + void hp64k_floppy1_rdy(int state); void hp64k_floppy_idx_cb(floppy_image_device *floppy , int state); void hp64k_floppy_wpt_cb(floppy_image_device *floppy , int state); uint16_t hp64k_usart_r(offs_t offset); void hp64k_usart_w(offs_t offset, uint16_t data); - DECLARE_WRITE_LINE_MEMBER(hp64k_rxrdy_w); - DECLARE_WRITE_LINE_MEMBER(hp64k_txrdy_w); - DECLARE_WRITE_LINE_MEMBER(hp64k_txd_w); - DECLARE_WRITE_LINE_MEMBER(hp64k_dtr_w); - DECLARE_WRITE_LINE_MEMBER(hp64k_rts_w); + void hp64k_rxrdy_w(int state); + void hp64k_txrdy_w(int state); + void hp64k_txd_w(int state); + void hp64k_dtr_w(int state); + void hp64k_rts_w(int state); void hp64k_loopback_w(uint16_t data); void hp64k_update_loopback(void); - DECLARE_WRITE_LINE_MEMBER(hp64k_rs232_rxd_w); - DECLARE_WRITE_LINE_MEMBER(hp64k_rs232_dcd_w); - DECLARE_WRITE_LINE_MEMBER(hp64k_rs232_cts_w); + void hp64k_rs232_rxd_w(int state); + void hp64k_rs232_dcd_w(int state); + void hp64k_rs232_cts_w(int state); uint16_t hp64k_phi_r(offs_t offset); void hp64k_phi_w(offs_t offset, uint16_t data); - DECLARE_WRITE_LINE_MEMBER(hp64k_phi_int_w); - DECLARE_READ_LINE_MEMBER(hp64k_phi_sys_ctrl_r); + void hp64k_phi_int_w(int state); + int hp64k_phi_sys_ctrl_r(); void hp64k_beep_w(offs_t offset, uint16_t data); TIMER_DEVICE_CALLBACK_MEMBER(hp64k_beeper_off); - DECLARE_WRITE_LINE_MEMBER(hp64k_baud_clk_w); + void hp64k_baud_clk_w(int state); void cpu_io_map(address_map &map); void cpu_mem_map(address_map &map); @@ -443,7 +443,7 @@ void hp64k_state::hp64k_crtc_w(offs_t offset, uint16_t data) m_crtc->write(offset == 0 , hp64k_crtc_filter((uint8_t)data)); } -WRITE_LINE_MEMBER(hp64k_state::hp64k_crtc_drq_w) +void hp64k_state::hp64k_crtc_drq_w(int state) { bool crtc_drq = state != 0; bool prev_crtc = m_crtc_drq; @@ -461,7 +461,7 @@ WRITE_LINE_MEMBER(hp64k_state::hp64k_crtc_drq_w) } } -WRITE_LINE_MEMBER(hp64k_state::hp64k_crtc_vrtc_w) +void hp64k_state::hp64k_crtc_vrtc_w(int state) { bool vrtc = state != 0; @@ -767,13 +767,13 @@ void hp64k_state::hp64k_flp_w(offs_t offset, uint16_t data) hp64k_update_floppy_irq(); } -WRITE_LINE_MEMBER(hp64k_state::hp64k_flp_drq_w) +void hp64k_state::hp64k_flp_drq_w(int state) { m_floppy_drq = state; hp64k_update_floppy_dma(); } -WRITE_LINE_MEMBER(hp64k_state::hp64k_flp_intrq_w) +void hp64k_state::hp64k_flp_intrq_w(int state) { if (state && !m_floppy_intrq && !BIT(m_floppy_if_ctrl , 7)) { m_floppy_mdci = true; @@ -890,7 +890,7 @@ void hp64k_state::hp64k_update_drv_ctrl(void) } } -WRITE_LINE_MEMBER(hp64k_state::hp64k_floppy0_rdy) +void hp64k_state::hp64k_floppy0_rdy(int state) { if (state) { BIT_CLR(m_floppy_status , 0); @@ -899,7 +899,7 @@ WRITE_LINE_MEMBER(hp64k_state::hp64k_floppy0_rdy) } } -WRITE_LINE_MEMBER(hp64k_state::hp64k_floppy1_rdy) +void hp64k_state::hp64k_floppy1_rdy(int state) { if (state) { BIT_CLR(m_floppy_status , 3); @@ -970,7 +970,7 @@ void hp64k_state::hp64k_usart_w(offs_t offset, uint16_t data) m_uart->write(~offset & 1, data & 0xff); } -WRITE_LINE_MEMBER(hp64k_state::hp64k_rxrdy_w) +void hp64k_state::hp64k_rxrdy_w(int state) { if (state) { BIT_SET(m_irl_pending , 6); @@ -981,7 +981,7 @@ WRITE_LINE_MEMBER(hp64k_state::hp64k_rxrdy_w) hp64k_update_irl(); } -WRITE_LINE_MEMBER(hp64k_state::hp64k_txrdy_w) +void hp64k_state::hp64k_txrdy_w(int state) { if (state) { BIT_SET(m_irl_pending , 5); @@ -992,7 +992,7 @@ WRITE_LINE_MEMBER(hp64k_state::hp64k_txrdy_w) hp64k_update_irl(); } -WRITE_LINE_MEMBER(hp64k_state::hp64k_txd_w) +void hp64k_state::hp64k_txd_w(int state) { m_txd_state = state; if (m_loopback) { @@ -1001,7 +1001,7 @@ WRITE_LINE_MEMBER(hp64k_state::hp64k_txd_w) m_rs232->write_txd(state); } -WRITE_LINE_MEMBER(hp64k_state::hp64k_dtr_w) +void hp64k_state::hp64k_dtr_w(int state) { m_dtr_state = state; if (m_loopback) { @@ -1010,7 +1010,7 @@ WRITE_LINE_MEMBER(hp64k_state::hp64k_dtr_w) m_rs232->write_dtr(state); } -WRITE_LINE_MEMBER(hp64k_state::hp64k_rts_w) +void hp64k_state::hp64k_rts_w(int state) { if (BIT(m_s5_sw->read() , 0)) { // Full duplex, RTS/ = 0 @@ -1043,14 +1043,14 @@ void hp64k_state::hp64k_update_loopback(void) } } -WRITE_LINE_MEMBER(hp64k_state::hp64k_rs232_rxd_w) +void hp64k_state::hp64k_rs232_rxd_w(int state) { if (!m_loopback) { m_uart->write_rxd(state); } } -WRITE_LINE_MEMBER(hp64k_state::hp64k_rs232_dcd_w) +void hp64k_state::hp64k_rs232_dcd_w(int state) { if (!m_loopback) { m_uart->write_dsr(state); @@ -1067,14 +1067,14 @@ void hp64k_state::hp64k_phi_w(offs_t offset, uint16_t data) m_phi->reg16_w(m_phi_reg , data); } -WRITE_LINE_MEMBER(hp64k_state::hp64k_rs232_cts_w) +void hp64k_state::hp64k_rs232_cts_w(int state) { if (!m_loopback) { m_uart->write_cts(state); } } -WRITE_LINE_MEMBER(hp64k_state::hp64k_phi_int_w) +void hp64k_state::hp64k_phi_int_w(int state) { if (state) { BIT_SET(m_irl_pending , 7); @@ -1085,7 +1085,7 @@ WRITE_LINE_MEMBER(hp64k_state::hp64k_phi_int_w) hp64k_update_irl(); } -READ_LINE_MEMBER(hp64k_state::hp64k_phi_sys_ctrl_r) +int hp64k_state::hp64k_phi_sys_ctrl_r() { return BIT(m_rear_panel_sw->read() , 6); } @@ -1104,7 +1104,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(hp64k_state::hp64k_beeper_off) m_beeper->set_state(0); } -WRITE_LINE_MEMBER(hp64k_state::hp64k_baud_clk_w) +void hp64k_state::hp64k_baud_clk_w(int state) { if (!m_16x_clk) { if (state && !m_baud_clk) { diff --git a/src/mame/hp/hp80.cpp b/src/mame/hp/hp80.cpp index 916029371a0..3fa3bcaa22d 100644 --- a/src/mame/hp/hp80.cpp +++ b/src/mame/hp/hp80.cpp @@ -994,7 +994,7 @@ private: virtual void machine_reset() override; uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(vblank_w); + void vblank_w(int state); uint8_t crtc_r(offs_t offset); void crtc_w(offs_t offset, uint8_t data); @@ -1098,7 +1098,7 @@ uint32_t hp85_state::screen_update(screen_device &screen, bitmap_rgb32 &bitmap, return 0; } -WRITE_LINE_MEMBER(hp85_state::vblank_w) +void hp85_state::vblank_w(int state) { COPY_BIT(!state , m_crt_sts , CRT_STS_DISPLAY_BIT); if (state) { @@ -1642,7 +1642,7 @@ protected: private: uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(vblank_w); + void vblank_w(int state); attotime time_to_video_mem_availability() const; required_device m_screen; @@ -1697,7 +1697,7 @@ private: void emc_w(offs_t offset, uint8_t data); uint32_t& get_ptr(); void ptr12_decrement(); - DECLARE_WRITE_LINE_MEMBER(lma_cycle); + void lma_cycle(int state); void opcode_cb(uint8_t opcode); }; @@ -1809,7 +1809,7 @@ uint32_t hp86_state::screen_update(screen_device &screen, bitmap_rgb32 &bitmap, return 0; } -WRITE_LINE_MEMBER(hp86_state::vblank_w) +void hp86_state::vblank_w(int state) { COPY_BIT(state , m_crt_sts , 4); if (state) { @@ -2098,7 +2098,7 @@ void hp86_state::ptr12_decrement() } } -WRITE_LINE_MEMBER(hp86_state::lma_cycle) +void hp86_state::lma_cycle(int state) { m_lmard = state; if (m_emc_state == EMC_INDIRECT_1) { diff --git a/src/mame/hp/hp95lx.cpp b/src/mame/hp/hp95lx.cpp index 5ca17474d21..f5fcd0eb5ee 100644 --- a/src/mame/hp/hp95lx.cpp +++ b/src/mame/hp/hp95lx.cpp @@ -145,8 +145,8 @@ protected: private: void hp95lx_palette(palette_device &palette) const; - DECLARE_WRITE_LINE_MEMBER(keyboard_clock_w); - DECLARE_WRITE_LINE_MEMBER(keyboard_data_w); + void keyboard_clock_w(int state); + void keyboard_data_w(int state); uint8_t keyboard_r(offs_t offset); void keyboard_w(offs_t offset, uint8_t data); uint8_t video_r(offs_t offset); @@ -547,7 +547,7 @@ void hp95lx_state::keyboard_w(offs_t offset, uint8_t data) m_pic8259->ir1_w(CLEAR_LINE); } -WRITE_LINE_MEMBER(hp95lx_state::keyboard_clock_w) +void hp95lx_state::keyboard_clock_w(int state) { LOGKBD("kbd: KCLK: %d kbit: %d\n", state ? 1 : 0, m_kbit); @@ -579,7 +579,7 @@ WRITE_LINE_MEMBER(hp95lx_state::keyboard_clock_w) m_kclk = (state == ASSERT_LINE) ? true : false; } -WRITE_LINE_MEMBER(hp95lx_state::keyboard_data_w) +void hp95lx_state::keyboard_data_w(int state) { LOGKBD("kbd: KDATA: %d\n", state ? 1 : 0); m_kdata = (state == ASSERT_LINE) ? 0x80 : 0x00; diff --git a/src/mame/hp/hp9825_tape.cpp b/src/mame/hp/hp9825_tape.cpp index 402d6f5ef44..4d5bc458789 100644 --- a/src/mame/hp/hp9825_tape.cpp +++ b/src/mame/hp/hp9825_tape.cpp @@ -281,7 +281,7 @@ void hp9825_tape_device::tape_w(offs_t offset, uint16_t data) } } -WRITE_LINE_MEMBER(hp9825_tape_device::short_gap_w) +void hp9825_tape_device::short_gap_w(int state) { LOG_DBG("Short gap %d\n" , state); m_short_gap_out = state; @@ -295,7 +295,7 @@ WRITE_LINE_MEMBER(hp9825_tape_device::short_gap_w) } } -WRITE_LINE_MEMBER(hp9825_tape_device::long_gap_w) +void hp9825_tape_device::long_gap_w(int state) { LOG_DBG("Long gap %d\n" , state); if (m_long_gap_out && !state && !BIT(m_cmd_reg , CMD_REG_DMA_EN_BIT)) { @@ -318,7 +318,7 @@ void hp9825_tape_device::set_flg(bool state) } } -WRITE_LINE_MEMBER(hp9825_tape_device::cart_out_w) +void hp9825_tape_device::cart_out_w(int state) { LOG_DBG("cart_out_w %d\n" , state); if (state) { @@ -337,7 +337,7 @@ WRITE_LINE_MEMBER(hp9825_tape_device::cart_out_w) update_sts(); } -WRITE_LINE_MEMBER(hp9825_tape_device::hole_w) +void hp9825_tape_device::hole_w(int state) { if (state) { LOG_DBG("hole_w\n"); @@ -346,7 +346,7 @@ WRITE_LINE_MEMBER(hp9825_tape_device::hole_w) } } -WRITE_LINE_MEMBER(hp9825_tape_device::tacho_tick_w) +void hp9825_tape_device::tacho_tick_w(int state) { if (state) { LOG_DBG("tacho_tick_w\n"); @@ -356,7 +356,7 @@ WRITE_LINE_MEMBER(hp9825_tape_device::tacho_tick_w) } } -WRITE_LINE_MEMBER(hp9825_tape_device::motion_w) +void hp9825_tape_device::motion_w(int state) { if (state) { LOG_DBG("motion_w\n"); @@ -376,7 +376,7 @@ WRITE_LINE_MEMBER(hp9825_tape_device::motion_w) } } -WRITE_LINE_MEMBER(hp9825_tape_device::rd_bit_w) +void hp9825_tape_device::rd_bit_w(int state) { m_short_gap_timer->b_w(1); m_short_gap_timer->b_w(0); @@ -398,7 +398,7 @@ WRITE_LINE_MEMBER(hp9825_tape_device::rd_bit_w) } } -READ_LINE_MEMBER(hp9825_tape_device::wr_bit_r) +int hp9825_tape_device::wr_bit_r() { if (BIT(m_cmd_reg , CMD_REG_FLG_SEL_BIT)) { set_flg(true); diff --git a/src/mame/hp/hp9825_tape.h b/src/mame/hp/hp9825_tape.h index 6818f978fa5..1ea3613c581 100644 --- a/src/mame/hp/hp9825_tape.h +++ b/src/mame/hp/hp9825_tape.h @@ -32,15 +32,15 @@ public: auto led() { return m_led_handler.bind(); } auto cart_in() { return m_cart_in_handler.bind(); } - DECLARE_WRITE_LINE_MEMBER(short_gap_w); - DECLARE_WRITE_LINE_MEMBER(long_gap_w); - - DECLARE_WRITE_LINE_MEMBER(cart_out_w); - DECLARE_WRITE_LINE_MEMBER(hole_w); - DECLARE_WRITE_LINE_MEMBER(tacho_tick_w); - DECLARE_WRITE_LINE_MEMBER(motion_w); - DECLARE_WRITE_LINE_MEMBER(rd_bit_w); - DECLARE_READ_LINE_MEMBER(wr_bit_r); + void short_gap_w(int state); + void long_gap_w(int state); + + void cart_out_w(int state); + void hole_w(int state); + void tacho_tick_w(int state); + void motion_w(int state); + void rd_bit_w(int state); + int wr_bit_r(); protected: // device-level overrides diff --git a/src/mame/hp/hp9845.cpp b/src/mame/hp/hp9845.cpp index 0426cdedc41..c059dc3e00d 100644 --- a/src/mame/hp/hp9845.cpp +++ b/src/mame/hp/hp9845.cpp @@ -715,7 +715,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(hp9845_base_state::beeper_off) m_beeper->set_state(0); } -WRITE_LINE_MEMBER(hp9845_base_state::prt_irl_w) +void hp9845_base_state::prt_irl_w(int state) { m_prt_irl = state; update_kb_prt_irq(); @@ -770,7 +770,7 @@ private: TIMER_DEVICE_CALLBACK_MEMBER(scanline_timer); - DECLARE_WRITE_LINE_MEMBER(vblank_w); + void vblank_w(int state); void set_graphic_mode(bool graphic); void set_video_mar(uint16_t mar); @@ -929,7 +929,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(hp9845b_state::scanline_timer) } } -WRITE_LINE_MEMBER(hp9845b_state::vblank_w) +void hp9845b_state::vblank_w(int state) { // VBlank signal is fed into HALT flag of PPU m_ppu->halt_w(state); @@ -1295,7 +1295,7 @@ public: uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(vblank_w); + void vblank_w(int state); DECLARE_INPUT_CHANGED_MEMBER(softkey_changed); protected: @@ -1485,7 +1485,7 @@ uint32_t hp9845ct_base_state::screen_update(screen_device &screen, bitmap_rgb32 return 0; } -WRITE_LINE_MEMBER(hp9845ct_base_state::vblank_w) +void hp9845ct_base_state::vblank_w(int state) { // VBlank signal is fed into HALT flag of PPU m_ppu->halt_w(state); diff --git a/src/mame/hp/hp9845.h b/src/mame/hp/hp9845.h index 03fb0ef231c..147d1786251 100644 --- a/src/mame/hp/hp9845.h +++ b/src/mame/hp/hp9845.h @@ -42,7 +42,7 @@ protected: void kb_irq_clear_w(uint16_t data); TIMER_DEVICE_CALLBACK_MEMBER(beeper_off); - DECLARE_WRITE_LINE_MEMBER(prt_irl_w); + void prt_irl_w(int state); void hp9845_base(machine_config &config); void global_mem_map(address_map &map); diff --git a/src/mame/hp/hp9k_3xx.cpp b/src/mame/hp/hp9k_3xx.cpp index 6dc331b3ae3..42998f3103e 100644 --- a/src/mame/hp/hp9k_3xx.cpp +++ b/src/mame/hp/hp9k_3xx.cpp @@ -128,13 +128,13 @@ private: void add_dio16_bus(machine_config &mconfig); void add_dio32_bus(machine_config &mconfig); - DECLARE_WRITE_LINE_MEMBER(dio_irq1_w) { m_maincpu->set_input_line(M68K_IRQ_1, state); }; - DECLARE_WRITE_LINE_MEMBER(dio_irq2_w) { m_maincpu->set_input_line(M68K_IRQ_2, state); }; - DECLARE_WRITE_LINE_MEMBER(dio_irq3_w) { m_maincpu->set_input_line(M68K_IRQ_3, state); }; - DECLARE_WRITE_LINE_MEMBER(dio_irq4_w) { m_maincpu->set_input_line(M68K_IRQ_4, state); }; - DECLARE_WRITE_LINE_MEMBER(dio_irq5_w) { m_maincpu->set_input_line(M68K_IRQ_5, state); }; - DECLARE_WRITE_LINE_MEMBER(dio_irq6_w) { m_maincpu->set_input_line(M68K_IRQ_6, state); }; - DECLARE_WRITE_LINE_MEMBER(dio_irq7_w) { m_maincpu->set_input_line(M68K_IRQ_7, state); }; + void dio_irq1_w(int state) { m_maincpu->set_input_line(M68K_IRQ_1, state); } + void dio_irq2_w(int state) { m_maincpu->set_input_line(M68K_IRQ_2, state); } + void dio_irq3_w(int state) { m_maincpu->set_input_line(M68K_IRQ_3, state); } + void dio_irq4_w(int state) { m_maincpu->set_input_line(M68K_IRQ_4, state); } + void dio_irq5_w(int state) { m_maincpu->set_input_line(M68K_IRQ_5, state); } + void dio_irq6_w(int state) { m_maincpu->set_input_line(M68K_IRQ_6, state); } + void dio_irq7_w(int state) { m_maincpu->set_input_line(M68K_IRQ_7, state); } bool m_bus_error = false; emu_timer *m_bus_error_timer = nullptr; diff --git a/src/mame/hp/hp_ipc.cpp b/src/mame/hp/hp_ipc.cpp index 1cf18b97110..db116a4f7d7 100644 --- a/src/mame/hp/hp_ipc.cpp +++ b/src/mame/hp/hp_ipc.cpp @@ -427,13 +427,13 @@ private: void floppy_id_w(uint8_t data); static void floppy_formats(format_registration &fr); - DECLARE_WRITE_LINE_MEMBER(irq_1); - DECLARE_WRITE_LINE_MEMBER(irq_2); - DECLARE_WRITE_LINE_MEMBER(irq_3); - [[maybe_unused]] DECLARE_WRITE_LINE_MEMBER(irq_4); - DECLARE_WRITE_LINE_MEMBER(irq_5); - [[maybe_unused]] DECLARE_WRITE_LINE_MEMBER(irq_6); - DECLARE_WRITE_LINE_MEMBER(irq_7); + void irq_1(int state); + void irq_2(int state); + void irq_3(int state); + [[maybe_unused]] void irq_4(int state); + void irq_5(int state); + [[maybe_unused]] void irq_6(int state); + void irq_7(int state); void hp_ipc_mem_inner_base(address_map &map); void hp_ipc_mem_inner_9807a(address_map &map); @@ -656,37 +656,37 @@ void hp_ipc_state::floppy_id_w(uint8_t data) } -WRITE_LINE_MEMBER(hp_ipc_state::irq_1) +void hp_ipc_state::irq_1(int state) { m_maincpu->set_input_line(M68K_IRQ_1, state); } -WRITE_LINE_MEMBER(hp_ipc_state::irq_2) +void hp_ipc_state::irq_2(int state) { m_maincpu->set_input_line(M68K_IRQ_2, state); } -WRITE_LINE_MEMBER(hp_ipc_state::irq_3) +void hp_ipc_state::irq_3(int state) { m_irq3_merger->in_w<0>(state); } -WRITE_LINE_MEMBER(hp_ipc_state::irq_4) +void hp_ipc_state::irq_4(int state) { m_irq4_merger->in_w<0>(state); } -WRITE_LINE_MEMBER(hp_ipc_state::irq_5) +void hp_ipc_state::irq_5(int state) { m_irq5_merger->in_w<0>(state); } -WRITE_LINE_MEMBER(hp_ipc_state::irq_6) +void hp_ipc_state::irq_6(int state) { m_irq6_merger->in_w<0>(state); } -WRITE_LINE_MEMBER(hp_ipc_state::irq_7) +void hp_ipc_state::irq_7(int state) { m_maincpu->set_input_line(M68K_IRQ_7, state); } diff --git a/src/mame/husky/hunter2.cpp b/src/mame/husky/hunter2.cpp index e0066f35bc0..7a1f26b294f 100644 --- a/src/mame/husky/hunter2.cpp +++ b/src/mame/husky/hunter2.cpp @@ -86,10 +86,10 @@ private: void memmap_w(uint8_t data); void hunter2_palette(palette_device &palette) const; - DECLARE_WRITE_LINE_MEMBER(timer0_out); - DECLARE_WRITE_LINE_MEMBER(timer1_out); - DECLARE_WRITE_LINE_MEMBER(cts_w); - DECLARE_WRITE_LINE_MEMBER(rxd_w); + void timer0_out(int state); + void timer1_out(int state); + void cts_w(int state); + void rxd_w(int state); void hunter2_io(address_map &map); void hunter2_mem(address_map &map); @@ -386,19 +386,19 @@ void hunter2_state::hunter2_palette(palette_device &palette) const palette.set_pen_color(1, rgb_t(92, 83, 88)); } -WRITE_LINE_MEMBER(hunter2_state::timer0_out) +void hunter2_state::timer0_out(int state) { if(state == ASSERT_LINE) m_maincpu->pulse_input_line(INPUT_LINE_NMI, attotime::zero); } -WRITE_LINE_MEMBER(hunter2_state::timer1_out) +void hunter2_state::timer1_out(int state) { if(m_irq_mask & 0x08) m_maincpu->set_input_line(NSC800_RSTA, state); } -WRITE_LINE_MEMBER(hunter2_state::cts_w) +void hunter2_state::cts_w(int state) { if(BIT(m_irq_mask, 1)) { @@ -407,7 +407,7 @@ WRITE_LINE_MEMBER(hunter2_state::cts_w) } } -WRITE_LINE_MEMBER(hunter2_state::rxd_w) +void hunter2_state::rxd_w(int state) { if(BIT(m_irq_mask, 2)) m_maincpu->set_input_line(NSC800_RSTB, ASSERT_LINE); diff --git a/src/mame/husky/husky.cpp b/src/mame/husky/husky.cpp index dcf67ff9083..5859e75ea02 100644 --- a/src/mame/husky/husky.cpp +++ b/src/mame/husky/husky.cpp @@ -77,10 +77,10 @@ private: void page_w(offs_t offset, uint8_t data); void husky_palette(palette_device &palette) const; - DECLARE_WRITE_LINE_MEMBER(timer0_out); - DECLARE_WRITE_LINE_MEMBER(timer1_out); - DECLARE_WRITE_LINE_MEMBER(cts_w); - DECLARE_WRITE_LINE_MEMBER(rxd_w); + void timer0_out(int state); + void timer1_out(int state); + void cts_w(int state); + void rxd_w(int state); uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); @@ -434,25 +434,25 @@ void husky_state::husky_palette(palette_device &palette) const palette.set_pen_color(2, rgb_t(131, 136, 139)); // LCD pixel off } -WRITE_LINE_MEMBER(husky_state::timer0_out) +void husky_state::timer0_out(int state) { if(state == ASSERT_LINE) m_maincpu->pulse_input_line(INPUT_LINE_NMI, attotime::zero); } -WRITE_LINE_MEMBER(husky_state::timer1_out) +void husky_state::timer1_out(int state) { if(BIT(m_irq_mask, 7)) m_maincpu->set_input_line(NSC800_RSTA, state); } -WRITE_LINE_MEMBER(husky_state::cts_w) +void husky_state::cts_w(int state) { if(BIT(m_irq_mask, 1)) m_maincpu->set_input_line(NSC800_RSTC, state); } -WRITE_LINE_MEMBER(husky_state::rxd_w) +void husky_state::rxd_w(int state) { if(BIT(m_irq_mask, 2)) m_maincpu->set_input_line(NSC800_RSTB, ASSERT_LINE); diff --git a/src/mame/ibm/ibm6580.cpp b/src/mame/ibm/ibm6580.cpp index 5c0bd315252..16c3b400e2f 100644 --- a/src/mame/ibm/ibm6580.cpp +++ b/src/mame/ibm/ibm6580.cpp @@ -234,21 +234,21 @@ private: void video_w(offs_t offset, uint8_t data); uint8_t video_r(offs_t offset); - DECLARE_WRITE_LINE_MEMBER(vblank_w); + void vblank_w(int state); uint8_t kb_data_r(); void led_w(uint8_t data); void ppi_c_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(kb_data_w); - DECLARE_WRITE_LINE_MEMBER(kb_clock_w); - DECLARE_WRITE_LINE_MEMBER(kb_clock_w_internal); - DECLARE_WRITE_LINE_MEMBER(kb_strobe_w); + void kb_data_w(int state); + void kb_clock_w(int state); + void kb_clock_w_internal(int state); + void kb_strobe_w(int state); void floppy_w(offs_t offset, uint8_t data); uint8_t floppy_r(offs_t offset); static void floppy_formats(format_registration &fr); - DECLARE_WRITE_LINE_MEMBER(hrq_w); + void hrq_w(int state); uint8_t memory_read_byte(offs_t offset); void memory_write_byte(offs_t offset, uint8_t data); @@ -445,7 +445,7 @@ uint8_t ibm6580_state::video_r(offs_t offset) return data; } -WRITE_LINE_MEMBER(ibm6580_state::vblank_w) +void ibm6580_state::vblank_w(int state) { // if (state) // m_pic8259->ir6_w(state); @@ -589,21 +589,21 @@ uint8_t ibm6580_state::kb_data_r() return data; } -WRITE_LINE_MEMBER(ibm6580_state::kb_data_w) +void ibm6580_state::kb_data_w(int state) { if (!BIT(m_p4a, 0)) return; m_kb_data_bit = !state; } -WRITE_LINE_MEMBER(ibm6580_state::kb_clock_w) +void ibm6580_state::kb_clock_w(int state) { if (!BIT(m_p4a, 0)) return; kb_clock_w_internal(state); } -WRITE_LINE_MEMBER(ibm6580_state::kb_clock_w_internal) +void ibm6580_state::kb_clock_w_internal(int state) { if (m_kb_clock == state) return; m_kb_clock = state; @@ -615,7 +615,7 @@ WRITE_LINE_MEMBER(ibm6580_state::kb_clock_w_internal) } } -WRITE_LINE_MEMBER(ibm6580_state::kb_strobe_w) +void ibm6580_state::kb_strobe_w(int state) { if (!BIT(m_p4a, 0)) return; @@ -629,7 +629,7 @@ WRITE_LINE_MEMBER(ibm6580_state::kb_strobe_w) m_ppi8255->pc4_w(m_kb_strobe); } -WRITE_LINE_MEMBER(ibm6580_state::hrq_w) +void ibm6580_state::hrq_w(int state) { m_maincpu->set_input_line(INPUT_LINE_HALT, state); m_dma8257->hlda_w(state); diff --git a/src/mame/ibm/ibm6580_fdc.cpp b/src/mame/ibm/ibm6580_fdc.cpp index 0d563371304..ebbf61cd7dc 100644 --- a/src/mame/ibm/ibm6580_fdc.cpp +++ b/src/mame/ibm/ibm6580_fdc.cpp @@ -96,14 +96,14 @@ uint8_t dw_fdc_device::p2_r() return data; } -READ_LINE_MEMBER( dw_fdc_device::t0_r ) +int dw_fdc_device::t0_r() { LOGDBG("t0 == %d\n", m_t0); return m_t0; } -READ_LINE_MEMBER( dw_fdc_device::t1_r ) +int dw_fdc_device::t1_r() { LOGDBG("t1 == %d\n", m_t1); @@ -120,7 +120,7 @@ uint8_t dw_fdc_device::bus_r() return m_bus; } -WRITE_LINE_MEMBER( dw_fdc_device::reset_w ) +void dw_fdc_device::reset_w(int state) { if(!state) m_reset_timer->adjust(attotime::from_msec(50)); @@ -131,7 +131,7 @@ WRITE_LINE_MEMBER( dw_fdc_device::reset_w ) } } -WRITE_LINE_MEMBER( dw_fdc_device::ack_w ) +void dw_fdc_device::ack_w(int state) { m_t0 = state; } diff --git a/src/mame/ibm/ibm6580_fdc.h b/src/mame/ibm/ibm6580_fdc.h index c36e34cd465..752b72858bb 100644 --- a/src/mame/ibm/ibm6580_fdc.h +++ b/src/mame/ibm/ibm6580_fdc.h @@ -19,8 +19,8 @@ public: auto out_clock_handler() { return m_out_clock.bind(); } auto out_strobe_handler() { return m_out_strobe.bind(); } - DECLARE_WRITE_LINE_MEMBER(reset_w); - DECLARE_WRITE_LINE_MEMBER(ack_w); + void reset_w(int state); + void ack_w(int state); protected: virtual const tiny_rom_entry *device_rom_region() const override; @@ -45,8 +45,8 @@ private: void p1_w(uint8_t data); void p2_w(uint8_t data); uint8_t p2_r(); - DECLARE_READ_LINE_MEMBER(t0_r); - DECLARE_READ_LINE_MEMBER(t1_r); + int t0_r(); + int t1_r(); }; DECLARE_DEVICE_TYPE(DW_FDC, dw_fdc_device) diff --git a/src/mame/ibm/ibm6580_kbd.cpp b/src/mame/ibm/ibm6580_kbd.cpp index 411a84f4c77..734712838f9 100644 --- a/src/mame/ibm/ibm6580_kbd.cpp +++ b/src/mame/ibm/ibm6580_kbd.cpp @@ -281,7 +281,7 @@ void dw_keyboard_device::bus_w(uint8_t data) } } -WRITE_LINE_MEMBER(dw_keyboard_device::reset_w) +void dw_keyboard_device::reset_w(int state) { if (m_reset ^ state) { @@ -295,7 +295,7 @@ WRITE_LINE_MEMBER(dw_keyboard_device::reset_w) } } -WRITE_LINE_MEMBER(dw_keyboard_device::ack_w) +void dw_keyboard_device::ack_w(int state) { m_ack = state; } diff --git a/src/mame/ibm/ibm6580_kbd.h b/src/mame/ibm/ibm6580_kbd.h index afc4c28ceb2..8c7c60ce5a8 100644 --- a/src/mame/ibm/ibm6580_kbd.h +++ b/src/mame/ibm/ibm6580_kbd.h @@ -18,8 +18,8 @@ public: int memory_record_r() { return m_mr->read(); } - DECLARE_WRITE_LINE_MEMBER(reset_w); - DECLARE_WRITE_LINE_MEMBER(ack_w); + void reset_w(int state); + void ack_w(int state); protected: virtual const tiny_rom_entry *device_rom_region() const override; diff --git a/src/mame/ice/chexx.cpp b/src/mame/ice/chexx.cpp index 1253d835c9f..953ef2271dc 100644 --- a/src/mame/ice/chexx.cpp +++ b/src/mame/ice/chexx.cpp @@ -113,10 +113,10 @@ public: void via_a_out(uint8_t data); void via_b_out(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(via_ca2_out); - DECLARE_WRITE_LINE_MEMBER(via_cb1_out); - DECLARE_WRITE_LINE_MEMBER(via_cb2_out); - DECLARE_WRITE_LINE_MEMBER(via_irq_out); + void via_ca2_out(int state); + void via_cb1_out(int state); + void via_cb2_out(int state); + void via_irq_out(int state); uint8_t input_r(); @@ -214,7 +214,7 @@ void chexx_state::via_b_out(uint8_t data) // logerror("%s: VIA write B = %02X\n", machine().describe_context(), data); } -WRITE_LINE_MEMBER(chexx_state::via_ca2_out) +void chexx_state::via_ca2_out(int state) { m_digitalker->digitalker_0_cms_w(CLEAR_LINE); m_digitalker->digitalker_0_cs_w(CLEAR_LINE); @@ -223,12 +223,12 @@ WRITE_LINE_MEMBER(chexx_state::via_ca2_out) // logerror("%s: VIA write CA2 = %02X\n", machine().describe_context(), state); } -WRITE_LINE_MEMBER(chexx_state::via_cb1_out) +void chexx_state::via_cb1_out(int state) { // logerror("%s: VIA write CB1 = %02X\n", machine().describe_context(), state); } -WRITE_LINE_MEMBER(chexx_state::via_cb2_out) +void chexx_state::via_cb2_out(int state) { m_shift = ((m_shift << 1) & 0xffffff) | state; @@ -248,7 +248,7 @@ WRITE_LINE_MEMBER(chexx_state::via_cb2_out) // logerror("%s: VIA write CB2 = %02X\n", machine().describe_context(), state); } -WRITE_LINE_MEMBER(chexx_state::via_irq_out) +void chexx_state::via_irq_out(int state) { m_maincpu->set_input_line(INPUT_LINE_IRQ0, state ? ASSERT_LINE : CLEAR_LINE); // logerror("%s: VIA write IRQ = %02X\n", machine().describe_context(), state); diff --git a/src/mame/ice/vp101.cpp b/src/mame/ice/vp101.cpp index 2cf75a0af90..693ac908d65 100644 --- a/src/mame/ice/vp101.cpp +++ b/src/mame/ice/vp101.cpp @@ -145,7 +145,7 @@ private: void dmaaddr_w(uint32_t data); - DECLARE_WRITE_LINE_MEMBER(dmarq_w); + void dmarq_w(int state); uint32_t tty_4925_rdy_r() { return 0x2; } @@ -201,7 +201,7 @@ void vp10x_state::dmaaddr_w(uint32_t data) m_dma_ptr = (data & 0x07ffffff); } -WRITE_LINE_MEMBER(vp10x_state::dmarq_w) +void vp10x_state::dmarq_w(int state) { if (state != m_dmarq_state) { diff --git a/src/mame/igs/goldstar.cpp b/src/mame/igs/goldstar.cpp index ffb687d7d9f..f156645c3f6 100644 --- a/src/mame/igs/goldstar.cpp +++ b/src/mame/igs/goldstar.cpp @@ -9111,7 +9111,7 @@ void goldstar_state::cmast91(machine_config &config) -WRITE_LINE_MEMBER(wingco_state::masked_irq) +void wingco_state::masked_irq(int state) { if (state && m_nmi_enable) m_maincpu->set_input_line(INPUT_LINE_NMI, ASSERT_LINE); @@ -9640,7 +9640,7 @@ void cmaster_state::nfm(machine_config &config) } -WRITE_LINE_MEMBER(unkch_state::vblank_irq) +void unkch_state::vblank_irq(int state) { if (state && m_vblank_irq_enable) m_maincpu->set_input_line(INPUT_LINE_NMI, ASSERT_LINE); diff --git a/src/mame/igs/goldstar.h b/src/mame/igs/goldstar.h index ede34755d55..8fa9632a51c 100644 --- a/src/mame/igs/goldstar.h +++ b/src/mame/igs/goldstar.h @@ -258,7 +258,7 @@ public: uint32_t screen_update_magical(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); uint32_t screen_update_mbstar(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(masked_irq); + void masked_irq(int state); void bingowng(machine_config &config); void flaming7(machine_config &config); @@ -400,7 +400,7 @@ public: DECLARE_VIDEO_START(unkch); uint32_t screen_update_unkch(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(vblank_irq); + void vblank_irq(int state); void megaline(machine_config &config); void unkch(machine_config &config); diff --git a/src/mame/igs/igs009.cpp b/src/mame/igs/igs009.cpp index de076245f73..a81be75ce7b 100644 --- a/src/mame/igs/igs009.cpp +++ b/src/mame/igs/igs009.cpp @@ -64,7 +64,7 @@ public: void init_jingbell(); void init_jingbelli(); - DECLARE_READ_LINE_MEMBER(hopper_r); + int hopper_r(); protected: virtual void machine_start() override; @@ -83,7 +83,7 @@ private: uint8_t magic_r(); void show_out(); - DECLARE_WRITE_LINE_MEMBER(vblank_irq); + void vblank_irq(int state); template TILE_GET_INFO_MEMBER(get_jingbell_reel_tile_info); template TILE_GET_INFO_MEMBER(get_gp98_reel_tile_info); @@ -285,7 +285,7 @@ uint32_t igs009_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap ***************************************************************************/ -READ_LINE_MEMBER(igs009_state::hopper_r) +int igs009_state::hopper_r() { return m_hopper && !(m_screen->frame_number()%10); } @@ -721,7 +721,7 @@ void igs009_state::machine_reset() m_video_enable = 1; } -WRITE_LINE_MEMBER(igs009_state::vblank_irq) +void igs009_state::vblank_irq(int state) { if (state && BIT(m_nmi_enable, 7)) m_maincpu->pulse_input_line(INPUT_LINE_NMI, attotime::zero); diff --git a/src/mame/igs/igs011.cpp b/src/mame/igs/igs011.cpp index 0d21d37f22d..3220933ef76 100644 --- a/src/mame/igs/igs011.cpp +++ b/src/mame/igs/igs011.cpp @@ -107,7 +107,7 @@ public: { } - DECLARE_READ_LINE_MEMBER(igs_hopper_r); + int igs_hopper_r(); void init_lhbv33c(); void init_drgnwrldv21j(); @@ -265,13 +265,13 @@ private: void vbowl_link_2_w(u16 data); void vbowl_link_3_w(u16 data); void lhb_okibank_w(u8 data); - DECLARE_WRITE_LINE_MEMBER(sound_irq); + void sound_irq(int state); TIMER_DEVICE_CALLBACK_MEMBER(lev5_timer_irq_cb); TIMER_DEVICE_CALLBACK_MEMBER(lhb_timer_irq_cb); TIMER_DEVICE_CALLBACK_MEMBER(lev3_timer_irq_cb); u32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(screen_vblank_vbowl); + void screen_vblank_vbowl(int state); INTERRUPT_GEN_MEMBER(lhb_vblank_irq); void wlcc_decrypt(); void lhb_decrypt(); @@ -647,7 +647,7 @@ void igs011_state::machine_start() // Inputs -READ_LINE_MEMBER(igs011_state::igs_hopper_r) +int igs011_state::igs_hopper_r() { return (m_igs_hopper && ((m_screen->frame_number()/5)&1)) ? 0x0000 : 0x0001; } @@ -2826,7 +2826,7 @@ u16 igs011_state::vbowl_unk_r() return 0xffff; } -WRITE_LINE_MEMBER(igs011_state::screen_vblank_vbowl) +void igs011_state::screen_vblank_vbowl(int state) { // rising edge if (state) @@ -4176,7 +4176,7 @@ void igs011_state::nkishusp(machine_config &config) } -WRITE_LINE_MEMBER(igs011_state::sound_irq) +void igs011_state::sound_irq(int state) { // m_maincpu->set_input_line(3, state); } diff --git a/src/mame/igs/igs_fear.cpp b/src/mame/igs/igs_fear.cpp index 56b32a6e025..08176640cec 100644 --- a/src/mame/igs/igs_fear.cpp +++ b/src/mame/igs/igs_fear.cpp @@ -31,7 +31,7 @@ protected: virtual void video_start() override; private: - DECLARE_WRITE_LINE_MEMBER(sound_irq); + void sound_irq(int state); uint32_t screen_update_igs_fear(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void pgm_create_dummy_internal_arm_region(); required_device m_maincpu; @@ -79,7 +79,7 @@ GFXDECODE_END static INPUT_PORTS_START( fear ) INPUT_PORTS_END -WRITE_LINE_MEMBER(igs_fear_state::sound_irq) +void igs_fear_state::sound_irq(int state) { } diff --git a/src/mame/igs/igs_m027.cpp b/src/mame/igs/igs_m027.cpp index 78cb7467945..a2629933cc1 100644 --- a/src/mame/igs/igs_m027.cpp +++ b/src/mame/igs/igs_m027.cpp @@ -67,7 +67,7 @@ private: required_device m_igs017_igs031; virtual void video_start() override; - DECLARE_WRITE_LINE_MEMBER(vblank_irq); + void vblank_irq(int state); void sdwx_gfx_decrypt(); void pgm_create_dummy_internal_arm_region(); @@ -314,7 +314,7 @@ INPUT_PORTS_END -WRITE_LINE_MEMBER(igs_m027_state::vblank_irq) +void igs_m027_state::vblank_irq(int state) { if (state) m_maincpu->pulse_input_line(ARM7_FIRQ_LINE, m_maincpu->minimum_quantum_time()); diff --git a/src/mame/igs/igspoker.cpp b/src/mame/igs/igspoker.cpp index a6b77a220c5..847ac26cede 100644 --- a/src/mame/igs/igspoker.cpp +++ b/src/mame/igs/igspoker.cpp @@ -128,7 +128,7 @@ public: void init_kungfu(); void init_kungfua(); - DECLARE_READ_LINE_MEMBER(hopper_r); + int hopper_r(); protected: virtual void machine_start() override { m_led.resolve(); m_lamps.resolve(); } @@ -397,7 +397,7 @@ void igspoker_state::custom_io_w(uint8_t data) } } -READ_LINE_MEMBER(igspoker_state::hopper_r) +int igspoker_state::hopper_r() { if (m_hopper) return !(m_screen->frame_number()%10); return machine().input().code_pressed(KEYCODE_H); diff --git a/src/mame/igs/jackie.cpp b/src/mame/igs/jackie.cpp index ff2425b6feb..aac72186b6d 100644 --- a/src/mame/igs/jackie.cpp +++ b/src/mame/igs/jackie.cpp @@ -80,7 +80,7 @@ public: void init_jackie(); - DECLARE_READ_LINE_MEMBER(hopper_r); + int hopper_r(); private: void fg_tile_w(offs_t offset, uint8_t data); @@ -378,7 +378,7 @@ void jackie_state::io_map(address_map &map) map(0x8000, 0xffff).r(FUNC(jackie_state::expram_r)); } -READ_LINE_MEMBER(jackie_state::hopper_r) +int jackie_state::hopper_r() { if (m_hopper) return !(m_screen->frame_number()%10); return machine().input().code_pressed(KEYCODE_H); diff --git a/src/mame/igs/pgm.h b/src/mame/igs/pgm.h index e0880c45900..61666039d24 100644 --- a/src/mame/igs/pgm.h +++ b/src/mame/igs/pgm.h @@ -127,7 +127,7 @@ private: TILE_GET_INFO_MEMBER(get_tx_tile_info); TILE_GET_INFO_MEMBER(get_bg_tile_info); u32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(screen_vblank); + void screen_vblank(int state); TIMER_DEVICE_CALLBACK_MEMBER(interrupt); inline void pgm_draw_pix(int xdrawpos, int pri, u16* dest, u8* destpri, const rectangle &cliprect, u16 srcdat); diff --git a/src/mame/igs/pgm2.cpp b/src/mame/igs/pgm2.cpp index 98f42d32913..0b479c2f89a 100644 --- a/src/mame/igs/pgm2.cpp +++ b/src/mame/igs/pgm2.cpp @@ -680,7 +680,7 @@ static INPUT_PORTS_START( pgm2 ) INPUT_PORTS_END -WRITE_LINE_MEMBER(pgm2_state::irq) +void pgm2_state::irq(int state) { // logerror("irq\n"); if (state == ASSERT_LINE) m_maincpu->set_input_line(ARM7_IRQ_LINE, ASSERT_LINE); diff --git a/src/mame/igs/pgm2.h b/src/mame/igs/pgm2.h index 66a79da4072..c43f757b2a8 100644 --- a/src/mame/igs/pgm2.h +++ b/src/mame/igs/pgm2.h @@ -117,8 +117,8 @@ private: TILE_GET_INFO_MEMBER(get_bg_tile_info); u32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(screen_vblank); - DECLARE_WRITE_LINE_MEMBER(irq); + void screen_vblank(int state); + void irq(int state); TIMER_DEVICE_CALLBACK_MEMBER(mcu_interrupt); diff --git a/src/mame/igs/pgm2_v.cpp b/src/mame/igs/pgm2_v.cpp index f9d2fc6563f..ff0912e8c93 100644 --- a/src/mame/igs/pgm2_v.cpp +++ b/src/mame/igs/pgm2_v.cpp @@ -327,7 +327,7 @@ u32 pgm2_state::screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const return 0; } -WRITE_LINE_MEMBER(pgm2_state::screen_vblank) +void pgm2_state::screen_vblank(int state) { // rising edge if (state) diff --git a/src/mame/igs/pgm3.cpp b/src/mame/igs/pgm3.cpp index e40cb24d8fc..8e0be99b226 100644 --- a/src/mame/igs/pgm3.cpp +++ b/src/mame/igs/pgm3.cpp @@ -72,7 +72,7 @@ private: virtual void machine_reset() override; virtual void video_start() override; uint32_t screen_update_pgm3(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(screen_vblank_pgm3); + void screen_vblank_pgm3(int state); required_device m_maincpu; void pgm3_map(address_map &map); }; @@ -90,7 +90,7 @@ uint32_t pgm3_state::screen_update_pgm3(screen_device &screen, bitmap_ind16 &bit return 0; } -WRITE_LINE_MEMBER(pgm3_state::screen_vblank_pgm3) +void pgm3_state::screen_vblank_pgm3(int state) { } diff --git a/src/mame/igs/pgm_v.cpp b/src/mame/igs/pgm_v.cpp index e17cc2b5cb9..8b73553a6c8 100644 --- a/src/mame/igs/pgm_v.cpp +++ b/src/mame/igs/pgm_v.cpp @@ -654,7 +654,7 @@ u32 pgm_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const return 0; } -WRITE_LINE_MEMBER(pgm_state::screen_vblank) +void pgm_state::screen_vblank(int state) { // rising edge if (state) diff --git a/src/mame/igs/spoker.cpp b/src/mame/igs/spoker.cpp index 210b2158f1c..6b51a366dfd 100644 --- a/src/mame/igs/spoker.cpp +++ b/src/mame/igs/spoker.cpp @@ -69,7 +69,7 @@ public: void init_spk116it(); void init_3super8(); - DECLARE_READ_LINE_MEMBER(hopper_r); + int hopper_r(); protected: virtual void machine_start() override; @@ -178,7 +178,7 @@ uint32_t spoker_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap Misc Handlers ***************************************************************************/ -READ_LINE_MEMBER(spoker_state::hopper_r) +int spoker_state::hopper_r() { if (m_hopper) return !(m_screen->frame_number()%10); return machine().input().code_pressed(KEYCODE_H); diff --git a/src/mame/igt/drw80pkr.cpp b/src/mame/igt/drw80pkr.cpp index a6d56344872..caed66a073c 100644 --- a/src/mame/igt/drw80pkr.cpp +++ b/src/mame/igt/drw80pkr.cpp @@ -82,11 +82,11 @@ private: void p1_w(uint8_t data); void p2_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(prog_w); + void prog_w(int state); void bus_w(uint8_t data); void io_w(offs_t offset, uint8_t data); - DECLARE_READ_LINE_MEMBER(t0_r); - DECLARE_READ_LINE_MEMBER(t1_r); + int t0_r(); + int t1_r(); uint8_t p1_r(); uint8_t p2_r(); uint8_t bus_r(); @@ -125,7 +125,7 @@ void drw80pkr_state::p2_w(uint8_t data) m_p2 = data; } -WRITE_LINE_MEMBER(drw80pkr_state::prog_w) +void drw80pkr_state::prog_w(int state) { m_prog = state; @@ -198,12 +198,12 @@ void drw80pkr_state::io_w(offs_t offset, uint8_t data) * Read Handlers * ****************/ -READ_LINE_MEMBER(drw80pkr_state::t0_r) +int drw80pkr_state::t0_r() { return m_t0; } -READ_LINE_MEMBER(drw80pkr_state::t1_r) +int drw80pkr_state::t1_r() { return m_t1; } diff --git a/src/mame/igt/gkigt.cpp b/src/mame/igt/gkigt.cpp index 89e505f5608..5b1c81e2c62 100644 --- a/src/mame/igt/gkigt.cpp +++ b/src/mame/igt/gkigt.cpp @@ -138,7 +138,7 @@ private: uint8_t irq_vector_r(); void unk_w(uint8_t data); uint8_t frame_number_r(); - DECLARE_WRITE_LINE_MEMBER(vblank_irq); + void vblank_irq(int state); uint8_t timer_r(); uint16_t version_r(); @@ -586,7 +586,7 @@ void igt_gameking_state::machine_reset() m_quart1->ip2_w(1); // needs to be high } -WRITE_LINE_MEMBER(igt_gameking_state::vblank_irq) +void igt_gameking_state::vblank_irq(int state) { if (state && BIT(m_irq_enable, 3)) { diff --git a/src/mame/igt/peplus.cpp b/src/mame/igt/peplus.cpp index b0e3629462b..fd8b1493339 100644 --- a/src/mame/igt/peplus.cpp +++ b/src/mame/igt/peplus.cpp @@ -345,7 +345,7 @@ private: uint8_t dropdoor_r(); uint8_t watchdog_r(); void crtc_mode_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(crtc_vsync); + void crtc_vsync(int state); void i2c_nvram_w(uint8_t data); uint8_t input_bank_a_r(); uint8_t input0_r(); @@ -444,7 +444,7 @@ void peplus_state::handle_lightpen() m_assert_lp_timer->adjust(m_screen->time_until_pos(yt, xt), 0); } -WRITE_LINE_MEMBER(peplus_state::crtc_vsync) +void peplus_state::crtc_vsync(int state) { m_maincpu->set_input_line(0, state ? ASSERT_LINE : CLEAR_LINE); handle_lightpen(); diff --git a/src/mame/igt/videopkr.cpp b/src/mame/igt/videopkr.cpp index c10a8eb9173..ee44b1a3f29 100644 --- a/src/mame/igt/videopkr.cpp +++ b/src/mame/igt/videopkr.cpp @@ -335,8 +335,8 @@ protected: uint8_t videopkr_p2_data_r(); void videopkr_p1_data_w(uint8_t data); void videopkr_p2_data_w(uint8_t data); - DECLARE_READ_LINE_MEMBER(videopkr_t0_latch); - DECLARE_WRITE_LINE_MEMBER(prog_w); + int videopkr_t0_latch(); + void prog_w(int state); uint8_t sound_io_r(); void sound_io_w(uint8_t data); uint8_t sound_p2_r(); @@ -780,12 +780,12 @@ void videopkr_state::videopkr_p2_data_w(uint8_t data) m_p2 = data; } -READ_LINE_MEMBER(videopkr_state::videopkr_t0_latch) +int videopkr_state::videopkr_t0_latch() { return m_t0_latch; } -WRITE_LINE_MEMBER(videopkr_state::prog_w) +void videopkr_state::prog_w(int state) { if (!state) m_maincpu->set_input_line(0, CLEAR_LINE); /* clear interrupt FF */ diff --git a/src/mame/intel/imds2.cpp b/src/mame/intel/imds2.cpp index 3f472378003..39b2d30e0b9 100644 --- a/src/mame/intel/imds2.cpp +++ b/src/mame/intel/imds2.cpp @@ -106,13 +106,13 @@ public: void imds2(machine_config &config); - DECLARE_WRITE_LINE_MEMBER(xack); + void xack(int state); private: uint8_t ipc_mem_read(offs_t offset); void ipc_mem_write(offs_t offset, uint8_t data); void ipc_control_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(ipc_intr_w); + void ipc_intr_w(int state); uint8_t ipcsyspic_r(offs_t offset); uint8_t ipclocpic_r(offs_t offset); void ipcsyspic_w(offs_t offset, uint8_t data); @@ -210,7 +210,7 @@ void imds2_state::ipc_control_w(uint8_t data) m_boot.disable(); } -WRITE_LINE_MEMBER(imds2_state::ipc_intr_w) +void imds2_state::ipc_intr_w(int state) { m_ipccpu->set_input_line(I8085_INTR_LINE, (state != 0) && m_ipcctrl->q2_r()); } @@ -313,7 +313,7 @@ void imds2_state::imds2(machine_config &config) MULTIBUS_SLOT(config, m_slot, m_bus, imds2_cards, nullptr, false); // FIXME: isbc202 } -WRITE_LINE_MEMBER(imds2_state::xack) +void imds2_state::xack(int state) { if (state) { // Put CPU in wait state diff --git a/src/mame/intel/imds2ioc.cpp b/src/mame/intel/imds2ioc.cpp index b3ce476d8ec..81e06e82ddf 100644 --- a/src/mame/intel/imds2ioc.cpp +++ b/src/mame/intel/imds2ioc.cpp @@ -93,7 +93,7 @@ uint8_t imds2ioc_device::miscin_r() return res | ((m_beeper_timer == 0) << 2); } -WRITE_LINE_MEMBER(imds2ioc_device::beep_timer_w) +void imds2ioc_device::beep_timer_w(int state) { m_beeper_timer = state; update_beeper(); @@ -176,14 +176,14 @@ void imds2ioc_device::kb_port_p1_w(uint8_t data) m_kb_p1 = data; } -READ_LINE_MEMBER(imds2ioc_device::kb_port_t0_r) +int imds2ioc_device::kb_port_t0_r() { // T0 tied low // It appears to be some kind of strapping option on kb hw return 0; } -READ_LINE_MEMBER(imds2ioc_device::kb_port_t1_r) +int imds2ioc_device::kb_port_t1_r() { // T1 tied low // It appears to be some kind of strapping option on kb hw @@ -265,7 +265,7 @@ void imds2ioc_device::dbb_master_w(offs_t offset, uint8_t data) m_ioc_ibf = data; } -WRITE_LINE_MEMBER(imds2ioc_device::hrq_w) +void imds2ioc_device::hrq_w(int state) { // Should be propagated to HOLD input of IOC CPU m_iocdma->hlda_w(state); @@ -313,7 +313,7 @@ void imds2ioc_device::pio_port_p2_w(uint8_t data) m_parallel_int_cb(BIT(data, 7)); } -WRITE_LINE_MEMBER(imds2ioc_device::pio_lpt_ack_w) +void imds2ioc_device::pio_lpt_ack_w(int state) { if (state) { m_device_status_byte |= 0x20; @@ -322,7 +322,7 @@ WRITE_LINE_MEMBER(imds2ioc_device::pio_lpt_ack_w) } } -WRITE_LINE_MEMBER(imds2ioc_device::pio_lpt_busy_w) +void imds2ioc_device::pio_lpt_busy_w(int state) { if (state) { m_device_status_byte |= 0x10; diff --git a/src/mame/intel/imds2ioc.h b/src/mame/intel/imds2ioc.h index a0665a0b15c..1ee4e5541a2 100644 --- a/src/mame/intel/imds2ioc.h +++ b/src/mame/intel/imds2ioc.h @@ -41,14 +41,14 @@ protected: private: void miscout_w(uint8_t data); uint8_t miscin_r(); - DECLARE_WRITE_LINE_MEMBER(beep_timer_w); + void beep_timer_w(int state); void start_timer_w(uint8_t data); uint8_t kb_read(offs_t offset); uint8_t kb_port_p2_r(); void kb_port_p1_w(uint8_t data); - DECLARE_READ_LINE_MEMBER(kb_port_t0_r); - DECLARE_READ_LINE_MEMBER(kb_port_t1_r); + int kb_port_t0_r(); + int kb_port_t1_r(); void ioc_dbbout_w(offs_t offset, uint8_t data); void ioc_f0_w(offs_t offset, uint8_t data); @@ -57,7 +57,7 @@ private: uint8_t ioc_status_r(); uint8_t ioc_dbbin_r(); - DECLARE_WRITE_LINE_MEMBER(hrq_w); + void hrq_w(int state); uint8_t ioc_mem_r(offs_t offset); void ioc_mem_w(offs_t offset, uint8_t data); @@ -65,8 +65,8 @@ private: void pio_port_p1_w(uint8_t data); uint8_t pio_port_p2_r(); void pio_port_p2_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(pio_lpt_ack_w); - DECLARE_WRITE_LINE_MEMBER(pio_lpt_busy_w); + void pio_lpt_ack_w(int state); + void pio_lpt_busy_w(int state); I8275_DRAW_CHARACTER_MEMBER(crtc_display_pixels); diff --git a/src/mame/intel/imm6_76.cpp b/src/mame/intel/imm6_76.cpp index 81155411ea9..fefde490333 100644 --- a/src/mame/intel/imm6_76.cpp +++ b/src/mame/intel/imm6_76.cpp @@ -121,12 +121,12 @@ u8 intel_imm6_76_device::do_r() const } } -DECLARE_WRITE_LINE_MEMBER(intel_imm6_76_device::data_out_enable) +void intel_imm6_76_device::data_out_enable(int state) { m_do_enable = bool(state); } -DECLARE_WRITE_LINE_MEMBER(intel_imm6_76_device::data_in_positive) +void intel_imm6_76_device::data_in_positive(int state) { if (bool(state) != m_di_pos) { @@ -136,12 +136,12 @@ DECLARE_WRITE_LINE_MEMBER(intel_imm6_76_device::data_in_positive) } } -DECLARE_WRITE_LINE_MEMBER(intel_imm6_76_device::data_out_positive) +void intel_imm6_76_device::data_out_positive(int state) { m_do_pos = !bool(state); } -WRITE_LINE_MEMBER(intel_imm6_76_device::r_w) +void intel_imm6_76_device::r_w(int state) { if (!m_r_w && !bool(state) && !m_cycle) { @@ -154,7 +154,7 @@ WRITE_LINE_MEMBER(intel_imm6_76_device::r_w) m_r_w = !bool(state); } -WRITE_LINE_MEMBER(intel_imm6_76_device::r_w_a) +void intel_imm6_76_device::r_w_a(int state) { if (!m_r_w_a && !bool(state) && !m_cycle_a) { @@ -167,7 +167,7 @@ WRITE_LINE_MEMBER(intel_imm6_76_device::r_w_a) m_r_w_a = !bool(state); } -WRITE_LINE_MEMBER(intel_imm6_76_device::prgm_prom_pwr) +void intel_imm6_76_device::prgm_prom_pwr(int state) { if (!bool(state) != m_prgm_pwr) { diff --git a/src/mame/intel/imm6_76.h b/src/mame/intel/imm6_76.h index d590cd1b97f..ae894a25b8b 100644 --- a/src/mame/intel/imm6_76.h +++ b/src/mame/intel/imm6_76.h @@ -169,12 +169,12 @@ public: void di_w(u8 data); void a_w(u8 data); u8 do_r() const; - DECLARE_WRITE_LINE_MEMBER(data_out_enable); // 1 = asserted - DECLARE_WRITE_LINE_MEMBER(data_in_positive); // 1 = asserted - DECLARE_WRITE_LINE_MEMBER(data_out_positive); // 0 = asserted - DECLARE_WRITE_LINE_MEMBER(r_w); // 1 = read, 0 = write - DECLARE_WRITE_LINE_MEMBER(r_w_a); // 1 = read, 0 = write - DECLARE_WRITE_LINE_MEMBER(prgm_prom_pwr); // 0 = asserted + void data_out_enable(int state); // 1 = asserted + void data_in_positive(int state); // 1 = asserted + void data_out_positive(int state); // 0 = asserted + void r_w(int state); // 1 = read, 0 = write + void r_w_a(int state); // 1 = read, 0 = write + void prgm_prom_pwr(int state); // 0 = asserted protected: // device_t implementation diff --git a/src/mame/intel/intellec4.cpp b/src/mame/intel/intellec4.cpp index 7dd24266750..45e3e80d90d 100644 --- a/src/mame/intel/intellec4.cpp +++ b/src/mame/intel/intellec4.cpp @@ -83,8 +83,8 @@ public: void ram1_out(u8 data); // universal slot outputs - DECLARE_WRITE_LINE_MEMBER(bus_reset_4002); - DECLARE_WRITE_LINE_MEMBER(bus_user_reset); + void bus_reset_4002(int state); + void bus_user_reset(int state); // front panel switches DECLARE_INPUT_CHANGED_MEMBER(sw_reset); @@ -498,13 +498,13 @@ void intellec4_state::ram1_out(u8 data) Bus signal handlers ----------------------------------*/ -WRITE_LINE_MEMBER(intellec4_state::bus_reset_4002) +void intellec4_state::bus_reset_4002(int state) { m_bus_reset_4002 = 0 == state; check_4002_reset(); } -WRITE_LINE_MEMBER(intellec4_state::bus_user_reset) +void intellec4_state::bus_user_reset(int state) { if (!state) trigger_reset(); @@ -1038,7 +1038,7 @@ public: } // universal slot outputs - DECLARE_WRITE_LINE_MEMBER(bus_test); + void bus_test(int state); // front panel switches DECLARE_INPUT_CHANGED_MEMBER(sw_hold); @@ -1091,7 +1091,7 @@ INPUT_PORTS_END Bus signal handlers ----------------------------------*/ -WRITE_LINE_MEMBER(mod4_state::bus_test) +void mod4_state::bus_test(int state) { if (!m_one_shot && !m_sw_hold) m_cpu->set_input_line(I4004_TEST_LINE, state ? CLEAR_LINE : ASSERT_LINE); @@ -1230,11 +1230,11 @@ public: { } - DECLARE_WRITE_LINE_MEMBER(stp_ack); + void stp_ack(int state); // universal slot outputs - DECLARE_WRITE_LINE_MEMBER(bus_stop); - DECLARE_WRITE_LINE_MEMBER(bus_test); + void bus_stop(int state); + void bus_test(int state); // front panel switches DECLARE_INPUT_CHANGED_MEMBER(sw_stop); @@ -1287,7 +1287,7 @@ INPUT_PORTS_END CPU output handlers ----------------------------------*/ -WRITE_LINE_MEMBER(mod40_state::stp_ack) +void mod40_state::stp_ack(int state) { // resets the single-step monostable if (m_stp_ack && state) @@ -1307,7 +1307,7 @@ WRITE_LINE_MEMBER(mod40_state::stp_ack) } -WRITE_LINE_MEMBER(mod40_state::bus_stop) +void mod40_state::bus_stop(int state) { // will not allow the CPU to step/run if (m_single_step || !m_sw_stop) @@ -1320,7 +1320,7 @@ WRITE_LINE_MEMBER(mod40_state::bus_stop) Bus signal handlers ----------------------------------*/ -WRITE_LINE_MEMBER(mod40_state::bus_test) +void mod40_state::bus_test(int state) { m_cpu->set_input_line(I4040_TEST_LINE, state ? CLEAR_LINE : ASSERT_LINE); } diff --git a/src/mame/intel/isbc.cpp b/src/mame/intel/isbc.cpp index e520300d6c7..3b65d74144a 100644 --- a/src/mame/intel/isbc.cpp +++ b/src/mame/intel/isbc.cpp @@ -61,11 +61,11 @@ public: void sm1810(machine_config &config); private: - DECLARE_WRITE_LINE_MEMBER(write_centronics_ack); + void write_centronics_ack(int state); - DECLARE_WRITE_LINE_MEMBER(isbc86_tmr2_w); - DECLARE_WRITE_LINE_MEMBER(isbc286_tmr2_w); -// DECLARE_WRITE_LINE_MEMBER(isbc_uart8274_irq); + void isbc86_tmr2_w(int state); + void isbc286_tmr2_w(int state); +// void isbc_uart8274_irq(int state); uint8_t get_slave_ack(offs_t offset); void ppi_c_w(uint8_t data); void upperen_w(uint8_t data); @@ -74,9 +74,9 @@ private: void edge_intr_clear_w(uint8_t data); void status_register_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(nmi_mask_w); - DECLARE_WRITE_LINE_MEMBER(bus_intr_out1_w); - DECLARE_WRITE_LINE_MEMBER(bus_intr_out2_w); + void nmi_mask_w(int state); + void bus_intr_out1_w(int state); + void bus_intr_out2_w(int state); void isbc2861_mem(address_map &map); void isbc286_io(address_map &map); void isbc286_mem(address_map &map); @@ -253,7 +253,7 @@ static DEVICE_INPUT_DEFAULTS_START( isbc286_terminal ) DEVICE_INPUT_DEFAULTS( "RS232_STOPBITS", 0xff, RS232_STOPBITS_1 ) DEVICE_INPUT_DEFAULTS_END -WRITE_LINE_MEMBER( isbc_state::isbc86_tmr2_w ) +void isbc_state::isbc86_tmr2_w(int state) { m_uart8251->write_rxc(state); m_uart8251->write_txc(state); @@ -267,13 +267,13 @@ uint8_t isbc_state::get_slave_ack(offs_t offset) return 0x00; } -WRITE_LINE_MEMBER( isbc_state::isbc286_tmr2_w ) +void isbc_state::isbc286_tmr2_w(int state) { m_uart8274->rxca_w(state); m_uart8274->txca_w(state); } -WRITE_LINE_MEMBER( isbc_state::write_centronics_ack ) +void isbc_state::write_centronics_ack(int state) { m_cent_status_in->write_bit4(state); @@ -310,7 +310,7 @@ void isbc_state::bioslo_w(offs_t offset, uint16_t data, uint16_t mem_mask) } #if 0 -WRITE_LINE_MEMBER(isbc_state::isbc_uart8274_irq) +void isbc_state::isbc_uart8274_irq(int state) { m_uart8274->m1_r(); // always set m_pic_0->ir6_w(state); @@ -328,18 +328,18 @@ void isbc_state::status_register_w(uint8_t data) m_statuslatch->write_bit(data & 0x07, BIT(data, 3)); } -WRITE_LINE_MEMBER(isbc_state::nmi_mask_w) +void isbc_state::nmi_mask_w(int state) { // combined with NMI input by 74LS08 AND gate at U12 m_nmi_enable = state; } -WRITE_LINE_MEMBER(isbc_state::bus_intr_out1_w) +void isbc_state::bus_intr_out1_w(int state) { // Multibus interrupt request (active high) } -WRITE_LINE_MEMBER(isbc_state::bus_intr_out2_w) +void isbc_state::bus_intr_out2_w(int state) { // Multibus interrupt request (active high) } diff --git a/src/mame/intel/isbc8010.cpp b/src/mame/intel/isbc8010.cpp index 5c6968faf4c..c00069cd6c4 100644 --- a/src/mame/intel/isbc8010.cpp +++ b/src/mame/intel/isbc8010.cpp @@ -64,7 +64,7 @@ public: private: [[maybe_unused]] uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER( usart_clock_tick ); + void usart_clock_tick(int state); void isbc8010_io(address_map &map); void isbc8010_mem(address_map &map); @@ -151,7 +151,7 @@ uint32_t isbc8010_state::screen_update(screen_device &screen, bitmap_ind16 &bitm return 0; } -WRITE_LINE_MEMBER( isbc8010_state::usart_clock_tick ) +void isbc8010_state::usart_clock_tick(int state) { uint8_t old_counter = m_usart_divide_counter; m_usart_divide_counter++; diff --git a/src/mame/intel/isbc_208.cpp b/src/mame/intel/isbc_208.cpp index 38128956d42..6c02860a5b4 100644 --- a/src/mame/intel/isbc_208.cpp +++ b/src/mame/intel/isbc_208.cpp @@ -52,17 +52,17 @@ void isbc_208_device::map(address_map &map) } -WRITE_LINE_MEMBER(isbc_208_device::out_eop_w) +void isbc_208_device::out_eop_w(int state) { m_fdc->tc_w(state); } -WRITE_LINE_MEMBER(isbc_208_device::irq_w) +void isbc_208_device::irq_w(int state) { m_out_irq_func(state); } -WRITE_LINE_MEMBER(isbc_208_device::hreq_w) +void isbc_208_device::hreq_w(int state) { m_maincpu->set_input_line(INPUT_LINE_HALT, state ? ASSERT_LINE : CLEAR_LINE); /* Assert HLDA */ diff --git a/src/mame/intel/isbc_208.h b/src/mame/intel/isbc_208.h index aed6ba9c004..204a2be7fd2 100644 --- a/src/mame/intel/isbc_208.h +++ b/src/mame/intel/isbc_208.h @@ -42,11 +42,11 @@ private: u16 m_seg; address_space *m_maincpu_mem; - DECLARE_WRITE_LINE_MEMBER(out_eop_w); - DECLARE_WRITE_LINE_MEMBER(hreq_w); + void out_eop_w(int state); + void hreq_w(int state); uint8_t dma_read_byte(offs_t offset); void dma_write_byte(offs_t offset, uint8_t data); - DECLARE_WRITE_LINE_MEMBER(irq_w); + void irq_w(int state); }; DECLARE_DEVICE_TYPE(ISBC_208, isbc_208_device) diff --git a/src/mame/intel/rex6000.cpp b/src/mame/intel/rex6000.cpp index 67d2dcc72bf..fb80b2c741a 100644 --- a/src/mame/intel/rex6000.cpp +++ b/src/mame/intel/rex6000.cpp @@ -85,8 +85,8 @@ public: void rex6000_palettte(palette_device &palette) const; DECLARE_QUICKLOAD_LOAD_MEMBER(quickload_rex6000); DECLARE_INPUT_CHANGED_MEMBER(trigger_irq); - DECLARE_WRITE_LINE_MEMBER(serial_irq); - DECLARE_WRITE_LINE_MEMBER(alarm_irq); + void serial_irq(int state); + void alarm_irq(int state); TIMER_DEVICE_CALLBACK_MEMBER(irq_timer1); TIMER_DEVICE_CALLBACK_MEMBER(irq_timer2); @@ -708,7 +708,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(rex6000_state::sec_timer) } } -WRITE_LINE_MEMBER( rex6000_state::alarm_irq ) +void rex6000_state::alarm_irq(int state) { if (!(m_irq_mask & IRQ_FLAG_ALARM) && state) { @@ -717,7 +717,7 @@ WRITE_LINE_MEMBER( rex6000_state::alarm_irq ) } } -WRITE_LINE_MEMBER( rex6000_state::serial_irq ) +void rex6000_state::serial_irq(int state) { if (!(m_irq_mask & IRQ_FLAG_SERIAL)) { diff --git a/src/mame/intel/sdk51.cpp b/src/mame/intel/sdk51.cpp index 7558216205b..91a67abe09e 100644 --- a/src/mame/intel/sdk51.cpp +++ b/src/mame/intel/sdk51.cpp @@ -57,8 +57,8 @@ private: u8 upibus_r(); void upibus_w(u8 data); - DECLARE_WRITE_LINE_MEMBER(display_clock_w); - DECLARE_WRITE_LINE_MEMBER(upiobf_w); + void display_clock_w(int state); + void upiobf_w(int state); void serial_control_w(u8 data); required_device m_maincpu; @@ -127,7 +127,7 @@ void sdk51_state::serial_control_w(u8 data) m_serial_control = data; } -WRITE_LINE_MEMBER(sdk51_state::display_clock_w) +void sdk51_state::display_clock_w(int state) { if (!m_display_clock && state) m_kdtime = ((m_kdtime << 1) & 0xfffffe) | BIT(m_upi->p1_r(), 6); @@ -135,7 +135,7 @@ WRITE_LINE_MEMBER(sdk51_state::display_clock_w) m_display_clock = state; } -WRITE_LINE_MEMBER(sdk51_state::upiobf_w) +void sdk51_state::upiobf_w(int state) { if (m_upiobf != bool(state)) { diff --git a/src/mame/intel/sdk80.cpp b/src/mame/intel/sdk80.cpp index 342305164e6..e04fd7dd4e1 100644 --- a/src/mame/intel/sdk80.cpp +++ b/src/mame/intel/sdk80.cpp @@ -57,7 +57,7 @@ public: void sdk80(machine_config &config); private: - DECLARE_WRITE_LINE_MEMBER( usart_clock_tick ); + void usart_clock_tick(int state); void sdk80_io(address_map &map); void sdk80_mem(address_map &map); @@ -101,7 +101,7 @@ static INPUT_PORTS_START( sdk80 ) PORT_DIPSETTING( 0x40, "75") INPUT_PORTS_END -WRITE_LINE_MEMBER( sdk80_state::usart_clock_tick ) +void sdk80_state::usart_clock_tick(int state) { uint8_t old_counter = m_usart_divide_counter; m_usart_divide_counter++; diff --git a/src/mame/intel/sdk85.cpp b/src/mame/intel/sdk85.cpp index a6f69b34999..077688742ce 100644 --- a/src/mame/intel/sdk85.cpp +++ b/src/mame/intel/sdk85.cpp @@ -74,11 +74,11 @@ public: void sdk85(machine_config &config); - DECLARE_WRITE_LINE_MEMBER(reset_w); - DECLARE_WRITE_LINE_MEMBER(vect_intr_w); + void reset_w(int state); + void vect_intr_w(int state); private: - DECLARE_READ_LINE_MEMBER(sid_r); + int sid_r(); void scanlines_w(u8 data); void digit_w(u8 data); @@ -114,7 +114,7 @@ void sdk85_state::machine_start() save_item(NAME(m_digit)); } -WRITE_LINE_MEMBER(sdk85_state::reset_w) +void sdk85_state::reset_w(int state) { m_maincpu->set_input_line(INPUT_LINE_RESET, state ? CLEAR_LINE : ASSERT_LINE); if (!state) @@ -127,12 +127,12 @@ WRITE_LINE_MEMBER(sdk85_state::reset_w) } } -WRITE_LINE_MEMBER(sdk85_state::vect_intr_w) +void sdk85_state::vect_intr_w(int state) { m_maincpu->set_input_line(I8085_RST75_LINE, state ? ASSERT_LINE : CLEAR_LINE); } -READ_LINE_MEMBER(sdk85_state::sid_r) +int sdk85_state::sid_r() { // Actual HW has S25 switch to ground SID when using keyboard input instead of TTY RX if (m_tty->get_card_device() == nullptr) diff --git a/src/mame/intergraph/interpro_ioga.h b/src/mame/intergraph/interpro_ioga.h index bad186cb0f0..0489577a9ad 100644 --- a/src/mame/intergraph/interpro_ioga.h +++ b/src/mame/intergraph/interpro_ioga.h @@ -65,19 +65,19 @@ public: virtual void map(address_map &map) = 0; // interrupt request lines - DECLARE_WRITE_LINE_MEMBER(ir0_w) { set_int_line(IRQ_SCSI, state); } - DECLARE_WRITE_LINE_MEMBER(ir1_w) { set_int_line(IRQ_FLOPPY, state); } - DECLARE_WRITE_LINE_MEMBER(ir2_w) { set_int_line(IRQ_PLOTTER, state); } - DECLARE_WRITE_LINE_MEMBER(ir3_w) { set_int_line(IRQ_SRXCBUS0, state); } - DECLARE_WRITE_LINE_MEMBER(ir4_w) { set_int_line(IRQ_SRXCBUS1, state); } - DECLARE_WRITE_LINE_MEMBER(ir5_w) { set_int_line(IRQ_SRXCBUS2, state); } - DECLARE_WRITE_LINE_MEMBER(ir6_w) { set_int_line(IRQ_VB, state); } - DECLARE_WRITE_LINE_MEMBER(ir7_w) { set_int_line(IRQ_7, state); } - DECLARE_WRITE_LINE_MEMBER(ir8_w) { set_int_line(IRQ_CBUS3, state); } - DECLARE_WRITE_LINE_MEMBER(ir9_w) { set_int_line(IRQ_RTC, state); } - //DECLARE_WRITE_LINE_MEMBER(ir10_w) { set_int_line(IRQ_60HZ, state); } - DECLARE_WRITE_LINE_MEMBER(ir11_w) { set_int_line(IRQ_SERIAL, state); } - DECLARE_WRITE_LINE_MEMBER(ir12_w) { set_int_line(IRQ_ETHERNET, state); } + void ir0_w(int state) { set_int_line(IRQ_SCSI, state); } + void ir1_w(int state) { set_int_line(IRQ_FLOPPY, state); } + void ir2_w(int state) { set_int_line(IRQ_PLOTTER, state); } + void ir3_w(int state) { set_int_line(IRQ_SRXCBUS0, state); } + void ir4_w(int state) { set_int_line(IRQ_SRXCBUS1, state); } + void ir5_w(int state) { set_int_line(IRQ_SRXCBUS2, state); } + void ir6_w(int state) { set_int_line(IRQ_VB, state); } + void ir7_w(int state) { set_int_line(IRQ_7, state); } + void ir8_w(int state) { set_int_line(IRQ_CBUS3, state); } + void ir9_w(int state) { set_int_line(IRQ_RTC, state); } + //void ir10_w(int state) { set_int_line(IRQ_60HZ, state); } + void ir11_w(int state) { set_int_line(IRQ_SERIAL, state); } + void ir12_w(int state) { set_int_line(IRQ_ETHERNET, state); } virtual IRQ_CALLBACK_MEMBER(acknowledge_interrupt); @@ -117,12 +117,12 @@ public: void softint_w(u8 data); // dma request lines - DECLARE_WRITE_LINE_MEMBER(drq_plotter) { drq(state, DMA_PLOTTER); } - DECLARE_WRITE_LINE_MEMBER(drq_scsi) { drq(state, DMA_SCSI); } - DECLARE_WRITE_LINE_MEMBER(drq_floppy) { drq(state, DMA_FLOPPY); } - DECLARE_WRITE_LINE_MEMBER(drq_serial0) { serial_drq(state, 0); } - DECLARE_WRITE_LINE_MEMBER(drq_serial1) { serial_drq(state, 1); } - DECLARE_WRITE_LINE_MEMBER(drq_serial2) { serial_drq(state, 2); } + void drq_plotter(int state) { drq(state, DMA_PLOTTER); } + void drq_scsi(int state) { drq(state, DMA_SCSI); } + void drq_floppy(int state) { drq(state, DMA_FLOPPY); } + void drq_serial0(int state) { serial_drq(state, 0); } + void drq_serial1(int state) { serial_drq(state, 1); } + void drq_serial2(int state) { serial_drq(state, 2); } // dma control enum dma_ctrl_mask diff --git a/src/mame/interton/vc4000.h b/src/mame/interton/vc4000.h index ebc0010c6be..a71eea4dc25 100644 --- a/src/mame/interton/vc4000.h +++ b/src/mame/interton/vc4000.h @@ -117,7 +117,7 @@ private: uint8_t vc4000_key_r(offs_t offset); uint8_t vc4000_video_r(offs_t offset); void vc4000_video_w(offs_t offset, uint8_t data); - DECLARE_READ_LINE_MEMBER(vc4000_vsync_r); + int vc4000_vsync_r(); uint8_t elektor_cass_r(); void elektor_cass_w(uint8_t data); vc4000_video_t m_video; diff --git a/src/mame/interton/vc4000_v.cpp b/src/mame/interton/vc4000_v.cpp index 03fe5f68005..288acb6b0e9 100644 --- a/src/mame/interton/vc4000_v.cpp +++ b/src/mame/interton/vc4000_v.cpp @@ -350,7 +350,7 @@ void vc4000_state::vc4000_video_w(offs_t offset, uint8_t data) } -READ_LINE_MEMBER(vc4000_state::vc4000_vsync_r) +int vc4000_state::vc4000_vsync_r() { return m_video.line >= VC4000_END_LINE ? ASSERT_LINE : CLEAR_LINE; } diff --git a/src/mame/irem/m63.cpp b/src/mame/irem/m63.cpp index 4925381a0ba..b0ddcb2cf2b 100644 --- a/src/mame/irem/m63.cpp +++ b/src/mame/irem/m63.cpp @@ -200,21 +200,21 @@ private: void m63_videoram_w(offs_t offset, uint8_t data); void m63_colorram_w(offs_t offset, uint8_t data); void m63_videoram2_w(offs_t offset, uint8_t data); - DECLARE_WRITE_LINE_MEMBER(pal_bank_w); - DECLARE_WRITE_LINE_MEMBER(m63_flipscreen_w); - DECLARE_WRITE_LINE_MEMBER(fghtbskt_flipscreen_w); - DECLARE_WRITE_LINE_MEMBER(coin1_w); - DECLARE_WRITE_LINE_MEMBER(coin2_w); + void pal_bank_w(int state); + void m63_flipscreen_w(int state); + void fghtbskt_flipscreen_w(int state); + void coin1_w(int state); + void coin2_w(int state); void snd_irq_w(uint8_t data); void snddata_w(offs_t offset, uint8_t data); void p1_w(uint8_t data); void p2_w(uint8_t data); uint8_t snd_status_r(); - DECLARE_READ_LINE_MEMBER(irq_r); + int irq_r(); uint8_t snddata_r(offs_t offset); void fghtbskt_samples_w(uint8_t data); SAMPLES_START_CB_MEMBER(fghtbskt_sh_start); - DECLARE_WRITE_LINE_MEMBER(nmi_mask_w); + void nmi_mask_w(int state); TILE_GET_INFO_MEMBER(get_bg_tile_info); TILE_GET_INFO_MEMBER(get_fg_tile_info); void m63_palette(palette_device &palette) const; @@ -302,19 +302,19 @@ void m63_state::m63_videoram2_w(offs_t offset, uint8_t data) m_fg_tilemap->mark_tile_dirty(offset); } -WRITE_LINE_MEMBER(m63_state::pal_bank_w) +void m63_state::pal_bank_w(int state) { m_pal_bank = state; m_bg_tilemap->mark_all_dirty(); } -WRITE_LINE_MEMBER(m63_state::m63_flipscreen_w) +void m63_state::m63_flipscreen_w(int state) { flip_screen_set(!state); machine().tilemap().mark_all_dirty(); } -WRITE_LINE_MEMBER(m63_state::fghtbskt_flipscreen_w) +void m63_state::fghtbskt_flipscreen_w(int state) { flip_screen_set(state); m_fg_flag = flip_screen() ? TILE_FLIPX : 0; @@ -399,12 +399,12 @@ uint32_t m63_state::screen_update_m63(screen_device &screen, bitmap_ind16 &bitma } -WRITE_LINE_MEMBER(m63_state::coin1_w) +void m63_state::coin1_w(int state) { machine().bookkeeping().coin_counter_w(0, state); } -WRITE_LINE_MEMBER(m63_state::coin2_w) +void m63_state::coin2_w(int state) { machine().bookkeeping().coin_counter_w(1, state); } @@ -448,7 +448,7 @@ uint8_t m63_state::snd_status_r() return m_sound_status; } -READ_LINE_MEMBER(m63_state::irq_r) +int m63_state::irq_r() { if (m_sound_irq) { @@ -474,7 +474,7 @@ void m63_state::fghtbskt_samples_w(uint8_t data) m_samples->start_raw(0, m_samplebuf.get() + ((data & 0xf0) << 8), 0x2000, 8000); } -WRITE_LINE_MEMBER(m63_state::nmi_mask_w) +void m63_state::nmi_mask_w(int state) { m_nmi_mask = state; } diff --git a/src/mame/irem/m90.cpp b/src/mame/irem/m90.cpp index a9c4326f916..68854ae21bc 100644 --- a/src/mame/irem/m90.cpp +++ b/src/mame/irem/m90.cpp @@ -741,13 +741,13 @@ INTERRUPT_GEN_MEMBER(m90_state::bomblord_fake_nmi) m_audio->sample_w(sample); } -WRITE_LINE_MEMBER(m90_state::dynablsb_vblank_int_w) +void m90_state::dynablsb_vblank_int_w(int state) { if (state) m_maincpu->set_input_line_and_vector(0, HOLD_LINE, 0x60/4); // V30 } -WRITE_LINE_MEMBER(m90_state::bomblord_vblank_int_w) +void m90_state::bomblord_vblank_int_w(int state) { if (state) m_maincpu->set_input_line_and_vector(0, HOLD_LINE, 0x50/4); // V30 diff --git a/src/mame/irem/m90.h b/src/mame/irem/m90.h index 24ec939ea0e..d4749f416c8 100644 --- a/src/mame/irem/m90.h +++ b/src/mame/irem/m90.h @@ -74,8 +74,8 @@ private: uint32_t screen_update_dynablsb(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(fake_nmi); INTERRUPT_GEN_MEMBER(bomblord_fake_nmi); - DECLARE_WRITE_LINE_MEMBER(dynablsb_vblank_int_w); - DECLARE_WRITE_LINE_MEMBER(bomblord_vblank_int_w); + void dynablsb_vblank_int_w(int state); + void bomblord_vblank_int_w(int state); void draw_sprites(screen_device &screen, bitmap_ind16 &bitmap,const rectangle &cliprect); void bomblord_draw_sprites(screen_device &screen, bitmap_ind16 &bitmap,const rectangle &cliprect); void dynablsb_draw_sprites(screen_device &screen, bitmap_ind16 &bitmap,const rectangle &cliprect); diff --git a/src/mame/irem/m92.cpp b/src/mame/irem/m92.cpp index b870b6db0cc..0aaa6a74a0f 100644 --- a/src/mame/irem/m92.cpp +++ b/src/mame/irem/m92.cpp @@ -275,7 +275,7 @@ void m92_state::bankswitch_w(uint8_t data) logerror("%05x: bankswitch %04x\n", m_maincpu->pc(), data); } -READ_LINE_MEMBER(m92_state::sprite_busy_r) +int m92_state::sprite_busy_r() { return m_sprite_buffer_busy; } diff --git a/src/mame/irem/m92.h b/src/mame/irem/m92.h index 5ad740c0735..7dae130cca8 100644 --- a/src/mame/irem/m92.h +++ b/src/mame/irem/m92.h @@ -68,7 +68,7 @@ public: void init_bank(); - DECLARE_READ_LINE_MEMBER(sprite_busy_r); + int sprite_busy_r(); private: required_device m_spriteram; diff --git a/src/mame/irem/redalert_a.cpp b/src/mame/irem/redalert_a.cpp index 9d684972cd8..66ed245fabb 100644 --- a/src/mame/irem/redalert_a.cpp +++ b/src/mame/irem/redalert_a.cpp @@ -134,7 +134,7 @@ void irem_m37b_audio_device::analog_w(uint8_t data) * *************************************/ -READ_LINE_MEMBER(irem_m37b_audio_device::sound_status_r) +int irem_m37b_audio_device::sound_status_r() { // communication handshake between host and sound CPU // at least Panther uses it, unconfirmed for Red Alert and Demoneye-X diff --git a/src/mame/irem/redalert_a.h b/src/mame/irem/redalert_a.h index 4747bd09169..707d802fab5 100644 --- a/src/mame/irem/redalert_a.h +++ b/src/mame/irem/redalert_a.h @@ -24,7 +24,7 @@ public: irem_m37b_audio_device(const machine_config &config, const char *tag, device_t *owner, uint32_t clock = 0U); - DECLARE_READ_LINE_MEMBER(sound_status_r); + int sound_status_r(); void audio_command_w(uint8_t data); diff --git a/src/mame/isc/compucolor.cpp b/src/mame/isc/compucolor.cpp index 594c4475a2e..e3d8ae667bb 100644 --- a/src/mame/isc/compucolor.cpp +++ b/src/mame/isc/compucolor.cpp @@ -78,7 +78,7 @@ public: uint8_t xi_r(); void xo_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER( xmt_w ); + void xmt_w(int state); IRQ_CALLBACK_MEMBER( int_ack ); @@ -364,7 +364,7 @@ void compucolor2_state::xo_w(uint8_t data) } } -WRITE_LINE_MEMBER( compucolor2_state::xmt_w ) +void compucolor2_state::xmt_w(int state) { switch ((m_xo >> 4) & 0x03) { diff --git a/src/mame/itech/iteagle_fpga.cpp b/src/mame/itech/iteagle_fpga.cpp index a5959f05d92..030b604104e 100644 --- a/src/mame/itech/iteagle_fpga.cpp +++ b/src/mame/itech/iteagle_fpga.cpp @@ -239,7 +239,7 @@ TIMER_CALLBACK_MEMBER(iteagle_fpga_device::assert_vblank_irq) LOGMASKED(LOG_FPGA, "%s:fpga assert_vblank_irq Setting interrupt(%i)\n", machine().describe_context(), m_irq_num); } -WRITE_LINE_MEMBER(iteagle_fpga_device::vblank_update) +void iteagle_fpga_device::vblank_update(int state) { m_vblank_state = state; if (state && m_fpga_regs[0x4 / 4] & 0x01000000) { @@ -257,7 +257,7 @@ WRITE_LINE_MEMBER(iteagle_fpga_device::vblank_update) } } -WRITE_LINE_MEMBER(iteagle_fpga_device::serial_interrupt) +void iteagle_fpga_device::serial_interrupt(int state) { LOGMASKED(LOG_SERIAL, "serial_interrupt: intr(%i) = %i\n", m_serial_irq_num, state); m_cpu->set_input_line(m_serial_irq_num, state); diff --git a/src/mame/itech/iteagle_fpga.h b/src/mame/itech/iteagle_fpga.h index 0ef8e8ec436..b060bd7fe56 100644 --- a/src/mame/itech/iteagle_fpga.h +++ b/src/mame/itech/iteagle_fpga.h @@ -51,7 +51,7 @@ public: template void set_irq_info(T &&tag, const int irq_num, int serial_num) { m_cpu.set_tag(std::forward(tag)); m_irq_num = irq_num; m_serial_irq_num = serial_num; } - DECLARE_WRITE_LINE_MEMBER(vblank_update); + void vblank_update(int state); void serial_rx_w(uint8_t data); enum { IO_SYSTEM, IO_IN1, IO_SW5, IO_NUM }; @@ -118,7 +118,7 @@ private: uint32_t e1_ram_r(offs_t offset, uint32_t mem_mask = ~0); void e1_ram_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0); - DECLARE_WRITE_LINE_MEMBER(serial_interrupt); + void serial_interrupt(int state); }; class iteagle_eeprom_device : public pci_device { diff --git a/src/mame/itech/itech32.cpp b/src/mame/itech/itech32.cpp index aa99c65e9fb..5b606f6ed4c 100644 --- a/src/mame/itech/itech32.cpp +++ b/src/mame/itech/itech32.cpp @@ -440,7 +440,7 @@ void itech32_state::update_interrupts(int vint, int xint, int qint) } -WRITE_LINE_MEMBER(itech32_state::generate_int1) +void itech32_state::generate_int1(int state) { if (state) { @@ -535,7 +535,7 @@ void itech32_state::color_w(u8 data) *************************************/ -READ_LINE_MEMBER(itech32_state::special_port_r) +int itech32_state::special_port_r() { if (m_soundlatch->pending_r()) m_special_result ^= 1; @@ -771,7 +771,7 @@ void drivedge_state::portb_out(u8 data) } -WRITE_LINE_MEMBER(drivedge_state::turbo_light) +void drivedge_state::turbo_light(int state) { m_leds[0] = state ? 1 : 0; } diff --git a/src/mame/itech/itech32.h b/src/mame/itech/itech32.h index 3e60c916e34..95a5d66381a 100644 --- a/src/mame/itech/itech32.h +++ b/src/mame/itech/itech32.h @@ -79,7 +79,7 @@ public: void init_gt3dl(); void init_pubball(); - DECLARE_READ_LINE_MEMBER(special_port_r); + int special_port_r(); protected: required_device m_maincpu; @@ -184,7 +184,7 @@ protected: void init_gt_common(); u32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - WRITE_LINE_MEMBER(generate_int1); + void generate_int1(int state); TIMER_CALLBACK_MEMBER(scanline_interrupt); inline offs_t compute_safe_address(int x, int y); inline void disable_clipping(); @@ -247,7 +247,7 @@ protected: void zbuf_control_w(offs_t offset, u32 data, u32 mem_mask = u32(~0)); void portb_out(u8 data); - DECLARE_WRITE_LINE_MEMBER(turbo_light); + void turbo_light(int state); void main_map(address_map &map); void tms1_map(address_map &map); diff --git a/src/mame/itech/itech8.cpp b/src/mame/itech/itech8.cpp index da0d58984fb..a68a8dd5362 100644 --- a/src/mame/itech/itech8.cpp +++ b/src/mame/itech/itech8.cpp @@ -565,7 +565,7 @@ TIMER_CALLBACK_MEMBER(itech8_state::irq_off) } -WRITE_LINE_MEMBER(itech8_state::generate_nmi) +void itech8_state::generate_nmi(int state) { if (state) { @@ -577,7 +577,7 @@ WRITE_LINE_MEMBER(itech8_state::generate_nmi) } } -WRITE_LINE_MEMBER(itech8_state::ninclown_irq) +void itech8_state::ninclown_irq(int state) { // definitely doesn't like the generate_nmi code, so we just generate VBlank irq here instead if (state) @@ -734,7 +734,7 @@ void itech8_state::rimrockn_bank_w(uint8_t data) * *************************************/ -READ_LINE_MEMBER(itech8_state::special_r) +int itech8_state::special_r() { return m_pia_portb_data & 0x01; } @@ -1687,7 +1687,7 @@ INPUT_PORTS_END * *************************************/ -WRITE_LINE_MEMBER(itech8_state::generate_tms34061_interrupt) +void itech8_state::generate_tms34061_interrupt(int state) { update_interrupts(-1, state, -1); diff --git a/src/mame/itech/itech8.h b/src/mame/itech/itech8.h index 09828140efa..2e42835c5fe 100644 --- a/src/mame/itech/itech8.h +++ b/src/mame/itech/itech8.h @@ -62,7 +62,7 @@ public: void init_arligntn(); void init_hstennis(); - DECLARE_READ_LINE_MEMBER(special_r); + int special_r(); DECLARE_CUSTOM_INPUT_MEMBER(gtg_mux); protected: @@ -125,7 +125,7 @@ protected: int m_bankxor = 0; // common - DECLARE_WRITE_LINE_MEMBER(generate_tms34061_interrupt); + void generate_tms34061_interrupt(int state); void nmi_ack_w(uint8_t data); void blitter_bank_w(offs_t offset, uint8_t data); void rimrockn_bank_w(uint8_t data); @@ -152,8 +152,8 @@ protected: uint32_t screen_update_2page(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); uint32_t screen_update_2page_large(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(generate_nmi); - DECLARE_WRITE_LINE_MEMBER(ninclown_irq); + void generate_nmi(int state); + void ninclown_irq(int state); TIMER_CALLBACK_MEMBER(irq_off); TIMER_CALLBACK_MEMBER(behind_the_beam_update); TIMER_CALLBACK_MEMBER(blitter_done); diff --git a/src/mame/jaleco/aeroboto.cpp b/src/mame/jaleco/aeroboto.cpp index 068dd16ebfa..79682899aa9 100644 --- a/src/mame/jaleco/aeroboto.cpp +++ b/src/mame/jaleco/aeroboto.cpp @@ -126,7 +126,7 @@ private: void tilecolor_w(offs_t offset, uint8_t data); TILE_GET_INFO_MEMBER(get_tile_info); uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(vblank_irq); + void vblank_irq(int state); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); void main_map(address_map &map); @@ -346,7 +346,7 @@ uint8_t aeroboto_state::_201_r() } -WRITE_LINE_MEMBER(aeroboto_state::vblank_irq) +void aeroboto_state::vblank_irq(int state) { if (state) { diff --git a/src/mame/jaleco/armchamp.cpp b/src/mame/jaleco/armchamp.cpp index 0c65c98436b..838962c211d 100644 --- a/src/mame/jaleco/armchamp.cpp +++ b/src/mame/jaleco/armchamp.cpp @@ -68,7 +68,7 @@ private: void io4_w(uint8_t data); void adpcm_w(uint8_t data); uint8_t arm_r(); - DECLARE_WRITE_LINE_MEMBER(msm5205_vck); + void msm5205_vck(int state); required_device m_maincpu; required_memory_bank m_rombank; @@ -242,7 +242,7 @@ uint8_t armchamp_state::arm_r() return (ioport("ARM")->read() & 0xff); } -WRITE_LINE_MEMBER(armchamp_state::msm5205_vck) +void armchamp_state::msm5205_vck(int state) { if (m_io2 & 0x80) { diff --git a/src/mame/jaleco/bnstars.cpp b/src/mame/jaleco/bnstars.cpp index a9dda513c6d..8c0d68ac545 100644 --- a/src/mame/jaleco/bnstars.cpp +++ b/src/mame/jaleco/bnstars.cpp @@ -165,7 +165,7 @@ private: template u16 object_vram_r(offs_t offset); template void palette_ram_w(offs_t offset, u16 data, u16 mem_mask = ~0); template u16 palette_ram_r(offs_t offset); - DECLARE_WRITE_LINE_MEMBER(flipscreen_dual_w); + void flipscreen_dual_w(int state); template TILE_GET_INFO_MEMBER(get_ascii_tile_info); template TILE_GET_INFO_MEMBER(get_scroll_tile_info); template TILE_GET_INFO_MEMBER(get_rotate_tile_info); @@ -186,7 +186,7 @@ private: }; -WRITE_LINE_MEMBER(ms32_bnstars_state::flipscreen_dual_w) +void ms32_bnstars_state::flipscreen_dual_w(int state) { for (int chip = 0; chip < 2; chip++) { diff --git a/src/mame/jaleco/cischeat.cpp b/src/mame/jaleco/cischeat.cpp index 8346854abda..6dd111039f9 100644 --- a/src/mame/jaleco/cischeat.cpp +++ b/src/mame/jaleco/cischeat.cpp @@ -835,7 +835,7 @@ CUSTOM_INPUT_MEMBER(captflag_state::motor_pos_r) } template -READ_LINE_MEMBER(captflag_state::motor_busy_r) +int captflag_state::motor_busy_r() { // timer_device & dev = ((side == RIGHT) ? m_motor_right : m_motor_left); // return (dev.remaining() == attotime::never) ? 0 : 1; @@ -2060,7 +2060,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(cischeat_state::bigrun_scanline) m_cpu1->set_input_line(2, HOLD_LINE); } -WRITE_LINE_MEMBER(cischeat_state::sound_irq) +void cischeat_state::sound_irq(int state) { if(state) m_soundcpu->set_input_line(4, HOLD_LINE); diff --git a/src/mame/jaleco/cischeat.h b/src/mame/jaleco/cischeat.h index 80ea01f8dee..41d59a419bc 100644 --- a/src/mame/jaleco/cischeat.h +++ b/src/mame/jaleco/cischeat.h @@ -73,7 +73,7 @@ public: void f1gpstr2_io_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); void cischeat_soundbank_1_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); void cischeat_soundbank_2_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); - DECLARE_WRITE_LINE_MEMBER(sound_irq); + void sound_irq(int state); void init_cischeat(); void init_bigrun(); void init_f1gpstar(); @@ -220,7 +220,7 @@ public: } void captflag(machine_config &config); - template DECLARE_READ_LINE_MEMBER(motor_busy_r); + template int motor_busy_r(); template DECLARE_CUSTOM_INPUT_MEMBER(motor_pos_r); void init_captflag(); void init_vscaptfl(); diff --git a/src/mame/jaleco/ddayjlc.cpp b/src/mame/jaleco/ddayjlc.cpp index ac36bb61763..c83441ba516 100644 --- a/src/mame/jaleco/ddayjlc.cpp +++ b/src/mame/jaleco/ddayjlc.cpp @@ -115,7 +115,7 @@ private: TILE_GET_INFO_MEMBER(get_tile_info_fg); void ddayjlc_palette(palette_device &palette) const; uint32_t screen_update_ddayjlc(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(vblank_irq); + void vblank_irq(int state); void main_map(address_map &map); void sound_map(address_map &map); @@ -526,7 +526,7 @@ static GFXDECODE_START( gfx_ddayjlc ) GFXDECODE_ENTRY( "gfx3", 0, charlayout, 0x100, 16 ) GFXDECODE_END -WRITE_LINE_MEMBER(ddayjlc_state::vblank_irq) +void ddayjlc_state::vblank_irq(int state) { if (state && m_main_nmi_enable) m_maincpu->set_input_line(INPUT_LINE_NMI, ASSERT_LINE); diff --git a/src/mame/jaleco/homerun.cpp b/src/mame/jaleco/homerun.cpp index 538c3ff691b..b9a4d71de1d 100644 --- a/src/mame/jaleco/homerun.cpp +++ b/src/mame/jaleco/homerun.cpp @@ -145,8 +145,8 @@ public: void dynashot(machine_config &config); void homerun(machine_config &config); - DECLARE_READ_LINE_MEMBER(sprite0_r); - DECLARE_READ_LINE_MEMBER(homerun_d7756_busy_r); + int sprite0_r(); + int homerun_d7756_busy_r(); DECLARE_CUSTOM_INPUT_MEMBER(ganjaja_hopper_status_r); protected: @@ -195,7 +195,7 @@ private: /**************************************************************************/ -READ_LINE_MEMBER(homerun_state::sprite0_r) +int homerun_state::sprite0_r() { // sprite-0 vs background collision status, similar to NES return (m_screen->vpos() > (m_spriteram[0] - 16 + 1)) ? 1 : 0; @@ -408,7 +408,7 @@ void homerun_state::io_map(address_map &map) } -READ_LINE_MEMBER(homerun_state::homerun_d7756_busy_r) +int homerun_state::homerun_d7756_busy_r() { return m_samples->playing(0) ? 0 : 1; } diff --git a/src/mame/jaleco/megasys1.cpp b/src/mame/jaleco/megasys1.cpp index 42573aab64c..f352e61739e 100644 --- a/src/mame/jaleco/megasys1.cpp +++ b/src/mame/jaleco/megasys1.cpp @@ -492,7 +492,7 @@ void megasys1_state::megasys1D_oki_map(address_map &map) */ /* YM2151 IRQ */ -WRITE_LINE_MEMBER(megasys1_state::sound_irq) +void megasys1_state::sound_irq(int state) { if (state) m_audiocpu->set_input_line(4, HOLD_LINE); diff --git a/src/mame/jaleco/megasys1.h b/src/mame/jaleco/megasys1.h index 5cf63da6d99..d84156de2da 100644 --- a/src/mame/jaleco/megasys1.h +++ b/src/mame/jaleco/megasys1.h @@ -148,7 +148,7 @@ private: // soldam u16 *m_spriteram = nullptr; - DECLARE_WRITE_LINE_MEMBER(sound_irq); + void sound_irq(int state); u16 ip_select_r(); void ip_select_w(u16 data); u16 protection_peekaboo_r(); @@ -183,7 +183,7 @@ private: DECLARE_MACHINE_RESET(megasys1_hachoo); u32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(screen_vblank); + void screen_vblank(int state); INTERRUPT_GEN_MEMBER(megasys1D_irq); TIMER_DEVICE_CALLBACK_MEMBER(megasys1A_scanline); TIMER_DEVICE_CALLBACK_MEMBER(megasys1A_iganinju_scanline); diff --git a/src/mame/jaleco/megasys1_v.cpp b/src/mame/jaleco/megasys1_v.cpp index a20f3d171ad..d02b4d67fe1 100644 --- a/src/mame/jaleco/megasys1_v.cpp +++ b/src/mame/jaleco/megasys1_v.cpp @@ -871,7 +871,7 @@ u32 megasys1_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, c return 0; } -WRITE_LINE_MEMBER(megasys1_state::screen_vblank) +void megasys1_state::screen_vblank(int state) { // rising edge if (state) diff --git a/src/mame/jaleco/ms32.cpp b/src/mame/jaleco/ms32.cpp index 0867d269161..4968db6b2ae 100644 --- a/src/mame/jaleco/ms32.cpp +++ b/src/mame/jaleco/ms32.cpp @@ -1652,22 +1652,22 @@ void ms32_base_state::irq_raise(int level, bool state) m_maincpu->set_input_line(0, CLEAR_LINE); } -WRITE_LINE_MEMBER(ms32_base_state::timer_irq_w) +void ms32_base_state::timer_irq_w(int state) { irq_raise(0, state); } -WRITE_LINE_MEMBER(ms32_base_state::vblank_irq_w) +void ms32_base_state::vblank_irq_w(int state) { irq_raise(10, state); } -WRITE_LINE_MEMBER(ms32_base_state::field_irq_w) +void ms32_base_state::field_irq_w(int state) { irq_raise(9, state); } -WRITE_LINE_MEMBER(ms32_base_state::sound_reset_line_w) +void ms32_base_state::sound_reset_line_w(int state) { if (state) m_audiocpu->pulse_input_line(INPUT_LINE_RESET, attotime::zero); @@ -1715,7 +1715,7 @@ void ms32_base_state::to_main_w(u8 data) } -WRITE_LINE_MEMBER(ms32_base_state::sound_ack_w) +void ms32_base_state::sound_ack_w(int state) { // used by f1superb, is it the reason for sound dying? if (state) diff --git a/src/mame/jaleco/ms32.h b/src/mame/jaleco/ms32.h index c6caafe203e..843a4cee619 100644 --- a/src/mame/jaleco/ms32.h +++ b/src/mame/jaleco/ms32.h @@ -33,11 +33,11 @@ protected: required_memory_bank_array<2> m_z80bank; required_shared_ptr m_sprite_ctrl; - DECLARE_WRITE_LINE_MEMBER(timer_irq_w); - DECLARE_WRITE_LINE_MEMBER(vblank_irq_w); - DECLARE_WRITE_LINE_MEMBER(field_irq_w); - DECLARE_WRITE_LINE_MEMBER(sound_ack_w); - DECLARE_WRITE_LINE_MEMBER(sound_reset_line_w); + void timer_irq_w(int state); + void vblank_irq_w(int state); + void field_irq_w(int state); + void sound_ack_w(int state); + void sound_reset_line_w(int state); void ms32_snd_bank_w(u8 data); IRQ_CALLBACK_MEMBER(irq_callback); @@ -103,7 +103,7 @@ protected: required_device m_gfxdecode; required_device m_ymf; - DECLARE_WRITE_LINE_MEMBER(flipscreen_w); + void flipscreen_w(int state); virtual void video_start() override; void ms32_map(address_map &map); @@ -166,7 +166,7 @@ private: TILE_GET_INFO_MEMBER(get_ms32_bg_tile_info); u32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(screen_vblank); + void screen_vblank(int state); void update_color(int color); void draw_sprites(bitmap_ind16 &bitmap, bitmap_ind8 &bitmap_pri, const rectangle &cliprect, u16 *sprram_top); void draw_roz(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect,int priority); diff --git a/src/mame/jaleco/ms32_v.cpp b/src/mame/jaleco/ms32_v.cpp index bd0fc60c8cc..60b848252c7 100644 --- a/src/mame/jaleco/ms32_v.cpp +++ b/src/mame/jaleco/ms32_v.cpp @@ -696,7 +696,7 @@ u32 ms32_state::screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const return 0; } -WRITE_LINE_MEMBER(ms32_state::screen_vblank) +void ms32_state::screen_vblank(int state) { if (state) { @@ -704,7 +704,7 @@ WRITE_LINE_MEMBER(ms32_state::screen_vblank) } } -WRITE_LINE_MEMBER(ms32_state::flipscreen_w) +void ms32_state::flipscreen_w(int state) { m_tx_tilemap->set_flip(state ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); m_bg_tilemap->set_flip(state ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); diff --git a/src/mame/jaleco/pturn.cpp b/src/mame/jaleco/pturn.cpp index 103c57acc85..981c8f02009 100644 --- a/src/mame/jaleco/pturn.cpp +++ b/src/mame/jaleco/pturn.cpp @@ -134,17 +134,17 @@ private: bool m_nmi_sub = false; void videoram_w(offs_t offset, uint8_t data); - DECLARE_WRITE_LINE_MEMBER(nmi_main_enable_w); + void nmi_main_enable_w(int state); void nmi_sub_enable_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(coin_counter_1_w); - DECLARE_WRITE_LINE_MEMBER(coin_counter_2_w); + void coin_counter_1_w(int state); + void coin_counter_2_w(int state); void bgcolor_w(uint8_t data); void bg_scrollx_w(uint8_t data); void fgpalette_w(uint8_t data); void bg_scrolly_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(fgbank_w); - DECLARE_WRITE_LINE_MEMBER(bgbank_w); - DECLARE_WRITE_LINE_MEMBER(flip_w); + void fgbank_w(int state); + void bgbank_w(int state); + void flip_w(int state); uint8_t custom_r(offs_t offset); TILE_GET_INFO_MEMBER(get_tile_info); @@ -246,7 +246,7 @@ void pturn_state::videoram_w(offs_t offset, uint8_t data) } -WRITE_LINE_MEMBER(pturn_state::nmi_main_enable_w) +void pturn_state::nmi_main_enable_w(int state) { m_nmi_main = state; if (!m_nmi_main) @@ -260,12 +260,12 @@ void pturn_state::nmi_sub_enable_w(uint8_t data) m_audiocpu->set_input_line(INPUT_LINE_NMI, CLEAR_LINE); } -WRITE_LINE_MEMBER(pturn_state::coin_counter_1_w) +void pturn_state::coin_counter_1_w(int state) { machine().bookkeeping().coin_counter_w(0, state); } -WRITE_LINE_MEMBER(pturn_state::coin_counter_2_w) +void pturn_state::coin_counter_2_w(int state) { machine().bookkeeping().coin_counter_w(1, state); } @@ -293,19 +293,19 @@ void pturn_state::bg_scrolly_w(uint8_t data) m_bgmap->set_scrollx(0, data); } -WRITE_LINE_MEMBER(pturn_state::fgbank_w) +void pturn_state::fgbank_w(int state) { m_fgbank = state; m_fgmap->mark_all_dirty(); } -WRITE_LINE_MEMBER(pturn_state::bgbank_w) +void pturn_state::bgbank_w(int state) { m_bgbank = state; m_bgmap->mark_all_dirty(); } -WRITE_LINE_MEMBER(pturn_state::flip_w) +void pturn_state::flip_w(int state) { flip_screen_set(state); } diff --git a/src/mame/jaleco/tetrisp2.cpp b/src/mame/jaleco/tetrisp2.cpp index f177f94ffac..defacf0d826 100644 --- a/src/mame/jaleco/tetrisp2.cpp +++ b/src/mame/jaleco/tetrisp2.cpp @@ -1752,23 +1752,23 @@ void tetrisp2_state::init_rockn3() m_rockn_protectdata = 4; } -WRITE_LINE_MEMBER(tetrisp2_state::field_irq_w) +void tetrisp2_state::field_irq_w(int state) { // irq1 is valid on all games but tetrisp2, but always masked by SR? m_maincpu->set_input_line(1, (state) ? ASSERT_LINE : CLEAR_LINE); } -WRITE_LINE_MEMBER(tetrisp2_state::vblank_irq_w) +void tetrisp2_state::vblank_irq_w(int state) { m_maincpu->set_input_line(2, (state) ? ASSERT_LINE : CLEAR_LINE); } -WRITE_LINE_MEMBER(tetrisp2_state::timer_irq_w) +void tetrisp2_state::timer_irq_w(int state) { m_maincpu->set_input_line(4, (state) ? ASSERT_LINE : CLEAR_LINE); } -WRITE_LINE_MEMBER(tetrisp2_state::sound_reset_line_w) +void tetrisp2_state::sound_reset_line_w(int state) { logerror("%s: sound_reset_line_w %d but no CPU to reset?\n", machine().describe_context(), state); } @@ -1930,22 +1930,22 @@ void tetrisp2_state::rockn2(machine_config &config) ymz.add_route(1, "rspeaker", 1.0); } -WRITE_LINE_MEMBER(rocknms_state::sub_field_irq_w) +void rocknms_state::sub_field_irq_w(int state) { m_subcpu->set_input_line(1, (state) ? ASSERT_LINE : CLEAR_LINE); } -WRITE_LINE_MEMBER(rocknms_state::sub_vblank_irq_w) +void rocknms_state::sub_vblank_irq_w(int state) { m_subcpu->set_input_line(2, (state) ? ASSERT_LINE : CLEAR_LINE); } -WRITE_LINE_MEMBER(rocknms_state::sub_timer_irq_w) +void rocknms_state::sub_timer_irq_w(int state) { m_subcpu->set_input_line(4, (state) ? ASSERT_LINE : CLEAR_LINE); } -WRITE_LINE_MEMBER(rocknms_state::sub_sound_reset_line_w) +void rocknms_state::sub_sound_reset_line_w(int state) { logerror("%s: sound_reset_line_w %d on sub CPU but no CPU to reset?\n", machine().describe_context(), state); } @@ -2012,7 +2012,7 @@ void rocknms_state::rocknms(machine_config &config) ymz.add_route(1, "rspeaker", 1.0); } -WRITE_LINE_MEMBER(stepstag_state::field_cb) +void stepstag_state::field_cb(int state) { // TODO: pinpoint the exact source, translate to configure_scanline if necessary // irq 4 is definitely a 30 Hz-ish here as well, diff --git a/src/mame/jaleco/tetrisp2.h b/src/mame/jaleco/tetrisp2.h index 4c0807d909d..9a71cad0f2c 100644 --- a/src/mame/jaleco/tetrisp2.h +++ b/src/mame/jaleco/tetrisp2.h @@ -57,11 +57,11 @@ public: protected: void setup_main_sysctrl(machine_config &config, const XTAL clock); void setup_main_sprite(machine_config &config, const XTAL clock); - DECLARE_WRITE_LINE_MEMBER(flipscreen_w); - DECLARE_WRITE_LINE_MEMBER(timer_irq_w); - DECLARE_WRITE_LINE_MEMBER(vblank_irq_w); - DECLARE_WRITE_LINE_MEMBER(field_irq_w); - DECLARE_WRITE_LINE_MEMBER(sound_reset_line_w); + void flipscreen_w(int state); + void timer_irq_w(int state); + void vblank_irq_w(int state); + void field_irq_w(int state); + void sound_reset_line_w(int state); u16 rockn_adpcmbank_r(); void rockn_adpcmbank_w(u16 data); @@ -198,11 +198,11 @@ private: tilemap_t *m_tilemap_sub_fg = nullptr; tilemap_t *m_tilemap_sub_rot = nullptr; - DECLARE_WRITE_LINE_MEMBER(sub_flipscreen_w); - DECLARE_WRITE_LINE_MEMBER(sub_timer_irq_w); - DECLARE_WRITE_LINE_MEMBER(sub_vblank_irq_w); - DECLARE_WRITE_LINE_MEMBER(sub_field_irq_w); - DECLARE_WRITE_LINE_MEMBER(sub_sound_reset_line_w); + void sub_flipscreen_w(int state); + void sub_timer_irq_w(int state); + void sub_vblank_irq_w(int state); + void sub_field_irq_w(int state); + void sub_sound_reset_line_w(int state); }; class stepstag_state : public tetrisp2_state @@ -275,7 +275,7 @@ private: void stepstag_sub_map(address_map &map); void vjdash_map(address_map &map); - DECLARE_WRITE_LINE_MEMBER(field_cb); + void field_cb(int state); void setup_non_sysctrl_screen(machine_config &config, screen_device *screen, const XTAL xtal); void convert_yuv422_to_rgb888(palette_device *paldev, u16 *palram,u32 offset); diff --git a/src/mame/jaleco/tetrisp2_v.cpp b/src/mame/jaleco/tetrisp2_v.cpp index af5756aef03..27f75ca47ac 100644 --- a/src/mame/jaleco/tetrisp2_v.cpp +++ b/src/mame/jaleco/tetrisp2_v.cpp @@ -36,7 +36,7 @@ To Do: #include "tetrisp2.h" -WRITE_LINE_MEMBER(tetrisp2_state::flipscreen_w) +void tetrisp2_state::flipscreen_w(int state) { machine().tilemap().set_flip_all(state ? (TILEMAP_FLIPX | TILEMAP_FLIPY) : 0); // TODO: sprite device(s) @@ -44,7 +44,7 @@ WRITE_LINE_MEMBER(tetrisp2_state::flipscreen_w) m_rot_ofsy = state ? 0x04df : 0x400; } -WRITE_LINE_MEMBER(rocknms_state::sub_flipscreen_w) +void rocknms_state::sub_flipscreen_w(int state) { // ... } diff --git a/src/mame/jpm/jpmimpct.cpp b/src/mame/jpm/jpmimpct.cpp index 8578b72014c..9b00f3a43b2 100644 --- a/src/mame/jpm/jpmimpct.cpp +++ b/src/mame/jpm/jpmimpct.cpp @@ -1104,7 +1104,7 @@ INPUT_PORTS_END * *************************************/ -WRITE_LINE_MEMBER(jpmimpct_video_state::tms_irq) +void jpmimpct_video_state::tms_irq(int state) { m_tms_irq = state; update_irqs(); @@ -1126,7 +1126,7 @@ WRITE_LINE_MEMBER(jpmimpct_video_state::tms_irq) // B2 = Hopper Low // B3 = 20p Hopper Opto -READ_LINE_MEMBER( jpmimpct_state::hopper_b_0_r ) +int jpmimpct_state::hopper_b_0_r() { uint8_t retval = 0x01; @@ -1147,7 +1147,7 @@ READ_LINE_MEMBER( jpmimpct_state::hopper_b_0_r ) return retval; } -READ_LINE_MEMBER( jpmimpct_state::hopper_b_3_r ) +int jpmimpct_state::hopper_b_3_r() { uint8_t retval = 0x01; @@ -1181,7 +1181,7 @@ READ_LINE_MEMBER( jpmimpct_state::hopper_b_3_r ) // if (StatBtns & 0x20) // Top Up switch // retval &= ~0x20; -READ_LINE_MEMBER(jpmimpct_state::hopper_c_4_r) +int jpmimpct_state::hopper_c_4_r() { uint8_t retval = 0x01; @@ -1193,7 +1193,7 @@ READ_LINE_MEMBER(jpmimpct_state::hopper_c_4_r) return retval; } -READ_LINE_MEMBER(jpmimpct_state::hopper_c_6_r) +int jpmimpct_state::hopper_c_6_r() { uint8_t retval = 0x01; @@ -1205,7 +1205,7 @@ READ_LINE_MEMBER(jpmimpct_state::hopper_c_6_r) return retval; } -READ_LINE_MEMBER(jpmimpct_state::hopper_c_7_r) +int jpmimpct_state::hopper_c_7_r() { uint8_t retval = 0x01; @@ -1286,7 +1286,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(jpmimpct_state::duart_set_ip5) * *************************************/ -WRITE_LINE_MEMBER(jpmimpct_state::duart_irq_handler) +void jpmimpct_state::duart_irq_handler(int state) { // triggers IRQ 5 m_maincpu->set_input_line(5, state); diff --git a/src/mame/jpm/jpmimpct.h b/src/mame/jpm/jpmimpct.h index fbc88c2606a..56c3aea3751 100644 --- a/src/mame/jpm/jpmimpct.h +++ b/src/mame/jpm/jpmimpct.h @@ -35,7 +35,7 @@ public: auto rxd_handler() { return m_rxd_handler.bind(); } - DECLARE_WRITE_LINE_MEMBER( output_rxd ) { m_rxd_handler(state); } + void output_rxd(int state) { m_rxd_handler(state); } void touched(uint8_t x, uint8_t y); @@ -84,13 +84,13 @@ public: DECLARE_INPUT_CHANGED_MEMBER(coin_changed); - template DECLARE_READ_LINE_MEMBER( coinsense_r ) { return (m_coinstate >> N) & 1; } + template int coinsense_r() { return (m_coinstate >> N) & 1; } - DECLARE_READ_LINE_MEMBER(hopper_b_0_r); - DECLARE_READ_LINE_MEMBER(hopper_b_3_r); - DECLARE_READ_LINE_MEMBER(hopper_c_4_r); - DECLARE_READ_LINE_MEMBER(hopper_c_6_r); - DECLARE_READ_LINE_MEMBER(hopper_c_7_r); + int hopper_b_0_r(); + int hopper_b_3_r(); + int hopper_c_4_r(); + int hopper_c_6_r(); + int hopper_c_7_r(); protected: void impact_nonvideo_base(machine_config &config); @@ -124,8 +124,8 @@ protected: virtual void machine_reset() override; private: - template DECLARE_WRITE_LINE_MEMBER(reel_optic_cb) { if (state) m_optic_pattern |= (1 << N); else m_optic_pattern &= ~(1 << N); } - template DECLARE_WRITE_LINE_MEMBER(reel_optic_inv_cb) { if (!state) m_optic_pattern |= (1 << N); else m_optic_pattern &= ~(1 << N); } + template void reel_optic_cb(int state) { if (state) m_optic_pattern |= (1 << N); else m_optic_pattern &= ~(1 << N); } + template void reel_optic_inv_cb(int state) { if (!state) m_optic_pattern |= (1 << N); else m_optic_pattern &= ~(1 << N); } template TIMER_DEVICE_CALLBACK_MEMBER(coinoff) { m_coinstate |= (1 << N); logerror("coin state lowered %d\n", N+1); } @@ -150,7 +150,7 @@ private: - DECLARE_WRITE_LINE_MEMBER(duart_irq_handler); + void duart_irq_handler(int state); void impact_non_video_map(address_map &map); uint8_t m_Lamps[256]{}; @@ -203,7 +203,7 @@ protected: void tms_program_map(address_map &map); - DECLARE_WRITE_LINE_MEMBER(tms_irq); + void tms_irq(int state); TMS340X0_TO_SHIFTREG_CB_MEMBER(to_shiftreg); TMS340X0_FROM_SHIFTREG_CB_MEMBER(from_shiftreg); TMS340X0_SCANLINE_RGB32_CB_MEMBER(scanline_update); diff --git a/src/mame/jpm/jpms80.cpp b/src/mame/jpm/jpms80.cpp index 2f0621b179c..ed6f4b6ca32 100644 --- a/src/mame/jpm/jpms80.cpp +++ b/src/mame/jpm/jpms80.cpp @@ -66,10 +66,10 @@ public: private: virtual void machine_reset() override; - DECLARE_WRITE_LINE_MEMBER(int1_enable_w); - DECLARE_WRITE_LINE_MEMBER(int2_enable_w); - DECLARE_WRITE_LINE_MEMBER(watchdog_w); - DECLARE_WRITE_LINE_MEMBER(io_enable_w); + void int1_enable_w(int state); + void int2_enable_w(int state); + void watchdog_w(int state); + void io_enable_w(int state); void jpms80_io_map(address_map &map); void jpms80_map(address_map &map); @@ -79,19 +79,19 @@ private: required_device m_acc; }; -WRITE_LINE_MEMBER(jpms80_state::int1_enable_w) +void jpms80_state::int1_enable_w(int state) { } -WRITE_LINE_MEMBER(jpms80_state::int2_enable_w) +void jpms80_state::int2_enable_w(int state) { } -WRITE_LINE_MEMBER(jpms80_state::watchdog_w) +void jpms80_state::watchdog_w(int state) { } -WRITE_LINE_MEMBER(jpms80_state::io_enable_w) +void jpms80_state::io_enable_w(int state) { } diff --git a/src/mame/jpm/jpmsru.cpp b/src/mame/jpm/jpmsru.cpp index ea0378c7834..e3b2558c64a 100644 --- a/src/mame/jpm/jpmsru.cpp +++ b/src/mame/jpm/jpmsru.cpp @@ -111,12 +111,12 @@ public: void sup2p(machine_config &config); void lal(machine_config &config); - template DECLARE_READ_LINE_MEMBER(opto_r) { return m_opto[N]; } + template int opto_r() { return m_opto[N]; } protected: virtual void machine_start() override; virtual void device_post_load() override; - template DECLARE_WRITE_LINE_MEMBER(opto_cb) { m_opto[N] = state; } + template void opto_cb(int state) { m_opto[N] = state; } uint8_t inputs_r(offs_t offset); uint8_t inputs_ext_r(offs_t offset); diff --git a/src/mame/jpm/jpmsys5.cpp b/src/mame/jpm/jpmsys5.cpp index c4dad0b8900..a993dcb0268 100644 --- a/src/mame/jpm/jpmsys5.cpp +++ b/src/mame/jpm/jpmsys5.cpp @@ -72,7 +72,7 @@ enum int_levels * *************************************/ -WRITE_LINE_MEMBER(jpmsys5v_state::generate_tms34061_interrupt) +void jpmsys5v_state::generate_tms34061_interrupt(int state) { m_maincpu->set_input_line(INT_TMS34061, state); } @@ -632,7 +632,7 @@ INPUT_PORTS_END * 6821 PIA * *************************************/ -WRITE_LINE_MEMBER(jpmsys5_state::pia_irq) +void jpmsys5_state::pia_irq(int state) { m_maincpu->set_input_line(INT_6821PIA, state ? ASSERT_LINE : CLEAR_LINE); } @@ -664,13 +664,13 @@ void jpmsys5_state::u29_portb_w(uint8_t data) } } -WRITE_LINE_MEMBER(jpmsys5_state::u29_ca2_w) +void jpmsys5_state::u29_ca2_w(int state) { //The 'CHOP' line controls power to the reel motors, without this the reels won't turn m_chop = state; } -WRITE_LINE_MEMBER(jpmsys5_state::u29_cb2_w) +void jpmsys5_state::u29_cb2_w(int state) { //On a cabinet, this overrides the volume, we don't emulate this yet logerror("Alarm override enabled \n"); @@ -682,12 +682,12 @@ WRITE_LINE_MEMBER(jpmsys5_state::u29_cb2_w) * *************************************/ -WRITE_LINE_MEMBER(jpmsys5_state::ptm_irq) +void jpmsys5_state::ptm_irq(int state) { m_maincpu->set_input_line(INT_6840PTM, state ? ASSERT_LINE : CLEAR_LINE); } -WRITE_LINE_MEMBER(jpmsys5_state::u26_o1_callback) +void jpmsys5_state::u26_o1_callback(int state) { if (m_mpxclk != state) { @@ -708,17 +708,17 @@ WRITE_LINE_MEMBER(jpmsys5_state::u26_o1_callback) * *************************************/ -WRITE_LINE_MEMBER(jpmsys5_state::a0_tx_w) +void jpmsys5_state::a0_tx_w(int state) { m_a0_data_out = state; } -WRITE_LINE_MEMBER(jpmsys5_state::a1_tx_w) +void jpmsys5_state::a1_tx_w(int state) { m_a1_data_out = state; } -WRITE_LINE_MEMBER(jpmsys5_state::a2_tx_w) +void jpmsys5_state::a2_tx_w(int state) { m_a2_data_out = state; } diff --git a/src/mame/jpm/jpmsys5.h b/src/mame/jpm/jpmsys5.h index 58626504f6a..86548ff2f4e 100644 --- a/src/mame/jpm/jpmsys5.h +++ b/src/mame/jpm/jpmsys5.h @@ -51,14 +51,14 @@ public: void jpmsys5(machine_config &config); void jpmsys5_ym(machine_config &config); - DECLARE_WRITE_LINE_MEMBER(ptm_irq); - DECLARE_WRITE_LINE_MEMBER(u26_o1_callback); - DECLARE_WRITE_LINE_MEMBER(pia_irq); - DECLARE_WRITE_LINE_MEMBER(u29_ca2_w); - DECLARE_WRITE_LINE_MEMBER(u29_cb2_w); - DECLARE_WRITE_LINE_MEMBER(a0_tx_w); - DECLARE_WRITE_LINE_MEMBER(a1_tx_w); - DECLARE_WRITE_LINE_MEMBER(a2_tx_w); + void ptm_irq(int state); + void u26_o1_callback(int state); + void pia_irq(int state); + void u29_ca2_w(int state); + void u29_cb2_w(int state); + void a0_tx_w(int state); + void a1_tx_w(int state); + void a2_tx_w(int state); uint8_t u29_porta_r(); void u29_portb_w(uint8_t data); @@ -96,7 +96,7 @@ protected: void m68000_ym_map(address_map &map); private: - template DECLARE_WRITE_LINE_MEMBER(reel_optic_cb) { if (state) m_optic_pattern |= (1 << ((7-N)^3)); else m_optic_pattern &= ~(1 << ((7-N)^3)); } + template void reel_optic_cb(int state) { if (state) m_optic_pattern |= (1 << ((7-N)^3)); else m_optic_pattern &= ~(1 << ((7-N)^3)); } uint16_t unknown_port_r(offs_t offset, uint16_t mem_mask = ~0); @@ -172,7 +172,7 @@ private: void tmsvideo(machine_config &config); - DECLARE_WRITE_LINE_MEMBER(generate_tms34061_interrupt); + void generate_tms34061_interrupt(int state); void sys5_tms34061_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); uint16_t sys5_tms34061_r(offs_t offset, uint16_t mem_mask = ~0); void ramdac_w(offs_t offset, uint16_t data); diff --git a/src/mame/kaneko/airbustr.cpp b/src/mame/kaneko/airbustr.cpp index c003c37c8d6..2c275f5f849 100644 --- a/src/mame/kaneko/airbustr.cpp +++ b/src/mame/kaneko/airbustr.cpp @@ -307,7 +307,7 @@ private: void scrollregs_w(offs_t offset, uint8_t data); template TILE_GET_INFO_MEMBER(get_tile_info); uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(screen_vblank); + void screen_vblank(int state); INTERRUPT_GEN_MEMBER(slave_interrupt); TIMER_DEVICE_CALLBACK_MEMBER(scanline); @@ -419,7 +419,7 @@ uint32_t airbustr_state::screen_update(screen_device &screen, bitmap_ind16 &bitm return 0; } -WRITE_LINE_MEMBER(airbustr_state::screen_vblank) +void airbustr_state::screen_vblank(int state) { // rising edge if (state) diff --git a/src/mame/kaneko/djboy.cpp b/src/mame/kaneko/djboy.cpp index 7c925def439..e9a669b230f 100644 --- a/src/mame/kaneko/djboy.cpp +++ b/src/mame/kaneko/djboy.cpp @@ -251,7 +251,7 @@ private: void paletteram_w(offs_t offset, uint8_t data); TILE_GET_INFO_MEMBER(get_bg_tile_info); uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(screen_vblank); + void screen_vblank(int state); TIMER_DEVICE_CALLBACK_MEMBER(scanline); void mastercpu_am(address_map &map); void mastercpu_port_am(address_map &map); @@ -327,7 +327,7 @@ uint32_t djboy_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, return 0; } -WRITE_LINE_MEMBER(djboy_state::screen_vblank) +void djboy_state::screen_vblank(int state) { // rising edge if (state) diff --git a/src/mame/kaneko/galpanic.cpp b/src/mame/kaneko/galpanic.cpp index 577793c17f3..29be2e80378 100644 --- a/src/mame/kaneko/galpanic.cpp +++ b/src/mame/kaneko/galpanic.cpp @@ -125,7 +125,7 @@ private: void palette(palette_device &palette) const; uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(screen_vblank); + void screen_vblank(int state); TIMER_DEVICE_CALLBACK_MEMBER(scanline); void draw_fgbitmap(bitmap_ind16 &bitmap, const rectangle &cliprect); @@ -195,7 +195,7 @@ void galpanic_state::machine_start() m_okibank->configure_entries(0, 16, memregion("oki")->base(), 0x10000); } -WRITE_LINE_MEMBER(galpanic_state::screen_vblank) +void galpanic_state::screen_vblank(int state) { // rising edge if (state) diff --git a/src/mame/kaneko/galpanic_ms.cpp b/src/mame/kaneko/galpanic_ms.cpp index bfa289a2138..9764c8d479d 100644 --- a/src/mame/kaneko/galpanic_ms.cpp +++ b/src/mame/kaneko/galpanic_ms.cpp @@ -110,7 +110,7 @@ private: tilemap_t *m_bg_tilemap2 = nullptr; - DECLARE_WRITE_LINE_MEMBER(splash_msm5205_int); + void splash_msm5205_int(int state); [[maybe_unused]] void splash_adpcm_data_w(uint8_t data); [[maybe_unused]] void splash_adpcm_control_w(uint8_t data); int m_adpcm_data = 0; @@ -224,7 +224,7 @@ void galspanic_ms_state::splash_adpcm_control_w(uint8_t data) m_soundrom->set_bank(bank & 0xf); } -WRITE_LINE_MEMBER(galspanic_ms_state::splash_msm5205_int) +void galspanic_ms_state::splash_msm5205_int(int state) { m_msm->data_w(m_adpcm_data >> 4); m_adpcm_data = (m_adpcm_data << 4) & 0xf0; diff --git a/src/mame/kaneko/hvyunit.cpp b/src/mame/kaneko/hvyunit.cpp index 0934e647f4b..a93bdf81c25 100644 --- a/src/mame/kaneko/hvyunit.cpp +++ b/src/mame/kaneko/hvyunit.cpp @@ -161,7 +161,7 @@ private: virtual void video_start() override; uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(screen_vblank); + void screen_vblank(int state); TIMER_DEVICE_CALLBACK_MEMBER(scanline); void master_io(address_map &map); @@ -232,7 +232,7 @@ uint32_t hvyunit_state::screen_update(screen_device &screen, bitmap_ind16 &bitma return 0; } -WRITE_LINE_MEMBER(hvyunit_state::screen_vblank) +void hvyunit_state::screen_vblank(int state) { // rising edge if (state) diff --git a/src/mame/kaneko/sandscrp.cpp b/src/mame/kaneko/sandscrp.cpp index 93351564430..c7db7893bac 100644 --- a/src/mame/kaneko/sandscrp.cpp +++ b/src/mame/kaneko/sandscrp.cpp @@ -134,7 +134,7 @@ private: virtual void machine_start() override; u32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(screen_vblank); + void screen_vblank(int state); INTERRUPT_GEN_MEMBER(interrupt); void update_irq_state(); @@ -198,7 +198,7 @@ INTERRUPT_GEN_MEMBER(sandscrp_state::interrupt) } -WRITE_LINE_MEMBER(sandscrp_state::screen_vblank) +void sandscrp_state::screen_vblank(int state) { // rising edge if (state) diff --git a/src/mame/kaneko/snowbros.cpp b/src/mame/kaneko/snowbros.cpp index 2db2b89eff5..32ac95e1c06 100644 --- a/src/mame/kaneko/snowbros.cpp +++ b/src/mame/kaneko/snowbros.cpp @@ -108,7 +108,7 @@ uint32_t snowbros_state::screen_update_snowbros(screen_device &screen, bitmap_in } -WRITE_LINE_MEMBER(snowbros_state::screen_vblank_snowbros) +void snowbros_state::screen_vblank_snowbros(int state) { // rising edge if (state) diff --git a/src/mame/kaneko/snowbros.h b/src/mame/kaneko/snowbros.h index 473fcc8843c..bb84833b372 100644 --- a/src/mame/kaneko/snowbros.h +++ b/src/mame/kaneko/snowbros.h @@ -101,7 +101,7 @@ private: uint32_t screen_update_twinadv(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_snowbro3(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_wintbob(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(screen_vblank_snowbros); + void screen_vblank_snowbros(int state); TIMER_DEVICE_CALLBACK_MEMBER(snowbros_irq); TIMER_DEVICE_CALLBACK_MEMBER(snowbros3_irq); diff --git a/src/mame/kaneko/suprnova.h b/src/mame/kaneko/suprnova.h index 3a6e7e9e1da..fd41508bf51 100644 --- a/src/mame/kaneko/suprnova.h +++ b/src/mame/kaneko/suprnova.h @@ -176,7 +176,7 @@ private: TILE_GET_INFO_MEMBER(get_tilemap_A_tile_info); TILE_GET_INFO_MEMBER(get_tilemap_B_tile_info); uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(screen_vblank); + void screen_vblank(int state); TIMER_DEVICE_CALLBACK_MEMBER(interrupt_callback); TIMER_DEVICE_CALLBACK_MEMBER(irq); diff --git a/src/mame/kaneko/suprnova_v.cpp b/src/mame/kaneko/suprnova_v.cpp index 847621c712d..d40f78476cc 100644 --- a/src/mame/kaneko/suprnova_v.cpp +++ b/src/mame/kaneko/suprnova_v.cpp @@ -605,7 +605,7 @@ uint32_t skns_state::screen_update(screen_device &screen, bitmap_rgb32 &bitmap, return 0; } -WRITE_LINE_MEMBER(skns_state::screen_vblank) +void skns_state::screen_vblank(int state) { if (state) { diff --git a/src/mame/kaypro/kay_kbd.cpp b/src/mame/kaypro/kay_kbd.cpp index 7e9f1dc8402..15a0281857b 100644 --- a/src/mame/kaypro/kay_kbd.cpp +++ b/src/mame/kaypro/kay_kbd.cpp @@ -411,7 +411,7 @@ void kaypro_10_keyboard_device::p2_w(uint8_t data) m_rxd_cb(BIT(data, 7)); } -READ_LINE_MEMBER(kaypro_10_keyboard_device::t1_r) +int kaypro_10_keyboard_device::t1_r() { return m_txd ? 1 : 0; } diff --git a/src/mame/kaypro/kay_kbd.h b/src/mame/kaypro/kay_kbd.h index 12f3d0bd039..6c738486859 100644 --- a/src/mame/kaypro/kay_kbd.h +++ b/src/mame/kaypro/kay_kbd.h @@ -19,7 +19,7 @@ public: auto rxd_cb() { return m_rxd_cb.bind(); } - DECLARE_WRITE_LINE_MEMBER(txd_w) { m_txd = state ? 1U : 0U; } + void txd_w(int state) { m_txd = state ? 1U : 0U; } protected: virtual const tiny_rom_entry *device_rom_region() const override; @@ -30,7 +30,7 @@ protected: uint8_t p1_r(); uint8_t p2_r(); void p2_w(uint8_t data); - DECLARE_READ_LINE_MEMBER(t1_r); + int t1_r(); uint8_t bus_r(); void bus_w(uint8_t data); diff --git a/src/mame/kaypro/kaypro.h b/src/mame/kaypro/kaypro.h index 43d640709ac..b2b2b2a259b 100644 --- a/src/mame/kaypro/kaypro.h +++ b/src/mame/kaypro/kaypro.h @@ -49,10 +49,10 @@ protected: //private: void kaypro_map(address_map &map); - DECLARE_WRITE_LINE_MEMBER(write_centronics_busy); + void write_centronics_busy(int state); TIMER_DEVICE_CALLBACK_MEMBER(floppy_timer); - DECLARE_WRITE_LINE_MEMBER(fdc_intrq_w); - DECLARE_WRITE_LINE_MEMBER(fdc_drq_w); + void fdc_intrq_w(int state); + void fdc_drq_w(int state); static void floppy_formats(format_registration &fr); void kaypro_palette(palette_device &palette) const; diff --git a/src/mame/kaypro/kaypro_m.cpp b/src/mame/kaypro/kaypro_m.cpp index d934c02d0ac..2bda040f82f 100644 --- a/src/mame/kaypro/kaypro_m.cpp +++ b/src/mame/kaypro/kaypro_m.cpp @@ -16,7 +16,7 @@ ************************************************************/ -WRITE_LINE_MEMBER( kaypro_state::write_centronics_busy ) +void kaypro_state::write_centronics_busy(int state) { m_centronics_busy = state; } @@ -202,12 +202,12 @@ TIMER_DEVICE_CALLBACK_MEMBER(kaypro_state::floppy_timer) } -WRITE_LINE_MEMBER( kaypro_state::fdc_intrq_w ) +void kaypro_state::fdc_intrq_w(int state) { m_fdc_rq = (m_fdc_rq & 0x82) | state; } -WRITE_LINE_MEMBER( kaypro_state::fdc_drq_w ) +void kaypro_state::fdc_drq_w(int state) { m_fdc_rq = (m_fdc_rq & 0x81) | (state << 1); } diff --git a/src/mame/konami/3dom2.h b/src/mame/konami/3dom2.h index 2a1f5bc10d9..dd05535f5d9 100644 --- a/src/mame/konami/3dom2.h +++ b/src/mame/konami/3dom2.h @@ -244,12 +244,12 @@ public: // Static configuration helpers auto int_handler() { return m_int_handler.bind(); } - template WRITE_LINE_MEMBER( int_line ) + template void int_line(int state) { if (state) - m_int_status |= 1 << line; + m_int_status |= 1 << Line; else - m_int_status &= ~(1 << line); + m_int_status &= ~(1 << Line); update_interrupts(); } @@ -457,9 +457,6 @@ public: protected: virtual void device_start() override; virtual void device_reset() override; - -private: - }; @@ -479,9 +476,6 @@ public: protected: virtual void device_start() override; virtual void device_reset() override; - -private: - }; diff --git a/src/mame/konami/battlnts.cpp b/src/mame/konami/battlnts.cpp index 9a1b166f512..5e23e25b051 100644 --- a/src/mame/konami/battlnts.cpp +++ b/src/mame/konami/battlnts.cpp @@ -66,7 +66,7 @@ private: void bankswitch_w(uint8_t data); void spritebank_w(uint8_t data); uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(vblank_irq); + void vblank_irq(int state); K007342_CALLBACK_MEMBER(tile_callback); K007420_CALLBACK_MEMBER(sprite_callback); @@ -132,7 +132,7 @@ uint32_t battlnts_state::screen_update(screen_device &screen, bitmap_ind16 &bitm * *************************************/ -WRITE_LINE_MEMBER(battlnts_state::vblank_irq) +void battlnts_state::vblank_irq(int state) { if (state && m_k007342->is_int_enabled()) m_maincpu->set_input_line(HD6309_IRQ_LINE, HOLD_LINE); diff --git a/src/mame/konami/circusc.cpp b/src/mame/konami/circusc.cpp index 2e1b9280703..71e8646a373 100644 --- a/src/mame/konami/circusc.cpp +++ b/src/mame/konami/circusc.cpp @@ -126,16 +126,16 @@ private: uint8_t sh_timer_r(); void sh_irqtrigger_w(uint8_t data); - template DECLARE_WRITE_LINE_MEMBER(coin_counter_w); + template void coin_counter_w(int state); void sound_w(offs_t offset, uint8_t data); - DECLARE_WRITE_LINE_MEMBER(irq_mask_w); + void irq_mask_w(int state); void videoram_w(offs_t offset, uint8_t data); void colorram_w(offs_t offset, uint8_t data); - DECLARE_WRITE_LINE_MEMBER(spritebank_w); + void spritebank_w(int state); TILE_GET_INFO_MEMBER(get_tile_info); void palette(palette_device &palette) const; uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(vblank_irq); + void vblank_irq(int state); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); void main_map(address_map &map); void sound_map(address_map &map); @@ -276,7 +276,7 @@ void circusc_state::colorram_w(offs_t offset, uint8_t data) m_bg_tilemap->mark_tile_dirty(offset); } -WRITE_LINE_MEMBER(circusc_state::spritebank_w) +void circusc_state::spritebank_w(int state) { m_spritebank = state; } @@ -371,7 +371,7 @@ void circusc_state::sh_irqtrigger_w(uint8_t data) } template -WRITE_LINE_MEMBER(circusc_state::coin_counter_w) +void circusc_state::coin_counter_w(int state) { machine().bookkeeping().coin_counter_w(Which, state); } @@ -409,7 +409,7 @@ void circusc_state::sound_w(offs_t offset, uint8_t data) } } -WRITE_LINE_MEMBER(circusc_state::irq_mask_w) +void circusc_state::irq_mask_w(int state) { m_irq_mask = state; if (!m_irq_mask) @@ -577,7 +577,7 @@ static DISCRETE_SOUND_START( circusc_discrete ) DISCRETE_SOUND_END -WRITE_LINE_MEMBER(circusc_state::vblank_irq) +void circusc_state::vblank_irq(int state) { if (state && m_irq_mask) m_maincpu->set_input_line(M6809_IRQ_LINE, ASSERT_LINE); diff --git a/src/mame/konami/cobra.cpp b/src/mame/konami/cobra.cpp index 539d0a3f4da..032a9861aa9 100644 --- a/src/mame/konami/cobra.cpp +++ b/src/mame/konami/cobra.cpp @@ -579,7 +579,7 @@ public: void sub_jvs_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(ide_interrupt); + void ide_interrupt(int state); std::unique_ptr m_renderer; @@ -2891,7 +2891,7 @@ void cobra_state::cobra_gfx_map(address_map &map) INPUT_PORTS_START( cobra ) INPUT_PORTS_END -WRITE_LINE_MEMBER(cobra_state::ide_interrupt) +void cobra_state::ide_interrupt(int state) { if (state == CLEAR_LINE) { diff --git a/src/mame/konami/dbz.cpp b/src/mame/konami/dbz.cpp index 78ba009ab83..94738a8f689 100644 --- a/src/mame/konami/dbz.cpp +++ b/src/mame/konami/dbz.cpp @@ -135,7 +135,7 @@ private: void dbz_sound_cause_nmi(uint16_t data); void dbz_bg2_videoram_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); void dbz_bg1_videoram_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); - DECLARE_WRITE_LINE_MEMBER(dbz_irq2_ack_w); + void dbz_irq2_ack_w(int state); TILE_GET_INFO_MEMBER(get_dbz_bg2_tile_info); TILE_GET_INFO_MEMBER(get_dbz_bg1_tile_info); uint32_t screen_update_dbz(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); @@ -525,7 +525,7 @@ GFXDECODE_END /**********************************************************************************/ -WRITE_LINE_MEMBER(dbz_state::dbz_irq2_ack_w) +void dbz_state::dbz_irq2_ack_w(int state) { m_maincpu->set_input_line(M68K_IRQ_2, CLEAR_LINE); } diff --git a/src/mame/konami/ddribble.cpp b/src/mame/konami/ddribble.cpp index 60e61a2854e..6dba49c4692 100644 --- a/src/mame/konami/ddribble.cpp +++ b/src/mame/konami/ddribble.cpp @@ -92,7 +92,7 @@ private: TILE_GET_INFO_MEMBER(get_bg_tile_info); void palette(palette_device &palette) const; uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(vblank_irq); + void vblank_irq(int state); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect, uint8_t* source, int lenght, int gfxset, int flipscreen); void maincpu_map(address_map &map); void subcpu_map(address_map &map); @@ -318,7 +318,7 @@ uint32_t ddribble_state::screen_update(screen_device &screen, bitmap_ind16 &bitm // machine -WRITE_LINE_MEMBER(ddribble_state::vblank_irq) +void ddribble_state::vblank_irq(int state) { if (state && m_int_enable[0]) m_maincpu->set_input_line(M6809_FIRQ_LINE, HOLD_LINE); diff --git a/src/mame/konami/djmain.cpp b/src/mame/konami/djmain.cpp index ea6d1948638..baee3bbc92e 100644 --- a/src/mame/konami/djmain.cpp +++ b/src/mame/konami/djmain.cpp @@ -149,7 +149,7 @@ private: uint32_t screen_update_djmain(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(vb_interrupt); - DECLARE_WRITE_LINE_MEMBER(ide_interrupt); + void ide_interrupt(int state); void draw_sprites( bitmap_rgb32 &bitmap, const rectangle &cliprect); K056832_CB_MEMBER(tile_callback); void k054539_map(address_map &map); @@ -621,7 +621,7 @@ INTERRUPT_GEN_MEMBER(djmain_state::vb_interrupt) } -WRITE_LINE_MEMBER( djmain_state::ide_interrupt ) +void djmain_state::ide_interrupt(int state) { if (state != CLEAR_LINE) { diff --git a/src/mame/konami/finalizr.cpp b/src/mame/konami/finalizr.cpp index 6d82adc6fc9..2b814007a98 100644 --- a/src/mame/konami/finalizr.cpp +++ b/src/mame/konami/finalizr.cpp @@ -85,7 +85,7 @@ private: void flipscreen_w(uint8_t data); void sound_irq_w(uint8_t data); void sound_irqen_w(uint8_t data); - DECLARE_READ_LINE_MEMBER(bootleg_t1_r); + int bootleg_t1_r(); void videoctrl_w(uint8_t data); TILE_GET_INFO_MEMBER(get_bg_tile_info); TILE_GET_INFO_MEMBER(get_fg_tile_info); @@ -367,7 +367,7 @@ void finalizr_state::sound_irqen_w(uint8_t data) m_audiocpu->set_input_line(0, CLEAR_LINE); } -READ_LINE_MEMBER(finalizr_state::bootleg_t1_r) +int finalizr_state::bootleg_t1_r() { /* The clock-out from the MCS48 T0 line should be connected here. Accounting for the MCS48 input clock, and internal/external divisors diff --git a/src/mame/konami/firebeat.cpp b/src/mame/konami/firebeat.cpp index 4ce1ed6d5fc..da72fcef089 100644 --- a/src/mame/konami/firebeat.cpp +++ b/src/mame/konami/firebeat.cpp @@ -426,9 +426,9 @@ protected: void lamp_output3_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0); INTERRUPT_GEN_MEMBER(firebeat_interrupt); - DECLARE_WRITE_LINE_MEMBER(ata_interrupt); - DECLARE_WRITE_LINE_MEMBER(gcu_interrupt); - DECLARE_WRITE_LINE_MEMBER(sound_irq_callback); + void ata_interrupt(int state); + void gcu_interrupt(int state); + void sound_irq_callback(int state); int m_cabinet_info = 0; @@ -495,8 +495,8 @@ protected: void spu_map(address_map &map); void rf5c400_map(address_map& map); - DECLARE_WRITE_LINE_MEMBER(spu_ata_dmarq); - DECLARE_WRITE_LINE_MEMBER(spu_ata_interrupt); + void spu_ata_dmarq(int state); + void spu_ata_interrupt(int state); TIMER_CALLBACK_MEMBER(spu_dma_callback); TIMER_DEVICE_CALLBACK_MEMBER(spu_timer_callback); @@ -609,8 +609,8 @@ private: void midi_uart_w(offs_t offset, uint8_t data); // TIMER_CALLBACK_MEMBER(keyboard_timer_callback); - DECLARE_WRITE_LINE_MEMBER(midi_keyboard_right_irq_callback); - DECLARE_WRITE_LINE_MEMBER(midi_keyboard_left_irq_callback); + void midi_keyboard_right_irq_callback(int state); + void midi_keyboard_left_irq_callback(int state); // emu_timer *m_keyboard_timer; // int m_keyboard_state[2]; @@ -653,7 +653,7 @@ private: uint8_t midi_uart_r(offs_t offset); void midi_uart_w(offs_t offset, uint8_t data); - DECLARE_WRITE_LINE_MEMBER(midi_st224_irq_callback); + void midi_st224_irq_callback(int state); required_device m_fdc; required_device m_floppy; @@ -664,7 +664,7 @@ private: required_ioport_array<2> m_io_turntables; required_ioport_array<7> m_io_effects; - DECLARE_WRITE_LINE_MEMBER(floppy_irq_callback); + void floppy_irq_callback(int state); }; class firebeat_popn_state : public firebeat_spu_state @@ -1163,17 +1163,17 @@ INTERRUPT_GEN_MEMBER(firebeat_state::firebeat_interrupt) device.execute().set_input_line(INPUT_LINE_IRQ0, ASSERT_LINE); } -WRITE_LINE_MEMBER(firebeat_state::ata_interrupt) +void firebeat_state::ata_interrupt(int state) { m_maincpu->set_input_line(INPUT_LINE_IRQ4, state); } -WRITE_LINE_MEMBER(firebeat_state::gcu_interrupt) +void firebeat_state::gcu_interrupt(int state) { m_maincpu->set_input_line(INPUT_LINE_IRQ0, state); } -WRITE_LINE_MEMBER(firebeat_state::sound_irq_callback) +void firebeat_state::sound_irq_callback(int state) { } @@ -1365,7 +1365,7 @@ void firebeat_spu_state::firebeat_waveram_w(offs_t offset, uint16_t data, uint16 COMBINE_DATA(&m_waveram[offset + m_wave_bank]); } -WRITE_LINE_MEMBER(firebeat_spu_state::spu_ata_dmarq) +void firebeat_spu_state::spu_ata_dmarq(int state) { if (m_spuata != nullptr && m_spu_ata_dmarq != state) { @@ -1398,7 +1398,7 @@ TIMER_CALLBACK_MEMBER(firebeat_spu_state::spu_dma_callback) } } -WRITE_LINE_MEMBER(firebeat_spu_state::spu_ata_interrupt) +void firebeat_spu_state::spu_ata_interrupt(int state) { if (state == 0) m_audiocpu->set_input_line(INPUT_LINE_IRQ2, state); @@ -1422,7 +1422,7 @@ static void pc_hd_floppies(device_slot_interface &device) device.option_add("35hd", FLOPPY_35_HD); } -WRITE_LINE_MEMBER(firebeat_bm3_state::floppy_irq_callback) +void firebeat_bm3_state::floppy_irq_callback(int state) { if (BIT(m_extend_board_irq_enable, 2) == 0 && state) { @@ -1513,7 +1513,7 @@ uint16_t firebeat_bm3_state::sensor_r(offs_t offset) return 0; } -WRITE_LINE_MEMBER(firebeat_bm3_state::midi_st224_irq_callback) +void firebeat_bm3_state::midi_st224_irq_callback(int state) { if (BIT(m_extend_board_irq_enable, 0) == 0 && state != CLEAR_LINE) { @@ -1882,7 +1882,7 @@ void firebeat_kbm_state::midi_uart_w(offs_t offset, uint8_t data) m_duart_midi->write(offset >> 6, data); } -WRITE_LINE_MEMBER(firebeat_kbm_state::midi_keyboard_right_irq_callback) +void firebeat_kbm_state::midi_keyboard_right_irq_callback(int state) { if (BIT(m_extend_board_irq_enable, 1) == 0 && state != CLEAR_LINE) { @@ -1893,7 +1893,7 @@ WRITE_LINE_MEMBER(firebeat_kbm_state::midi_keyboard_right_irq_callback) m_maincpu->set_input_line(INPUT_LINE_IRQ1, CLEAR_LINE); } -WRITE_LINE_MEMBER(firebeat_kbm_state::midi_keyboard_left_irq_callback) +void firebeat_kbm_state::midi_keyboard_left_irq_callback(int state) { if (BIT(m_extend_board_irq_enable, 0) == 0 && state != CLEAR_LINE) { diff --git a/src/mame/konami/gyruss.cpp b/src/mame/konami/gyruss.cpp index 004fd138e3b..c4a0a66c657 100644 --- a/src/mame/konami/gyruss.cpp +++ b/src/mame/konami/gyruss.cpp @@ -140,18 +140,18 @@ private: void irq_clear_w(uint8_t data); void sh_irqtrigger_w(uint8_t data); void i8039_irq_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(master_nmi_mask_w); + void master_nmi_mask_w(int state); void slave_irq_mask_w(uint8_t data); - template DECLARE_WRITE_LINE_MEMBER(coin_counter_w); + template void coin_counter_w(int state); void spriteram_w(offs_t offset, uint8_t data); uint8_t scanline_r(); - DECLARE_WRITE_LINE_MEMBER(flipscreen_w); + void flipscreen_w(int state); uint8_t porta_r(); void dac_w(uint8_t data); TILE_GET_INFO_MEMBER(get_tile_info); void palette(palette_device &palette) const; uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(vblank_irq); + void vblank_irq(int state); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); template void filter_w(uint8_t data); @@ -281,7 +281,7 @@ uint8_t gyruss_state::scanline_r() } -WRITE_LINE_MEMBER(gyruss_state::flipscreen_w) +void gyruss_state::flipscreen_w(int state) { m_flipscreen = state; } @@ -385,7 +385,7 @@ void gyruss_state::i8039_irq_w(uint8_t data) m_audiocpu_2->set_input_line(0, ASSERT_LINE); } -WRITE_LINE_MEMBER(gyruss_state::master_nmi_mask_w) +void gyruss_state::master_nmi_mask_w(int state) { m_master_nmi_mask = state; if (!m_master_nmi_mask) @@ -400,7 +400,7 @@ void gyruss_state::slave_irq_mask_w(uint8_t data) } template -WRITE_LINE_MEMBER(gyruss_state::coin_counter_w) +void gyruss_state::coin_counter_w(int state) { machine().bookkeeping().coin_counter_w(Which, state); } @@ -684,7 +684,7 @@ void gyruss_state::machine_start() save_item(NAME(m_slave_irq_mask)); } -WRITE_LINE_MEMBER(gyruss_state::vblank_irq) +void gyruss_state::vblank_irq(int state) { if (state && m_master_nmi_mask) m_maincpu->set_input_line(INPUT_LINE_NMI, ASSERT_LINE); diff --git a/src/mame/konami/hexion.cpp b/src/mame/konami/hexion.cpp index 463e79f0057..afa5b31ab55 100644 --- a/src/mame/konami/hexion.cpp +++ b/src/mame/konami/hexion.cpp @@ -156,8 +156,8 @@ private: void bankedram_w(offs_t offset, uint8_t data); void bankctrl_w(uint8_t data); void gfxrom_select_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(irq_ack_w); - DECLARE_WRITE_LINE_MEMBER(nmi_ack_w); + void irq_ack_w(int state); + void nmi_ack_w(int state); void ccu_int_time_w(uint8_t data); template TILE_GET_INFO_MEMBER(get_tile_info); @@ -342,12 +342,12 @@ void hexion_state::coincntr_w(uint8_t data) if ((data & 0xdc) != 0x10) LOGUNKWRITE("coincntr %02x", data); } -WRITE_LINE_MEMBER(hexion_state::irq_ack_w) +void hexion_state::irq_ack_w(int state) { m_maincpu->set_input_line(0, CLEAR_LINE); } -WRITE_LINE_MEMBER(hexion_state::nmi_ack_w) +void hexion_state::nmi_ack_w(int state) { m_maincpu->set_input_line(INPUT_LINE_NMI, CLEAR_LINE); } diff --git a/src/mame/konami/hyperspt.cpp b/src/mame/konami/hyperspt.cpp index 8653e4f0caa..649048cd5ba 100644 --- a/src/mame/konami/hyperspt.cpp +++ b/src/mame/konami/hyperspt.cpp @@ -94,17 +94,17 @@ private: void konami_sn76496_w(uint8_t data) { m_sn->write(m_sn76496_latch); } uint8_t m_irq_mask = 0U; - template DECLARE_WRITE_LINE_MEMBER(coin_counter_w); - DECLARE_WRITE_LINE_MEMBER(irq_mask_w); + template void coin_counter_w(int state); + void irq_mask_w(int state); void videoram_w(offs_t offset, uint8_t data); void colorram_w(offs_t offset, uint8_t data); - DECLARE_WRITE_LINE_MEMBER(flipscreen_w); + void flipscreen_w(int state); void palette(palette_device &palette) const; TILE_GET_INFO_MEMBER(get_bg_tile_info); uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(vblank_irq); + void vblank_irq(int state); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -244,7 +244,7 @@ void base_state::colorram_w(offs_t offset, uint8_t data) m_bg_tilemap->mark_tile_dirty(offset); } -WRITE_LINE_MEMBER(base_state::flipscreen_w) +void base_state::flipscreen_w(int state) { flip_screen_set(state); machine().tilemap().mark_all_dirty(); @@ -343,12 +343,12 @@ void base_state::machine_start() } template -WRITE_LINE_MEMBER(base_state::coin_counter_w) +void base_state::coin_counter_w(int state) { machine().bookkeeping().coin_counter_w(Which, state); } -WRITE_LINE_MEMBER(base_state::irq_mask_w) +void base_state::irq_mask_w(int state) { m_irq_mask = state; if (!m_irq_mask) @@ -614,7 +614,7 @@ static GFXDECODE_START( gfx_roadf ) GFXDECODE_ENTRY( "tiles", 0, roadf_charlayout, 16*16, 16 ) GFXDECODE_END -WRITE_LINE_MEMBER(base_state::vblank_irq) +void base_state::vblank_irq(int state) { if (state && m_irq_mask) m_maincpu->set_input_line(0, ASSERT_LINE); diff --git a/src/mame/konami/jackal.cpp b/src/mame/konami/jackal.cpp index ba415f5f905..cccfd930b23 100644 --- a/src/mame/konami/jackal.cpp +++ b/src/mame/konami/jackal.cpp @@ -152,7 +152,7 @@ private: TILE_GET_INFO_MEMBER(get_bg_tile_info); void palette(palette_device &palette) const; uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(vblank_irq); + void vblank_irq(int state); void draw_background(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_sprites_region(bitmap_ind16 &bitmap, const rectangle &cliprect, const uint8_t *sram, int length, int bank); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); @@ -545,7 +545,7 @@ GFXDECODE_END * *************************************/ -WRITE_LINE_MEMBER(jackal_state::vblank_irq) +void jackal_state::vblank_irq(int state) { if (state && m_irq_enable) { diff --git a/src/mame/konami/jailbrek.cpp b/src/mame/konami/jailbrek.cpp index 806e03d5185..5b15dcfc661 100644 --- a/src/mame/konami/jailbrek.cpp +++ b/src/mame/konami/jailbrek.cpp @@ -157,7 +157,7 @@ private: TILE_GET_INFO_MEMBER(get_bg_tile_info); void palette(palette_device &palette) const; uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(vblank_irq); + void vblank_irq(int state); INTERRUPT_GEN_MEMBER(interrupt_nmi); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); @@ -294,7 +294,7 @@ void jailbrek_state::coin_w(uint8_t data) machine().bookkeeping().coin_counter_w(1, data & 0x02); } -WRITE_LINE_MEMBER(jailbrek_state::vblank_irq) +void jailbrek_state::vblank_irq(int state) { if (state && m_irq_enable) m_maincpu->set_input_line(0, HOLD_LINE); diff --git a/src/mame/konami/junofrst.cpp b/src/mame/konami/junofrst.cpp index 4f9ec9ad1ee..2c694799233 100644 --- a/src/mame/konami/junofrst.cpp +++ b/src/mame/konami/junofrst.cpp @@ -128,7 +128,7 @@ private: uint8_t portA_r(); void portB_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(_30hz_irq); + void _30hz_irq(int state); void audio_map(address_map &map); void main_map(address_map &map); void mcu_io_map(address_map &map); @@ -393,7 +393,7 @@ void junofrst_state::machine_reset() m_irq_toggle = 0; } -WRITE_LINE_MEMBER(junofrst_state::_30hz_irq) +void junofrst_state::_30hz_irq(int state) { /* flip flops cause the interrupt to be signalled every other frame */ if (state) diff --git a/src/mame/konami/k053250_ps.cpp b/src/mame/konami/k053250_ps.cpp index 071f92564b5..b76bb23443f 100644 --- a/src/mame/konami/k053250_ps.cpp +++ b/src/mame/konami/k053250_ps.cpp @@ -526,7 +526,7 @@ TIMER_CALLBACK_MEMBER(k053250ps_device::handle_od_wait) } } -WRITE_LINE_MEMBER(k053250ps_device::vblank_w) +void k053250ps_device::vblank_w(int state) { if (state == 1) { @@ -547,7 +547,7 @@ WRITE_LINE_MEMBER(k053250ps_device::vblank_w) } } -READ_LINE_MEMBER(k053250ps_device::dmairq_r) +int k053250ps_device::dmairq_r() { return !m_dmairq_on; } diff --git a/src/mame/konami/k053250_ps.h b/src/mame/konami/k053250_ps.h index 3e599bb8531..3a16126d4ef 100644 --- a/src/mame/konami/k053250_ps.h +++ b/src/mame/konami/k053250_ps.h @@ -38,8 +38,8 @@ public: uint16_t ram_r(offs_t offset); void ram_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); uint16_t rom_r(offs_t offset); - DECLARE_WRITE_LINE_MEMBER(vblank_w); - DECLARE_READ_LINE_MEMBER(dmairq_r); + void vblank_w(int state); + int dmairq_r(); void draw( bitmap_rgb32 &bitmap, const rectangle &cliprect, int colorbase, int flags, bitmap_ind8 &priority_bitmap, int priority ); diff --git a/src/mame/konami/k573cass.cpp b/src/mame/konami/k573cass.cpp index 2d1a26d77eb..010912e4afe 100644 --- a/src/mame/konami/k573cass.cpp +++ b/src/mame/konami/k573cass.cpp @@ -22,41 +22,41 @@ konami573_cassette_interface::~konami573_cassette_interface() -WRITE_LINE_MEMBER(konami573_cassette_interface::write_line_d0) +void konami573_cassette_interface::write_line_d0(int state) { } -WRITE_LINE_MEMBER(konami573_cassette_interface::write_line_d4) +void konami573_cassette_interface::write_line_d4(int state) { } -WRITE_LINE_MEMBER(konami573_cassette_interface::write_line_d5) +void konami573_cassette_interface::write_line_d5(int state) { } -WRITE_LINE_MEMBER(konami573_cassette_interface::write_line_d6) +void konami573_cassette_interface::write_line_d6(int state) { } -WRITE_LINE_MEMBER(konami573_cassette_interface::write_line_d7) +void konami573_cassette_interface::write_line_d7(int state) { } -WRITE_LINE_MEMBER(konami573_cassette_interface::write_line_zs01_sda) +void konami573_cassette_interface::write_line_zs01_sda(int state) { } -READ_LINE_MEMBER(konami573_cassette_interface::read_line_ds2401) +int konami573_cassette_interface::read_line_ds2401() { return 0; } -READ_LINE_MEMBER(konami573_cassette_interface::read_line_adc083x_do) +int konami573_cassette_interface::read_line_adc083x_do() { return 0; } -READ_LINE_MEMBER(konami573_cassette_interface::read_line_adc083x_sars) +int konami573_cassette_interface::read_line_adc083x_sars() { return 0; } @@ -86,27 +86,27 @@ void konami573_cassette_x_device::device_start() output_dsr(0); } -WRITE_LINE_MEMBER(konami573_cassette_x_device::write_line_d0) +void konami573_cassette_x_device::write_line_d0(int state) { m_x76f041->write_sda(state); } -WRITE_LINE_MEMBER(konami573_cassette_x_device::write_line_d1) +void konami573_cassette_x_device::write_line_d1(int state) { m_x76f041->write_scl(state); } -WRITE_LINE_MEMBER(konami573_cassette_x_device::write_line_d2) +void konami573_cassette_x_device::write_line_d2(int state) { m_x76f041->write_cs(state); } -WRITE_LINE_MEMBER(konami573_cassette_x_device::write_line_d3) +void konami573_cassette_x_device::write_line_d3(int state) { m_x76f041->write_rst(state); } -READ_LINE_MEMBER(konami573_cassette_x_device::read_line_secflash_sda) +int konami573_cassette_x_device::read_line_secflash_sda() { return m_x76f041->read_sda(); } @@ -128,41 +128,41 @@ void konami573_cassette_xi_device::device_add_mconfig(machine_config &config) ADC0838(config, m_adc0838); } -WRITE_LINE_MEMBER(konami573_cassette_xi_device::write_line_d0) +void konami573_cassette_xi_device::write_line_d0(int state) { konami573_cassette_x_device::write_line_d0( state ); // shares line with x76f041 sda m_adc0838->cs_write(state); } -WRITE_LINE_MEMBER(konami573_cassette_xi_device::write_line_d1) +void konami573_cassette_xi_device::write_line_d1(int state) { konami573_cassette_x_device::write_line_d1(state); // shares line with x76f041 scl m_adc0838->clk_write(state); } -WRITE_LINE_MEMBER(konami573_cassette_xi_device::write_line_d4) +void konami573_cassette_xi_device::write_line_d4(int state) { m_ds2401->write(!state); } -WRITE_LINE_MEMBER(konami573_cassette_xi_device::write_line_d5) +void konami573_cassette_xi_device::write_line_d5(int state) { m_adc0838->di_write(state); } -READ_LINE_MEMBER(konami573_cassette_xi_device::read_line_ds2401) +int konami573_cassette_xi_device::read_line_ds2401() { return m_ds2401->read(); } -READ_LINE_MEMBER(konami573_cassette_xi_device::read_line_adc083x_do) +int konami573_cassette_xi_device::read_line_adc083x_do() { return m_adc0838->do_read(); } -READ_LINE_MEMBER(konami573_cassette_xi_device::read_line_adc083x_sars) +int konami573_cassette_xi_device::read_line_adc083x_sars() { return m_adc0838->sars_read(); } @@ -209,51 +209,51 @@ void konami573_cassette_y_device::device_start() output_dsr(0); } -READ_LINE_MEMBER(konami573_cassette_y_device::read_line_secflash_sda) +int konami573_cassette_y_device::read_line_secflash_sda() { return m_x76f100->read_sda(); } -WRITE_LINE_MEMBER(konami573_cassette_y_device::write_line_d0) +void konami573_cassette_y_device::write_line_d0(int state) { m_d0_handler(state); m_x76f100->write_sda(state); } -WRITE_LINE_MEMBER(konami573_cassette_y_device::write_line_d1) +void konami573_cassette_y_device::write_line_d1(int state) { m_d1_handler(state); m_x76f100->write_scl(state); } -WRITE_LINE_MEMBER(konami573_cassette_y_device::write_line_d2) +void konami573_cassette_y_device::write_line_d2(int state) { m_d2_handler(state); m_x76f100->write_cs(state); } -WRITE_LINE_MEMBER(konami573_cassette_y_device::write_line_d3) +void konami573_cassette_y_device::write_line_d3(int state) { m_d3_handler(state); m_x76f100->write_rst(state); } -WRITE_LINE_MEMBER(konami573_cassette_y_device::write_line_d4) +void konami573_cassette_y_device::write_line_d4(int state) { m_d4_handler(state); } -WRITE_LINE_MEMBER(konami573_cassette_y_device::write_line_d5) +void konami573_cassette_y_device::write_line_d5(int state) { m_d5_handler(state); } -WRITE_LINE_MEMBER(konami573_cassette_y_device::write_line_d6) +void konami573_cassette_y_device::write_line_d6(int state) { m_d6_handler(state); } -WRITE_LINE_MEMBER(konami573_cassette_y_device::write_line_d7) +void konami573_cassette_y_device::write_line_d7(int state) { m_d7_handler(state); } @@ -273,14 +273,14 @@ void konami573_cassette_yi_device::device_add_mconfig(machine_config &config) DS2401(config, m_ds2401); } -WRITE_LINE_MEMBER(konami573_cassette_yi_device::write_line_d4) +void konami573_cassette_yi_device::write_line_d4(int state) { konami573_cassette_y_device::write_line_d4(state); m_ds2401->write(!state); } -READ_LINE_MEMBER(konami573_cassette_yi_device::read_line_ds2401) +int konami573_cassette_yi_device::read_line_ds2401() { return m_ds2401->read(); } @@ -307,37 +307,37 @@ void konami573_cassette_zi_device::device_start() output_dsr(0); } -WRITE_LINE_MEMBER(konami573_cassette_zi_device::write_line_d1) +void konami573_cassette_zi_device::write_line_d1(int state) { m_zs01->write_scl(state); } -WRITE_LINE_MEMBER(konami573_cassette_zi_device::write_line_d2) +void konami573_cassette_zi_device::write_line_d2(int state) { m_zs01->write_cs(state); } -WRITE_LINE_MEMBER(konami573_cassette_zi_device::write_line_d3) +void konami573_cassette_zi_device::write_line_d3(int state) { m_zs01->write_rst(state); } -WRITE_LINE_MEMBER(konami573_cassette_zi_device::write_line_d4) +void konami573_cassette_zi_device::write_line_d4(int state) { m_ds2401->write(!state); } -WRITE_LINE_MEMBER(konami573_cassette_zi_device::write_line_zs01_sda) +void konami573_cassette_zi_device::write_line_zs01_sda(int state) { m_zs01->write_sda(state); } -READ_LINE_MEMBER(konami573_cassette_zi_device::read_line_ds2401) +int konami573_cassette_zi_device::read_line_ds2401() { return m_ds2401->read(); } -READ_LINE_MEMBER(konami573_cassette_zi_device::read_line_secflash_sda) +int konami573_cassette_zi_device::read_line_secflash_sda() { return m_zs01->read_sda(); } @@ -359,61 +359,61 @@ void konami573_cassette_slot_device::device_start() m_dev = get_card_device(); } -WRITE_LINE_MEMBER(konami573_cassette_slot_device::write_line_d0) +void konami573_cassette_slot_device::write_line_d0(int state) { if (m_dev) m_dev->write_line_d0(state); } -WRITE_LINE_MEMBER(konami573_cassette_slot_device::write_line_d1) +void konami573_cassette_slot_device::write_line_d1(int state) { if (m_dev) m_dev->write_line_d1(state); } -WRITE_LINE_MEMBER(konami573_cassette_slot_device::write_line_d2) +void konami573_cassette_slot_device::write_line_d2(int state) { if (m_dev) m_dev->write_line_d2(state); } -WRITE_LINE_MEMBER(konami573_cassette_slot_device::write_line_d3) +void konami573_cassette_slot_device::write_line_d3(int state) { if (m_dev) m_dev->write_line_d3(state); } -WRITE_LINE_MEMBER(konami573_cassette_slot_device::write_line_d4) +void konami573_cassette_slot_device::write_line_d4(int state) { if (m_dev) m_dev->write_line_d4(state); } -WRITE_LINE_MEMBER(konami573_cassette_slot_device::write_line_d5) +void konami573_cassette_slot_device::write_line_d5(int state) { if (m_dev) m_dev->write_line_d5(state); } -WRITE_LINE_MEMBER(konami573_cassette_slot_device::write_line_d6) +void konami573_cassette_slot_device::write_line_d6(int state) { if (m_dev) m_dev->write_line_d6(state); } -WRITE_LINE_MEMBER(konami573_cassette_slot_device::write_line_d7) +void konami573_cassette_slot_device::write_line_d7(int state) { if (m_dev) m_dev->write_line_d7(state); } -WRITE_LINE_MEMBER(konami573_cassette_slot_device::write_line_zs01_sda) +void konami573_cassette_slot_device::write_line_zs01_sda(int state) { if (m_dev) m_dev->write_line_zs01_sda(state); } -READ_LINE_MEMBER(konami573_cassette_slot_device::read_line_ds2401) +int konami573_cassette_slot_device::read_line_ds2401() { if (m_dev) return m_dev->read_line_ds2401(); @@ -421,7 +421,7 @@ READ_LINE_MEMBER(konami573_cassette_slot_device::read_line_ds2401) return 0; } -READ_LINE_MEMBER(konami573_cassette_slot_device::read_line_secflash_sda) +int konami573_cassette_slot_device::read_line_secflash_sda() { if (m_dev) return m_dev->read_line_secflash_sda(); @@ -429,7 +429,7 @@ READ_LINE_MEMBER(konami573_cassette_slot_device::read_line_secflash_sda) return 0; } -READ_LINE_MEMBER(konami573_cassette_slot_device::read_line_adc083x_do) +int konami573_cassette_slot_device::read_line_adc083x_do() { if (m_dev) return m_dev->read_line_adc083x_do(); @@ -437,7 +437,7 @@ READ_LINE_MEMBER(konami573_cassette_slot_device::read_line_adc083x_do) return 0; } -READ_LINE_MEMBER(konami573_cassette_slot_device::read_line_adc083x_sars) +int konami573_cassette_slot_device::read_line_adc083x_sars() { if (m_dev) return m_dev->read_line_adc083x_sars(); diff --git a/src/mame/konami/k573cass.h b/src/mame/konami/k573cass.h index 59fbdbda78b..c73a14c5b7d 100644 --- a/src/mame/konami/k573cass.h +++ b/src/mame/konami/k573cass.h @@ -30,19 +30,19 @@ public: auto dsr_handler() { return m_dsr_handler.bind(); } - DECLARE_WRITE_LINE_MEMBER(write_line_d0); - DECLARE_WRITE_LINE_MEMBER(write_line_d1); - DECLARE_WRITE_LINE_MEMBER(write_line_d2); - DECLARE_WRITE_LINE_MEMBER(write_line_d3); - DECLARE_WRITE_LINE_MEMBER(write_line_d4); - DECLARE_WRITE_LINE_MEMBER(write_line_d5); - DECLARE_WRITE_LINE_MEMBER(write_line_d6); - DECLARE_WRITE_LINE_MEMBER(write_line_d7); - DECLARE_WRITE_LINE_MEMBER(write_line_zs01_sda); - DECLARE_READ_LINE_MEMBER(read_line_ds2401); - DECLARE_READ_LINE_MEMBER(read_line_secflash_sda); - DECLARE_READ_LINE_MEMBER(read_line_adc083x_do); - DECLARE_READ_LINE_MEMBER(read_line_adc083x_sars); + void write_line_d0(int state); + void write_line_d1(int state); + void write_line_d2(int state); + void write_line_d3(int state); + void write_line_d4(int state); + void write_line_d5(int state); + void write_line_d6(int state); + void write_line_d7(int state); + void write_line_zs01_sda(int state); + int read_line_ds2401(); + int read_line_secflash_sda(); + int read_line_adc083x_do(); + int read_line_adc083x_sars(); protected: virtual void device_start() override; @@ -60,21 +60,21 @@ class konami573_cassette_interface : public device_interface public: virtual ~konami573_cassette_interface(); - DECLARE_WRITE_LINE_MEMBER(output_dsr) { m_slot->m_dsr_handler(state); } - - virtual DECLARE_WRITE_LINE_MEMBER(write_line_d0); - virtual DECLARE_WRITE_LINE_MEMBER(write_line_d1) = 0; - virtual DECLARE_WRITE_LINE_MEMBER(write_line_d2) = 0; - virtual DECLARE_WRITE_LINE_MEMBER(write_line_d3) = 0; - virtual DECLARE_WRITE_LINE_MEMBER(write_line_d4); - virtual DECLARE_WRITE_LINE_MEMBER(write_line_d5); - virtual DECLARE_WRITE_LINE_MEMBER(write_line_d6); - virtual DECLARE_WRITE_LINE_MEMBER(write_line_d7); - virtual DECLARE_WRITE_LINE_MEMBER(write_line_zs01_sda); - virtual DECLARE_READ_LINE_MEMBER(read_line_ds2401); - virtual DECLARE_READ_LINE_MEMBER(read_line_secflash_sda) = 0; - virtual DECLARE_READ_LINE_MEMBER(read_line_adc083x_do); - virtual DECLARE_READ_LINE_MEMBER(read_line_adc083x_sars); + void output_dsr(int state) { m_slot->m_dsr_handler(state); } + + virtual void write_line_d0(int state); + virtual void write_line_d1(int state) = 0; + virtual void write_line_d2(int state) = 0; + virtual void write_line_d3(int state) = 0; + virtual void write_line_d4(int state); + virtual void write_line_d5(int state); + virtual void write_line_d6(int state); + virtual void write_line_d7(int state); + virtual void write_line_zs01_sda(int state); + virtual int read_line_ds2401(); + virtual int read_line_secflash_sda() = 0; + virtual int read_line_adc083x_do(); + virtual int read_line_adc083x_sars(); protected: konami573_cassette_interface(const machine_config &mconfig, device_t &device); @@ -90,11 +90,11 @@ class konami573_cassette_x_device: public device_t, public konami573_cassette_in public: konami573_cassette_x_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - virtual DECLARE_READ_LINE_MEMBER(read_line_secflash_sda) override; - virtual DECLARE_WRITE_LINE_MEMBER(write_line_d0) override; - virtual DECLARE_WRITE_LINE_MEMBER(write_line_d1) override; - virtual DECLARE_WRITE_LINE_MEMBER(write_line_d2) override; - virtual DECLARE_WRITE_LINE_MEMBER(write_line_d3) override; + virtual int read_line_secflash_sda() override; + virtual void write_line_d0(int state) override; + virtual void write_line_d1(int state) override; + virtual void write_line_d2(int state) override; + virtual void write_line_d3(int state) override; protected: konami573_cassette_x_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); @@ -113,14 +113,14 @@ class konami573_cassette_xi_device: public konami573_cassette_x_device public: konami573_cassette_xi_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - virtual DECLARE_READ_LINE_MEMBER(read_line_ds2401) override; - virtual DECLARE_WRITE_LINE_MEMBER(write_line_d4) override; + virtual int read_line_ds2401() override; + virtual void write_line_d4(int state) override; - virtual DECLARE_WRITE_LINE_MEMBER(write_line_d0) override; - virtual DECLARE_WRITE_LINE_MEMBER(write_line_d1) override; - virtual DECLARE_READ_LINE_MEMBER(read_line_adc083x_do) override; - virtual DECLARE_READ_LINE_MEMBER(read_line_adc083x_sars) override; - virtual DECLARE_WRITE_LINE_MEMBER(write_line_d5) override; + virtual void write_line_d0(int state) override; + virtual void write_line_d1(int state) override; + virtual int read_line_adc083x_do() override; + virtual int read_line_adc083x_sars() override; + virtual void write_line_d5(int state) override; double punchmania_inputs_callback(uint8_t input); @@ -150,15 +150,15 @@ public: auto d6_handler() { return m_d6_handler.bind(); } auto d7_handler() { return m_d7_handler.bind(); } - virtual DECLARE_READ_LINE_MEMBER(read_line_secflash_sda) override; - virtual DECLARE_WRITE_LINE_MEMBER(write_line_d0) override; - virtual DECLARE_WRITE_LINE_MEMBER(write_line_d1) override; - virtual DECLARE_WRITE_LINE_MEMBER(write_line_d2) override; - virtual DECLARE_WRITE_LINE_MEMBER(write_line_d3) override; - virtual DECLARE_WRITE_LINE_MEMBER(write_line_d4) override; - virtual DECLARE_WRITE_LINE_MEMBER(write_line_d5) override; - virtual DECLARE_WRITE_LINE_MEMBER(write_line_d6) override; - virtual DECLARE_WRITE_LINE_MEMBER(write_line_d7) override; + virtual int read_line_secflash_sda() override; + virtual void write_line_d0(int state) override; + virtual void write_line_d1(int state) override; + virtual void write_line_d2(int state) override; + virtual void write_line_d3(int state) override; + virtual void write_line_d4(int state) override; + virtual void write_line_d5(int state) override; + virtual void write_line_d6(int state) override; + virtual void write_line_d7(int state) override; protected: konami573_cassette_y_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); @@ -187,8 +187,8 @@ class konami573_cassette_yi_device: public konami573_cassette_y_device public: konami573_cassette_yi_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - virtual DECLARE_READ_LINE_MEMBER(read_line_ds2401) override; - virtual DECLARE_WRITE_LINE_MEMBER(write_line_d4) override; + virtual int read_line_ds2401() override; + virtual void write_line_d4(int state) override; protected: virtual void device_add_mconfig(machine_config &config) override; @@ -205,13 +205,13 @@ class konami573_cassette_zi_device: public device_t, public konami573_cassette_i public: konami573_cassette_zi_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - virtual DECLARE_READ_LINE_MEMBER(read_line_ds2401) override; - virtual DECLARE_READ_LINE_MEMBER(read_line_secflash_sda) override; - virtual DECLARE_WRITE_LINE_MEMBER(write_line_d4) override; - virtual DECLARE_WRITE_LINE_MEMBER(write_line_d1) override; - virtual DECLARE_WRITE_LINE_MEMBER(write_line_d2) override; - virtual DECLARE_WRITE_LINE_MEMBER(write_line_d3) override; - virtual DECLARE_WRITE_LINE_MEMBER(write_line_zs01_sda) override; + virtual int read_line_ds2401() override; + virtual int read_line_secflash_sda() override; + virtual void write_line_d4(int state) override; + virtual void write_line_d1(int state) override; + virtual void write_line_d2(int state) override; + virtual void write_line_d3(int state) override; + virtual void write_line_zs01_sda(int state) override; protected: virtual void device_start() override; diff --git a/src/mame/konami/k573fpga.cpp b/src/mame/konami/k573fpga.cpp index b013267d8d2..4324123e724 100644 --- a/src/mame/konami/k573fpga.cpp +++ b/src/mame/konami/k573fpga.cpp @@ -353,7 +353,7 @@ TIMER_CALLBACK_MEMBER(k573fpga_device::update_stream) mp3_remaining_bytes--; } -WRITE_LINE_MEMBER(k573fpga_device::mpeg_frame_sync) +void k573fpga_device::mpeg_frame_sync(int state) { if (state) { mpeg_status &= ~(1 << PLAYBACK_STATE_IDLE); @@ -374,7 +374,7 @@ WRITE_LINE_MEMBER(k573fpga_device::mpeg_frame_sync) } } -WRITE_LINE_MEMBER(k573fpga_device::mas3507d_demand) +void k573fpga_device::mas3507d_demand(int state) { if (state && !BIT(mpeg_status, PLAYBACK_STATE_DEMAND)) { mpeg_status |= 1 << PLAYBACK_STATE_DEMAND; diff --git a/src/mame/konami/k573fpga.h b/src/mame/konami/k573fpga.h index 1330203b05c..26b7d1b78be 100644 --- a/src/mame/konami/k573fpga.h +++ b/src/mame/konami/k573fpga.h @@ -21,8 +21,8 @@ public: void set_ddrsbm_fpga(bool flag) { is_ddrsbm_fpga = flag; } - DECLARE_WRITE_LINE_MEMBER(mpeg_frame_sync); - DECLARE_WRITE_LINE_MEMBER(mas3507d_demand); + void mpeg_frame_sync(int state); + void mas3507d_demand(int state); void set_crypto_key1(uint16_t v); void set_crypto_key2(uint16_t v); diff --git a/src/mame/konami/k573mcr.cpp b/src/mame/konami/k573mcr.cpp index 8407c6fa8c3..a7452263189 100644 --- a/src/mame/konami/k573mcr.cpp +++ b/src/mame/konami/k573mcr.cpp @@ -113,7 +113,7 @@ uint8_t k573mcr_device::comm_method_version() return 0x10; } -WRITE_LINE_MEMBER(k573mcr_device::write_rxd) +void k573mcr_device::write_rxd(int state) { if (m_psx_clock) { if (m_psx_rx_bit == 0) { diff --git a/src/mame/konami/k573mcr.h b/src/mame/konami/k573mcr.h index 224649e38e6..c87e918cb25 100644 --- a/src/mame/konami/k573mcr.h +++ b/src/mame/konami/k573mcr.h @@ -27,7 +27,7 @@ public: virtual ioport_constructor device_input_ports() const override; - DECLARE_WRITE_LINE_MEMBER(write_rxd); + void write_rxd(int state); protected: virtual void device_start() override; diff --git a/src/mame/konami/konamigq.cpp b/src/mame/konami/konamigq.cpp index d94e1b1c2b9..0ddaa5f9d2e 100644 --- a/src/mame/konami/konamigq.cpp +++ b/src/mame/konami/konamigq.cpp @@ -124,7 +124,7 @@ private: uint16_t tms57002_status_word_r(); void tms57002_control_word_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); INTERRUPT_GEN_MEMBER(tms_sync); - DECLARE_WRITE_LINE_MEMBER(k054539_irq_gen); + void k054539_irq_gen(int state); void scsi_dma_read( uint32_t *p_n_psxram, uint32_t n_address, int32_t n_size ); void scsi_dma_write( uint32_t *p_n_psxram, uint32_t n_address, int32_t n_size ); @@ -251,7 +251,7 @@ void konamigq_state::konamigq_k054539_map(address_map &map) /* 058141 */ -WRITE_LINE_MEMBER(konamigq_state::k054539_irq_gen) +void konamigq_state::k054539_irq_gen(int state) { if (m_sound_ctrl & 1) { diff --git a/src/mame/konami/konamigs.cpp b/src/mame/konami/konamigs.cpp index f7bd5c136b7..c6c0704791b 100644 --- a/src/mame/konami/konamigs.cpp +++ b/src/mame/konami/konamigs.cpp @@ -120,7 +120,7 @@ protected: void gpu_w(offs_t offset, uint16_t data, uint16_t mem_mask = 0xffff); u16 vram_r(offs_t offset); void vram_w(offs_t offset, u16 data, u16 mem_mask = ~0); - DECLARE_WRITE_LINE_MEMBER(vblank); + void vblank(int state); void do_render(bool vbkem); void draw_quad_tex(u16 cmd, u16 *data); void draw_quad_bin(u16 cmd, u16 *data); @@ -400,7 +400,7 @@ void gsan_state::gpu_w(offs_t offset, uint16_t data, uint16_t mem_mask) } } -WRITE_LINE_MEMBER(gsan_state::vblank) +void gsan_state::vblank(int state) { if (state) { diff --git a/src/mame/konami/konamigx.cpp b/src/mame/konami/konamigx.cpp index 1542b23ddb3..e5a5b75ca95 100644 --- a/src/mame/konami/konamigx.cpp +++ b/src/mame/konami/konamigx.cpp @@ -1157,7 +1157,7 @@ void konamigx_state::gxtmsmap(address_map &map) } -WRITE_LINE_MEMBER(konamigx_state::k054539_irq_gen) +void konamigx_state::k054539_irq_gen(int state) { if (m_sound_ctrl & 1) { @@ -1641,13 +1641,13 @@ static GFXDECODE_START( gfx_type4 ) GFXDECODE_ENTRY( "gfx3", 0, bglayout_8bpp, 0x1800, 8 ) GFXDECODE_END -WRITE_LINE_MEMBER(konamigx_state::vblank_irq_ack_w) +void konamigx_state::vblank_irq_ack_w(int state) { m_maincpu->set_input_line(1, CLEAR_LINE); m_gx_syncen |= 0x20; } -WRITE_LINE_MEMBER(konamigx_state::hblank_irq_ack_w) +void konamigx_state::hblank_irq_ack_w(int state) { m_maincpu->set_input_line(2, CLEAR_LINE); m_gx_syncen |= 0x40; diff --git a/src/mame/konami/konamigx.h b/src/mame/konami/konamigx.h index ba9f3360ccc..c1482d11199 100644 --- a/src/mame/konami/konamigx.h +++ b/src/mame/konami/konamigx.h @@ -83,8 +83,8 @@ public: void konamigx_tilebank_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0); void konamigx_t1_psacmap_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0); void konamigx_t4_psacmap_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0); - DECLARE_WRITE_LINE_MEMBER(vblank_irq_ack_w); - DECLARE_WRITE_LINE_MEMBER(hblank_irq_ack_w); + void vblank_irq_ack_w(int state); + void hblank_irq_ack_w(int state); DECLARE_CUSTOM_INPUT_MEMBER(gx_rdport1_3_r); void init_konamigx(); TILE_GET_INFO_MEMBER(get_gx_psac_tile_info); @@ -110,7 +110,7 @@ public: INTERRUPT_GEN_MEMBER(konamigx_type2_vblank_irq); TIMER_DEVICE_CALLBACK_MEMBER(konamigx_type2_scanline); TIMER_DEVICE_CALLBACK_MEMBER(konamigx_type4_scanline); - DECLARE_WRITE_LINE_MEMBER(k054539_irq_gen); + void k054539_irq_gen(int state); TIMER_CALLBACK_MEMBER(dmaend_callback); TIMER_CALLBACK_MEMBER(boothack_callback); double adc0834_callback(uint8_t input); diff --git a/src/mame/konami/konamim2.cpp b/src/mame/konami/konamim2.cpp index 404d7881610..140205f5057 100644 --- a/src/mame/konami/konamim2.cpp +++ b/src/mame/konami/konamim2.cpp @@ -288,15 +288,15 @@ protected: virtual void machine_start() override; public: - DECLARE_WRITE_LINE_MEMBER(ppc1_int); - DECLARE_WRITE_LINE_MEMBER(ppc2_int); + void ppc1_int(int state); + void ppc2_int(int state); void cde_sdbg_out(uint32_t data); void ldac_out(uint16_t data); void rdac_out(uint16_t data); - DECLARE_WRITE_LINE_MEMBER(ata_int); + void ata_int(int state); uint16_t konami_io0_r(offs_t offset); void konami_io0_w(offs_t offset, uint16_t data); @@ -365,12 +365,12 @@ private: * *************************************/ -WRITE_LINE_MEMBER(konamim2_state::ppc1_int) +void konamim2_state::ppc1_int(int state) { m_ppc1->set_input_line(INPUT_LINE_IRQ0, state ? ASSERT_LINE : CLEAR_LINE); } -WRITE_LINE_MEMBER(konamim2_state::ppc2_int) +void konamim2_state::ppc2_int(int state) { m_ppc2->set_input_line(INPUT_LINE_IRQ0, state ? ASSERT_LINE : CLEAR_LINE); } @@ -408,7 +408,7 @@ void konamim2_state::rdac_out(uint16_t data) * *************************************/ -WRITE_LINE_MEMBER( konamim2_state::ata_int ) +void konamim2_state::ata_int(int state) { // m_atapi_timer->adjust( attotime::from_msec(10), state ); m_ata_int = state; diff --git a/src/mame/konami/konblands.cpp b/src/mame/konami/konblands.cpp index 43edf1ed2b2..a021c3c8c13 100644 --- a/src/mame/konami/konblands.cpp +++ b/src/mame/konami/konblands.cpp @@ -56,7 +56,7 @@ private: void firq_enable_w(uint8_t data); INTERRUPT_GEN_MEMBER(vblank_irq); INTERRUPT_GEN_MEMBER(timer_irq); - DECLARE_WRITE_LINE_MEMBER(ld_command_strobe_cb); + void ld_command_strobe_cb(int state); void konblands_map(address_map &map); void konblandsh_map(address_map &map); @@ -256,7 +256,7 @@ INTERRUPT_GEN_MEMBER(konblands_state::timer_irq) m_maincpu->set_input_line(M6809_FIRQ_LINE, HOLD_LINE); } -WRITE_LINE_MEMBER(konblands_state::ld_command_strobe_cb) +void konblands_state::ld_command_strobe_cb(int state) { if(m_irq_enable == true) m_maincpu->set_input_line(M6809_IRQ_LINE, state ? ASSERT_LINE : CLEAR_LINE); diff --git a/src/mame/konami/konendev.cpp b/src/mame/konami/konendev.cpp index a929ddedb3d..77835566f72 100644 --- a/src/mame/konami/konendev.cpp +++ b/src/mame/konami/konendev.cpp @@ -112,7 +112,7 @@ private: uint16_t ifu_dpram_r(offs_t offset); void ifu_dpram_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); - DECLARE_WRITE_LINE_MEMBER(gcu_interrupt); + void gcu_interrupt(int state); INTERRUPT_GEN_MEMBER(vbl_interrupt); uint8_t rtc_dev_r(uint32_t reg); @@ -372,7 +372,7 @@ static INPUT_PORTS_START( konendev ) INPUT_PORTS_END -WRITE_LINE_MEMBER(konendev_state::gcu_interrupt) +void konendev_state::gcu_interrupt(int state) { m_maincpu->set_input_line(INPUT_LINE_IRQ1, state); m_maincpu->set_input_line(INPUT_LINE_IRQ3, state); diff --git a/src/mame/konami/konmedal.cpp b/src/mame/konami/konmedal.cpp index 086e1f34deb..af01aa98f3b 100644 --- a/src/mame/konami/konmedal.cpp +++ b/src/mame/konami/konmedal.cpp @@ -137,8 +137,8 @@ private: K056832_CB_MEMBER(tile_callback); TIMER_DEVICE_CALLBACK_MEMBER(konmedal_scanline); - WRITE_LINE_MEMBER(vbl_ack_w) { m_maincpu->set_input_line(0, CLEAR_LINE); } - WRITE_LINE_MEMBER(nmi_ack_w) { m_maincpu->set_input_line(INPUT_LINE_NMI, CLEAR_LINE); } + void vbl_ack_w(int state) { m_maincpu->set_input_line(0, CLEAR_LINE); } + void nmi_ack_w(int state) { m_maincpu->set_input_line(INPUT_LINE_NMI, CLEAR_LINE); } void ccu_int_time_w(uint8_t data) { m_ccu_int_time = data; } void k056832_w(offs_t offset, uint8_t data) { m_k056832->write(offset ^ 1, data); } void k056832_b_w(offs_t offset, uint8_t data) { m_k056832->b_w(offset ^ 1, data); } diff --git a/src/mame/konami/konppc_jvshost.cpp b/src/mame/konami/konppc_jvshost.cpp index db52d311014..678229db32a 100644 --- a/src/mame/konami/konppc_jvshost.cpp +++ b/src/mame/konami/konppc_jvshost.cpp @@ -39,7 +39,7 @@ void konppc_jvs_host_device::device_reset() m_jvs_sdata_ptr = 0; } -READ_LINE_MEMBER( konppc_jvs_host_device::sense ) +int konppc_jvs_host_device::sense() { return !get_address_set_line(); } diff --git a/src/mame/konami/konppc_jvshost.h b/src/mame/konami/konppc_jvshost.h index d09977b0fd8..ef04c6e25a8 100644 --- a/src/mame/konami/konppc_jvshost.h +++ b/src/mame/konami/konppc_jvshost.h @@ -19,7 +19,7 @@ public: void read(); bool write(uint8_t data); - DECLARE_READ_LINE_MEMBER( sense ); + int sense(); protected: virtual void device_start() override; diff --git a/src/mame/konami/kpontoon.cpp b/src/mame/konami/kpontoon.cpp index c4cf759ecc5..9f965d815e2 100644 --- a/src/mame/konami/kpontoon.cpp +++ b/src/mame/konami/kpontoon.cpp @@ -94,12 +94,12 @@ private: void snd_bnk_w(u8 data); TILE_GET_INFO_MEMBER(ttl_get_tile_info); - DECLARE_WRITE_LINE_MEMBER(k054539_nmi_gen); + void k054539_nmi_gen(int state); u32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); TIMER_DEVICE_CALLBACK_MEMBER(ccu_scanline); - WRITE_LINE_MEMBER(vbl_ack_w) { m_maincpu->set_input_line(0, CLEAR_LINE); } - WRITE_LINE_MEMBER(nmi_ack_w) { m_maincpu->set_input_line(INPUT_LINE_NMI, CLEAR_LINE); } + void vbl_ack_w(int state) { m_maincpu->set_input_line(0, CLEAR_LINE); } + void nmi_ack_w(int state) { m_maincpu->set_input_line(INPUT_LINE_NMI, CLEAR_LINE); } u8 m_control; u8 m_charrom_bank; @@ -215,7 +215,7 @@ void kpontoon_state::snd_to_main_w(offs_t offset, u8 data) } } -WRITE_LINE_MEMBER(kpontoon_state::k054539_nmi_gen) +void kpontoon_state::k054539_nmi_gen(int state) { // Trigger an /NMI on the rising edge if (!m_sound_nmi_clk && state) diff --git a/src/mame/konami/kpython2.cpp b/src/mame/konami/kpython2.cpp index d85759cbf4d..79a6818350f 100644 --- a/src/mame/konami/kpython2.cpp +++ b/src/mame/konami/kpython2.cpp @@ -471,7 +471,7 @@ protected: uint64_t ee_iop_ram_r(offs_t offset); void iop_debug_w(uint32_t data); - DECLARE_WRITE_LINE_MEMBER(iop_timer_irq); + void iop_timer_irq(int state); void mem_map(address_map &map); void iop_map(address_map &map); @@ -741,7 +741,7 @@ void kpython2_state::ipu_fifo_w(offs_t offset, uint64_t data, uint64_t mem_mask) } } -WRITE_LINE_MEMBER(kpython2_state::iop_timer_irq) +void kpython2_state::iop_timer_irq(int state) { logerror("%s: iop_timer_irq: %d\n", machine().describe_context(), state); if (state) diff --git a/src/mame/konami/ksys573.cpp b/src/mame/konami/ksys573.cpp index 25cb68828ac..5acb4be34ec 100644 --- a/src/mame/konami/ksys573.cpp +++ b/src/mame/konami/ksys573.cpp @@ -457,7 +457,7 @@ public: void send_packet(uint8_t *data, int length); int received_packet(uint8_t *buffer); - DECLARE_READ_LINE_MEMBER( jvs_sense_r ); + int jvs_sense_r(); private: int output_buffer_size = 0; @@ -471,7 +471,7 @@ sys573_jvs_host::sys573_jvs_host(const machine_config &mconfig, const char *tag, output_buffer_size = 0; } -READ_LINE_MEMBER( sys573_jvs_host::jvs_sense_r ) +int sys573_jvs_host::jvs_sense_r() { return !get_address_set_line(); } @@ -612,45 +612,45 @@ public: void init_hyperbbc(); void init_drmn(); - DECLARE_READ_LINE_MEMBER( gunmania_tank_shutter_sensor ); - DECLARE_READ_LINE_MEMBER( gunmania_cable_holder_sensor ); - - DECLARE_READ_LINE_MEMBER( h8_d0_r ); - DECLARE_READ_LINE_MEMBER( h8_d1_r ); - DECLARE_READ_LINE_MEMBER( h8_d2_r ); - DECLARE_READ_LINE_MEMBER( h8_d3_r ); - - template DECLARE_READ_LINE_MEMBER( pccard_cd_r ); - - DECLARE_WRITE_LINE_MEMBER( gtrfrks_lamps_b7 ); - DECLARE_WRITE_LINE_MEMBER( gtrfrks_lamps_b6 ); - DECLARE_WRITE_LINE_MEMBER( gtrfrks_lamps_b5 ); - DECLARE_WRITE_LINE_MEMBER( gtrfrks_lamps_b4 ); - DECLARE_WRITE_LINE_MEMBER( dmx_lamps_b0 ); - DECLARE_WRITE_LINE_MEMBER( dmx_lamps_b1 ); - DECLARE_WRITE_LINE_MEMBER( dmx_lamps_b2 ); - DECLARE_WRITE_LINE_MEMBER( dmx_lamps_b3 ); - DECLARE_WRITE_LINE_MEMBER( dmx_lamps_b4 ); - DECLARE_WRITE_LINE_MEMBER( dmx_lamps_b5 ); - DECLARE_WRITE_LINE_MEMBER( mamboagg_lamps_b3 ); - DECLARE_WRITE_LINE_MEMBER( mamboagg_lamps_b4 ); - DECLARE_WRITE_LINE_MEMBER( mamboagg_lamps_b5 ); - DECLARE_WRITE_LINE_MEMBER( serial_lamp_reset ); - DECLARE_WRITE_LINE_MEMBER( serial_lamp_data ); - DECLARE_WRITE_LINE_MEMBER( stepchmp_lamp_clock ); - DECLARE_WRITE_LINE_MEMBER( animechmp_lamp_clock ); - DECLARE_WRITE_LINE_MEMBER( salarymc_lamp_clock ); - DECLARE_WRITE_LINE_MEMBER( hyperbbc_lamp_red ); - DECLARE_WRITE_LINE_MEMBER( hyperbbc_lamp_green ); - DECLARE_WRITE_LINE_MEMBER( hyperbbc_lamp_blue ); - DECLARE_WRITE_LINE_MEMBER( hyperbbc_lamp_start ); - DECLARE_WRITE_LINE_MEMBER( hyperbbc_lamp_strobe1 ); - DECLARE_WRITE_LINE_MEMBER( hyperbbc_lamp_strobe2 ); - DECLARE_WRITE_LINE_MEMBER( hyperbbc_lamp_strobe3 ); - - DECLARE_WRITE_LINE_MEMBER( h8_clk_w ); - - DECLARE_READ_LINE_MEMBER( jvs_rx_r ); + int gunmania_tank_shutter_sensor(); + int gunmania_cable_holder_sensor(); + + int h8_d0_r(); + int h8_d1_r(); + int h8_d2_r(); + int h8_d3_r(); + + template int pccard_cd_r(); + + void gtrfrks_lamps_b7(int state); + void gtrfrks_lamps_b6(int state); + void gtrfrks_lamps_b5(int state); + void gtrfrks_lamps_b4(int state); + void dmx_lamps_b0(int state); + void dmx_lamps_b1(int state); + void dmx_lamps_b2(int state); + void dmx_lamps_b3(int state); + void dmx_lamps_b4(int state); + void dmx_lamps_b5(int state); + void mamboagg_lamps_b3(int state); + void mamboagg_lamps_b4(int state); + void mamboagg_lamps_b5(int state); + void serial_lamp_reset(int state); + void serial_lamp_data(int state); + void stepchmp_lamp_clock(int state); + void animechmp_lamp_clock(int state); + void salarymc_lamp_clock(int state); + void hyperbbc_lamp_red(int state); + void hyperbbc_lamp_green(int state); + void hyperbbc_lamp_blue(int state); + void hyperbbc_lamp_start(int state); + void hyperbbc_lamp_strobe1(int state); + void hyperbbc_lamp_strobe2(int state); + void hyperbbc_lamp_strobe3(int state); + + void h8_clk_w(int state); + + int jvs_rx_r(); protected: using gx700pwfbf_output_delegate = delegate; @@ -690,7 +690,7 @@ private: void gx700pwbk_io_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); void gunmania_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); uint16_t gunmania_r(offs_t offset, uint16_t mem_mask = ~0); - DECLARE_WRITE_LINE_MEMBER( ata_interrupt ); + void ata_interrupt(int state); TIMER_CALLBACK_MEMBER( atapi_xfer_end ); void ddrsolo_output_callback(offs_t offset, uint8_t data); @@ -1039,7 +1039,7 @@ uint16_t ksys573_state::port_in2_jvs_r(offs_t offset, uint16_t mem_mask) return data; } -READ_LINE_MEMBER( ksys573_state::jvs_rx_r ) +int ksys573_state::jvs_rx_r() { if (m_jvs_output_len_w <= 0) { m_jvs_output_len_w = m_sys573_jvs_host->received_packet(m_jvs_output_buffer); @@ -1088,7 +1088,7 @@ TIMER_CALLBACK_MEMBER( ksys573_state::atapi_xfer_end ) } } -WRITE_LINE_MEMBER( ksys573_state::ata_interrupt ) +void ksys573_state::ata_interrupt(int state) { m_psxirq->intin10( state ); } @@ -1137,7 +1137,7 @@ uint16_t ksys573_state::security_r(offs_t offset, uint16_t mem_mask) } template -READ_LINE_MEMBER( ksys573_state::pccard_cd_r ) +int ksys573_state::pccard_cd_r() { return m_pccard_cd[N]; } @@ -1176,7 +1176,7 @@ void ksys573_state::machine_reset() // H8 check at startup (JVS related) -WRITE_LINE_MEMBER( ksys573_state::h8_clk_w ) +void ksys573_state::h8_clk_w(int state) { if( m_h8_clk != state ) { @@ -1192,22 +1192,22 @@ WRITE_LINE_MEMBER( ksys573_state::h8_clk_w ) } } -READ_LINE_MEMBER( ksys573_state::h8_d0_r ) +int ksys573_state::h8_d0_r() { return ( m_h8_response[ m_h8_index ] >> 0 ) & 1; } -READ_LINE_MEMBER( ksys573_state::h8_d1_r ) +int ksys573_state::h8_d1_r() { return ( m_h8_response[ m_h8_index ] >> 1 ) & 1; } -READ_LINE_MEMBER( ksys573_state::h8_d2_r ) +int ksys573_state::h8_d2_r() { return ( m_h8_response[ m_h8_index ] >> 2 ) & 1; } -READ_LINE_MEMBER( ksys573_state::h8_d3_r ) +int ksys573_state::h8_d3_r() { return ( m_h8_response[ m_h8_index ] >> 3 ) & 1; } @@ -1590,22 +1590,22 @@ void ddr_state::init_ddr() /* Guitar freaks */ -WRITE_LINE_MEMBER( ksys573_state::gtrfrks_lamps_b7 ) +void ksys573_state::gtrfrks_lamps_b7(int state) { output().set_value( "spot left", state ); } -WRITE_LINE_MEMBER( ksys573_state::gtrfrks_lamps_b6 ) +void ksys573_state::gtrfrks_lamps_b6(int state) { output().set_value( "spot right", state ); } -WRITE_LINE_MEMBER( ksys573_state::gtrfrks_lamps_b5 ) +void ksys573_state::gtrfrks_lamps_b5(int state) { m_lamps[0] = state ? 1 : 0; // start left } -WRITE_LINE_MEMBER( ksys573_state::gtrfrks_lamps_b4 ) +void ksys573_state::gtrfrks_lamps_b4(int state) { m_lamps[1] = state ? 1 : 0; // start right } @@ -1856,38 +1856,38 @@ void ksys573_state::dmx_output_callback(offs_t offset, uint8_t data) } } -WRITE_LINE_MEMBER( ksys573_state::dmx_lamps_b0 ) +void ksys573_state::dmx_lamps_b0(int state) { output().set_value( "left 2p", state ); } -WRITE_LINE_MEMBER( ksys573_state::dmx_lamps_b1 ) +void ksys573_state::dmx_lamps_b1(int state) { m_lamps[1] = state ? 1 : 0; // start 1p } -WRITE_LINE_MEMBER( ksys573_state::dmx_lamps_b2 ) +void ksys573_state::dmx_lamps_b2(int state) { output().set_value( "right 2p", state ); } -WRITE_LINE_MEMBER( ksys573_state::dmx_lamps_b3 ) +void ksys573_state::dmx_lamps_b3(int state) { output().set_value( "left 1p", state ); } -WRITE_LINE_MEMBER( ksys573_state::dmx_lamps_b4 ) +void ksys573_state::dmx_lamps_b4(int state) { m_lamps[0] = state ? 1 : 0; // start 2p } -WRITE_LINE_MEMBER( ksys573_state::dmx_lamps_b5 ) +void ksys573_state::dmx_lamps_b5(int state) { output().set_value( "right 1p", state ); } /* step champ */ -WRITE_LINE_MEMBER( ksys573_state::stepchmp_lamp_clock ) +void ksys573_state::stepchmp_lamp_clock(int state) { if( state && !m_serial_lamp_clock ) { @@ -1924,7 +1924,7 @@ void ksys573_state::stepchmp_cassette_install(device_t* device) } /* anime champ */ -WRITE_LINE_MEMBER( ksys573_state::animechmp_lamp_clock ) +void ksys573_state::animechmp_lamp_clock(int state) { if( state && !m_serial_lamp_clock ) { @@ -1974,7 +1974,7 @@ void ksys573_state::animechmp_cassette_install(device_t *device) } /* salary man champ */ -WRITE_LINE_MEMBER( ksys573_state::serial_lamp_reset ) +void ksys573_state::serial_lamp_reset(int state) { if( state ) { @@ -1983,12 +1983,12 @@ WRITE_LINE_MEMBER( ksys573_state::serial_lamp_reset ) } } -WRITE_LINE_MEMBER( ksys573_state::serial_lamp_data ) +void ksys573_state::serial_lamp_data(int state) { m_serial_lamp_data = state; } -WRITE_LINE_MEMBER( ksys573_state::salarymc_lamp_clock ) +void ksys573_state::salarymc_lamp_clock(int state) { if( state && !m_serial_lamp_clock ) { @@ -2044,27 +2044,27 @@ void ksys573_state::init_serlamp() /* Hyper Bishi Bashi Champ */ -WRITE_LINE_MEMBER( ksys573_state::hyperbbc_lamp_red ) +void ksys573_state::hyperbbc_lamp_red(int state) { m_hyperbbc_lamp_red = state; } -WRITE_LINE_MEMBER( ksys573_state::hyperbbc_lamp_green ) +void ksys573_state::hyperbbc_lamp_green(int state) { m_hyperbbc_lamp_green = state; } -WRITE_LINE_MEMBER( ksys573_state::hyperbbc_lamp_blue ) +void ksys573_state::hyperbbc_lamp_blue(int state) { m_hyperbbc_lamp_blue = state; } -WRITE_LINE_MEMBER( ksys573_state::hyperbbc_lamp_start ) +void ksys573_state::hyperbbc_lamp_start(int state) { m_hyperbbc_lamp_start = state; } -WRITE_LINE_MEMBER( ksys573_state::hyperbbc_lamp_strobe1 ) +void ksys573_state::hyperbbc_lamp_strobe1(int state) { if( state && !m_hyperbbc_lamp_strobe1 ) { @@ -2077,7 +2077,7 @@ WRITE_LINE_MEMBER( ksys573_state::hyperbbc_lamp_strobe1 ) m_hyperbbc_lamp_strobe1 = state; } -WRITE_LINE_MEMBER( ksys573_state::hyperbbc_lamp_strobe2 ) +void ksys573_state::hyperbbc_lamp_strobe2(int state) { if( state && !m_hyperbbc_lamp_strobe2 ) { @@ -2090,7 +2090,7 @@ WRITE_LINE_MEMBER( ksys573_state::hyperbbc_lamp_strobe2 ) m_hyperbbc_lamp_strobe2 = state; } -WRITE_LINE_MEMBER( ksys573_state::hyperbbc_lamp_strobe3 ) +void ksys573_state::hyperbbc_lamp_strobe3(int state) { if( state && !m_hyperbbc_lamp_strobe3 ) { @@ -2176,17 +2176,17 @@ void ksys573_state::mamboagg_output_callback(offs_t offset, uint8_t data) } } -WRITE_LINE_MEMBER( ksys573_state::mamboagg_lamps_b3 ) +void ksys573_state::mamboagg_lamps_b3(int state) { m_lamps[0] = state ? 1 : 0; // start 1p } -WRITE_LINE_MEMBER( ksys573_state::mamboagg_lamps_b4 ) +void ksys573_state::mamboagg_lamps_b4(int state) { output().set_value( "select right", state ); } -WRITE_LINE_MEMBER( ksys573_state::mamboagg_lamps_b5 ) +void ksys573_state::mamboagg_lamps_b5(int state) { output().set_value( "select left", state ); } @@ -2382,7 +2382,7 @@ void ksys573_state::gunmania_w(offs_t offset, uint16_t data, uint16_t mem_mask) LOGIOBOARD( "gunmania_w %08x %08x %08x\n", offset, mem_mask, data ); } -READ_LINE_MEMBER( ksys573_state::gunmania_tank_shutter_sensor ) +int ksys573_state::gunmania_tank_shutter_sensor() { if( m_tank_shutter_position == 0 ) { @@ -2392,7 +2392,7 @@ READ_LINE_MEMBER( ksys573_state::gunmania_tank_shutter_sensor ) return 0; } -READ_LINE_MEMBER( ksys573_state::gunmania_cable_holder_sensor ) +int ksys573_state::gunmania_cable_holder_sensor() { return m_cable_holder_release; } diff --git a/src/mame/konami/labyrunr.cpp b/src/mame/konami/labyrunr.cpp index 5feaab1e622..8cf71f8d558 100644 --- a/src/mame/konami/labyrunr.cpp +++ b/src/mame/konami/labyrunr.cpp @@ -73,7 +73,7 @@ private: template TILE_GET_INFO_MEMBER(get_tile_info); void palette(palette_device &palette) const; uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(vblank_irq); + void vblank_irq(int state); INTERRUPT_GEN_MEMBER(timer_interrupt); void prg_map(address_map &map); }; @@ -305,7 +305,7 @@ uint32_t labyrunr_state::screen_update(screen_device &screen, bitmap_ind16 &bitm // machine -WRITE_LINE_MEMBER(labyrunr_state::vblank_irq) +void labyrunr_state::vblank_irq(int state) { if (state && (m_k007121->ctrlram_r(7) & 0x02)) m_maincpu->set_input_line(HD6309_IRQ_LINE, HOLD_LINE); diff --git a/src/mame/konami/mainevt.cpp b/src/mame/konami/mainevt.cpp index 18585cac50b..9ef885cd0bb 100644 --- a/src/mame/konami/mainevt.cpp +++ b/src/mame/konami/mainevt.cpp @@ -149,7 +149,7 @@ private: INTERRUPT_GEN_MEMBER(sound_timer_irq); uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(vblank_w); + void vblank_w(int state); K052109_CB_MEMBER(tile_callback); K051960_CB_MEMBER(sprite_callback); @@ -255,7 +255,7 @@ void devstors_state::nmienable_w(uint8_t data) m_nmi_enable = data; } -WRITE_LINE_MEMBER(devstors_state::vblank_w) +void devstors_state::vblank_w(int state) { if (state && m_nmi_enable) m_maincpu->pulse_input_line(INPUT_LINE_NMI, attotime::zero); diff --git a/src/mame/konami/megazone.cpp b/src/mame/konami/megazone.cpp index ff1bd66a039..92ecb74ff60 100644 --- a/src/mame/konami/megazone.cpp +++ b/src/mame/konami/megazone.cpp @@ -255,15 +255,15 @@ private: void i8039_irq_w(uint8_t data); void i8039_irqen_and_status_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(coin_counter_1_w); - DECLARE_WRITE_LINE_MEMBER(coin_counter_2_w); - DECLARE_WRITE_LINE_MEMBER(irq_mask_w); - DECLARE_WRITE_LINE_MEMBER(flipscreen_w); + void coin_counter_1_w(int state); + void coin_counter_2_w(int state); + void irq_mask_w(int state); + void flipscreen_w(int state); uint8_t port_a_r(); void port_b_w(uint8_t data); void palette(palette_device &palette) const; uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(vblank_irq); + void vblank_irq(int state); void i8039_io_map(address_map &map); void i8039_map(address_map &map); void main_map(address_map &map); @@ -354,7 +354,7 @@ void megazone_state::palette(palette_device &palette) const } } -WRITE_LINE_MEMBER(megazone_state::flipscreen_w) +void megazone_state::flipscreen_w(int state) { m_flipscreen = state; } @@ -512,17 +512,17 @@ void megazone_state::i8039_irqen_and_status_w(uint8_t data) m_i8039_status = (data & 0x70) >> 4; } -WRITE_LINE_MEMBER(megazone_state::coin_counter_1_w) +void megazone_state::coin_counter_1_w(int state) { machine().bookkeeping().coin_counter_w(0, state); } -WRITE_LINE_MEMBER(megazone_state::coin_counter_2_w) +void megazone_state::coin_counter_2_w(int state) { machine().bookkeeping().coin_counter_w(1, state); } -WRITE_LINE_MEMBER(megazone_state::irq_mask_w) +void megazone_state::irq_mask_w(int state) { m_irq_mask = state; } @@ -673,7 +673,7 @@ void megazone_state::machine_reset() m_i8039_status = 0; } -WRITE_LINE_MEMBER(megazone_state::vblank_irq) +void megazone_state::vblank_irq(int state) { if (state && m_irq_mask) m_maincpu->set_input_line(0, HOLD_LINE); diff --git a/src/mame/konami/mikie.cpp b/src/mame/konami/mikie.cpp index 88b5574b4c0..40f07fd9901 100644 --- a/src/mame/konami/mikie.cpp +++ b/src/mame/konami/mikie.cpp @@ -100,17 +100,17 @@ private: uint8_t m_irq_mask = 0; uint8_t sh_timer_r(); - DECLARE_WRITE_LINE_MEMBER(sh_irqtrigger_w); - template DECLARE_WRITE_LINE_MEMBER(coin_counter_w); - DECLARE_WRITE_LINE_MEMBER(irq_mask_w); + void sh_irqtrigger_w(int state); + template void coin_counter_w(int state); + void irq_mask_w(int state); void videoram_w(offs_t offset, uint8_t data); void colorram_w(offs_t offset, uint8_t data); void palettebank_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(flipscreen_w); + void flipscreen_w(int state); TILE_GET_INFO_MEMBER(get_bg_tile_info); void palette(palette_device &palette) const; uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(vblank_irq); + void vblank_irq(int state); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); void main_map(address_map &map); void sound_map(address_map &map); @@ -211,7 +211,7 @@ void mikie_state::palettebank_w(uint8_t data) } } -WRITE_LINE_MEMBER(mikie_state::flipscreen_w) +void mikie_state::flipscreen_w(int state) { flip_screen_set(state); machine().tilemap().mark_all_dirty(); @@ -286,7 +286,7 @@ uint8_t mikie_state::sh_timer_r() return clock; } -WRITE_LINE_MEMBER(mikie_state::sh_irqtrigger_w) +void mikie_state::sh_irqtrigger_w(int state) { if (state) { @@ -296,12 +296,12 @@ WRITE_LINE_MEMBER(mikie_state::sh_irqtrigger_w) } template -WRITE_LINE_MEMBER(mikie_state::coin_counter_w) +void mikie_state::coin_counter_w(int state) { machine().bookkeeping().coin_counter_w(Which, state); } -WRITE_LINE_MEMBER(mikie_state::irq_mask_w) +void mikie_state::irq_mask_w(int state) { m_irq_mask = state; if (!m_irq_mask) @@ -450,7 +450,7 @@ void mikie_state::machine_reset() m_palettebank = 0; } -WRITE_LINE_MEMBER(mikie_state::vblank_irq) +void mikie_state::vblank_irq(int state) { if (state && m_irq_mask) m_maincpu->set_input_line(M6809_IRQ_LINE, ASSERT_LINE); diff --git a/src/mame/konami/mystwarr.cpp b/src/mame/konami/mystwarr.cpp index c6a52329a78..009a92f98ab 100644 --- a/src/mame/konami/mystwarr.cpp +++ b/src/mame/konami/mystwarr.cpp @@ -624,7 +624,7 @@ void mystwarr_state::mystwarr_sound_map(address_map &map) } -WRITE_LINE_MEMBER(mystwarr_state::k054539_nmi_gen) +void mystwarr_state::k054539_nmi_gen(int state) { if (m_sound_ctrl & 0x10) { diff --git a/src/mame/konami/mystwarr.h b/src/mame/konami/mystwarr.h index 5a7506b81cf..2980ee06b0d 100644 --- a/src/mame/konami/mystwarr.h +++ b/src/mame/konami/mystwarr.h @@ -98,7 +98,7 @@ private: uint32_t screen_update_dadandrn(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); uint32_t screen_update_martchmp(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(ddd_interrupt); - DECLARE_WRITE_LINE_MEMBER(k054539_nmi_gen); + void k054539_nmi_gen(int state); TIMER_DEVICE_CALLBACK_MEMBER(mystwarr_interrupt); TIMER_DEVICE_CALLBACK_MEMBER(metamrph_interrupt); TIMER_DEVICE_CALLBACK_MEMBER(mchamp_interrupt); diff --git a/src/mame/konami/nemesis.cpp b/src/mame/konami/nemesis.cpp index cc42f5d1183..e004c555ced 100644 --- a/src/mame/konami/nemesis.cpp +++ b/src/mame/konami/nemesis.cpp @@ -124,19 +124,19 @@ initials #include "konamigt.lh" -WRITE_LINE_MEMBER(nemesis_state::nemesis_vblank_irq) +void nemesis_state::nemesis_vblank_irq(int state) { if (state && m_irq_on) m_maincpu->set_input_line(1, HOLD_LINE); } -WRITE_LINE_MEMBER(nemesis_state::blkpnthr_vblank_irq) +void nemesis_state::blkpnthr_vblank_irq(int state) { if (state && m_irq_on) m_maincpu->set_input_line(2, HOLD_LINE); } -WRITE_LINE_MEMBER(nemesis_state::bubsys_vblank_irq) +void nemesis_state::bubsys_vblank_irq(int state) { if (state && m_irq_on) m_maincpu->set_input_line(4, HOLD_LINE); @@ -207,44 +207,44 @@ TIMER_DEVICE_CALLBACK_MEMBER(nemesis_state::gx400_interrupt) } -WRITE_LINE_MEMBER(nemesis_state::irq_enable_w) +void nemesis_state::irq_enable_w(int state) { m_irq_on = state; } -WRITE_LINE_MEMBER(nemesis_state::irq1_enable_w) +void nemesis_state::irq1_enable_w(int state) { m_irq1_on = state; } -WRITE_LINE_MEMBER(nemesis_state::irq2_enable_w) +void nemesis_state::irq2_enable_w(int state) { m_irq2_on = state; } -WRITE_LINE_MEMBER(nemesis_state::irq4_enable_w) +void nemesis_state::irq4_enable_w(int state) { m_irq4_on = state; } -WRITE_LINE_MEMBER(nemesis_state::coin1_lockout_w) +void nemesis_state::coin1_lockout_w(int state) { machine().bookkeeping().coin_lockout_w(0, state); } -WRITE_LINE_MEMBER(nemesis_state::coin2_lockout_w) +void nemesis_state::coin2_lockout_w(int state) { machine().bookkeeping().coin_lockout_w(1, state); } -WRITE_LINE_MEMBER(nemesis_state::sound_irq_w) +void nemesis_state::sound_irq_w(int state) { // This asserts the Z80 /irq pin by setting a 74ls74 latch; the Z80 pulses /IOREQ low during servicing of the interrupt, which clears the latch automatically, so HOLD_LINE is correct in this case if (state) m_audiocpu->set_input_line_and_vector(0, HOLD_LINE, 0xff); // Z80 } -WRITE_LINE_MEMBER(nemesis_state::sound_nmi_w) +void nemesis_state::sound_nmi_w(int state) { // On Bubble System at least, this goes to an LS02 NOR before the Z80, whose other input is tied to ???, acting as an inverter. Effectively, if the bit is 1, NMI is asserted, otherwise it is cleared. This is also cleared on reset. // the ??? input is likely either tied to VBLANK or 256V, or tied to one of those two through a 74ls74 enable latch, controlled by something else (probably either the one of the two output/int enable latches of the 68k, or by exx0/exx7 address-latched accesses from the sound z80, though technically it could be anything, even the /BS signal from the mcu to the 68k) diff --git a/src/mame/konami/nemesis.h b/src/mame/konami/nemesis.h index d785f7b2dee..6eb3e4678aa 100644 --- a/src/mame/konami/nemesis.h +++ b/src/mame/konami/nemesis.h @@ -114,14 +114,14 @@ private: required_device m_screen; required_device m_palette; - DECLARE_WRITE_LINE_MEMBER(irq_enable_w); - DECLARE_WRITE_LINE_MEMBER(irq1_enable_w); - DECLARE_WRITE_LINE_MEMBER(irq2_enable_w); - DECLARE_WRITE_LINE_MEMBER(irq4_enable_w); - DECLARE_WRITE_LINE_MEMBER(coin1_lockout_w); - DECLARE_WRITE_LINE_MEMBER(coin2_lockout_w); - DECLARE_WRITE_LINE_MEMBER(sound_irq_w); - DECLARE_WRITE_LINE_MEMBER(sound_nmi_w); + void irq_enable_w(int state); + void irq1_enable_w(int state); + void irq2_enable_w(int state); + void irq4_enable_w(int state); + void coin1_lockout_w(int state); + void coin2_lockout_w(int state); + void sound_irq_w(int state); + void sound_nmi_w(int state); uint16_t gx400_sharedram_word_r(offs_t offset); void gx400_sharedram_word_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); uint16_t konamigt_input_word_r(); @@ -129,8 +129,8 @@ private: uint8_t selected_ip_r(); void bubsys_mcu_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); uint8_t wd_r(); - DECLARE_WRITE_LINE_MEMBER(gfx_flipx_w); - DECLARE_WRITE_LINE_MEMBER(gfx_flipy_w); + void gfx_flipx_w(int state); + void gfx_flipy_w(int state); void salamand_control_port_word_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); void nemesis_palette_word_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); void nemesis_videoram1_word_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); @@ -149,10 +149,10 @@ private: virtual void machine_reset() override; virtual void video_start() override; uint32_t screen_update_nemesis(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(nemesis_vblank_irq); - DECLARE_WRITE_LINE_MEMBER(bubsys_vblank_irq); + void nemesis_vblank_irq(int state); + void bubsys_vblank_irq(int state); - DECLARE_WRITE_LINE_MEMBER(blkpnthr_vblank_irq); + void blkpnthr_vblank_irq(int state); TIMER_DEVICE_CALLBACK_MEMBER(bubsys_interrupt); TIMER_DEVICE_CALLBACK_MEMBER(konamigt_interrupt); TIMER_DEVICE_CALLBACK_MEMBER(hcrash_interrupt); diff --git a/src/mame/konami/nemesis_v.cpp b/src/mame/konami/nemesis_v.cpp index b8982f9fd94..c91df94f485 100644 --- a/src/mame/konami/nemesis_v.cpp +++ b/src/mame/konami/nemesis_v.cpp @@ -95,7 +95,7 @@ TILE_GET_INFO_MEMBER(nemesis_state::get_fg_tile_info) } -WRITE_LINE_MEMBER(nemesis_state::gfx_flipx_w) +void nemesis_state::gfx_flipx_w(int state) { m_flipscreen = state; @@ -107,7 +107,7 @@ WRITE_LINE_MEMBER(nemesis_state::gfx_flipx_w) machine().tilemap().set_flip_all(m_tilemap_flip); } -WRITE_LINE_MEMBER(nemesis_state::gfx_flipy_w) +void nemesis_state::gfx_flipy_w(int state) { if (state) m_tilemap_flip |= TILEMAP_FLIPY; diff --git a/src/mame/konami/pandoras.cpp b/src/mame/konami/pandoras.cpp index 590b6400892..8aa1f04c24c 100644 --- a/src/mame/konami/pandoras.cpp +++ b/src/mame/konami/pandoras.cpp @@ -92,14 +92,14 @@ private: uint8_t m_firq_old_data_b = 0; uint8_t m_i8039_status = 0; - DECLARE_WRITE_LINE_MEMBER(cpua_irq_enable_w); - DECLARE_WRITE_LINE_MEMBER(cpub_irq_enable_w); + void cpua_irq_enable_w(int state); + void cpub_irq_enable_w(int state); void cpua_irqtrigger_w(uint8_t data); void cpub_irqtrigger_w(uint8_t data); void i8039_irqtrigger_w(uint8_t data); void i8039_irqen_and_status_w(uint8_t data); void z80_irqtrigger_w(uint8_t data); - template DECLARE_WRITE_LINE_MEMBER(coin_counter_w); + template void coin_counter_w(int state); void vram_w(offs_t offset, uint8_t data); void cram_w(offs_t offset, uint8_t data); void scrolly_w(uint8_t data); @@ -108,7 +108,7 @@ private: TILE_GET_INFO_MEMBER(get_tile_info0); void palette(palette_device &palette) const; uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(vblank_irq); + void vblank_irq(int state); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect, uint8_t* sr); void i8039_io_map(address_map &map); @@ -283,7 +283,7 @@ uint32_t pandoras_state::screen_update(screen_device &screen, bitmap_ind16 &bitm // machine -WRITE_LINE_MEMBER(pandoras_state::vblank_irq) +void pandoras_state::vblank_irq(int state) { if (state && m_irq_enable_a) m_maincpu->set_input_line(M6809_IRQ_LINE, ASSERT_LINE); @@ -291,14 +291,14 @@ WRITE_LINE_MEMBER(pandoras_state::vblank_irq) m_subcpu->set_input_line(M6809_IRQ_LINE, ASSERT_LINE); } -WRITE_LINE_MEMBER(pandoras_state::cpua_irq_enable_w) +void pandoras_state::cpua_irq_enable_w(int state) { if (!state) m_maincpu->set_input_line(M6809_IRQ_LINE, CLEAR_LINE); m_irq_enable_a = state; } -WRITE_LINE_MEMBER(pandoras_state::cpub_irq_enable_w) +void pandoras_state::cpub_irq_enable_w(int state) { if (!state) m_subcpu->set_input_line(M6809_IRQ_LINE, CLEAR_LINE); @@ -342,7 +342,7 @@ void pandoras_state::z80_irqtrigger_w(uint8_t data) } template -WRITE_LINE_MEMBER(pandoras_state::coin_counter_w) +void pandoras_state::coin_counter_w(int state) { machine().bookkeeping().coin_counter_w(Which, state); } diff --git a/src/mame/konami/piratesh.cpp b/src/mame/konami/piratesh.cpp index a269c84f075..8eb9c253f25 100644 --- a/src/mame/konami/piratesh.cpp +++ b/src/mame/konami/piratesh.cpp @@ -112,7 +112,7 @@ private: void control3_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); uint32_t screen_update_piratesh(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(k054539_nmi_gen); + void k054539_nmi_gen(int state); TIMER_DEVICE_CALLBACK_MEMBER(piratesh_interrupt); K056832_CB_MEMBER(piratesh_tile_callback); K055673_CB_MEMBER(piratesh_sprite_callback); @@ -426,7 +426,7 @@ void piratesh_state::piratesh_map(address_map &map) } -WRITE_LINE_MEMBER(piratesh_state::k054539_nmi_gen) +void piratesh_state::k054539_nmi_gen(int state) { static int m_sound_intck = 0; // TODO: KILL ME diff --git a/src/mame/konami/plygonet.cpp b/src/mame/konami/plygonet.cpp index 231771a25ba..c91408f8426 100644 --- a/src/mame/konami/plygonet.cpp +++ b/src/mame/konami/plygonet.cpp @@ -205,7 +205,7 @@ private: // Sound handlers void sound_ctrl_w(u8 data); void update_sound_nmi(); - DECLARE_WRITE_LINE_MEMBER(k054539_nmi_gen); + void k054539_nmi_gen(int state); template void process_polys(); template void draw_poly(bitmap_rgb32 &bitmap, const u16 raw_color, const u16 span_ptr, const u16 raw_start, const u16 raw_end); @@ -1027,7 +1027,7 @@ void polygonet_state::update_sound_nmi() m_audiocpu->set_input_line(INPUT_LINE_NMI, CLEAR_LINE); } -WRITE_LINE_MEMBER(polygonet_state::k054539_nmi_gen) +void polygonet_state::k054539_nmi_gen(int state) { m_sound_intck = state; update_sound_nmi(); diff --git a/src/mame/konami/pooyan.cpp b/src/mame/konami/pooyan.cpp index 218b16fc386..52c4fcc951b 100644 --- a/src/mame/konami/pooyan.cpp +++ b/src/mame/konami/pooyan.cpp @@ -66,8 +66,8 @@ private: // misc uint8_t m_irq_enable = 0; - DECLARE_WRITE_LINE_MEMBER(irq_enable_w); - template DECLARE_WRITE_LINE_MEMBER(coin_counter_w); + void irq_enable_w(int state); + template void coin_counter_w(int state); void videoram_w(offs_t offset, uint8_t data); void colorram_w(offs_t offset, uint8_t data); @@ -78,7 +78,7 @@ private: uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(vblank_irq); + void vblank_irq(int state); void main_map(address_map &map); }; @@ -266,14 +266,14 @@ uint32_t pooyan_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap * *************************************/ -WRITE_LINE_MEMBER(pooyan_state::vblank_irq) +void pooyan_state::vblank_irq(int state) { if (state && m_irq_enable) m_maincpu->set_input_line(INPUT_LINE_NMI, ASSERT_LINE); } -WRITE_LINE_MEMBER(pooyan_state::irq_enable_w) +void pooyan_state::irq_enable_w(int state) { m_irq_enable = state; if (!m_irq_enable) @@ -282,7 +282,7 @@ WRITE_LINE_MEMBER(pooyan_state::irq_enable_w) template -WRITE_LINE_MEMBER(pooyan_state::coin_counter_w) +void pooyan_state::coin_counter_w(int state) { machine().bookkeeping().coin_counter_w(Which, state); } diff --git a/src/mame/konami/qdrmfgp.cpp b/src/mame/konami/qdrmfgp.cpp index b18d92c61b2..0acc8c9d4b1 100644 --- a/src/mame/konami/qdrmfgp.cpp +++ b/src/mame/konami/qdrmfgp.cpp @@ -101,9 +101,9 @@ private: INTERRUPT_GEN_MEMBER(qdrmfgp2_interrupt); TIMER_CALLBACK_MEMBER(gp2_timer_callback); TIMER_DEVICE_CALLBACK_MEMBER(qdrmfgp_interrupt); - DECLARE_WRITE_LINE_MEMBER(ide_interrupt); - DECLARE_WRITE_LINE_MEMBER(gp2_ide_interrupt); - DECLARE_WRITE_LINE_MEMBER(k054539_irq1_gen); + void ide_interrupt(int state); + void gp2_ide_interrupt(int state); + void k054539_irq1_gen(int state); K056832_CB_MEMBER(qdrmfgp_tile_callback); K056832_CB_MEMBER(qdrmfgp2_tile_callback); @@ -349,7 +349,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(qdrmfgp_state::qdrmfgp_interrupt) m_maincpu->set_input_line(M68K_IRQ_3, ASSERT_LINE); } -WRITE_LINE_MEMBER(qdrmfgp_state::ide_interrupt) +void qdrmfgp_state::ide_interrupt(int state) { if (m_control & 0x0008) if (state != CLEAR_LINE) @@ -371,7 +371,7 @@ INTERRUPT_GEN_MEMBER(qdrmfgp_state::qdrmfgp2_interrupt) device.execute().set_input_line(M68K_IRQ_4, ASSERT_LINE); } -WRITE_LINE_MEMBER(qdrmfgp_state::gp2_ide_interrupt) +void qdrmfgp_state::gp2_ide_interrupt(int state) { if (m_control & 0x0010) if (state != CLEAR_LINE) @@ -614,7 +614,7 @@ INPUT_PORTS_END int m_sound_intck; -WRITE_LINE_MEMBER(qdrmfgp_state::k054539_irq1_gen) +void qdrmfgp_state::k054539_irq1_gen(int state) { if (m_control & 1) { diff --git a/src/mame/konami/quickpick5.cpp b/src/mame/konami/quickpick5.cpp index 9660f0c2fec..7f063dfedfb 100644 --- a/src/mame/konami/quickpick5.cpp +++ b/src/mame/konami/quickpick5.cpp @@ -59,7 +59,7 @@ public: void quickpick5(machine_config &config); void waijockey(machine_config &config); - DECLARE_READ_LINE_MEMBER(serial_io_r); + int serial_io_r(); private: u32 screen_update_quickpick5(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); @@ -69,8 +69,8 @@ private: void ccu_int_time_w(u8 data); TIMER_DEVICE_CALLBACK_MEMBER(scanline); - WRITE_LINE_MEMBER(vbl_ack_w) { m_maincpu->set_input_line(0, CLEAR_LINE); } - WRITE_LINE_MEMBER(nmi_ack_w) { m_maincpu->set_input_line(INPUT_LINE_NMI, CLEAR_LINE); } + void vbl_ack_w(int state) { m_maincpu->set_input_line(0, CLEAR_LINE); } + void nmi_ack_w(int state) { m_maincpu->set_input_line(INPUT_LINE_NMI, CLEAR_LINE); } // A0 is inverted to match the Z80's endianness. Typical Konami. u8 k244_r(offs_t offset) { return m_k053245->k053244_r(offset^1); } @@ -158,7 +158,7 @@ void quickpick5_state::serial_io_w(u8 data) m_sio_prev = data; } -READ_LINE_MEMBER(quickpick5_state::serial_io_r) +int quickpick5_state::serial_io_r() { return BIT(m_sio_out, 0); } diff --git a/src/mame/konami/rockrage.cpp b/src/mame/konami/rockrage.cpp index 65176b9d3da..897eae8b30f 100644 --- a/src/mame/konami/rockrage.cpp +++ b/src/mame/konami/rockrage.cpp @@ -113,7 +113,7 @@ private: void speech_w(uint8_t data); void palette(palette_device &palette) const; uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(vblank_irq); + void vblank_irq(int state); K007342_CALLBACK_MEMBER(tile_callback); K007420_CALLBACK_MEMBER(sprite_callback); @@ -205,7 +205,7 @@ uint32_t rockrage_state::screen_update(screen_device &screen, bitmap_ind16 &bitm // machine -WRITE_LINE_MEMBER(rockrage_state::vblank_irq) +void rockrage_state::vblank_irq(int state) { if (state && m_k007342->is_int_enabled()) m_maincpu->set_input_line(HD6309_IRQ_LINE, HOLD_LINE); diff --git a/src/mame/konami/rocnrope.cpp b/src/mame/konami/rocnrope.cpp index a0239ea03be..e383f984eb7 100644 --- a/src/mame/konami/rocnrope.cpp +++ b/src/mame/konami/rocnrope.cpp @@ -66,15 +66,15 @@ private: uint8_t m_irq_mask = 0; void interrupt_vector_w(offs_t offset, uint8_t data); - DECLARE_WRITE_LINE_MEMBER(irq_mask_w); - template DECLARE_WRITE_LINE_MEMBER(coin_counter_w); + void irq_mask_w(int state); + template void coin_counter_w(int state); void videoram_w(offs_t offset, uint8_t data); void colorram_w(offs_t offset, uint8_t data); TILE_GET_INFO_MEMBER(get_bg_tile_info); void palette(palette_device &palette) const; uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(vblank_irq); + void vblank_irq(int state); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); void main_map(address_map &map); }; @@ -221,7 +221,7 @@ void rocnrope_state::interrupt_vector_w(offs_t offset, uint8_t data) m_vectors[offset] = data; } -WRITE_LINE_MEMBER(rocnrope_state::irq_mask_w) +void rocnrope_state::irq_mask_w(int state) { m_irq_mask = state; if (!m_irq_mask) @@ -229,7 +229,7 @@ WRITE_LINE_MEMBER(rocnrope_state::irq_mask_w) } template -WRITE_LINE_MEMBER(rocnrope_state::coin_counter_w) +void rocnrope_state::coin_counter_w(int state) { machine().bookkeeping().coin_counter_w(Which, state); } @@ -384,7 +384,7 @@ GFXDECODE_END * *************************************/ -WRITE_LINE_MEMBER(rocnrope_state::vblank_irq) +void rocnrope_state::vblank_irq(int state) { if (state && m_irq_mask) m_maincpu->set_input_line(M6809_IRQ_LINE, ASSERT_LINE); diff --git a/src/mame/konami/rollerg.cpp b/src/mame/konami/rollerg.cpp index 9a169fea817..2dce2285668 100644 --- a/src/mame/konami/rollerg.cpp +++ b/src/mame/konami/rollerg.cpp @@ -79,7 +79,7 @@ private: void sound_arm_nmi_w(uint8_t data); void z80_nmi_w(int state); uint8_t pip_r(); - DECLARE_WRITE_LINE_MEMBER(irq_ack_w); + void irq_ack_w(int state); uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); K05324X_CB_MEMBER(sprite_callback); K051316_CB_MEMBER(zoom_callback); @@ -324,7 +324,7 @@ INPUT_PORTS_END ***************************************************************************/ -WRITE_LINE_MEMBER(rollerg_state::irq_ack_w) +void rollerg_state::irq_ack_w(int state) { m_maincpu->set_input_line(0, CLEAR_LINE); } diff --git a/src/mame/konami/rungun.cpp b/src/mame/konami/rungun.cpp index 27c76bdb13a..6c3316b8dad 100644 --- a/src/mame/konami/rungun.cpp +++ b/src/mame/konami/rungun.cpp @@ -139,7 +139,7 @@ private: uint8_t k53936_rom_r(offs_t offset); TILE_GET_INFO_MEMBER(ttl_get_tile_info); TILE_GET_INFO_MEMBER(get_rng_936_tile_info); - DECLARE_WRITE_LINE_MEMBER(k054539_nmi_gen); + void k054539_nmi_gen(int state); uint16_t palette_read(offs_t offset); void palette_write(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); @@ -493,7 +493,7 @@ void rungun_state::sound_ctrl_w(uint8_t data) m_sound_ctrl = data; } -WRITE_LINE_MEMBER(rungun_state::k054539_nmi_gen) +void rungun_state::k054539_nmi_gen(int state) { if (m_sound_ctrl & 0x10) { diff --git a/src/mame/konami/sbasketb.cpp b/src/mame/konami/sbasketb.cpp index 0f16ff5ea1e..9d5565748e8 100644 --- a/src/mame/konami/sbasketb.cpp +++ b/src/mame/konami/sbasketb.cpp @@ -115,18 +115,18 @@ private: uint8_t m_sn76496_latch = 0; void sh_irqtrigger_w(uint8_t data); - template DECLARE_WRITE_LINE_MEMBER(coin_counter_w); - DECLARE_WRITE_LINE_MEMBER(irq_mask_w); + template void coin_counter_w(int state); + void irq_mask_w(int state); void videoram_w(offs_t offset, uint8_t data); void colorram_w(offs_t offset, uint8_t data); - DECLARE_WRITE_LINE_MEMBER(flipscreen_w); - DECLARE_WRITE_LINE_MEMBER(spriteram_select_w); + void flipscreen_w(int state); + void spriteram_select_w(int state); void konami_sn76496_latch_w(uint8_t data) { m_sn76496_latch = data; } void konami_sn76496_w(uint8_t data) { m_sn->write(m_sn76496_latch); } TILE_GET_INFO_MEMBER(get_bg_tile_info); void palette(palette_device &palette) const; uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(vblank_irq); + void vblank_irq(int state); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); void main_map(address_map &map); @@ -226,13 +226,13 @@ void sbasketb_state::colorram_w(offs_t offset, uint8_t data) m_bg_tilemap->mark_tile_dirty(offset); } -WRITE_LINE_MEMBER(sbasketb_state::flipscreen_w) +void sbasketb_state::flipscreen_w(int state) { flip_screen_set(state); machine().tilemap().mark_all_dirty(); } -WRITE_LINE_MEMBER(sbasketb_state::spriteram_select_w) +void sbasketb_state::spriteram_select_w(int state) { m_spriteram_select = state; } @@ -308,12 +308,12 @@ void sbasketb_state::sh_irqtrigger_w(uint8_t data) } template -WRITE_LINE_MEMBER(sbasketb_state::coin_counter_w) +void sbasketb_state::coin_counter_w(int state) { machine().bookkeeping().coin_counter_w(Which, state); } -WRITE_LINE_MEMBER(sbasketb_state::irq_mask_w) +void sbasketb_state::irq_mask_w(int state) { m_irq_mask = state; if (!m_irq_mask) @@ -403,7 +403,7 @@ static GFXDECODE_START( gfx_sbasketb ) GFXDECODE_ENTRY( "sprites", 0, gfx_16x16x4_packed_msb, 16*16, 16*16 ) GFXDECODE_END -WRITE_LINE_MEMBER(sbasketb_state::vblank_irq) +void sbasketb_state::vblank_irq(int state) { if (state && m_irq_mask) m_maincpu->set_input_line(0, HOLD_LINE); diff --git a/src/mame/konami/scotrsht.cpp b/src/mame/konami/scotrsht.cpp index 298b365c5b6..60eba23e219 100644 --- a/src/mame/konami/scotrsht.cpp +++ b/src/mame/konami/scotrsht.cpp @@ -99,7 +99,7 @@ private: TILE_GET_INFO_MEMBER(get_bg_tile_info); - DECLARE_WRITE_LINE_MEMBER(vblank_irq); + void vblank_irq(int state); void palette(palette_device &palette) const; @@ -252,7 +252,7 @@ void scotrsht_state::ctrl_w(uint8_t data) flip_screen_set(data & 0x08); } -WRITE_LINE_MEMBER(scotrsht_state::vblank_irq) +void scotrsht_state::vblank_irq(int state) { if (state && m_irq_enable) m_maincpu->set_input_line(0, HOLD_LINE); diff --git a/src/mame/konami/tasman.cpp b/src/mame/konami/tasman.cpp index f55f9da7962..344c0bc9752 100644 --- a/src/mame/konami/tasman.cpp +++ b/src/mame/konami/tasman.cpp @@ -86,8 +86,8 @@ private: uint8_t m_irq_mask = 0; uint32_t screen_update_kongambl(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - WRITE_LINE_MEMBER(vblank_irq_ack_w); - WRITE_LINE_MEMBER(hblank_irq_ack_w); + void vblank_irq_ack_w(int state); + void hblank_irq_ack_w(int state); TIMER_DEVICE_CALLBACK_MEMBER(kongambl_vblank); K056832_CB_MEMBER(tile_callback); K053246_CB_MEMBER(sprite_callback); @@ -620,12 +620,12 @@ static GFXDECODE_START( gfx_tasman ) GFXDECODE_END -WRITE_LINE_MEMBER(kongambl_state::vblank_irq_ack_w) +void kongambl_state::vblank_irq_ack_w(int state) { m_maincpu->set_input_line(1, CLEAR_LINE); } -WRITE_LINE_MEMBER(kongambl_state::hblank_irq_ack_w) +void kongambl_state::hblank_irq_ack_w(int state) { m_maincpu->set_input_line(2, CLEAR_LINE); } diff --git a/src/mame/konami/timeplt.cpp b/src/mame/konami/timeplt.cpp index 8dbcbcf932d..2199dc96160 100644 --- a/src/mame/konami/timeplt.cpp +++ b/src/mame/konami/timeplt.cpp @@ -109,9 +109,9 @@ private: // misc uint8_t m_nmi_enable = 0; - DECLARE_WRITE_LINE_MEMBER(nmi_enable_w); - DECLARE_WRITE_LINE_MEMBER(video_enable_w); - template DECLARE_WRITE_LINE_MEMBER(coin_counter_w); + void nmi_enable_w(int state); + void video_enable_w(int state); + template void coin_counter_w(int state); void videoram_w(offs_t offset, uint8_t data); void colorram_w(offs_t offset, uint8_t data); uint8_t scanline_r(); @@ -119,7 +119,7 @@ private: void palette(palette_device &palette) const; uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(vblank_irq); + void vblank_irq(int state); }; class psurge_state : public timeplt_state @@ -145,7 +145,7 @@ public: void bikkuric(machine_config &config); - DECLARE_READ_LINE_MEMBER(hopper_status_r); + int hopper_status_r(); protected: virtual void video_start() override; @@ -330,7 +330,7 @@ void timeplt_state::colorram_w(offs_t offset, uint8_t data) } -WRITE_LINE_MEMBER(timeplt_state::video_enable_w) +void timeplt_state::video_enable_w(int state) { m_video_enable = state; } @@ -396,14 +396,14 @@ uint32_t timeplt_state::screen_update(screen_device &screen, bitmap_ind16 &bitma * *************************************/ -WRITE_LINE_MEMBER(timeplt_state::vblank_irq) +void timeplt_state::vblank_irq(int state) { if (state && m_nmi_enable) m_maincpu->set_input_line(INPUT_LINE_NMI, ASSERT_LINE); } -WRITE_LINE_MEMBER(timeplt_state::nmi_enable_w) +void timeplt_state::nmi_enable_w(int state) { m_nmi_enable = state; if (!m_nmi_enable) @@ -419,7 +419,7 @@ WRITE_LINE_MEMBER(timeplt_state::nmi_enable_w) *************************************/ template -WRITE_LINE_MEMBER(timeplt_state::coin_counter_w) +void timeplt_state::coin_counter_w(int state) { machine().bookkeeping().coin_counter_w(Which, state); } @@ -443,7 +443,7 @@ void chkun_state::sound_w(uint8_t data) m_tc8830f->reset(); } -READ_LINE_MEMBER(bikkuric_state::hopper_status_r) +int bikkuric_state::hopper_status_r() { // temp workaround, needs hopper return machine().rand(); diff --git a/src/mame/konami/tmnt.h b/src/mame/konami/tmnt.h index 74da15b7702..8b29cf16f64 100644 --- a/src/mame/konami/tmnt.h +++ b/src/mame/konami/tmnt.h @@ -162,12 +162,12 @@ protected: uint32_t screen_update_glfgreat(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_tmnt2(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_thndrx2(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(screen_vblank_blswhstl); + void screen_vblank_blswhstl(int state); INTERRUPT_GEN_MEMBER(tmnt_interrupt); INTERRUPT_GEN_MEMBER(punkshot_interrupt); INTERRUPT_GEN_MEMBER(lgtnfght_interrupt); - inline uint32_t tmnt2_get_word( uint32_t addr ); - void tmnt2_put_word( uint32_t addr, uint16_t data ); + inline uint32_t tmnt2_get_word(uint32_t addr); + void tmnt2_put_word(uint32_t addr, uint16_t data); void volume_callback(uint8_t data); K051960_CB_MEMBER(mia_sprite_callback); K051960_CB_MEMBER(tmnt_sprite_callback); diff --git a/src/mame/konami/tmnt_v.cpp b/src/mame/konami/tmnt_v.cpp index 572dd49897b..aeb1925c5d4 100644 --- a/src/mame/konami/tmnt_v.cpp +++ b/src/mame/konami/tmnt_v.cpp @@ -770,7 +770,7 @@ uint32_t tmnt_state::screen_update_thndrx2(screen_device &screen, bitmap_ind16 & ***************************************************************************/ -WRITE_LINE_MEMBER(tmnt_state::screen_vblank_blswhstl) +void tmnt_state::screen_vblank_blswhstl(int state) { // on rising edge if (state) diff --git a/src/mame/konami/tp84.cpp b/src/mame/konami/tp84.cpp index a17f2a41e9b..41040a3eddc 100644 --- a/src/mame/konami/tp84.cpp +++ b/src/mame/konami/tp84.cpp @@ -140,10 +140,10 @@ private: bool m_irq_enable = false; bool m_sub_irq_mask = false; - DECLARE_WRITE_LINE_MEMBER(irq_enable_w); - template DECLARE_WRITE_LINE_MEMBER(coin_counter_w); - DECLARE_WRITE_LINE_MEMBER(flip_screen_x_w); - DECLARE_WRITE_LINE_MEMBER(flip_screen_y_w); + void irq_enable_w(int state); + template void coin_counter_w(int state); + void flip_screen_x_w(int state); + void flip_screen_y_w(int state); uint8_t sh_timer_r(); void filter_w(offs_t offset, uint8_t data); void sh_irqtrigger_w(uint8_t data); @@ -154,7 +154,7 @@ private: TILE_GET_INFO_MEMBER(get_fg_tile_info); void palette(palette_device &palette) const; uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(vblank_irq); + void vblank_irq(int state); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); void audio_map(address_map &map); @@ -361,7 +361,7 @@ void tp84_state::machine_start() } -WRITE_LINE_MEMBER(tp84_state::vblank_irq) +void tp84_state::vblank_irq(int state) { if (state && m_irq_enable) m_maincpu->set_input_line(0, ASSERT_LINE); @@ -370,7 +370,7 @@ WRITE_LINE_MEMBER(tp84_state::vblank_irq) } -WRITE_LINE_MEMBER(tp84_state::irq_enable_w) +void tp84_state::irq_enable_w(int state) { m_irq_enable = state; if (!m_irq_enable) @@ -379,19 +379,19 @@ WRITE_LINE_MEMBER(tp84_state::irq_enable_w) template -WRITE_LINE_MEMBER(tp84_state::coin_counter_w) +void tp84_state::coin_counter_w(int state) { machine().bookkeeping().coin_counter_w(Which, state); } -WRITE_LINE_MEMBER(tp84_state::flip_screen_x_w) +void tp84_state::flip_screen_x_w(int state) { m_flipscreen_x = state; } -WRITE_LINE_MEMBER(tp84_state::flip_screen_y_w) +void tp84_state::flip_screen_y_w(int state) { m_flipscreen_y = state; } diff --git a/src/mame/konami/trackfld.cpp b/src/mame/konami/trackfld.cpp index a0ae87f77de..6c31f983474 100644 --- a/src/mame/konami/trackfld.cpp +++ b/src/mame/konami/trackfld.cpp @@ -199,12 +199,12 @@ MAIN BOARD: #define VLM_CLOCK XTAL(3'579'545) -WRITE_LINE_MEMBER(trackfld_state::coin_counter_1_w) +void trackfld_state::coin_counter_1_w(int state) { machine().bookkeeping().coin_counter_w(0, state); } -WRITE_LINE_MEMBER(trackfld_state::coin_counter_2_w) +void trackfld_state::coin_counter_2_w(int state) { machine().bookkeeping().coin_counter_w(1, state); } @@ -221,7 +221,7 @@ void trackfld_state::questions_bank_w(uint8_t data) } } -WRITE_LINE_MEMBER(trackfld_state::irq_mask_w) +void trackfld_state::irq_mask_w(int state) { m_irq_mask = state; if (!m_irq_mask) @@ -251,7 +251,7 @@ void trackfld_state::main_map(address_map &map) map(0x6000, 0xffff).rom(); } -WRITE_LINE_MEMBER(trackfld_state::nmi_mask_w) +void trackfld_state::nmi_mask_w(int state) { m_nmi_mask = state; if (!m_nmi_mask) @@ -871,13 +871,13 @@ MACHINE_RESET_MEMBER(trackfld_state,trackfld) m_old_gfx_bank = 0; } -WRITE_LINE_MEMBER(trackfld_state::vblank_irq) +void trackfld_state::vblank_irq(int state) { if (state && m_irq_mask) m_maincpu->set_input_line(0, ASSERT_LINE); } -WRITE_LINE_MEMBER(trackfld_state::vblank_nmi) +void trackfld_state::vblank_nmi(int state) { if (state && m_nmi_mask) m_maincpu->set_input_line(INPUT_LINE_NMI, ASSERT_LINE); diff --git a/src/mame/konami/trackfld.h b/src/mame/konami/trackfld.h index 6df829fc00b..c65f052016b 100644 --- a/src/mame/konami/trackfld.h +++ b/src/mame/konami/trackfld.h @@ -113,11 +113,11 @@ private: uint8_t m_SN76496_latch = 0; - DECLARE_WRITE_LINE_MEMBER(coin_counter_1_w); - DECLARE_WRITE_LINE_MEMBER(coin_counter_2_w); - DECLARE_WRITE_LINE_MEMBER(irq_mask_w); - DECLARE_WRITE_LINE_MEMBER(nmi_mask_w); - DECLARE_WRITE_LINE_MEMBER(flipscreen_w); + void coin_counter_1_w(int state); + void coin_counter_2_w(int state); + void irq_mask_w(int state); + void nmi_mask_w(int state); + void flipscreen_w(int state); TILE_GET_INFO_MEMBER(get_bg_tile_info); DECLARE_MACHINE_START(trackfld); @@ -126,8 +126,8 @@ private: void trackfld_palette(palette_device &palette) const; DECLARE_VIDEO_START(atlantol); uint32_t screen_update_trackfld(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(vblank_irq); - DECLARE_WRITE_LINE_MEMBER(vblank_nmi); + void vblank_irq(int state); + void vblank_nmi(int state); INTERRUPT_GEN_MEMBER(yieartf_timer_irq); void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); }; diff --git a/src/mame/konami/trackfld_a.cpp b/src/mame/konami/trackfld_a.cpp index 8534da5adc2..cfa86aae994 100644 --- a/src/mame/konami/trackfld_a.cpp +++ b/src/mame/konami/trackfld_a.cpp @@ -119,7 +119,7 @@ void trackfld_audio_device::hyperspt_sound_w(offs_t offset, uint8_t data) -WRITE_LINE_MEMBER(trackfld_audio_device::sh_irqtrigger_w) +void trackfld_audio_device::sh_irqtrigger_w(int state) { if (m_last_irq == 0 && state) { diff --git a/src/mame/konami/trackfld_a.h b/src/mame/konami/trackfld_a.h index c6ea34b8b33..3ac32099af4 100644 --- a/src/mame/konami/trackfld_a.h +++ b/src/mame/konami/trackfld_a.h @@ -21,7 +21,7 @@ public: trackfld_audio_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - DECLARE_WRITE_LINE_MEMBER(sh_irqtrigger_w); + void sh_irqtrigger_w(int state); uint8_t trackfld_sh_timer_r(); uint8_t trackfld_speech_r(); void trackfld_sound_w(offs_t offset, uint8_t data); diff --git a/src/mame/konami/trackfld_v.cpp b/src/mame/konami/trackfld_v.cpp index 66f8501452e..e5a987a6538 100644 --- a/src/mame/konami/trackfld_v.cpp +++ b/src/mame/konami/trackfld_v.cpp @@ -99,7 +99,7 @@ void trackfld_state::trackfld_colorram_w(offs_t offset, uint8_t data) m_bg_tilemap->mark_tile_dirty(offset); } -WRITE_LINE_MEMBER(trackfld_state::flipscreen_w) +void trackfld_state::flipscreen_w(int state) { flip_screen_set(state); machine().tilemap().mark_all_dirty(); diff --git a/src/mame/konami/tutankhm.cpp b/src/mame/konami/tutankhm.cpp index 10789b42c35..8fa1c622147 100644 --- a/src/mame/konami/tutankhm.cpp +++ b/src/mame/konami/tutankhm.cpp @@ -100,7 +100,7 @@ * *************************************/ -WRITE_LINE_MEMBER(tutankhm_state::vblank_irq) +void tutankhm_state::vblank_irq(int state) { /* flip flops cause the interrupt to be signalled every other frame */ if (state) @@ -112,7 +112,7 @@ WRITE_LINE_MEMBER(tutankhm_state::vblank_irq) } -WRITE_LINE_MEMBER(tutankhm_state::irq_enable_w) +void tutankhm_state::irq_enable_w(int state) { m_irq_enable = state; if (!m_irq_enable) @@ -138,13 +138,13 @@ void tutankhm_state::tutankhm_bankselect_w(uint8_t data) * *************************************/ -WRITE_LINE_MEMBER(tutankhm_state::coin_counter_1_w) +void tutankhm_state::coin_counter_1_w(int state) { machine().bookkeeping().coin_counter_w(0, state); } -WRITE_LINE_MEMBER(tutankhm_state::coin_counter_2_w) +void tutankhm_state::coin_counter_2_w(int state) { machine().bookkeeping().coin_counter_w(1, state); } diff --git a/src/mame/konami/tutankhm.h b/src/mame/konami/tutankhm.h index 3b978b8a95b..e8c47f40357 100644 --- a/src/mame/konami/tutankhm.h +++ b/src/mame/konami/tutankhm.h @@ -43,19 +43,19 @@ public: void tutankhm(machine_config &config); protected: - DECLARE_WRITE_LINE_MEMBER(irq_enable_w); + void irq_enable_w(int state); void tutankhm_bankselect_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(coin_counter_1_w); - DECLARE_WRITE_LINE_MEMBER(coin_counter_2_w); + void coin_counter_1_w(int state); + void coin_counter_2_w(int state); void sound_on_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(flip_screen_x_w); - DECLARE_WRITE_LINE_MEMBER(flip_screen_y_w); + void flip_screen_x_w(int state); + void flip_screen_y_w(int state); virtual void machine_start() override; virtual void machine_reset() override; uint32_t screen_update_tutankhm_bootleg(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); uint32_t screen_update_tutankhm_scramble(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); uint32_t screen_update_tutankhm(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(vblank_irq); + void vblank_irq(int state); void main_map(address_map &map); virtual void video_start() override; void galaxian_palette(palette_device &palette); diff --git a/src/mame/konami/tutankhm_v.cpp b/src/mame/konami/tutankhm_v.cpp index ae9dbc4372e..bb17cd73027 100644 --- a/src/mame/konami/tutankhm_v.cpp +++ b/src/mame/konami/tutankhm_v.cpp @@ -21,13 +21,13 @@ * *************************************/ -WRITE_LINE_MEMBER(tutankhm_state::flip_screen_x_w) +void tutankhm_state::flip_screen_x_w(int state) { m_flipscreen_x = state; } -WRITE_LINE_MEMBER(tutankhm_state::flip_screen_y_w) +void tutankhm_state::flip_screen_y_w(int state) { m_flipscreen_y = state; } diff --git a/src/mame/konami/twin16.h b/src/mame/konami/twin16.h index 41f147bd896..7d80744b344 100644 --- a/src/mame/konami/twin16.h +++ b/src/mame/konami/twin16.h @@ -41,7 +41,7 @@ public: void init_twin16(); void volume_callback(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(screen_vblank_twin16); + void screen_vblank_twin16(int state); uint32_t screen_update_twin16(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); protected: @@ -106,7 +106,7 @@ protected: int set_sprite_timer(); void spriteram_process(); - void draw_sprites( screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect ); + void draw_sprites(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); int spriteram_process_enable(); void twin16_postload(); }; diff --git a/src/mame/konami/twin16_v.cpp b/src/mame/konami/twin16_v.cpp index 8cd549476f1..f108a1c7d24 100644 --- a/src/mame/konami/twin16_v.cpp +++ b/src/mame/konami/twin16_v.cpp @@ -543,7 +543,7 @@ uint32_t twin16_state::screen_update_twin16(screen_device &screen, bitmap_ind16 return 0; } -WRITE_LINE_MEMBER(twin16_state::screen_vblank_twin16) +void twin16_state::screen_vblank_twin16(int state) { // rising edge if (state) diff --git a/src/mame/konami/twinkle.cpp b/src/mame/konami/twinkle.cpp index d7da2771cc3..3cd36fd7abb 100644 --- a/src/mame/konami/twinkle.cpp +++ b/src/mame/konami/twinkle.cpp @@ -330,10 +330,10 @@ private: void twinkle_waveram_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); void spu_led_w(uint16_t data); void spu_wavebank_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); - DECLARE_WRITE_LINE_MEMBER(spu_ata_irq); - DECLARE_WRITE_LINE_MEMBER(spu_ata_dmarq); - void scsi_dma_read( uint32_t *p_n_psxram, uint32_t n_address, int32_t n_size ); - void scsi_dma_write( uint32_t *p_n_psxram, uint32_t n_address, int32_t n_size ); + void spu_ata_irq(int state); + void spu_ata_dmarq(int state); + void scsi_dma_read(uint32_t *p_n_psxram, uint32_t n_address, int32_t n_size); + void scsi_dma_write(uint32_t *p_n_psxram, uint32_t n_address, int32_t n_size); void main_map(address_map &map); void rf5c400_map(address_map &map); @@ -896,7 +896,7 @@ void twinkle_state::main_map(address_map &map) /* SPU board */ -WRITE_LINE_MEMBER(twinkle_state::spu_ata_irq) +void twinkle_state::spu_ata_irq(int state) { if ((state) && (m_spu_ctrl & 0x0400)) { @@ -948,7 +948,7 @@ void twinkle_state::spu_ata_dma_high_w(uint16_t data) //printf("DMA now %x\n", m_spu_ata_dma); } -WRITE_LINE_MEMBER(twinkle_state::spu_ata_dmarq) +void twinkle_state::spu_ata_dmarq(int state) { if (m_spu_ata_dmarq != state) { diff --git a/src/mame/konami/viper.cpp b/src/mame/konami/viper.cpp index 57f10ce62e7..ba1bd5e6da7 100644 --- a/src/mame/konami/viper.cpp +++ b/src/mame/konami/viper.cpp @@ -454,7 +454,7 @@ public: void init_vipercf(); void init_viperhd(); - DECLARE_READ_LINE_MEMBER(ds2430_unk_r); + int ds2430_unk_r(); protected: virtual void machine_start() override; @@ -490,13 +490,13 @@ private: void ata_w(offs_t offset, uint64_t data, uint64_t mem_mask = ~0); uint64_t unk_serial_r(offs_t offset, uint64_t mem_mask = ~0); void unk_serial_w(offs_t offset, uint64_t data, uint64_t mem_mask = ~0); - DECLARE_WRITE_LINE_MEMBER(voodoo_vblank); + void voodoo_vblank(int state); uint16_t ppp_sensor_r(offs_t offset); uint32_t screen_update_viper(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(viper_vblank); - WRITE_LINE_MEMBER(voodoo_pciint); + void voodoo_pciint(int state); //the following two arrays need to stay public til the legacy PCI bus is removed uint32_t m_voodoo3_pci_reg[0x100]; @@ -2157,7 +2157,7 @@ void viper_state::viper_ppp_map(address_map &map) /*****************************************************************************/ -READ_LINE_MEMBER(viper_state::ds2430_unk_r) +int viper_state::ds2430_unk_r() { return m_ds2430_unk_status; } @@ -2538,14 +2538,14 @@ INTERRUPT_GEN_MEMBER(viper_state::viper_vblank) //mpc8240_interrupt(MPC8240_IRQ3); } -WRITE_LINE_MEMBER(viper_state::voodoo_vblank) +void viper_state::voodoo_vblank(int state) { if (state) mpc8240_interrupt(MPC8240_IRQ0); //mpc8240_interrupt(MPC8240_IRQ3); } -WRITE_LINE_MEMBER(viper_state::voodoo_pciint) +void viper_state::voodoo_pciint(int state) { if (state) { diff --git a/src/mame/konami/wecleman.cpp b/src/mame/konami/wecleman.cpp index 20f84c9e0ee..ab913ba50ab 100644 --- a/src/mame/konami/wecleman.cpp +++ b/src/mame/konami/wecleman.cpp @@ -829,7 +829,7 @@ INPUT_PORTS_END Hot Chase Input Ports ***************************************************************************/ -READ_LINE_MEMBER(wecleman_state::hotchase_sound_status_r) +int wecleman_state::hotchase_sound_status_r() { return m_hotchase_sound_hs; } diff --git a/src/mame/konami/wecleman.h b/src/mame/konami/wecleman.h index deca4ab08ab..25e2aa6cc89 100644 --- a/src/mame/konami/wecleman.h +++ b/src/mame/konami/wecleman.h @@ -43,7 +43,7 @@ public: void init_wecleman(); - DECLARE_READ_LINE_MEMBER(hotchase_sound_status_r); + int hotchase_sound_status_r(); protected: virtual void machine_start() override; diff --git a/src/mame/konami/xmen.cpp b/src/mame/konami/xmen.cpp index 7cd361a69e6..f1438d60eaa 100644 --- a/src/mame/konami/xmen.cpp +++ b/src/mame/konami/xmen.cpp @@ -143,7 +143,7 @@ public: void xmen6p(machine_config &config); - DECLARE_READ_LINE_MEMBER(frame_r); + int frame_r(); protected: virtual void video_start() override; @@ -155,7 +155,7 @@ private: uint16_t *m_k053247_ram; template uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(screen_vblank); + void screen_vblank(int state); void main_map(address_map &map); }; @@ -277,7 +277,7 @@ uint32_t xmen6p_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap } // my lefts and rights are mixed up in several places.. -WRITE_LINE_MEMBER(xmen6p_state::screen_vblank) +void xmen6p_state::screen_vblank(int state) { // rising edge if (state) @@ -558,7 +558,7 @@ static INPUT_PORTS_START( xmen2p ) PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_serial_er5911_device, cs_write) INPUT_PORTS_END -READ_LINE_MEMBER(xmen6p_state::frame_r) +int xmen6p_state::frame_r() { return m_screen->frame_number() & 1; } diff --git a/src/mame/konami/yiear.cpp b/src/mame/konami/yiear.cpp index df2a11270f9..d2079184507 100644 --- a/src/mame/konami/yiear.cpp +++ b/src/mame/konami/yiear.cpp @@ -169,7 +169,7 @@ private: TILE_GET_INFO_MEMBER(get_bg_tile_info); void palette(palette_device &palette) const; uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(vblank_irq); + void vblank_irq(int state); INTERRUPT_GEN_MEMBER(nmi_interrupt); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); @@ -327,7 +327,7 @@ void yiear_state::vlm5030_control_w(uint8_t data) m_vlm->rst((data >> 2) & 1); } -WRITE_LINE_MEMBER(yiear_state::vblank_irq) +void yiear_state::vblank_irq(int state) { if (state && m_irq_enable) m_maincpu->set_input_line(0, HOLD_LINE); diff --git a/src/mame/konami/zr107.cpp b/src/mame/konami/zr107.cpp index 4349bbabc1f..9aa27a02103 100644 --- a/src/mame/konami/zr107.cpp +++ b/src/mame/konami/zr107.cpp @@ -249,8 +249,8 @@ protected: void ccu_w(uint32_t data); void sound_ctrl_w(uint8_t data); - WRITE_LINE_MEMBER(vblank); - WRITE_LINE_MEMBER(k054539_irq_gen); + void vblank(int state); + void k054539_irq_gen(int state); double adc0838_callback(uint8_t input); void sharc_memmap(address_map &map); @@ -704,7 +704,7 @@ double zr107_state::adc0838_callback(uint8_t input) -WRITE_LINE_MEMBER(zr107_state::k054539_irq_gen) +void zr107_state::k054539_irq_gen(int state) { if (m_sound_ctrl & 1) { @@ -724,7 +724,7 @@ WRITE_LINE_MEMBER(zr107_state::k054539_irq_gen) DMA0 */ -WRITE_LINE_MEMBER(zr107_state::vblank) +void zr107_state::vblank(int state) { if (state) { diff --git a/src/mame/konami/zs01.cpp b/src/mame/konami/zs01.cpp index 0f5210d5ef6..400d72cca9b 100644 --- a/src/mame/konami/zs01.cpp +++ b/src/mame/konami/zs01.cpp @@ -99,7 +99,7 @@ void zs01_device::device_reset() m_previous_byte = 0; } -WRITE_LINE_MEMBER( zs01_device::write_rst ) +void zs01_device::write_rst(int state) { if( m_rst != state ) { @@ -117,7 +117,7 @@ WRITE_LINE_MEMBER( zs01_device::write_rst ) m_rst = state; } -WRITE_LINE_MEMBER( zs01_device::write_cs ) +void zs01_device::write_cs(int state) { if( m_cs != state ) { @@ -337,7 +337,7 @@ int zs01_device::data_offset() return m_write_buffer[ 1 ] * SIZE_DATA_BUFFER; } -WRITE_LINE_MEMBER( zs01_device::write_scl ) +void zs01_device::write_scl(int state) { if( m_scl != state ) { @@ -597,7 +597,7 @@ WRITE_LINE_MEMBER( zs01_device::write_scl ) m_scl = state; } -WRITE_LINE_MEMBER( zs01_device::write_sda ) +void zs01_device::write_sda(int state) { if( m_sdaw != state ) { @@ -637,7 +637,7 @@ WRITE_LINE_MEMBER( zs01_device::write_sda ) m_sdaw = state; } -READ_LINE_MEMBER( zs01_device::read_sda ) +int zs01_device::read_sda() { if( m_cs != 0 ) { diff --git a/src/mame/konami/zs01.h b/src/mame/konami/zs01.h index 102361ae7e2..398e0ef7a0b 100644 --- a/src/mame/konami/zs01.h +++ b/src/mame/konami/zs01.h @@ -29,11 +29,11 @@ public: // inline configuration helpers template void set_ds2401_tag( T &&tag ) { m_ds2401.set_tag(std::forward(tag)); } - DECLARE_WRITE_LINE_MEMBER( write_cs ); - DECLARE_WRITE_LINE_MEMBER( write_rst ); - DECLARE_WRITE_LINE_MEMBER( write_scl ); - DECLARE_WRITE_LINE_MEMBER( write_sda ); - DECLARE_READ_LINE_MEMBER( read_sda ); + void write_cs(int state); + void write_rst(int state); + void write_scl(int state); + void write_sda(int state); + int read_sda(); protected: // device-level overrides diff --git a/src/mame/kontron/kdt6.cpp b/src/mame/kontron/kdt6.cpp index 69963b0ec00..eebb629ab02 100644 --- a/src/mame/kontron/kdt6.cpp +++ b/src/mame/kontron/kdt6.cpp @@ -77,7 +77,7 @@ protected: virtual void machine_reset() override; private: - DECLARE_WRITE_LINE_MEMBER(busreq_w); + void busreq_w(int state); uint8_t memory_r(offs_t offset); void memory_w(offs_t offset, uint8_t data); uint8_t io_r(offs_t offset); @@ -104,7 +104,7 @@ private: TIMER_DEVICE_CALLBACK_MEMBER(beeper_off); void fdc_tc_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(fdc_drq_w); + void fdc_drq_w(int state); void drive0_led_cb(floppy_image_device *floppy, int state); void drive1_led_cb(floppy_image_device *floppy, int state); @@ -112,9 +112,9 @@ private: uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); void pio_porta_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(keyboard_rx_w); - DECLARE_WRITE_LINE_MEMBER(rs232b_rx_w); - DECLARE_WRITE_LINE_MEMBER(siob_tx_w); + void keyboard_rx_w(int state); + void rs232b_rx_w(int state); + void siob_tx_w(int state); void psi98_io(address_map &map); void psi98_mem(address_map &map); @@ -239,7 +239,7 @@ void kdt6_state::fdc_tc_w(uint8_t data) m_fdc->tc_w(0); } -WRITE_LINE_MEMBER( kdt6_state::fdc_drq_w ) +void kdt6_state::fdc_drq_w(int state) { if (!m_sasi_dma && BIT(m_status0, 4) == 0) m_dma->rdy_w(state); @@ -353,7 +353,7 @@ void kdt6_state::pio_porta_w(uint8_t data) m_centronics->write_init(BIT(data, 1)); } -WRITE_LINE_MEMBER( kdt6_state::keyboard_rx_w ) +void kdt6_state::keyboard_rx_w(int state) { if (machine().phase() >= machine_phase::RESET) { @@ -362,7 +362,7 @@ WRITE_LINE_MEMBER( kdt6_state::keyboard_rx_w ) } } -WRITE_LINE_MEMBER( kdt6_state::rs232b_rx_w ) +void kdt6_state::rs232b_rx_w(int state) { if (machine().phase() >= machine_phase::RESET) { @@ -371,7 +371,7 @@ WRITE_LINE_MEMBER( kdt6_state::rs232b_rx_w ) } } -WRITE_LINE_MEMBER( kdt6_state::siob_tx_w ) +void kdt6_state::siob_tx_w(int state) { if (machine().phase() >= machine_phase::RESET) { @@ -387,7 +387,7 @@ WRITE_LINE_MEMBER( kdt6_state::siob_tx_w ) // MACHINE //************************************************************************** -WRITE_LINE_MEMBER( kdt6_state::busreq_w ) +void kdt6_state::busreq_w(int state) { m_cpu->set_input_line(Z80_INPUT_LINE_BUSRQ, state); m_dma->bai_w(state); diff --git a/src/mame/korg/korgdss1.cpp b/src/mame/korg/korgdss1.cpp index 67f18d64bdb..4992cd7ceaa 100644 --- a/src/mame/korg/korgdss1.cpp +++ b/src/mame/korg/korgdss1.cpp @@ -75,8 +75,8 @@ private: void bank_switch_w(u8 data); void panel_led_w(u8 data); - DECLARE_WRITE_LINE_MEMBER(fdc_tc_w); - DECLARE_WRITE_LINE_MEMBER(sed9420c_trgin_w); + void fdc_tc_w(int state); + void sed9420c_trgin_w(int state); u8 fdc_r(offs_t offset); void fdc_w(offs_t offset, u8 data); @@ -158,7 +158,7 @@ void korg_dss1_state::panel_led_w(u8 data) // TODO } -WRITE_LINE_MEMBER(korg_dss1_state::fdc_tc_w) +void korg_dss1_state::fdc_tc_w(int state) { if (m_cpu1.found()) m_fdc->tc_w(state); @@ -168,7 +168,7 @@ WRITE_LINE_MEMBER(korg_dss1_state::fdc_tc_w) } } -WRITE_LINE_MEMBER(korg_dss1_state::sed9420c_trgin_w) +void korg_dss1_state::sed9420c_trgin_w(int state) { // TODO } diff --git a/src/mame/kyocera/kyocera.cpp b/src/mame/kyocera/kyocera.cpp index bc86a1d87c7..786e07ca5eb 100644 --- a/src/mame/kyocera/kyocera.cpp +++ b/src/mame/kyocera/kyocera.cpp @@ -996,12 +996,12 @@ void kc85_state::i8155_pb_w(uint8_t data) m_rs232->write_rts(BIT(data, 7)); } -WRITE_LINE_MEMBER( kc85_state::write_centronics_busy ) +void kc85_state::write_centronics_busy(int state) { m_centronics_busy = state; } -WRITE_LINE_MEMBER( kc85_state::write_centronics_select ) +void kc85_state::write_centronics_select(int state) { m_centronics_select = state; } @@ -1037,7 +1037,7 @@ uint8_t kc85_state::i8155_pc_r() return data; } -WRITE_LINE_MEMBER( kc85_state::i8155_to_w ) +void kc85_state::i8155_to_w(int state) { if (!m_buzzer && m_bell) { @@ -1097,12 +1097,12 @@ void tandy200_state::i8155_pb_w(uint8_t data) if (m_buzzer) m_speaker->level_w(m_bell); } -WRITE_LINE_MEMBER( tandy200_state::write_centronics_busy ) +void tandy200_state::write_centronics_busy(int state) { m_centronics_busy = state; } -WRITE_LINE_MEMBER( tandy200_state::write_centronics_select ) +void tandy200_state::write_centronics_select(int state) { m_centronics_select = state; } @@ -1134,7 +1134,7 @@ uint8_t tandy200_state::i8155_pc_r() return data; } -WRITE_LINE_MEMBER( tandy200_state::i8155_to_w ) +void tandy200_state::i8155_to_w(int state) { if (!m_buzzer && m_bell) { @@ -1303,22 +1303,22 @@ void tandy200_state::machine_start() save_item(NAME(m_tp)); } -WRITE_LINE_MEMBER( kc85_state::kc85_sod_w ) +void kc85_state::kc85_sod_w(int state) { m_cassette->output(state ? +1.0 : -1.0); } -READ_LINE_MEMBER( kc85_state::kc85_sid_r ) +int kc85_state::kc85_sid_r() { return (m_cassette->input() > 0.04) ? 0 : 1; } -WRITE_LINE_MEMBER( tandy200_state::kc85_sod_w ) +void tandy200_state::kc85_sod_w(int state) { m_cassette->output(state ? +1.0 : -1.0); } -READ_LINE_MEMBER( tandy200_state::kc85_sid_r ) +int tandy200_state::kc85_sid_r() { return (m_cassette->input() > 0.04) ? 0 : 1; } diff --git a/src/mame/kyocera/kyocera.h b/src/mame/kyocera/kyocera.h index 1fd36bb7ffd..de686960977 100644 --- a/src/mame/kyocera/kyocera.h +++ b/src/mame/kyocera/kyocera.h @@ -70,16 +70,16 @@ public: void kc85_video(machine_config &config); protected: - DECLARE_WRITE_LINE_MEMBER(kc85_sod_w); - DECLARE_READ_LINE_MEMBER(kc85_sid_r); + void kc85_sod_w(int state); + int kc85_sid_r(); void i8155_pa_w(uint8_t data); void i8155_pb_w(uint8_t data); uint8_t i8155_pc_r(); - DECLARE_WRITE_LINE_MEMBER( i8155_to_w ); - DECLARE_WRITE_LINE_MEMBER( write_centronics_busy ); - DECLARE_WRITE_LINE_MEMBER( write_centronics_select ); + void i8155_to_w(int state); + void write_centronics_busy(int state); + void write_centronics_select(int state); required_device m_maincpu; required_device m_rtc; @@ -233,11 +233,11 @@ private: void i8155_pa_w(uint8_t data); void i8155_pb_w(uint8_t data); uint8_t i8155_pc_r(); - DECLARE_WRITE_LINE_MEMBER( i8155_to_w ); - DECLARE_WRITE_LINE_MEMBER(kc85_sod_w); - DECLARE_READ_LINE_MEMBER(kc85_sid_r); - DECLARE_WRITE_LINE_MEMBER( write_centronics_busy ); - DECLARE_WRITE_LINE_MEMBER( write_centronics_select ); + void i8155_to_w(int state); + void kc85_sod_w(int state); + int kc85_sid_r(); + void write_centronics_busy(int state); + void write_centronics_select(int state); void tandy200_palette(palette_device &palette) const; diff --git a/src/mame/leapfrog/iquest.cpp b/src/mame/leapfrog/iquest.cpp index d3a620cd4e2..9a53693f12c 100644 --- a/src/mame/leapfrog/iquest.cpp +++ b/src/mame/leapfrog/iquest.cpp @@ -46,7 +46,7 @@ protected: required_device m_cart; required_device m_screen; - DECLARE_WRITE_LINE_MEMBER(rx_line_hack); + void rx_line_hack(int state); DECLARE_DEVICE_IMAGE_LOAD_MEMBER(cart_load); @@ -517,7 +517,7 @@ uint32_t leapfrog_iquest_state::screen_update(screen_device &screen, bitmap_rgb3 } // doesn't help? -WRITE_LINE_MEMBER(leapfrog_iquest_state::rx_line_hack) +void leapfrog_iquest_state::rx_line_hack(int state) { if (0) { diff --git a/src/mame/lsi/octopus.cpp b/src/mame/lsi/octopus.cpp index f1ecfa114a6..673dd3eb41b 100644 --- a/src/mame/lsi/octopus.cpp +++ b/src/mame/lsi/octopus.cpp @@ -181,12 +181,12 @@ private: uint8_t vram_r(offs_t offset); void vram_w(offs_t offset, uint8_t data); uint8_t get_slave_ack(offs_t offset); - [[maybe_unused]] DECLARE_WRITE_LINE_MEMBER(fdc_drq); + [[maybe_unused]] void fdc_drq(int state); uint8_t bank_sel_r(offs_t offset); void bank_sel_w(offs_t offset, uint8_t data); uint8_t dma_read(offs_t offset); void dma_write(offs_t offset, uint8_t data); - DECLARE_WRITE_LINE_MEMBER(dma_hrq_changed); + void dma_hrq_changed(int state); uint8_t system_r(offs_t offset); void system_w(offs_t offset, uint8_t data); uint8_t cntl_r(); @@ -207,21 +207,21 @@ private: uint8_t video_latch_r(offs_t offset); void video_latch_w(offs_t offset, uint8_t data); - DECLARE_WRITE_LINE_MEMBER(spk_w); - DECLARE_WRITE_LINE_MEMBER(spk_freq_w); - DECLARE_WRITE_LINE_MEMBER(beep_w); - DECLARE_WRITE_LINE_MEMBER(serial_clock_w); - DECLARE_WRITE_LINE_MEMBER(parallel_busy_w) { m_printer_busy = state; } - DECLARE_WRITE_LINE_MEMBER(parallel_slctout_w) { m_printer_slctout = state; } - - DECLARE_WRITE_LINE_MEMBER(dack0_w) { m_dma1->hack_w(state ? 0 : 1); } // for all unused DMA channel? - DECLARE_WRITE_LINE_MEMBER(dack1_w) { if(!state) m_current_dma = 1; else if(m_current_dma == 1) m_current_dma = -1; } // HD - DECLARE_WRITE_LINE_MEMBER(dack2_w) { if(!state) m_current_dma = 2; else if(m_current_dma == 2) m_current_dma = -1; } // RAM refresh - DECLARE_WRITE_LINE_MEMBER(dack3_w) { m_dma1->hack_w(state ? 0 : 1); } - DECLARE_WRITE_LINE_MEMBER(dack4_w) { m_dma1->hack_w(state ? 0 : 1); } - DECLARE_WRITE_LINE_MEMBER(dack5_w) { if(!state) m_current_dma = 5; else if(m_current_dma == 5) m_current_dma = -1; } // Floppy - DECLARE_WRITE_LINE_MEMBER(dack6_w) { m_dma1->hack_w(state ? 0 : 1); } - DECLARE_WRITE_LINE_MEMBER(dack7_w) { m_dma1->hack_w(state ? 0 : 1); } + void spk_w(int state); + void spk_freq_w(int state); + void beep_w(int state); + void serial_clock_w(int state); + void parallel_busy_w(int state) { m_printer_busy = state; } + void parallel_slctout_w(int state) { m_printer_slctout = state; } + + void dack0_w(int state) { m_dma1->hack_w(state ? 0 : 1); } // for all unused DMA channel? + void dack1_w(int state) { if(!state) m_current_dma = 1; else if(m_current_dma == 1) m_current_dma = -1; } // HD + void dack2_w(int state) { if(!state) m_current_dma = 2; else if(m_current_dma == 2) m_current_dma = -1; } // RAM refresh + void dack3_w(int state) { m_dma1->hack_w(state ? 0 : 1); } + void dack4_w(int state) { m_dma1->hack_w(state ? 0 : 1); } + void dack5_w(int state) { if(!state) m_current_dma = 5; else if(m_current_dma == 5) m_current_dma = -1; } // Floppy + void dack6_w(int state) { m_dma1->hack_w(state ? 0 : 1); } + void dack7_w(int state) { m_dma1->hack_w(state ? 0 : 1); } void octopus_io(address_map &map); void octopus_mem(address_map &map); @@ -382,7 +382,7 @@ uint8_t octopus_state::vram_r(offs_t offset) return m_vram[offset]; } -WRITE_LINE_MEMBER(octopus_state::fdc_drq) +void octopus_state::fdc_drq(int state) { // TODO } @@ -633,19 +633,19 @@ void octopus_state::vidcontrol_w(uint8_t data) // Sound level provided by i8253 timer 2 // Enabled by /DTR signal from i8251 // 100ms beep triggered by pulsing /CTS signal low on i8251 -WRITE_LINE_MEMBER(octopus_state::spk_w) +void octopus_state::spk_w(int state) { m_speaker_active = !state; m_speaker->level_w(((m_speaker_active || m_beep_active) && m_speaker_level) ? 1 : 0); } -WRITE_LINE_MEMBER(octopus_state::spk_freq_w) +void octopus_state::spk_freq_w(int state) { m_speaker_level = state; m_speaker->level_w(((m_speaker_active || m_beep_active) && m_speaker_level) ? 1 : 0); } -WRITE_LINE_MEMBER(octopus_state::beep_w) +void octopus_state::beep_w(int state) { if(!state) // active low { @@ -655,7 +655,7 @@ WRITE_LINE_MEMBER(octopus_state::beep_w) } } -WRITE_LINE_MEMBER(octopus_state::serial_clock_w) +void octopus_state::serial_clock_w(int state) { m_serial->rxca_w(state); m_serial->txca_w(state); @@ -723,7 +723,7 @@ void octopus_state::dma_write(offs_t offset, uint8_t data) prog_space.write_byte((m_fd_bank << 16) + offset, data); } -WRITE_LINE_MEMBER( octopus_state::dma_hrq_changed ) +void octopus_state::dma_hrq_changed(int state) { m_maincpu->set_input_line(INPUT_LINE_HALT, state ? ASSERT_LINE : CLEAR_LINE); diff --git a/src/mame/luxor/abc1600.cpp b/src/mame/luxor/abc1600.cpp index edb9f34e637..4dad4c27ebd 100644 --- a/src/mame/luxor/abc1600.cpp +++ b/src/mame/luxor/abc1600.cpp @@ -410,7 +410,7 @@ void abc1600_state::fw1_w(uint8_t data) // cs7_w - CS7 output handler //------------------------------------------------- -WRITE_LINE_MEMBER(abc1600_state::cs7_w) +void abc1600_state::cs7_w(int state) { LOG("%s CS7 %d\n", machine().describe_context(), state); @@ -422,7 +422,7 @@ WRITE_LINE_MEMBER(abc1600_state::cs7_w) // btce_w - _BTCE output handler //------------------------------------------------- -WRITE_LINE_MEMBER(abc1600_state::btce_w) +void abc1600_state::btce_w(int state) { LOG("%s _BTCE %d\n", machine().describe_context(), state); @@ -434,7 +434,7 @@ WRITE_LINE_MEMBER(abc1600_state::btce_w) // atce_w - _ATCE output handler //------------------------------------------------- -WRITE_LINE_MEMBER(abc1600_state::atce_w) +void abc1600_state::atce_w(int state) { LOG("%s _ATCE %d\n", machine().describe_context(), state); @@ -446,7 +446,7 @@ WRITE_LINE_MEMBER(abc1600_state::atce_w) // dmadis_w - _DMADIS output handler //------------------------------------------------- -WRITE_LINE_MEMBER(abc1600_state::dmadis_w) +void abc1600_state::dmadis_w(int state) { LOG("%s _DMADIS %d\n", machine().describe_context(), state); @@ -458,7 +458,7 @@ WRITE_LINE_MEMBER(abc1600_state::dmadis_w) // sysscc_w - SYSSCC output handler //------------------------------------------------- -WRITE_LINE_MEMBER(abc1600_state::sysscc_w) +void abc1600_state::sysscc_w(int state) { LOG("%s SYSSCC %d\n", machine().describe_context(), state); @@ -474,7 +474,7 @@ WRITE_LINE_MEMBER(abc1600_state::sysscc_w) // sysfs_w - SYSFS output handler //------------------------------------------------- -WRITE_LINE_MEMBER(abc1600_state::sysfs_w) +void abc1600_state::sysfs_w(int state) { LOG("%s SYSFS %d\n", machine().describe_context(), state); @@ -843,7 +843,7 @@ void abc1600_state::floppy_formats(format_registration &fr) // ABC1600BUS_INTERFACE( abcbus_intf ) //------------------------------------------------- -WRITE_LINE_MEMBER( abc1600_state::nmi_w ) +void abc1600_state::nmi_w(int state) { if (state == ASSERT_LINE) { diff --git a/src/mame/luxor/abc1600.h b/src/mame/luxor/abc1600.h index 5359b9374ee..d0025110ff2 100644 --- a/src/mame/luxor/abc1600.h +++ b/src/mame/luxor/abc1600.h @@ -122,15 +122,15 @@ private: void fw0_w(uint8_t data); void fw1_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(cs7_w); - DECLARE_WRITE_LINE_MEMBER(btce_w); - DECLARE_WRITE_LINE_MEMBER(atce_w); - DECLARE_WRITE_LINE_MEMBER(dmadis_w); - DECLARE_WRITE_LINE_MEMBER(sysscc_w); - DECLARE_WRITE_LINE_MEMBER(sysfs_w); - DECLARE_WRITE_LINE_MEMBER(dbrq0_w) { m_dbrq0 = state; update_br(); } - DECLARE_WRITE_LINE_MEMBER(dbrq1_w) { m_dbrq1 = state; update_br(); } - DECLARE_WRITE_LINE_MEMBER(dbrq2_w) { m_dbrq2 = state; update_br(); } + void cs7_w(int state); + void btce_w(int state); + void atce_w(int state); + void dmadis_w(int state); + void sysscc_w(int state); + void sysfs_w(int state); + void dbrq0_w(int state) { m_dbrq0 = state; update_br(); } + void dbrq1_w(int state) { m_dbrq1 = state; update_br(); } + void dbrq2_w(int state) { m_dbrq2 = state; update_br(); } uint8_t cio_pa_r(); uint8_t cio_pb_r(); diff --git a/src/mame/luxor/abc80.cpp b/src/mame/luxor/abc80.cpp index 4c61ad72ab7..529b38b723d 100644 --- a/src/mame/luxor/abc80.cpp +++ b/src/mame/luxor/abc80.cpp @@ -523,7 +523,7 @@ static const z80_daisy_config abc80_daisy_chain[] = // ABC80_KEYBOARD_INTERFACE //------------------------------------------------- -WRITE_LINE_MEMBER( abc80_state::keydown_w ) +void abc80_state::keydown_w(int state) { m_key_strobe = state; diff --git a/src/mame/luxor/abc80.h b/src/mame/luxor/abc80.h index e6226df4078..7729b512e33 100644 --- a/src/mame/luxor/abc80.h +++ b/src/mame/luxor/abc80.h @@ -122,13 +122,13 @@ protected: virtual u8 read(offs_t offset); virtual void write(offs_t offset, u8 data); - DECLARE_WRITE_LINE_MEMBER( vco_voltage_w ); + void vco_voltage_w(int state); u8 pio_pa_r(); u8 pio_pb_r(); void pio_pb_w(u8 data); - DECLARE_WRITE_LINE_MEMBER( keydown_w ); + void keydown_w(int state); void kbd_w(u8 data); void csg_w(u8 data); diff --git a/src/mame/luxor/abc80x.cpp b/src/mame/luxor/abc80x.cpp index 8c2cf1a88ac..77b43488a36 100644 --- a/src/mame/luxor/abc80x.cpp +++ b/src/mame/luxor/abc80x.cpp @@ -592,7 +592,7 @@ MC6845_UPDATE_ROW( abc802_state::abc802_update_row ) // vs_w - vertical sync write //------------------------------------------------- -WRITE_LINE_MEMBER( abc802_state::vs_w ) +void abc802_state::vs_w(int state) { if (!state) { @@ -797,7 +797,7 @@ void abc806_state::sto_w(uint8_t data) // eme_w - external memory enable //------------------------------------------------- -WRITE_LINE_MEMBER(abc806_state::eme_w) +void abc806_state::eme_w(int state) { LOG("%s EME %u\n", machine().describe_context(), state); m_eme = state; @@ -808,7 +808,7 @@ WRITE_LINE_MEMBER(abc806_state::eme_w) // _40_w - 40/80 column display //------------------------------------------------- -WRITE_LINE_MEMBER(abc806_state::_40_w) +void abc806_state::_40_w(int state) { m_40 = state; } @@ -818,7 +818,7 @@ WRITE_LINE_MEMBER(abc806_state::_40_w) // hru2_a8_w - HRU II address line 8, PROT A0 //------------------------------------------------- -WRITE_LINE_MEMBER(abc806_state::hru2_a8_w) +void abc806_state::hru2_a8_w(int state) { m_hru2_a8 = state; } @@ -828,7 +828,7 @@ WRITE_LINE_MEMBER(abc806_state::hru2_a8_w) // prot_ini_w - PROT INI //------------------------------------------------- -WRITE_LINE_MEMBER(abc806_state::prot_ini_w) +void abc806_state::prot_ini_w(int state) { } @@ -837,7 +837,7 @@ WRITE_LINE_MEMBER(abc806_state::prot_ini_w) // txoff_w - text display enable //------------------------------------------------- -WRITE_LINE_MEMBER(abc806_state::txoff_w) +void abc806_state::txoff_w(int state) { m_txoff = state; } @@ -847,7 +847,7 @@ WRITE_LINE_MEMBER(abc806_state::txoff_w) // prot_din_w - PROT DIN //------------------------------------------------- -WRITE_LINE_MEMBER(abc806_state::prot_din_w) +void abc806_state::prot_din_w(int state) { } @@ -977,7 +977,7 @@ MC6845_UPDATE_ROW( abc806_state::abc806_update_row ) // hs_w - horizontal sync write //------------------------------------------------- -WRITE_LINE_MEMBER( abc806_state::hs_w ) +void abc806_state::hs_w(int state) { int vsync; @@ -1025,7 +1025,7 @@ WRITE_LINE_MEMBER( abc806_state::hs_w ) // vs_w - vertical sync write //------------------------------------------------- -WRITE_LINE_MEMBER( abc806_state::vs_w ) +void abc806_state::vs_w(int state) { m_vsync = state; } @@ -1741,7 +1741,7 @@ TIMER_DEVICE_CALLBACK_MEMBER( abc800_state::ctc_tick ) m_ctc->trg2(0); } -WRITE_LINE_MEMBER( abc800_state::ctc_z0_w ) +void abc800_state::ctc_z0_w(int state) { if (BIT(m_sb, 2)) { @@ -1752,7 +1752,7 @@ WRITE_LINE_MEMBER( abc800_state::ctc_z0_w ) cassette_output_tick(state); } -WRITE_LINE_MEMBER( abc800_state::ctc_z1_w ) +void abc800_state::ctc_z1_w(int state) { if (BIT(m_sb, 3)) { @@ -1771,12 +1771,12 @@ WRITE_LINE_MEMBER( abc800_state::ctc_z1_w ) // Z80SIO //------------------------------------------------- -WRITE_LINE_MEMBER( abc800_state::sio_txdb_w ) +void abc800_state::sio_txdb_w(int state) { m_sio_txdb = state; } -WRITE_LINE_MEMBER( abc800_state::sio_dtrb_w ) +void abc800_state::sio_dtrb_w(int state) { if (m_cassette == nullptr) return; @@ -1790,7 +1790,7 @@ WRITE_LINE_MEMBER( abc800_state::sio_dtrb_w ) } } -WRITE_LINE_MEMBER( abc800_state::sio_rtsb_w ) +void abc800_state::sio_rtsb_w(int state) { if (m_cassette == nullptr) return; @@ -1807,7 +1807,7 @@ WRITE_LINE_MEMBER( abc800_state::sio_rtsb_w ) // Z80DART abc800 //------------------------------------------------- -WRITE_LINE_MEMBER( abc800_state::keydtr_w ) +void abc800_state::keydtr_w(int state) { LOG("%s KEYDTR %u\n",machine().describe_context(),state); @@ -1819,14 +1819,14 @@ WRITE_LINE_MEMBER( abc800_state::keydtr_w ) // Z80DART abc802 //------------------------------------------------- -WRITE_LINE_MEMBER( abc802_state::lrs_w ) +void abc802_state::lrs_w(int state) { LOG("%s LRS %u\n",machine().describe_context(),state); m_lrs = state; } -WRITE_LINE_MEMBER( abc802_state::mux80_40_w ) +void abc802_state::mux80_40_w(int state) { LOG("%s 80/40 MUX %u\n",machine().describe_context(),state); diff --git a/src/mame/luxor/abc80x.h b/src/mame/luxor/abc80x.h index 02e48261680..f293a6de24d 100644 --- a/src/mame/luxor/abc80x.h +++ b/src/mame/luxor/abc80x.h @@ -125,12 +125,12 @@ public: uint8_t pling_r(); void hrs_w(uint8_t data); void hrc_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER( ctc_z0_w ); - DECLARE_WRITE_LINE_MEMBER( ctc_z1_w ); - DECLARE_WRITE_LINE_MEMBER( sio_txdb_w ); - DECLARE_WRITE_LINE_MEMBER( sio_dtrb_w ); - DECLARE_WRITE_LINE_MEMBER( sio_rtsb_w ); - DECLARE_WRITE_LINE_MEMBER( keydtr_w ); + void ctc_z0_w(int state); + void ctc_z1_w(int state); + void sio_txdb_w(int state); + void sio_dtrb_w(int state); + void sio_rtsb_w(int state); + void keydtr_w(int state); TIMER_DEVICE_CALLBACK_MEMBER( ctc_tick ); TIMER_DEVICE_CALLBACK_MEMBER( cassette_input_tick ); @@ -245,9 +245,9 @@ public: uint8_t read(offs_t offset); void write(offs_t offset, uint8_t data); - DECLARE_WRITE_LINE_MEMBER( lrs_w ); - DECLARE_WRITE_LINE_MEMBER( mux80_40_w ); - DECLARE_WRITE_LINE_MEMBER( vs_w ); + void lrs_w(int state); + void mux80_40_w(int state); + void vs_w(int state); MC6845_UPDATE_ROW( abc802_update_row ); // cpu state @@ -316,14 +316,14 @@ public: void sso_w(uint8_t data); uint8_t sti_r(); void sto_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER( eme_w ); - DECLARE_WRITE_LINE_MEMBER( _40_w ); - DECLARE_WRITE_LINE_MEMBER( hru2_a8_w ); - DECLARE_WRITE_LINE_MEMBER( prot_ini_w ); - DECLARE_WRITE_LINE_MEMBER( txoff_w ); - DECLARE_WRITE_LINE_MEMBER( prot_din_w ); - DECLARE_WRITE_LINE_MEMBER( hs_w ); - DECLARE_WRITE_LINE_MEMBER( vs_w ); + void eme_w(int state); + void _40_w(int state); + void hru2_a8_w(int state); + void prot_ini_w(int state); + void txoff_w(int state); + void prot_din_w(int state); + void hs_w(int state); + void vs_w(int state); void abc806_palette(palette_device &palette) const; MC6845_UPDATE_ROW( abc806_update_row ); diff --git a/src/mame/matsushita/duet16.cpp b/src/mame/matsushita/duet16.cpp index 9c93e8ccc13..b6b7791d6dc 100644 --- a/src/mame/matsushita/duet16.cpp +++ b/src/mame/matsushita/duet16.cpp @@ -58,17 +58,17 @@ private: void fdcctrl_w(u8 data); void dispctrl_w(u8 data); void pal_w(offs_t offset, u8 data); - DECLARE_WRITE_LINE_MEMBER(hrq_w); + void hrq_w(int state); u8 rtc_r(); void rtc_w(u8 data); u8 rtc_stat_r(); void rtc_addr_w(u8 data); u16 sysstat_r(); - DECLARE_WRITE_LINE_MEMBER(rtc_d0_w); - DECLARE_WRITE_LINE_MEMBER(rtc_d1_w); - DECLARE_WRITE_LINE_MEMBER(rtc_d2_w); - DECLARE_WRITE_LINE_MEMBER(rtc_d3_w); - DECLARE_WRITE_LINE_MEMBER(rtc_busy_w); + void rtc_d0_w(int state); + void rtc_d1_w(int state); + void rtc_d2_w(int state); + void rtc_d3_w(int state); + void rtc_busy_w(int state); void rtc_irq_reset(); MC6845_UPDATE_ROW(crtc_update_row); void duet16_io(address_map &map); @@ -139,7 +139,7 @@ void duet16_state::dmapg_w(u8 data) m_dmapg = data & 0xf; } -WRITE_LINE_MEMBER(duet16_state::hrq_w) +void duet16_state::hrq_w(int state) { m_maincpu->set_input_line(INPUT_LINE_HALT, state); m_dmac->hack_w(state); @@ -242,27 +242,27 @@ MC6845_UPDATE_ROW(duet16_state::crtc_update_row) } } -WRITE_LINE_MEMBER(duet16_state::rtc_d0_w) +void duet16_state::rtc_d0_w(int state) { m_rtc_d = (m_rtc_d & ~1) | (state ? 1 : 0); } -WRITE_LINE_MEMBER(duet16_state::rtc_d1_w) +void duet16_state::rtc_d1_w(int state) { m_rtc_d = (m_rtc_d & ~2) | (state ? 2 : 0); } -WRITE_LINE_MEMBER(duet16_state::rtc_d2_w) +void duet16_state::rtc_d2_w(int state) { m_rtc_d = (m_rtc_d & ~4) | (state ? 4 : 0); } -WRITE_LINE_MEMBER(duet16_state::rtc_d3_w) +void duet16_state::rtc_d3_w(int state) { m_rtc_d = (m_rtc_d & ~8) | (state ? 8 : 0); } -WRITE_LINE_MEMBER(duet16_state::rtc_busy_w) +void duet16_state::rtc_busy_w(int state) { if (state && !m_rtc_busy && !m_rtc_irq) { diff --git a/src/mame/matsushita/jr100.cpp b/src/mame/matsushita/jr100.cpp index 9c75f9a3965..125c650408d 100644 --- a/src/mame/matsushita/jr100.cpp +++ b/src/mame/matsushita/jr100.cpp @@ -104,7 +104,7 @@ private: uint8_t pb_r(); void pa_w(uint8_t data); void pb_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(cb2_w); + void cb2_w(int state); uint32_t readByLittleEndian(uint8_t *buf,int pos); DECLARE_QUICKLOAD_LOAD_MEMBER(quickload_cb); @@ -309,7 +309,7 @@ void jr100_state::pb_w(uint8_t data) m_via->write_pb6(m_pb7); } -WRITE_LINE_MEMBER(jr100_state::cb2_w) +void jr100_state::cb2_w(int state) { m_cassette->output(state ? -1.0 : +1.0); } diff --git a/src/mame/matsushita/myb3k.cpp b/src/mame/matsushita/myb3k.cpp index 2fb2ad1e83b..6aa47ae218d 100644 --- a/src/mame/matsushita/myb3k.cpp +++ b/src/mame/matsushita/myb3k.cpp @@ -121,15 +121,15 @@ private: void myb3k_map(address_map &map); /* Interrupt controller */ - DECLARE_WRITE_LINE_MEMBER( pic_int_w ); + void pic_int_w(int state); /* Parallel port */ uint8_t ppi_portb_r(); void ppi_portc_w(uint8_t data); /* DMA controller */ - DECLARE_WRITE_LINE_MEMBER( hrq_w ); - DECLARE_WRITE_LINE_MEMBER( tc_w ); + void hrq_w(int state); + void tc_w(int state); void dma_segment_w(uint8_t data); uint8_t dma_memory_read_byte(offs_t offset); void dma_memory_write_byte(offs_t offset, uint8_t data); @@ -141,26 +141,26 @@ private: void io_dack1_w(uint8_t data) { LOGDMA("io_dack1_w: %02x\n", data); m_isabus->dack_w(1, data); } void io_dack2_w(uint8_t data) { LOGDMA("io_dack2_w: %02x\n", data); m_isabus->dack_w(2, data); } void io_dack3_w(uint8_t data) { LOGDMA("io_dack3_w: %02x\n", data); m_isabus->dack_w(3, data); } - DECLARE_WRITE_LINE_MEMBER( dack0_w ){ LOGDMA("dack0_w: %d\n", state); select_dma_channel(0, state); } - DECLARE_WRITE_LINE_MEMBER( dack1_w ){ LOGDMA("dack1_w: %d\n", state); select_dma_channel(1, state); } - DECLARE_WRITE_LINE_MEMBER( dack2_w ){ LOGDMA("dack2_w: %d\n", state); select_dma_channel(2, state); } - DECLARE_WRITE_LINE_MEMBER( dack3_w ){ LOGDMA("dack3_w: %d\n", state); select_dma_channel(3, state); } + void dack0_w(int state) { LOGDMA("dack0_w: %d\n", state); select_dma_channel(0, state); } + void dack1_w(int state) { LOGDMA("dack1_w: %d\n", state); select_dma_channel(1, state); } + void dack2_w(int state) { LOGDMA("dack2_w: %d\n", state); select_dma_channel(2, state); } + void dack3_w(int state) { LOGDMA("dack3_w: %d\n", state); select_dma_channel(3, state); } /* Timer */ - DECLARE_WRITE_LINE_MEMBER( pit_out1_changed ); + void pit_out1_changed(int state); /* Video controller */ MC6845_UPDATE_ROW(crtc_update_row); /* ISA+ Expansion bus */ - DECLARE_WRITE_LINE_MEMBER( isa_irq5_w ); - DECLARE_WRITE_LINE_MEMBER( isa_irq7_w ); + void isa_irq5_w(int state); + void isa_irq7_w(int state); /* Centronics */ - DECLARE_WRITE_LINE_MEMBER (centronics_ack_w); - DECLARE_WRITE_LINE_MEMBER (centronics_busy_w); - DECLARE_WRITE_LINE_MEMBER (centronics_perror_w); - DECLARE_WRITE_LINE_MEMBER (centronics_select_w); + void centronics_ack_w(int state); + void centronics_busy_w(int state); + void centronics_perror_w(int state); + void centronics_select_w(int state); /* Keyboard */ uint8_t myb3k_kbd_r(); @@ -757,7 +757,7 @@ void myb3k_state::select_dma_channel(int channel, bool state) } } -WRITE_LINE_MEMBER( myb3k_state::tc_w ) +void myb3k_state::tc_w(int state) { LOGDMA("tc_w: %d\n", state); if (m_dma_channel != -1 && (state == ASSERT_LINE) != m_cur_tc) @@ -765,7 +765,7 @@ WRITE_LINE_MEMBER( myb3k_state::tc_w ) m_cur_tc = state == ASSERT_LINE; } -WRITE_LINE_MEMBER(myb3k_state::pic_int_w) +void myb3k_state::pic_int_w(int state) { LOGPIC("pic_int_w: %d\n", state); m_maincpu->set_input_line(0, state); @@ -787,7 +787,7 @@ void myb3k_state::pic_ir7_w(int source, int state) m_pic8259->ir7_w(state); } -WRITE_LINE_MEMBER( myb3k_state::pit_out1_changed ) +void myb3k_state::pit_out1_changed(int state) { LOGPIT("pit_out1_changed: %d\n", state); m_speaker->level_w(state); @@ -799,7 +799,7 @@ void myb3k_state::dma_segment_w(uint8_t data) m_dma_page[(data >> 6) & 3] = data & 0x0f; } -WRITE_LINE_MEMBER(myb3k_state::hrq_w) +void myb3k_state::hrq_w(int state) { LOGDMA("hrq_w: %d\n", state); @@ -873,21 +873,21 @@ void myb3k_state::ppi_portc_w(uint8_t data) } /* ISA IRQ5 handler */ -WRITE_LINE_MEMBER (myb3k_state::isa_irq5_w) +void myb3k_state::isa_irq5_w(int state) { LOGCENT("isa_irq5_w %d\n", state); pic_ir5_w(ISA_IRQ5, state); } /* ISA IRQ7 handler */ -WRITE_LINE_MEMBER (myb3k_state::isa_irq7_w) +void myb3k_state::isa_irq7_w(int state) { LOGCENT("isa_irq7_w %d\n", state); pic_ir7_w(ISA_IRQ7, state); } /* Centronics ACK handler */ -WRITE_LINE_MEMBER (myb3k_state::centronics_ack_w) +void myb3k_state::centronics_ack_w(int state) { LOGCENT("centronics_ack_w %d\n", state); pic_ir7_w(CENT_ACK, state); @@ -896,7 +896,7 @@ WRITE_LINE_MEMBER (myb3k_state::centronics_ack_w) /* Centronics BUSY handler * The busy line is enterring the schematics from the connector but is lost to its way to the status latch * but there is only two possibilities, either D0 or D1 */ -WRITE_LINE_MEMBER (myb3k_state::centronics_busy_w) +void myb3k_state::centronics_busy_w(int state) { LOGCENT("centronics_busy_w %d\n", state); if (state == ASSERT_LINE) @@ -906,7 +906,7 @@ WRITE_LINE_MEMBER (myb3k_state::centronics_busy_w) } /* Centronics PERROR handler */ -WRITE_LINE_MEMBER (myb3k_state::centronics_perror_w) +void myb3k_state::centronics_perror_w(int state) { LOGCENT("centronics_perror_w %d\n", state); if (state == ASSERT_LINE) @@ -916,7 +916,7 @@ WRITE_LINE_MEMBER (myb3k_state::centronics_perror_w) } /* Centronics SELECT handler - The centronics select signal is not used by this hardware */ -WRITE_LINE_MEMBER (myb3k_state::centronics_select_w) +void myb3k_state::centronics_select_w(int state) { LOGCENT("centronics_select_w %d - not used by machine\n", state); } diff --git a/src/mame/maygay/maygay1b.cpp b/src/mame/maygay/maygay1b.cpp index 66e1286aa76..b8569f6236f 100644 --- a/src/mame/maygay/maygay1b.cpp +++ b/src/mame/maygay/maygay1b.cpp @@ -115,7 +115,7 @@ void maygay1b_state::cpu0_firq(int data) // IRQ from Duart (hopper?) -WRITE_LINE_MEMBER(maygay1b_state::duart_irq_handler) +void maygay1b_state::duart_irq_handler(int state) { m_maincpu->set_input_line(M6809_IRQ_LINE, state?ASSERT_LINE:CLEAR_LINE); } @@ -347,17 +347,17 @@ void maygay1b_state::m1_meter_w(uint8_t data) } } -WRITE_LINE_MEMBER(maygay1b_state::ramen_w) +void maygay1b_state::ramen_w(int state) { m_RAMEN = state; } -WRITE_LINE_MEMBER(maygay1b_state::alarmen_w) +void maygay1b_state::alarmen_w(int state) { m_ALARMEN = state; } -WRITE_LINE_MEMBER(maygay1b_state::nmien_w) +void maygay1b_state::nmien_w(int state) { if (m_NMIENABLE == 0 && state) { @@ -367,21 +367,21 @@ WRITE_LINE_MEMBER(maygay1b_state::nmien_w) m_NMIENABLE = state; } -WRITE_LINE_MEMBER(maygay1b_state::rts_w) +void maygay1b_state::rts_w(int state) { } -WRITE_LINE_MEMBER(maygay1b_state::psurelay_w) +void maygay1b_state::psurelay_w(int state) { m_PSUrelay = state; } -WRITE_LINE_MEMBER(maygay1b_state::wdog_w) +void maygay1b_state::wdog_w(int state) { m_WDOG = state; } -WRITE_LINE_MEMBER(maygay1b_state::srsel_w) +void maygay1b_state::srsel_w(int state) { // this is the ROM banking? logerror("rom bank %02x\n", state); diff --git a/src/mame/maygay/maygay1b.h b/src/mame/maygay/maygay1b.h index b20d2fb80a8..112a45c9b21 100644 --- a/src/mame/maygay/maygay1b.h +++ b/src/mame/maygay/maygay1b.h @@ -92,7 +92,7 @@ private: TIMER_DEVICE_CALLBACK_MEMBER( maygay1b_nmitimer_callback ); uint8_t m_Lamps[256]{}; int m_optic_pattern = 0; - template DECLARE_WRITE_LINE_MEMBER(reel_optic_cb) { if (state) m_optic_pattern |= (1 << N); else m_optic_pattern &= ~(1 << N); } + template void reel_optic_cb(int state) { if (state) m_optic_pattern |= (1 << N); else m_optic_pattern &= ~(1 << N); } void scanlines_w(uint8_t data); void scanlines_2_w(uint8_t data); void lamp_data_w(uint8_t data); @@ -101,13 +101,13 @@ private: void reel12_w(uint8_t data); void reel34_w(uint8_t data); void reel56_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(ramen_w); - DECLARE_WRITE_LINE_MEMBER(alarmen_w); - DECLARE_WRITE_LINE_MEMBER(nmien_w); - DECLARE_WRITE_LINE_MEMBER(rts_w); - DECLARE_WRITE_LINE_MEMBER(psurelay_w); - DECLARE_WRITE_LINE_MEMBER(wdog_w); - DECLARE_WRITE_LINE_MEMBER(srsel_w); + void ramen_w(int state); + void alarmen_w(int state); + void nmien_w(int state); + void rts_w(int state); + void psurelay_w(int state); + void wdog_w(int state); + void srsel_w(int state); void latch_ch2_w(uint8_t data); uint8_t latch_st_hi(); uint8_t latch_st_lo(); @@ -123,7 +123,7 @@ private: uint8_t nec_reset_r(); void nec_bank0_w(uint8_t data); void nec_bank1_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(duart_irq_handler); + void duart_irq_handler(int state); uint8_t m1_duart_r(); void mcu_port0_w(uint8_t data); void mcu_port1_w(uint8_t data); diff --git a/src/mame/maygay/maygayv1.cpp b/src/mame/maygay/maygayv1.cpp index 61243e8ff45..335cbec5aef 100644 --- a/src/mame/maygay/maygayv1.cpp +++ b/src/mame/maygay/maygayv1.cpp @@ -240,13 +240,13 @@ private: void lamp_data_w(uint8_t data); uint8_t kbd_r(); uint32_t screen_update_maygayv1(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(screen_vblank_maygayv1); + void screen_vblank_maygayv1(int state); uint8_t sound_p1_r(); void sound_p1_w(uint8_t data); uint8_t sound_p3_r(); void sound_p3_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(duart_irq_handler); - DECLARE_WRITE_LINE_MEMBER(duart_txa); + void duart_irq_handler(int state); + void duart_txa(int state); void main_map(address_map &map); void cpu_space_map(address_map &map); @@ -448,7 +448,7 @@ uint32_t maygayv1_state::screen_update_maygayv1(screen_device &screen, bitmap_in return 0; } -WRITE_LINE_MEMBER(maygayv1_state::screen_vblank_maygayv1) +void maygayv1_state::screen_vblank_maygayv1(int state) { // rising edge if (state) @@ -798,13 +798,13 @@ void maygayv1_state::cpu_space_map(address_map &map) map(0xfffffa, 0xfffffb).lr16(NAME([this] () -> u16 { return m_duart68681->get_irq_vector(); })); } -WRITE_LINE_MEMBER(maygayv1_state::duart_irq_handler) +void maygayv1_state::duart_irq_handler(int state) { m_maincpu->set_input_line(5, state); } -WRITE_LINE_MEMBER(maygayv1_state::duart_txa) +void maygayv1_state::duart_txa(int state) { if (state) m_p3 |= 1; diff --git a/src/mame/meadows/meadows.cpp b/src/mame/meadows/meadows.cpp index 02fa351a546..555c47a6e42 100644 --- a/src/mame/meadows/meadows.cpp +++ b/src/mame/meadows/meadows.cpp @@ -211,7 +211,7 @@ INPUT_CHANGED_MEMBER(meadows_state::coin_inserted) * *************************************/ -WRITE_LINE_MEMBER(meadows_state::meadows_vblank_irq) +void meadows_state::meadows_vblank_irq(int state) { if (state) { @@ -229,7 +229,7 @@ WRITE_LINE_MEMBER(meadows_state::meadows_vblank_irq) * *************************************/ -WRITE_LINE_MEMBER(meadows_state::minferno_vblank_irq) +void meadows_state::minferno_vblank_irq(int state) { if (state) { diff --git a/src/mame/meadows/meadows.h b/src/mame/meadows/meadows.h index 9b8a4707d39..8e950c218de 100644 --- a/src/mame/meadows/meadows.h +++ b/src/mame/meadows/meadows.h @@ -82,8 +82,8 @@ private: void meadows_spriteram_w(offs_t offset, uint8_t data); TILE_GET_INFO_MEMBER(get_tile_info); uint32_t screen_update_meadows(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(meadows_vblank_irq); - DECLARE_WRITE_LINE_MEMBER(minferno_vblank_irq); + void meadows_vblank_irq(int state); + void minferno_vblank_irq(int state); INTERRUPT_GEN_MEMBER(audio_interrupt); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &clip); void meadows_sh_update(); diff --git a/src/mame/memotech/mtx.cpp b/src/mame/memotech/mtx.cpp index 1ce110d434e..7126d875822 100644 --- a/src/mame/memotech/mtx.cpp +++ b/src/mame/memotech/mtx.cpp @@ -277,7 +277,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(mtx_state::ctc_tick) m_z80ctc->trg2(0); } -WRITE_LINE_MEMBER(mtx_state::ctc_trg1_w) +void mtx_state::ctc_trg1_w(int state) { if (m_z80dart) { @@ -286,7 +286,7 @@ WRITE_LINE_MEMBER(mtx_state::ctc_trg1_w) } } -WRITE_LINE_MEMBER(mtx_state::ctc_trg2_w) +void mtx_state::ctc_trg2_w(int state) { if (m_z80dart) { diff --git a/src/mame/memotech/mtx.h b/src/mame/memotech/mtx.h index f0262ab2f99..ff4124a1dce 100644 --- a/src/mame/memotech/mtx.h +++ b/src/mame/memotech/mtx.h @@ -118,17 +118,17 @@ private: void hrx_attr_w(uint8_t data); TIMER_DEVICE_CALLBACK_MEMBER(ctc_tick); TIMER_DEVICE_CALLBACK_MEMBER(cassette_tick); - DECLARE_WRITE_LINE_MEMBER(ctc_trg1_w); - DECLARE_WRITE_LINE_MEMBER(ctc_trg2_w); + void ctc_trg1_w(int state); + void ctc_trg2_w(int state); uint8_t mtx_strobe_r(); uint8_t mtx_sound_strobe_r(); void mtx_cst_w(uint8_t data); void mtx_cst_motor_w(uint8_t data); uint8_t mtx_prt_r(); - DECLARE_WRITE_LINE_MEMBER(write_centronics_busy); - DECLARE_WRITE_LINE_MEMBER(write_centronics_fault); - DECLARE_WRITE_LINE_MEMBER(write_centronics_perror); - DECLARE_WRITE_LINE_MEMBER(write_centronics_select); + void write_centronics_busy(int state); + void write_centronics_fault(int state); + void write_centronics_perror(int state); + void write_centronics_select(int state); void bankswitch(uint8_t data); DECLARE_DEVICE_IMAGE_LOAD_MEMBER(extrom_load); DECLARE_QUICKLOAD_LOAD_MEMBER(quickload_cb); diff --git a/src/mame/memotech/mtx_m.cpp b/src/mame/memotech/mtx_m.cpp index fe813129bba..fd76a773d69 100644 --- a/src/mame/memotech/mtx_m.cpp +++ b/src/mame/memotech/mtx_m.cpp @@ -202,22 +202,22 @@ void mtx_state::mtx_cst_motor_w(uint8_t data) mtx_prt_r - centronics status -------------------------------------------------*/ -WRITE_LINE_MEMBER(mtx_state::write_centronics_busy) +void mtx_state::write_centronics_busy(int state) { m_centronics_busy = state; } -WRITE_LINE_MEMBER(mtx_state::write_centronics_fault) +void mtx_state::write_centronics_fault(int state) { m_centronics_fault = state; } -WRITE_LINE_MEMBER(mtx_state::write_centronics_perror) +void mtx_state::write_centronics_perror(int state) { m_centronics_perror = state; } -WRITE_LINE_MEMBER(mtx_state::write_centronics_select) +void mtx_state::write_centronics_select(int state) { m_centronics_select = state; } diff --git a/src/mame/mera/konin.cpp b/src/mame/mera/konin.cpp index b9240395f0d..2d4b217d608 100644 --- a/src/mame/mera/konin.cpp +++ b/src/mame/mera/konin.cpp @@ -43,7 +43,7 @@ public: void konin(machine_config &config); private: - DECLARE_WRITE_LINE_MEMBER(picu_r3_w); + void picu_r3_w(int state); void io_map(address_map &map); void mem_map(address_map &map); @@ -55,7 +55,7 @@ private: required_device m_iopit; }; -WRITE_LINE_MEMBER(konin_state::picu_r3_w) +void konin_state::picu_r3_w(int state) { m_picu->r_w(4, !state); } diff --git a/src/mame/mera/m79152pc.cpp b/src/mame/mera/m79152pc.cpp index 28534d55647..0595f9d3876 100644 --- a/src/mame/mera/m79152pc.cpp +++ b/src/mame/mera/m79152pc.cpp @@ -60,9 +60,9 @@ protected: private: void beep_w(offs_t offset, uint8_t data); - DECLARE_WRITE_LINE_MEMBER(latch_full_w); - DECLARE_READ_LINE_MEMBER(mcu_t0_r); - DECLARE_READ_LINE_MEMBER(mcu_t1_r); + void latch_full_w(int state); + int mcu_t0_r(); + int mcu_t1_r(); void mcu_p1_w(u8 data); void mcu_p2_w(u8 data); void lc_reset_w(u8 data); @@ -103,17 +103,17 @@ void m79152pc_state::beep_w(offs_t offset, uint8_t data) m_beep->set_state(BIT(offset, 2)); } -WRITE_LINE_MEMBER(m79152pc_state::latch_full_w) +void m79152pc_state::latch_full_w(int state) { m_latch_full = state == ASSERT_LINE; } -READ_LINE_MEMBER(m79152pc_state::mcu_t0_r) +int m79152pc_state::mcu_t0_r() { return m_latch_full ? 0 : 1; } -READ_LINE_MEMBER(m79152pc_state::mcu_t1_r) +int m79152pc_state::mcu_t1_r() { return m_hsync ? 0 : 1; } diff --git a/src/mame/merit/merit.cpp b/src/mame/merit/merit.cpp index 1ced0fd23c9..9c93feb3d0a 100644 --- a/src/mame/merit/merit.cpp +++ b/src/mame/merit/merit.cpp @@ -125,7 +125,7 @@ public: void init_key_2(); void init_dtrvwz5(); - DECLARE_READ_LINE_MEMBER(rndbit_r); + int rndbit_r(); private: void dodge_nvram_init(nvram_device &nvram, void *base, size_t size); @@ -136,7 +136,7 @@ private: uint8_t palette_r(offs_t offset); void palette_w(offs_t offset, uint8_t data); void casino5_bank_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(hsync_changed); + void hsync_changed(int state); void led1_w(uint8_t data); void led2_w(uint8_t data); void misc_w(uint8_t data); @@ -338,7 +338,7 @@ MC6845_UPDATE_ROW( merit_state::crtc_update_row ) } -WRITE_LINE_MEMBER(merit_state::hsync_changed) +void merit_state::hsync_changed(int state) { /* update any video up to the current scanline */ // m_screen->update_now(); @@ -407,7 +407,7 @@ void merit_state::casino5_bank_w(uint8_t data) } } -READ_LINE_MEMBER(merit_state::rndbit_r) +int merit_state::rndbit_r() { return machine().rand(); } diff --git a/src/mame/merit/meritm.cpp b/src/mame/merit/meritm.cpp index e7950a2b3d0..532630498a2 100644 --- a/src/mame/merit/meritm.cpp +++ b/src/mame/merit/meritm.cpp @@ -265,12 +265,12 @@ private: uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); TIMER_DEVICE_CALLBACK_MEMBER(vblank_start_tick); TIMER_DEVICE_CALLBACK_MEMBER(vblank_end_tick); - void crt250_switch_banks( ); - void switch_banks( ); + void crt250_switch_banks(); + void switch_banks(); int touch_coord_transform(int *touch_x, int *touch_y); uint8_t binary_to_BCD(uint8_t data); - [[maybe_unused]] DECLARE_WRITE_LINE_MEMBER(vdp0_interrupt); - [[maybe_unused]] DECLARE_WRITE_LINE_MEMBER(vdp1_interrupt); + [[maybe_unused]] void vdp0_interrupt(int state); + [[maybe_unused]] void vdp1_interrupt(int state); void crt250_crt258_io_map(address_map &map); void crt250_io_map(address_map &map); void crt250_map(address_map &map); @@ -321,7 +321,7 @@ int meritm_state::touch_coord_transform(int *touch_x, int *touch_y) * *************************************/ -WRITE_LINE_MEMBER(meritm_state::vdp0_interrupt) +void meritm_state::vdp0_interrupt(int state) { if (state != m_interrupt_vdp0_state) { @@ -331,7 +331,7 @@ WRITE_LINE_MEMBER(meritm_state::vdp0_interrupt) } } -WRITE_LINE_MEMBER(meritm_state::vdp1_interrupt) +void meritm_state::vdp1_interrupt(int state) { if (state != m_interrupt_vdp1_state) { diff --git a/src/mame/metro/metro.cpp b/src/mame/metro/metro.cpp index b37dff9c4b0..6462c147374 100644 --- a/src/mame/metro/metro.cpp +++ b/src/mame/metro/metro.cpp @@ -138,7 +138,7 @@ TIMER_CALLBACK_MEMBER(metro_state::mouja_irq) if (m_vdp3) m_vdp3->set_irq(0); } -WRITE_LINE_MEMBER(metro_state::vblank_irq) +void metro_state::vblank_irq(int state) { if (state) { @@ -173,7 +173,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(metro_state::bangball_scanline) } /* lev 2-7 (lev 1 seems sound related) */ -WRITE_LINE_MEMBER(metro_state::karatour_vblank_irq) +void metro_state::karatour_vblank_irq(int state) { // printf("%d %d %lld\n", state, m_screen->vpos(), m_screen->frame_number()); @@ -198,7 +198,7 @@ WRITE_LINE_MEMBER(metro_state::karatour_vblank_irq) } } -WRITE_LINE_MEMBER(metro_state::ext_irq5_enable_w) +void metro_state::ext_irq5_enable_w(int state) { m_ext_irq_enable = state; } @@ -210,7 +210,7 @@ void metro_state::mouja_irq_timer_ctrl_w(u16 data) m_mouja_irq_timer->adjust(attotime::zero, 0, attotime::from_hz(freq)); } -WRITE_LINE_MEMBER(metro_state::puzzlet_vblank_irq) +void metro_state::puzzlet_vblank_irq(int state) { if (state) { @@ -230,7 +230,7 @@ WRITE_LINE_MEMBER(metro_state::puzzlet_vblank_irq) ***************************************************************************/ -READ_LINE_MEMBER(metro_state::rxd_r) +int metro_state::rxd_r() { u8 data = m_sound_data; @@ -259,7 +259,7 @@ u8 metro_state::soundstatus_r() return (m_busy_sndcpu ? 0x00 : 0x01); } -READ_LINE_MEMBER(metro_state::custom_soundstatus_r) +int metro_state::custom_soundstatus_r() { return (m_busy_sndcpu ? 1 : 0); } @@ -1110,7 +1110,7 @@ void metro_state::es8712_reset_w(u8 data) m_essnd->reset(); } -WRITE_LINE_MEMBER(metro_state::vmetal_es8712_irq) +void metro_state::vmetal_es8712_irq(int state) { if (m_essnd_gate) m_maincpu->set_input_line(3, state); diff --git a/src/mame/metro/metro.h b/src/mame/metro/metro.h index eecb2f01c32..4779c78703e 100644 --- a/src/mame/metro/metro.h +++ b/src/mame/metro/metro.h @@ -94,7 +94,7 @@ public: void init_lastfortg(); void init_puzzlet() { save_item(NAME(m_ext_irq_enable)); } - DECLARE_READ_LINE_MEMBER(custom_soundstatus_r); + int custom_soundstatus_r(); private: virtual void machine_start() override; @@ -130,7 +130,7 @@ private: // vmetal void vmetal_control_w(u8 data); void es8712_reset_w(u8 data); - DECLARE_WRITE_LINE_MEMBER(vmetal_es8712_irq); + void vmetal_es8712_irq(int state); TILE_GET_INFO_MEMBER(k053936_get_tile_info); TILE_GET_INFO_MEMBER(k053936_gstrik2_get_tile_info); @@ -138,12 +138,12 @@ private: DECLARE_VIDEO_START(blzntrnd); DECLARE_VIDEO_START(gstrik2); uint32_t screen_update_psac_vdp2_mix(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(vblank_irq); + void vblank_irq(int state); INTERRUPT_GEN_MEMBER(periodic_interrupt); TIMER_DEVICE_CALLBACK_MEMBER(bangball_scanline); - DECLARE_WRITE_LINE_MEMBER(karatour_vblank_irq); - DECLARE_WRITE_LINE_MEMBER(puzzlet_vblank_irq); - DECLARE_READ_LINE_MEMBER(rxd_r); + void karatour_vblank_irq(int state); + void puzzlet_vblank_irq(int state); + int rxd_r(); void balcube_map(address_map &map); void bangball_map(address_map &map); @@ -223,7 +223,7 @@ private: void gakusai_oki_bank_set(); - DECLARE_WRITE_LINE_MEMBER(ext_irq5_enable_w); + void ext_irq5_enable_w(int state); bool m_ext_irq_enable = false; }; diff --git a/src/mame/microkey/primo.h b/src/mame/microkey/primo.h index 8f07526736e..0ba05aed834 100644 --- a/src/mame/microkey/primo.h +++ b/src/mame/microkey/primo.h @@ -59,7 +59,7 @@ private: void machine_start() override; DECLARE_MACHINE_RESET(primob); uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(vblank_irq); + void vblank_irq(int state); void update_memory(); void common_machine_init(); void setup_pss(uint8_t* snapshot_data, uint32_t snapshot_size); diff --git a/src/mame/microkey/primo_m.cpp b/src/mame/microkey/primo_m.cpp index a9eb67b25bd..d985816bb66 100644 --- a/src/mame/microkey/primo_m.cpp +++ b/src/mame/microkey/primo_m.cpp @@ -27,7 +27,7 @@ *******************************************************************************/ -WRITE_LINE_MEMBER(primo_state::vblank_irq) +void primo_state::vblank_irq(int state) { if (state && m_nmi) m_maincpu->pulse_input_line(INPUT_LINE_NMI, attotime::zero); diff --git a/src/mame/microsoft/mct_adr.h b/src/mame/microsoft/mct_adr.h index 4b44b33c09f..f66afcbc295 100644 --- a/src/mame/microsoft/mct_adr.h +++ b/src/mame/microsoft/mct_adr.h @@ -22,8 +22,8 @@ public: template auto dma_r_cb() { return m_dma_r[DMA].bind(); } template auto dma_w_cb() { return m_dma_w[DMA].bind(); } - template DECLARE_WRITE_LINE_MEMBER(irq) { set_irq_line(IRQ, state); } - template DECLARE_WRITE_LINE_MEMBER(drq) { set_drq_line(DRQ, state); } + template void irq(int state) { set_irq_line(IRQ, state); } + template void drq(int state) { set_drq_line(DRQ, state); } void map(address_map &map); diff --git a/src/mame/microterm/microterm_f8.cpp b/src/mame/microterm/microterm_f8.cpp index efe55258893..9727cc7768f 100644 --- a/src/mame/microterm/microterm_f8.cpp +++ b/src/mame/microterm/microterm_f8.cpp @@ -50,7 +50,7 @@ private: u32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(vblank_w); + void vblank_w(int state); u8 bell_r(); void scroll_w(u8 data); @@ -185,7 +185,7 @@ u32 microterm_f8_state::screen_update(screen_device &screen, bitmap_rgb32 &bitma return 0; } -WRITE_LINE_MEMBER(microterm_f8_state::vblank_w) +void microterm_f8_state::vblank_w(int state) { if (state) m_bell->set_state(0); diff --git a/src/mame/microterm/mt420.cpp b/src/mame/microterm/mt420.cpp index 2f98b73a870..cdd613a9d63 100644 --- a/src/mame/microterm/mt420.cpp +++ b/src/mame/microterm/mt420.cpp @@ -37,7 +37,7 @@ public: private: SCN2674_DRAW_CHARACTER_MEMBER(draw_character); - DECLARE_WRITE_LINE_MEMBER(avdc_intr_w); + void avdc_intr_w(int state); void control_w(u8 data); u8 attr_r(offs_t offset); @@ -58,7 +58,7 @@ private: bool m_avdc_intr; }; -WRITE_LINE_MEMBER(mt420_state::avdc_intr_w) +void mt420_state::avdc_intr_w(int state) { m_avdc_intr = state; } diff --git a/src/mame/midcoin/wink.cpp b/src/mame/midcoin/wink.cpp index ab1eee26b27..825a130e3d1 100644 --- a/src/mame/midcoin/wink.cpp +++ b/src/mame/midcoin/wink.cpp @@ -55,11 +55,11 @@ private: bool m_nmi_enable = false; void bgram_w(offs_t offset, uint8_t data); - DECLARE_WRITE_LINE_MEMBER(nmi_clock_w); - DECLARE_WRITE_LINE_MEMBER(nmi_enable_w); - DECLARE_WRITE_LINE_MEMBER(player_mux_w); - DECLARE_WRITE_LINE_MEMBER(tile_banking_w); - template DECLARE_WRITE_LINE_MEMBER(coin_counter_w); + void nmi_clock_w(int state); + void nmi_enable_w(int state); + void player_mux_w(int state); + void tile_banking_w(int state); + template void coin_counter_w(int state); uint8_t analog_port_r(); uint8_t player_inputs_r(); void sound_irq_w(uint8_t data); @@ -115,33 +115,33 @@ void wink_state::bgram_w(offs_t offset, uint8_t data) m_bg_tilemap->mark_tile_dirty(offset); } -WRITE_LINE_MEMBER(wink_state::nmi_clock_w) +void wink_state::nmi_clock_w(int state) { if (state && m_nmi_enable) m_maincpu->set_input_line(INPUT_LINE_NMI, ASSERT_LINE); } -WRITE_LINE_MEMBER(wink_state::nmi_enable_w) +void wink_state::nmi_enable_w(int state) { m_nmi_enable = state; if (!m_nmi_enable) m_maincpu->set_input_line(INPUT_LINE_NMI, CLEAR_LINE); } -WRITE_LINE_MEMBER(wink_state::player_mux_w) +void wink_state::player_mux_w(int state) { //player_mux = state; //no mux / cocktail mode in the real pcb? strange... } -WRITE_LINE_MEMBER(wink_state::tile_banking_w) +void wink_state::tile_banking_w(int state) { m_tile_bank = state; m_bg_tilemap->mark_all_dirty(); } template -WRITE_LINE_MEMBER(wink_state::coin_counter_w) +void wink_state::coin_counter_w(int state) { machine().bookkeeping().coin_counter_w(Player, state); } diff --git a/src/mame/midw8080/8080bw.cpp b/src/mame/midw8080/8080bw.cpp index 5fb82a46131..ef006cc5fa4 100644 --- a/src/mame/midw8080/8080bw.cpp +++ b/src/mame/midw8080/8080bw.cpp @@ -1304,7 +1304,7 @@ void _8080bw_state::escmars(machine_config &config) /* */ /*******************************************************/ -READ_LINE_MEMBER(_8080bw_state::cosmicmo_cab_r) +int _8080bw_state::cosmicmo_cab_r() { return m_cabinet_type->read(); } @@ -1897,7 +1897,7 @@ void _8080bw_state::crashrd(machine_config &config) /* */ /*******************************************************/ -READ_LINE_MEMBER(_8080bw_state::sflush_80_r) +int _8080bw_state::sflush_80_r() { return (m_screen->vpos() & 0x80) ? 1 : 0; } @@ -2136,7 +2136,7 @@ void _8080bw_state::lupin3a(machine_config &config) /* */ /*******************************************************/ -WRITE_LINE_MEMBER(_8080bw_state::polaris_60hz_w) +void _8080bw_state::polaris_60hz_w(int state) { if (state) { @@ -3394,7 +3394,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(claybust_state::gun_callback) m_gun_pos = 0; } -READ_LINE_MEMBER(claybust_state::gun_on_r) +int claybust_state::gun_on_r() { return m_gun_pos ? 1 : 0; } diff --git a/src/mame/midw8080/8080bw.h b/src/mame/midw8080/8080bw.h index 380cd2c15b3..a6e6b08be1d 100644 --- a/src/mame/midw8080/8080bw.h +++ b/src/mame/midw8080/8080bw.h @@ -115,8 +115,8 @@ public: void init_attackfc(); - DECLARE_READ_LINE_MEMBER(cosmicmo_cab_r); - DECLARE_READ_LINE_MEMBER(sflush_80_r); + int cosmicmo_cab_r(); + int sflush_80_r(); protected: virtual void video_start() override { m_color_map = m_screen_red = 0; } @@ -207,7 +207,7 @@ private: uint32_t screen_update_polaris(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); uint32_t screen_update_ballbomb(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(polaris_60hz_w); + void polaris_60hz_w(int state); TIMER_DEVICE_CALLBACK_MEMBER(schaser_effect_555_cb); void indianbt_sh_port_3_w(uint8_t data); void polaris_sh_port_1_w(uint8_t data); @@ -542,7 +542,7 @@ public: DECLARE_INPUT_CHANGED_MEMBER(gun_trigger); - DECLARE_READ_LINE_MEMBER(gun_on_r); + int gun_on_r(); protected: virtual void machine_start() override; diff --git a/src/mame/midw8080/mw8080bw.cpp b/src/mame/midw8080/mw8080bw.cpp index b72d6f2ad8a..423c78b9d39 100644 --- a/src/mame/midw8080/mw8080bw.cpp +++ b/src/mame/midw8080/mw8080bw.cpp @@ -246,7 +246,7 @@ TIMER_CALLBACK_MEMBER(mw8080bw_state::interrupt_trigger) } -WRITE_LINE_MEMBER(mw8080bw_state::int_enable_w) +void mw8080bw_state::int_enable_w(int state) { m_int_enable = state; } diff --git a/src/mame/midw8080/mw8080bw.h b/src/mame/midw8080/mw8080bw.h index 43881673ee6..ccadcc82ed5 100644 --- a/src/mame/midw8080/mw8080bw.h +++ b/src/mame/midw8080/mw8080bw.h @@ -81,7 +81,7 @@ protected: virtual void machine_start() override; virtual void machine_reset() override; - DECLARE_WRITE_LINE_MEMBER(int_enable_w); + void int_enable_w(int state); u8 mw8080bw_shift_result_rev_r(); @@ -123,7 +123,7 @@ private: DECLARE_MACHINE_START(maze); DECLARE_MACHINE_START(phantom2); uint32_t screen_update_phantom2(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(screen_vblank_phantom2); + void screen_vblank_phantom2(int state); TIMER_CALLBACK_MEMBER(maze_tone_timing_timer_callback); TIMER_CALLBACK_MEMBER(interrupt_trigger); void tornbase_audio_w(uint8_t data); diff --git a/src/mame/midw8080/mw8080bw_v.cpp b/src/mame/midw8080/mw8080bw_v.cpp index e626d4bef04..83877cf77fc 100644 --- a/src/mame/midw8080/mw8080bw_v.cpp +++ b/src/mame/midw8080/mw8080bw_v.cpp @@ -331,7 +331,7 @@ uint32_t mw8080bw_state::screen_update_phantom2(screen_device &screen, bitmap_rg } -WRITE_LINE_MEMBER(mw8080bw_state::screen_vblank_phantom2) +void mw8080bw_state::screen_vblank_phantom2(int state) { // falling edge if (!state) diff --git a/src/mame/midway/astrocde.cpp b/src/mame/midway/astrocde.cpp index 29c1b8b1e0d..86844b8d643 100644 --- a/src/mame/midway/astrocde.cpp +++ b/src/mame/midway/astrocde.cpp @@ -228,14 +228,14 @@ uint8_t astrocde_state::input_mux_r(offs_t offset) template -WRITE_LINE_MEMBER(astrocde_state::coin_counter_w) +void astrocde_state::coin_counter_w(int state) { machine().bookkeeping().coin_counter_w(Coin, state); } template -WRITE_LINE_MEMBER(astrocde_state::sparkle_w) +void astrocde_state::sparkle_w(int state) { m_sparkle[Bit] = state; } @@ -274,7 +274,7 @@ void ebases_state::coin_w(uint8_t data) * *************************************/ -WRITE_LINE_MEMBER(astrocde_state::gorf_sound_switch_w) +void astrocde_state::gorf_sound_switch_w(int state) { m_astrocade_sound1->set_output_gain(0, state ? 0.0 : 1.0); m_votrax->set_output_gain(0, state ? 1.0 : 0.0); @@ -295,7 +295,7 @@ void astrocde_state::demndrgn_banksw_w(uint8_t data) m_bank8000->set_entry(bank); } -WRITE_LINE_MEMBER(demndrgn_state::input_select_w) +void demndrgn_state::input_select_w(int state) { m_input_select = state; } @@ -412,7 +412,7 @@ void astrocde_state::votrax_speech_w(uint8_t data) } -READ_LINE_MEMBER( astrocde_state::votrax_speech_status_r ) +int astrocde_state::votrax_speech_status_r() { return m_votrax->request(); } diff --git a/src/mame/midway/astrocde.h b/src/mame/midway/astrocde.h index ba62b4ea682..5f5ed028e7e 100644 --- a/src/mame/midway/astrocde.h +++ b/src/mame/midway/astrocde.h @@ -111,9 +111,9 @@ public: uint8_t protected_ram_r(offs_t offset); void protected_ram_w(offs_t offset, uint8_t data); uint8_t input_mux_r(offs_t offset); - template DECLARE_WRITE_LINE_MEMBER(coin_counter_w); - template DECLARE_WRITE_LINE_MEMBER(sparkle_w); - DECLARE_WRITE_LINE_MEMBER(gorf_sound_switch_w); + template void coin_counter_w(int state); + template void sparkle_w(int state); + void gorf_sound_switch_w(int state); void profpac_banksw_w(uint8_t data); void demndrgn_banksw_w(uint8_t data); uint8_t video_register_r(offs_t offset); @@ -127,7 +127,7 @@ public: uint8_t profpac_videoram_r(offs_t offset); void profpac_videoram_w(offs_t offset, uint8_t data); DECLARE_INPUT_CHANGED_MEMBER(spacezap_monitor); - DECLARE_WRITE_LINE_MEMBER(lightpen_trigger_w); + void lightpen_trigger_w(int state); void init_profpac(); void init_spacezap(); void init_robby(); @@ -153,7 +153,7 @@ public: void init_sparklestar(); void votrax_speech_w(uint8_t data); - DECLARE_READ_LINE_MEMBER( votrax_speech_status_r ); + int votrax_speech_status_r(); void astrocade_base(machine_config &config); void astrocade_16color_base(machine_config &config); @@ -247,7 +247,7 @@ protected: virtual void machine_start() override; private: - DECLARE_WRITE_LINE_MEMBER(input_select_w); + void input_select_w(int state); void sound_w(uint8_t data); void trackball_reset_w(uint8_t data); diff --git a/src/mame/midway/astrocde_v.cpp b/src/mame/midway/astrocde_v.cpp index ba9781e889f..bc71c2151c3 100644 --- a/src/mame/midway/astrocde_v.cpp +++ b/src/mame/midway/astrocde_v.cpp @@ -398,7 +398,7 @@ TIMER_CALLBACK_MEMBER(astrocde_state::interrupt_off) m_maincpu->set_input_line(0, CLEAR_LINE); } -WRITE_LINE_MEMBER(astrocde_state::lightpen_trigger_w) +void astrocde_state::lightpen_trigger_w(int state) { if (state) { diff --git a/src/mame/midway/atlantis.cpp b/src/mame/midway/atlantis.cpp index abb6e7b8997..f0d7867e0bf 100644 --- a/src/mame/midway/atlantis.cpp +++ b/src/mame/midway/atlantis.cpp @@ -178,14 +178,14 @@ private: uint32_t board_ctrl[CTRL_SIZE]{}; void update_asic_irq(); - DECLARE_WRITE_LINE_MEMBER(vblank_irq); - DECLARE_WRITE_LINE_MEMBER(zeus_irq); - DECLARE_WRITE_LINE_MEMBER(ide_irq); - DECLARE_WRITE_LINE_MEMBER(ioasic_irq); - DECLARE_WRITE_LINE_MEMBER(watchdog_irq); - DECLARE_WRITE_LINE_MEMBER(watchdog_reset); + void vblank_irq(int state); + void zeus_irq(int state); + void ide_irq(int state); + void ioasic_irq(int state); + void watchdog_irq(int state); + void watchdog_reset(int state); - DECLARE_WRITE_LINE_MEMBER(duart_irq_callback); + void duart_irq_callback(int state); DECLARE_CUSTOM_INPUT_MEMBER(port_mod_r); uint16_t port_ctrl_r(offs_t offset); @@ -412,7 +412,7 @@ uint32_t atlantis_state::user_io_input() /************************************* * DUART interrupt handler *************************************/ -WRITE_LINE_MEMBER(atlantis_state::duart_irq_callback) +void atlantis_state::duart_irq_callback(int state) { uint32_t status_bit = 1 << DUART_IRQ_SHIFT; if (state && !(board_ctrl[STATUS] & status_bit)) { @@ -429,7 +429,7 @@ WRITE_LINE_MEMBER(atlantis_state::duart_irq_callback) /************************************* * Video interrupts *************************************/ -WRITE_LINE_MEMBER(atlantis_state::vblank_irq) +void atlantis_state::vblank_irq(int state) { //logerror("%s: atlantis_state::vblank state = %i\n", machine().describe_context(), state); if (state) { @@ -441,7 +441,7 @@ WRITE_LINE_MEMBER(atlantis_state::vblank_irq) update_asic_irq(); } -WRITE_LINE_MEMBER(atlantis_state::zeus_irq) +void atlantis_state::zeus_irq(int state) { //logerror("%s: atlantis_state::zeus_irq state = %i\n", machine().describe_context(), state); if (state) { @@ -456,7 +456,7 @@ WRITE_LINE_MEMBER(atlantis_state::zeus_irq) /************************************* * IDE interrupts *************************************/ -WRITE_LINE_MEMBER(atlantis_state::ide_irq) +void atlantis_state::ide_irq(int state) { if (state) { m_maincpu->set_input_line(IDE_IRQ_NUM, ASSERT_LINE); @@ -472,7 +472,7 @@ WRITE_LINE_MEMBER(atlantis_state::ide_irq) /************************************* * I/O ASIC interrupts *************************************/ -WRITE_LINE_MEMBER(atlantis_state::ioasic_irq) +void atlantis_state::ioasic_irq(int state) { LOGMASKED(LOG_IRQ, "%s: atlantis_state::ioasic_irq state = %i\n", machine().describe_context(), state); if (state) { @@ -487,7 +487,7 @@ WRITE_LINE_MEMBER(atlantis_state::ioasic_irq) /************************************* * Watchdog interrupts *************************************/ -WRITE_LINE_MEMBER(atlantis_state::watchdog_irq) +void atlantis_state::watchdog_irq(int state) { LOGMASKED(LOG_IRQ, "%s: atlantis_state::watchdog_irq state = %i\n", machine().describe_context(), state); if (state) { @@ -502,7 +502,7 @@ WRITE_LINE_MEMBER(atlantis_state::watchdog_irq) /************************************* * Watchdog Reset *************************************/ -WRITE_LINE_MEMBER(atlantis_state::watchdog_reset) +void atlantis_state::watchdog_reset(int state) { if (state) { printf("atlantis_state::watchdog_reset!!!\n"); diff --git a/src/mame/midway/balsente.h b/src/mame/midway/balsente.h index 53dd691c8da..589b85536f4 100644 --- a/src/mame/midway/balsente.h +++ b/src/mame/midway/balsente.h @@ -104,14 +104,14 @@ private: uint8_t random_num_r(); void rombank_select_w(uint8_t data); void rombank2_select_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(out0_w); - DECLARE_WRITE_LINE_MEMBER(out1_w); - DECLARE_WRITE_LINE_MEMBER(out2_w); - DECLARE_WRITE_LINE_MEMBER(out3_w); - DECLARE_WRITE_LINE_MEMBER(out4_w); - DECLARE_WRITE_LINE_MEMBER(out5_w); - DECLARE_WRITE_LINE_MEMBER(out6_w); - DECLARE_WRITE_LINE_MEMBER(nvrecall_w); + void out0_w(int state); + void out1_w(int state); + void out2_w(int state); + void out3_w(int state); + void out4_w(int state); + void out5_w(int state); + void out6_w(int state); + void nvrecall_w(int state); uint8_t novram_8bit_r(address_space &space, offs_t offset); void novram_8bit_w(offs_t offset, uint8_t data); uint8_t adc_data_r(); diff --git a/src/mame/midway/balsente_m.cpp b/src/mame/midway/balsente_m.cpp index dfbd7a6c407..2b5728fabdc 100644 --- a/src/mame/midway/balsente_m.cpp +++ b/src/mame/midway/balsente_m.cpp @@ -204,42 +204,42 @@ void balsente_state::rombank2_select_w(uint8_t data) * *************************************/ -WRITE_LINE_MEMBER(balsente_state::out0_w) +void balsente_state::out0_w(int state) { // output().set_led_value(0, state); } -WRITE_LINE_MEMBER(balsente_state::out1_w) +void balsente_state::out1_w(int state) { // output().set_led_value(1, state); } -WRITE_LINE_MEMBER(balsente_state::out2_w) +void balsente_state::out2_w(int state) { // output().set_led_value(2, state); } -WRITE_LINE_MEMBER(balsente_state::out3_w) +void balsente_state::out3_w(int state) { // output().set_led_value(3, state); } -WRITE_LINE_MEMBER(balsente_state::out4_w) +void balsente_state::out4_w(int state) { // output().set_led_value(4, state); } -WRITE_LINE_MEMBER(balsente_state::out5_w) +void balsente_state::out5_w(int state) { // output().set_led_value(5, state); } -WRITE_LINE_MEMBER(balsente_state::out6_w) +void balsente_state::out6_w(int state) { // output().set_led_value(6, state); } -WRITE_LINE_MEMBER(balsente_state::nvrecall_w) +void balsente_state::nvrecall_w(int state) { m_novram[0]->recall(!state); m_novram[1]->recall(!state); diff --git a/src/mame/midway/csd.cpp b/src/mame/midway/csd.cpp index 0a606908672..cd9b334aefb 100644 --- a/src/mame/midway/csd.cpp +++ b/src/mame/midway/csd.cpp @@ -134,7 +134,7 @@ void midway_cheap_squeak_deluxe_device::sr_w(u8 data) // sirq_w - external irq write //------------------------------------------------- -WRITE_LINE_MEMBER( midway_cheap_squeak_deluxe_device::sirq_w ) +void midway_cheap_squeak_deluxe_device::sirq_w(int state) { m_pia_sync_timer->adjust(attotime::zero, !state); } @@ -143,7 +143,7 @@ WRITE_LINE_MEMBER( midway_cheap_squeak_deluxe_device::sirq_w ) // reset_write - write to the reset line //------------------------------------------------- -WRITE_LINE_MEMBER( midway_cheap_squeak_deluxe_device::reset_w ) +void midway_cheap_squeak_deluxe_device::reset_w(int state) { m_cpu->set_input_line(INPUT_LINE_RESET, state ? ASSERT_LINE : CLEAR_LINE); m_cpu->set_input_line(INPUT_LINE_HALT, state ? ASSERT_LINE : CLEAR_LINE); @@ -179,7 +179,7 @@ void midway_cheap_squeak_deluxe_device::portb_w(uint8_t data) // irq_w - IRQ line state changes //------------------------------------------------- -WRITE_LINE_MEMBER( midway_cheap_squeak_deluxe_device::irq_w ) +void midway_cheap_squeak_deluxe_device::irq_w(int state) { int combined_state = m_pia->irq_a_state() | m_pia->irq_b_state(); m_cpu->set_input_line(4, combined_state ? ASSERT_LINE : CLEAR_LINE); diff --git a/src/mame/midway/csd.h b/src/mame/midway/csd.h index 2619e8b74e3..02b75018b72 100644 --- a/src/mame/midway/csd.h +++ b/src/mame/midway/csd.h @@ -34,8 +34,8 @@ public: // read/write u8 stat_r(); void sr_w(u8 data); - DECLARE_WRITE_LINE_MEMBER(sirq_w); - DECLARE_WRITE_LINE_MEMBER(reset_w); + void sirq_w(int state); + void reset_w(int state); void csdeluxe_map(address_map &map); @@ -61,7 +61,7 @@ private: // internal communications void porta_w(uint8_t data); void portb_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(irq_w); + void irq_w(int state); }; // device type definition diff --git a/src/mame/midway/gridlee.cpp b/src/mame/midway/gridlee.cpp index fd2a9f9ffbe..0bdb63b1a5f 100644 --- a/src/mame/midway/gridlee.cpp +++ b/src/mame/midway/gridlee.cpp @@ -270,7 +270,7 @@ uint8_t gridlee_state::random_num_r() * *************************************/ -WRITE_LINE_MEMBER(gridlee_state::coin_counter_w) +void gridlee_state::coin_counter_w(int state) { machine().bookkeeping().coin_counter_w(0, state); logerror("coin counter %s\n", state ? "on" : "off"); diff --git a/src/mame/midway/gridlee.h b/src/mame/midway/gridlee.h index 4f24e5c5583..4929c0b551c 100644 --- a/src/mame/midway/gridlee.h +++ b/src/mame/midway/gridlee.h @@ -48,8 +48,8 @@ public: private: uint8_t analog_port_r(offs_t offset); uint8_t random_num_r(); - DECLARE_WRITE_LINE_MEMBER(coin_counter_w); - DECLARE_WRITE_LINE_MEMBER(cocktail_flip_w); + void coin_counter_w(int state); + void cocktail_flip_w(int state); void gridlee_videoram_w(offs_t offset, uint8_t data); void gridlee_palette_select_w(uint8_t data); void gridlee_palette(palette_device &palette) const; diff --git a/src/mame/midway/gridlee_v.cpp b/src/mame/midway/gridlee_v.cpp index 9768a48c232..485b7c67ee7 100644 --- a/src/mame/midway/gridlee_v.cpp +++ b/src/mame/midway/gridlee_v.cpp @@ -78,7 +78,7 @@ void gridlee_state::video_start() * *************************************/ -WRITE_LINE_MEMBER(gridlee_state::cocktail_flip_w) +void gridlee_state::cocktail_flip_w(int state) { m_cocktail_flip = state; } diff --git a/src/mame/midway/mcr.h b/src/mame/midway/mcr.h index dc04ac59ffd..87b48112dd3 100644 --- a/src/mame/midway/mcr.h +++ b/src/mame/midway/mcr.h @@ -197,8 +197,8 @@ public: m_ipu_pio1(*this, "ipu_pio1") { } - DECLARE_WRITE_LINE_MEMBER(sio_txda_w); - DECLARE_WRITE_LINE_MEMBER(sio_txdb_w); + void sio_txda_w(int state); + void sio_txdb_w(int state); void ipu_laserdisk_w(offs_t offset, uint8_t data); uint8_t ipu_watchdog_r(); void ipu_watchdog_w(uint8_t data); diff --git a/src/mame/midway/mcr_m.cpp b/src/mame/midway/mcr_m.cpp index 8f6e221d263..dd7fa56a6b0 100644 --- a/src/mame/midway/mcr_m.cpp +++ b/src/mame/midway/mcr_m.cpp @@ -145,12 +145,12 @@ TIMER_DEVICE_CALLBACK_MEMBER(mcr_nflfoot_state::ipu_interrupt) * *************************************/ -WRITE_LINE_MEMBER(mcr_nflfoot_state::sio_txda_w) +void mcr_nflfoot_state::sio_txda_w(int state) { m_ipu_sio_txda = !state; } -WRITE_LINE_MEMBER(mcr_nflfoot_state::sio_txdb_w) +void mcr_nflfoot_state::sio_txdb_w(int state) { // disc player m_ipu_sio_txdb = !state; diff --git a/src/mame/midway/midway.cpp b/src/mame/midway/midway.cpp index 9100860ebeb..2840891ae42 100644 --- a/src/mame/midway/midway.cpp +++ b/src/mame/midway/midway.cpp @@ -100,7 +100,7 @@ void midway_ssio_device::write(offs_t offset, uint8_t data) // reset_write - write to the reset line //------------------------------------------------- -WRITE_LINE_MEMBER(midway_ssio_device::reset_write) +void midway_ssio_device::reset_write(int state) { if (state) { @@ -517,7 +517,7 @@ void midway_sounds_good_device::write(uint8_t data) // reset_write - write to the reset line //------------------------------------------------- -WRITE_LINE_MEMBER(midway_sounds_good_device::reset_write) +void midway_sounds_good_device::reset_write(int state) { //if (state) osd_printf_debug("SG Reset\n"); m_cpu->set_input_line(INPUT_LINE_RESET, state ? ASSERT_LINE : CLEAR_LINE); @@ -555,7 +555,7 @@ void midway_sounds_good_device::portb_w(uint8_t data) // irq_w - IRQ line state changes //------------------------------------------------- -WRITE_LINE_MEMBER(midway_sounds_good_device::irq_w) +void midway_sounds_good_device::irq_w(int state) { int combined_state = m_pia->irq_a_state() | m_pia->irq_b_state(); m_cpu->set_input_line(4, combined_state ? ASSERT_LINE : CLEAR_LINE); @@ -712,7 +712,7 @@ void midway_turbo_cheap_squeak_device::write(uint8_t data) // reset_write - write to the reset line //------------------------------------------------- -WRITE_LINE_MEMBER(midway_turbo_cheap_squeak_device::reset_write) +void midway_turbo_cheap_squeak_device::reset_write(int state) { m_cpu->set_input_line(INPUT_LINE_RESET, state ? ASSERT_LINE : CLEAR_LINE); } @@ -745,7 +745,7 @@ void midway_turbo_cheap_squeak_device::portb_w(uint8_t data) // irq_w - IRQ line state changes //------------------------------------------------- -WRITE_LINE_MEMBER(midway_turbo_cheap_squeak_device::irq_w) +void midway_turbo_cheap_squeak_device::irq_w(int state) { int combined_state = m_pia->irq_a_state() | m_pia->irq_b_state(); m_cpu->set_input_line(M6809_IRQ_LINE, combined_state ? ASSERT_LINE : CLEAR_LINE); diff --git a/src/mame/midway/midway.h b/src/mame/midway/midway.h index 6d10732dd46..546bd3a97ec 100644 --- a/src/mame/midway/midway.h +++ b/src/mame/midway/midway.h @@ -54,7 +54,7 @@ public: // read/write uint8_t read(); void write(offs_t offset, uint8_t data); - DECLARE_WRITE_LINE_MEMBER(reset_write); + void reset_write(int state); uint8_t ioport_read(offs_t offset); void ioport_write(offs_t offset, uint8_t data); @@ -136,7 +136,7 @@ public: // read/write uint8_t read(); void write(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(reset_write); + void reset_write(int state); void soundsgood_map(address_map &map); protected: @@ -161,7 +161,7 @@ private: // internal communications void porta_w(uint8_t data); void portb_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(irq_w); + void irq_w(int state); }; @@ -177,7 +177,7 @@ public: // read/write uint8_t read(); void write(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(reset_write); + void reset_write(int state); void turbocs_map(address_map &map); protected: @@ -202,7 +202,7 @@ private: // internal communications void porta_w(uint8_t data); void portb_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(irq_w); + void irq_w(int state); }; #endif // MAME_MIDWAY_MIDWAY_H diff --git a/src/mame/midway/midwayic.cpp b/src/mame/midway/midwayic.cpp index eae2ab7d165..19cbc09a0be 100644 --- a/src/mame/midway/midwayic.cpp +++ b/src/mame/midway/midwayic.cpp @@ -176,7 +176,7 @@ void midway_serial_pic_device::device_reset() generate_serial_data(m_upper); } -WRITE_LINE_MEMBER(midway_serial_pic_device::reset_w) +void midway_serial_pic_device::reset_w(int state) { if (state) { @@ -269,7 +269,7 @@ void midway_serial_pic_emu_device::device_start() m_status = 0; } -WRITE_LINE_MEMBER(midway_serial_pic_emu_device::reset_w) +void midway_serial_pic_emu_device::reset_w(int state) { if (!state) // fixme, PIC should be stopped while 0 and start running at 0->1 transition m_pic->reset(); @@ -851,7 +851,7 @@ void midway_ioasic_device::cage_irq_handler(uint8_t data) } -WRITE_LINE_MEMBER(midway_ioasic_device::ioasic_input_empty) +void midway_ioasic_device::ioasic_input_empty(int state) { LOGFIFO("ioasic_input_empty(%d)\n", state); if (state) @@ -862,7 +862,7 @@ WRITE_LINE_MEMBER(midway_ioasic_device::ioasic_input_empty) } -WRITE_LINE_MEMBER(midway_ioasic_device::ioasic_output_full) +void midway_ioasic_device::ioasic_output_full(int state) { LOGFIFO("ioasic_output_full(%d)\n", state); if (state) @@ -950,7 +950,7 @@ uint16_t midway_ioasic_device::fifo_status_r(address_space &space) } -WRITE_LINE_MEMBER(midway_ioasic_device::fifo_reset_w) +void midway_ioasic_device::fifo_reset_w(int state) { /* on the high state, reset the FIFO data */ if (state) diff --git a/src/mame/midway/midwayic.h b/src/mame/midway/midwayic.h index 499bfa9c72b..789a6709c82 100644 --- a/src/mame/midway/midwayic.h +++ b/src/mame/midway/midwayic.h @@ -30,7 +30,7 @@ public: u8 read(); void write(u8 data); u8 status_r(); - DECLARE_WRITE_LINE_MEMBER( reset_w ); + void reset_w(int state); protected: midway_serial_pic_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); @@ -70,7 +70,7 @@ public: u8 read(); void write(u8 data); u8 status_r(); - DECLARE_WRITE_LINE_MEMBER(reset_w); + void reset_w(int state); protected: midway_serial_pic_emu_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); @@ -172,12 +172,12 @@ public: void fifo_w(uint16_t data); void fifo_full_w(uint16_t data); - DECLARE_WRITE_LINE_MEMBER(fifo_reset_w); + void fifo_reset_w(int state); uint16_t fifo_r(); uint16_t fifo_status_r(address_space &space); - DECLARE_WRITE_LINE_MEMBER(ioasic_input_empty); - DECLARE_WRITE_LINE_MEMBER(ioasic_output_full); + void ioasic_input_empty(int state); + void ioasic_output_full(int state); uint32_t read(address_space &space, offs_t offset); void write(offs_t offset, uint32_t data, uint32_t mem_mask = ~0); diff --git a/src/mame/midway/midxunit.h b/src/mame/midway/midxunit.h index 1b7e159841d..35d1bd19a57 100644 --- a/src/mame/midway/midxunit.h +++ b/src/mame/midway/midxunit.h @@ -48,14 +48,14 @@ private: void midxunit_cmos_w(offs_t offset, uint8_t data); void midxunit_io_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); void midxunit_unknown_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); - DECLARE_WRITE_LINE_MEMBER(adc_int_w); + void adc_int_w(int state); uint32_t midxunit_status_r(); uint8_t midxunit_uart_r(offs_t offset); void midxunit_uart_w(offs_t offset, uint8_t data); uint32_t midxunit_security_r(); void midxunit_security_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0); void midxunit_security_clock_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0); - DECLARE_WRITE_LINE_MEMBER(midxunit_dcs_output_full); + void midxunit_dcs_output_full(int state); uint32_t midxunit_dma_r(offs_t offset, uint32_t mem_mask = ~0); void midxunit_dma_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0); diff --git a/src/mame/midway/midxunit_m.cpp b/src/mame/midway/midxunit_m.cpp index cef2cc29904..1bd54a55ba1 100644 --- a/src/mame/midway/midxunit_m.cpp +++ b/src/mame/midway/midxunit_m.cpp @@ -87,7 +87,7 @@ void midxunit_state::midxunit_unknown_w(offs_t offset, uint16_t data, uint16_t m } -WRITE_LINE_MEMBER(midxunit_state::adc_int_w) +void midxunit_state::adc_int_w(int state) { m_adc_int = (state != CLEAR_LINE); } @@ -114,7 +114,7 @@ uint32_t midxunit_state::midxunit_status_r() * *************************************/ -WRITE_LINE_MEMBER(midxunit_state::midxunit_dcs_output_full) +void midxunit_state::midxunit_dcs_output_full(int state) { /* only signal if not in loopback state */ if (m_uart[1] != 0x66) diff --git a/src/mame/midway/midyunit.cpp b/src/mame/midway/midyunit.cpp index 28dbe2ac7a7..33d3dbad686 100644 --- a/src/mame/midway/midyunit.cpp +++ b/src/mame/midway/midyunit.cpp @@ -171,7 +171,7 @@ uint8_t midyunit_state::yawdim2_soundlatch_r() * *************************************/ -READ_LINE_MEMBER(midyunit_state::narc_talkback_strobe_r) +int midyunit_state::narc_talkback_strobe_r() { return (m_narc_sound->read() >> 8) & 1; } @@ -183,7 +183,7 @@ CUSTOM_INPUT_MEMBER(midyunit_state::narc_talkback_data_r) } -READ_LINE_MEMBER(midyunit_state::adpcm_irq_state_r) +int midyunit_state::adpcm_irq_state_r() { return m_adpcm_sound->irq_read() & 1; } diff --git a/src/mame/midway/midyunit.h b/src/mame/midway/midyunit.h index e4709779d6d..7d9b02f55d5 100644 --- a/src/mame/midway/midyunit.h +++ b/src/mame/midway/midyunit.h @@ -69,9 +69,9 @@ public: void init_mkyturbo(); void init_term2la2(); - DECLARE_READ_LINE_MEMBER(narc_talkback_strobe_r); + int narc_talkback_strobe_r(); DECLARE_CUSTOM_INPUT_MEMBER(narc_talkback_data_r); - DECLARE_READ_LINE_MEMBER(adpcm_irq_state_r); + int adpcm_irq_state_r(); private: /* protection data types */ diff --git a/src/mame/midway/midzeus.cpp b/src/mame/midway/midzeus.cpp index 6629902d639..6b1c34d5cb3 100644 --- a/src/mame/midway/midzeus.cpp +++ b/src/mame/midway/midzeus.cpp @@ -104,8 +104,8 @@ private: uint32_t disk_asic_r(offs_t offset); void disk_asic_w(offs_t offset, uint32_t data); - DECLARE_WRITE_LINE_MEMBER(firewire_irq); - DECLARE_WRITE_LINE_MEMBER(zeus_irq); + void firewire_irq(int state); + void zeus_irq(int state); uint32_t zeus2_timekeeper_r(offs_t offset); void zeus2_timekeeper_w(offs_t offset, uint32_t data); @@ -186,7 +186,7 @@ INTERRUPT_GEN_MEMBER(midzeus_state::display_irq) m_display_irq_off_timer->adjust(attotime::from_hz(30000000)); } -WRITE_LINE_MEMBER(midzeus2_state::zeus_irq) +void midzeus2_state::zeus_irq(int state) { m_maincpu->set_input_line(TMS3203X_IRQ2, ASSERT_LINE); } @@ -520,7 +520,7 @@ void midzeus2_state::crusnexo_leds_w(offs_t offset, uint32_t data) * *************************************/ -WRITE_LINE_MEMBER(midzeus2_state::firewire_irq) +void midzeus2_state::firewire_irq(int state) { m_fw_int = state; update_firewire_irq(); diff --git a/src/mame/midway/seattle.cpp b/src/mame/midway/seattle.cpp index 523ea6de9ed..c02d4e9ef09 100644 --- a/src/mame/midway/seattle.cpp +++ b/src/mame/midway/seattle.cpp @@ -425,11 +425,11 @@ private: void wheel_board_w(offs_t offset, uint32_t data); - DECLARE_WRITE_LINE_MEMBER(ide_interrupt); - DECLARE_WRITE_LINE_MEMBER(vblank_assert); + void ide_interrupt(int state); + void vblank_assert(int state); - DECLARE_WRITE_LINE_MEMBER(ethernet_interrupt); - DECLARE_WRITE_LINE_MEMBER(ioasic_irq); + void ethernet_interrupt(int state); + void ioasic_irq(int state); void update_vblank_irq(); void update_galileo_irqs(); void widget_reset(); @@ -529,7 +529,7 @@ void seattle_state::machine_reset() * *************************************/ -WRITE_LINE_MEMBER(seattle_state::ethernet_interrupt) +void seattle_state::ethernet_interrupt(int state) { m_ethernet_irq_state = state; if (m_board_config == FLAGSTAFF_CONFIG) @@ -548,7 +548,7 @@ WRITE_LINE_MEMBER(seattle_state::ethernet_interrupt) * *************************************/ -WRITE_LINE_MEMBER(seattle_state::ioasic_irq) +void seattle_state::ioasic_irq(int state) { m_maincpu->set_input_line(IOASIC_IRQ_NUM, state); } @@ -675,7 +675,7 @@ void seattle_state::vblank_clear_w(uint32_t data) } -WRITE_LINE_MEMBER(seattle_state::vblank_assert) +void seattle_state::vblank_assert(int state) { // cache the raw state m_vblank_state = state; diff --git a/src/mame/midway/sente6vb.cpp b/src/mame/midway/sente6vb.cpp index a5bebd127d6..5621f9ea5cc 100644 --- a/src/mame/midway/sente6vb.cpp +++ b/src/mame/midway/sente6vb.cpp @@ -223,13 +223,13 @@ void sente6vb_device::device_reset() * *************************************/ -WRITE_LINE_MEMBER(sente6vb_device::rec_w) +void sente6vb_device::rec_w(int state) { m_uart->write_rxd(state); } -WRITE_LINE_MEMBER(sente6vb_device::uart_clock_w) +void sente6vb_device::uart_clock_w(int state) { if (state && BIT(m_counter_control, 5)) m_audiocpu->set_input_line(INPUT_LINE_NMI, m_uint ? ASSERT_LINE : CLEAR_LINE); @@ -245,7 +245,7 @@ WRITE_LINE_MEMBER(sente6vb_device::uart_clock_w) * *************************************/ -WRITE_LINE_MEMBER(sente6vb_device::counter_0_set_out) +void sente6vb_device::counter_0_set_out(int state) { // OUT on counter 0 is hooked to the GATE line on counter 1 through an inverter m_pit->write_gate1(!state); @@ -255,7 +255,7 @@ WRITE_LINE_MEMBER(sente6vb_device::counter_0_set_out) } -WRITE_LINE_MEMBER(sente6vb_device::set_counter_0_ff) +void sente6vb_device::set_counter_0_ff(int state) { // the flip/flop output is inverted, so if we went high to low, that's a clock m_pit->write_clk0(!state); diff --git a/src/mame/midway/sente6vb.h b/src/mame/midway/sente6vb.h index 04bc8c925f0..7dea91a07ff 100644 --- a/src/mame/midway/sente6vb.h +++ b/src/mame/midway/sente6vb.h @@ -31,7 +31,7 @@ public: auto send_cb() { return m_send_cb.bind(); } auto clock_out_cb() { return m_clock_out_cb.bind(); } - DECLARE_WRITE_LINE_MEMBER(rec_w); + void rec_w(int state); protected: virtual void device_add_mconfig(machine_config &config) override; @@ -45,12 +45,12 @@ private: void chip_select_w(uint8_t data); void dac_data_w(offs_t offset, uint8_t data); void register_addr_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(uart_clock_w); - DECLARE_WRITE_LINE_MEMBER(counter_0_set_out); + void uart_clock_w(int state); + void counter_0_set_out(int state); void update_counter_0_timer(); TIMER_DEVICE_CALLBACK_MEMBER(clock_counter_0_ff); - DECLARE_WRITE_LINE_MEMBER(set_counter_0_ff); + void set_counter_0_ff(int state); void mem_map(address_map &map); void io_map(address_map &map); diff --git a/src/mame/midway/sspeedr.h b/src/mame/midway/sspeedr.h index 40e64612e0f..863766cdccf 100644 --- a/src/mame/midway/sspeedr.h +++ b/src/mame/midway/sspeedr.h @@ -58,7 +58,7 @@ private: void track_ice_w(uint8_t data); void palette(palette_device &palette) const; uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(screen_vblank); + void screen_vblank(int state); void io_map(address_map &map); void prg_map(address_map &map); diff --git a/src/mame/midway/sspeedr_v.cpp b/src/mame/midway/sspeedr_v.cpp index 2d8da66c0c5..a94099eca40 100644 --- a/src/mame/midway/sspeedr_v.cpp +++ b/src/mame/midway/sspeedr_v.cpp @@ -253,7 +253,7 @@ uint32_t sspeedr_state::screen_update(screen_device &screen, bitmap_ind16 &bitma } -WRITE_LINE_MEMBER(sspeedr_state::screen_vblank) +void sspeedr_state::screen_vblank(int state) { // rising edge if (state) diff --git a/src/mame/midway/starrider.cpp b/src/mame/midway/starrider.cpp index 00a6b1e15e1..9f0ca241180 100644 --- a/src/mame/midway/starrider.cpp +++ b/src/mame/midway/starrider.cpp @@ -310,7 +310,7 @@ private: void cpu_wd_w(u8 data); u8 cpu_nvram_r(address_space &space, offs_t offset); void cpu_nvram_w(offs_t offset, u8 data); - DECLARE_WRITE_LINE_MEMBER(cpu_pia2_ca2_w); + void cpu_pia2_ca2_w(int state); static constexpr u16 vgg_drams_map(u16 v, u16 h, u16 p); u16 vgg_drams_map(u16 a) const; @@ -340,10 +340,10 @@ private: void sound_er2_w(u8 data); void sound_pia2_pa(u8 data); - DECLARE_WRITE_LINE_MEMBER(sound_fifo0_ir); - DECLARE_WRITE_LINE_MEMBER(sound_fifo1_ir); - template DECLARE_WRITE_LINE_MEMBER(sound_fifo_or); - template DECLARE_WRITE_LINE_MEMBER(sound_fifo_flag); + void sound_fifo0_ir(int state); + void sound_fifo1_ir(int state); + template void sound_fifo_or(int state); + template void sound_fifo_flag(int state); void main_memory(address_map &map); void main_banks(address_map &map); @@ -586,7 +586,7 @@ void sr_state::cpu_nvram_w(offs_t offset, u8 data) m_main_nvram[offset] = data & 0x0f; } -WRITE_LINE_MEMBER(sr_state::cpu_pia2_ca2_w) +void sr_state::cpu_pia2_ca2_w(int state) { m_sound_cpu->set_input_line(INPUT_LINE_RESET, state ? ASSERT_LINE : CLEAR_LINE); for (auto const &fifo : m_sound_fifos) @@ -762,7 +762,7 @@ void sr_state::sound_pia2_pa(u8 data) } } -DECLARE_WRITE_LINE_MEMBER(sr_state::sound_fifo0_ir) +void sr_state::sound_fifo0_ir(int state) { if (state) m_sound_pia2_pb_in |= 0x08U; @@ -771,7 +771,7 @@ DECLARE_WRITE_LINE_MEMBER(sr_state::sound_fifo0_ir) m_sound_pia2->portb_w(m_sound_pia2_pb_in | (m_sound_pia2_pa_out & 0x77U)); } -DECLARE_WRITE_LINE_MEMBER(sr_state::sound_fifo1_ir) +void sr_state::sound_fifo1_ir(int state) { if (state) m_sound_pia2_pb_in |= 0x80U; @@ -780,7 +780,7 @@ DECLARE_WRITE_LINE_MEMBER(sr_state::sound_fifo1_ir) m_sound_pia2->portb_w(m_sound_pia2_pb_in | (m_sound_pia2_pa_out & 0x77U)); } -template WRITE_LINE_MEMBER(sr_state::sound_fifo_or) +template void sr_state::sound_fifo_or(int state) { if (state) m_sound_pia2_pb_in |= u8(1) << (N + 4); @@ -793,7 +793,7 @@ template WRITE_LINE_MEMBER(sr_state::sound_fifo_or) } } -template WRITE_LINE_MEMBER(sr_state::sound_fifo_flag) +template void sr_state::sound_fifo_flag(int state) { if (state) m_sound_pia2_pb_in |= u8(1) << N; diff --git a/src/mame/midway/tmaster.cpp b/src/mame/midway/tmaster.cpp index 460eb0da74b..95714e735e3 100644 --- a/src/mame/midway/tmaster.cpp +++ b/src/mame/midway/tmaster.cpp @@ -129,18 +129,18 @@ public: void tm(machine_config &config); void tmds1204(machine_config &config); - DECLARE_READ_LINE_MEMBER(read_rand); + int read_rand(); - DECLARE_WRITE_LINE_MEMBER(write_oki_bank0); - DECLARE_WRITE_LINE_MEMBER(write_oki_bank1); + void write_oki_bank0(int state); + void write_oki_bank1(int state); private: - DECLARE_WRITE_LINE_MEMBER(blitter_irq_callback); + void blitter_irq_callback(int state); TIMER_DEVICE_CALLBACK_MEMBER(scanline_interrupt); uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(duart_irq_handler); + void duart_irq_handler(int state); uint16_t rtc_r(offs_t offset); void rtc_w(offs_t offset, uint16_t data); @@ -161,7 +161,7 @@ private: uint8_t m_rtc_ram[8]{}; }; -WRITE_LINE_MEMBER(tmaster_state::blitter_irq_callback) +void tmaster_state::blitter_irq_callback(int state) { // logerror("%s: Blitter IRQ callback state = %x\n", machine().describe_context(), state); m_maincpu->set_input_line(2, state); @@ -185,7 +185,7 @@ uint32_t tmaster_state::screen_update(screen_device &screen, bitmap_ind16 &bitma ***************************************************************************/ -WRITE_LINE_MEMBER(tmaster_state::write_oki_bank0) +void tmaster_state::write_oki_bank0(int state) { if (state) m_okibank |= 1; @@ -195,7 +195,7 @@ WRITE_LINE_MEMBER(tmaster_state::write_oki_bank0) m_oki->set_rom_bank(m_okibank); } -WRITE_LINE_MEMBER(tmaster_state::write_oki_bank1) +void tmaster_state::write_oki_bank1(int state) { if (state) m_okibank |= 2; @@ -217,7 +217,7 @@ void tmaster_state::cpu_space_map(address_map &map) map(0xfffff8, 0xfffff9).lr16(NAME([this] () -> u16 { return m_duart->get_irq_vector(); })); } -WRITE_LINE_MEMBER(tmaster_state::duart_irq_handler) +void tmaster_state::duart_irq_handler(int state) { m_maincpu->set_input_line(4, state); } @@ -264,7 +264,7 @@ void tmaster_state::rtc_w(offs_t offset, uint16_t data) ***************************************************************************/ -READ_LINE_MEMBER(tmaster_state::read_rand) +int tmaster_state::read_rand() { return machine().rand() & 1; } diff --git a/src/mame/midway/vegas.cpp b/src/mame/midway/vegas.cpp index 4d19e151d7e..3f09e7fbdcb 100644 --- a/src/mame/midway/vegas.cpp +++ b/src/mame/midway/vegas.cpp @@ -435,13 +435,13 @@ private: uint32_t m_keypad_select; uint32_t m_gear; - DECLARE_WRITE_LINE_MEMBER(duart_irq_cb); - DECLARE_WRITE_LINE_MEMBER(vblank_assert); + void duart_irq_cb(int state); + void vblank_assert(int state); void update_sio_irqs(); - DECLARE_WRITE_LINE_MEMBER(watchdog_reset); - DECLARE_WRITE_LINE_MEMBER(watchdog_irq); + void watchdog_reset(int state); + void watchdog_irq(int state); void timekeeper_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0); uint32_t timekeeper_r(offs_t offset, uint32_t mem_mask = ~0); void reset_sio(void); @@ -455,8 +455,8 @@ private: uint32_t ethernet_r(offs_t offset, uint32_t mem_mask = ~0); void ethernet_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0); void dcs3_fifo_full_w(uint32_t data); - DECLARE_WRITE_LINE_MEMBER(ethernet_interrupt); - DECLARE_WRITE_LINE_MEMBER(ioasic_irq); + void ethernet_interrupt(int state); + void ioasic_irq(int state); uint32_t unknown_r(offs_t offset, uint32_t mem_mask = ~0); uint8_t parallel_r(offs_t offset); void parallel_w(offs_t offset, uint8_t data); @@ -552,7 +552,7 @@ void vegas_state::machine_reset() * Watchdog interrupts *************************************/ #define WD_IRQ 0x1 -WRITE_LINE_MEMBER(vegas_state::watchdog_irq) +void vegas_state::watchdog_irq(int state) { if (state && !(m_sio_irq_state & WD_IRQ)) { LOGMASKED(LOG_WATCHDOG, "%s: vegas_state::watchdog_irq state = %i\n", machine().describe_context(), state); @@ -569,7 +569,7 @@ WRITE_LINE_MEMBER(vegas_state::watchdog_irq) /************************************* * Watchdog Reset *************************************/ -WRITE_LINE_MEMBER(vegas_state::watchdog_reset) +void vegas_state::watchdog_reset(int state) { if (state) { LOGMASKED(LOG_WATCHDOG, "vegas_state::watchdog_reset!!!\n"); @@ -656,7 +656,7 @@ void vegas_state::update_sio_irqs() LOGMASKED(LOG_SIO, "update_sio_irqs: irq_enable: %02x %s irq_state: %02x %s\n", m_sio_irq_enable, sioEnable, m_sio_irq_state, sioState); } -WRITE_LINE_MEMBER(vegas_state::duart_irq_cb) +void vegas_state::duart_irq_cb(int state) { // Duart shares IRQ with SIO if (state ^ m_duart_irq_state) { @@ -665,7 +665,7 @@ WRITE_LINE_MEMBER(vegas_state::duart_irq_cb) } } -WRITE_LINE_MEMBER(vegas_state::vblank_assert) +void vegas_state::vblank_assert(int state) { LOGMASKED(LOG_SIO, "vblank_assert: m_sio_reset_ctrl: %04x state: %d\n", m_sio_reset_ctrl, state); // latch on the correct polarity transition @@ -677,7 +677,7 @@ WRITE_LINE_MEMBER(vegas_state::vblank_assert) } -WRITE_LINE_MEMBER(vegas_state::ioasic_irq) +void vegas_state::ioasic_irq(int state) { if (state) m_sio_irq_state |= 0x04; @@ -686,7 +686,7 @@ WRITE_LINE_MEMBER(vegas_state::ioasic_irq) update_sio_irqs(); } -WRITE_LINE_MEMBER(vegas_state::ethernet_interrupt) +void vegas_state::ethernet_interrupt(int state) { if (state) m_sio_irq_state |= 0x10; diff --git a/src/mame/midway/williams.h b/src/mame/midway/williams.h index 79b0fcf4056..2e61b97fe9f 100644 --- a/src/mame/midway/williams.h +++ b/src/mame/midway/williams.h @@ -458,7 +458,7 @@ public: private: virtual void machine_start() override; - DECLARE_WRITE_LINE_MEMBER(maxvol_w); + void maxvol_w(int state); void lamp_w(u8 data); required_device m_mux; @@ -493,7 +493,7 @@ private: TIMER_CALLBACK_MEMBER(deferred_snd_cmd_w); virtual void snd_cmd_w(u8 data) override; - DECLARE_WRITE_LINE_MEMBER(pia_s11_bg_strobe_w); + void pia_s11_bg_strobe_w(int state); }; diff --git a/src/mame/midway/williams_m.cpp b/src/mame/midway/williams_m.cpp index 4d138320128..a28a0f4cabd 100644 --- a/src/mame/midway/williams_m.cpp +++ b/src/mame/midway/williams_m.cpp @@ -458,7 +458,7 @@ void tshoot_state::machine_start() } -WRITE_LINE_MEMBER(tshoot_state::maxvol_w) +void tshoot_state::maxvol_w(int state) { /* something to do with the sound volume */ logerror("tshoot maxvol = %d (%s)\n", state, machine().describe_context()); @@ -498,7 +498,7 @@ TIMER_CALLBACK_MEMBER(joust2_state::deferred_snd_cmd_w) } -WRITE_LINE_MEMBER(joust2_state::pia_s11_bg_strobe_w) +void joust2_state::pia_s11_bg_strobe_w(int state) { m_current_sound_data = (m_current_sound_data & ~0x100) | ((state << 8) & 0x100); m_bg->ctrl_w(state); diff --git a/src/mame/midway/wmg.cpp b/src/mame/midway/wmg.cpp index 5b303260e5d..e9a1e089c22 100644 --- a/src/mame/midway/wmg.cpp +++ b/src/mame/midway/wmg.cpp @@ -105,7 +105,7 @@ private: void wmg_c400_w(u8 data); void wmg_d000_w(u8 data); void wmg_blitter_w(offs_t, u8); - DECLARE_WRITE_LINE_MEMBER(wmg_port_select_w); + void wmg_port_select_w(int state); void wmg_sound_reset_w(u8 data); void wmg_vram_select_w(u8 data); @@ -458,7 +458,7 @@ void wmg_state::machine_reset() * *************************************/ -WRITE_LINE_MEMBER( wmg_state::wmg_port_select_w ) +void wmg_state::wmg_port_select_w(int state) { m_wmg_port_select = state | (m_wmg_c400 << 1); } diff --git a/src/mame/midway/zwackery.cpp b/src/mame/midway/zwackery.cpp index d3c8ca6c844..2dbf233b73f 100644 --- a/src/mame/midway/zwackery.cpp +++ b/src/mame/midway/zwackery.cpp @@ -71,7 +71,7 @@ private: TILE_GET_INFO_MEMBER(get_fg_tile_info); void pia0_porta_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(pia0_irq_w); + void pia0_irq_w(int state); void pia1_porta_w(uint8_t data); uint8_t pia1_portb_r(); @@ -434,7 +434,7 @@ void zwackery_state::pia0_porta_w(uint8_t data) m_watchdog->watchdog_reset(); } -WRITE_LINE_MEMBER(zwackery_state::pia0_irq_w) +void zwackery_state::pia0_irq_w(int state) { int irq_state = m_pia0->irq_a_state() | m_pia0->irq_b_state(); m_maincpu->set_input_line(5, irq_state ? ASSERT_LINE : CLEAR_LINE); diff --git a/src/mame/miltonbradley/microvsn.cpp b/src/mame/miltonbradley/microvsn.cpp index 8c42847a4bd..c037b0a80eb 100644 --- a/src/mame/miltonbradley/microvsn.cpp +++ b/src/mame/miltonbradley/microvsn.cpp @@ -111,7 +111,7 @@ private: void i8021_p0_w(u8 data); void i8021_p1_w(u8 data); void i8021_p2_w(u8 data); - DECLARE_READ_LINE_MEMBER(i8021_t1_r); + int i8021_t1_r(); u8 m_p0 = 0xff; u8 m_p2 = 0xff; @@ -389,7 +389,7 @@ void microvision_state::i8021_p2_w(u8 data) m_p2 = data; } -READ_LINE_MEMBER(microvision_state::i8021_t1_r) +int microvision_state::i8021_t1_r() { // T1: paddle capacitor (active low) int active = (m_p2 & 0xc) ? 1 : 0; diff --git a/src/mame/miltonbradley/vectrex.h b/src/mame/miltonbradley/vectrex.h index bd994740435..6a4ec754945 100644 --- a/src/mame/miltonbradley/vectrex.h +++ b/src/mame/miltonbradley/vectrex.h @@ -68,9 +68,9 @@ protected: uint8_t via_pa_r(); void via_pb_w(uint8_t data); void via_pa_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(via_ca2_w); - DECLARE_WRITE_LINE_MEMBER(via_cb2_w); - DECLARE_WRITE_LINE_MEMBER(via_irq); + void via_ca2_w(int state); + void via_cb2_w(int state); + void via_irq(int state); void vectrex_base(machine_config &config); diff --git a/src/mame/miltonbradley/vectrex_m.cpp b/src/mame/miltonbradley/vectrex_m.cpp index 346424aa7a2..a3548b44ad4 100644 --- a/src/mame/miltonbradley/vectrex_m.cpp +++ b/src/mame/miltonbradley/vectrex_m.cpp @@ -175,7 +175,7 @@ void vectrex_base_state::screen_configuration() *********************************************************************/ -WRITE_LINE_MEMBER(vectrex_base_state::via_irq) +void vectrex_base_state::via_irq(int state) { m_maincpu->set_input_line(M6809_IRQ_LINE, state); } diff --git a/src/mame/miltonbradley/vectrex_v.cpp b/src/mame/miltonbradley/vectrex_v.cpp index dd23c8f8763..fe1d422e097 100644 --- a/src/mame/miltonbradley/vectrex_v.cpp +++ b/src/mame/miltonbradley/vectrex_v.cpp @@ -376,14 +376,14 @@ void vectrex_base_state::via_pa_w(uint8_t data) } -WRITE_LINE_MEMBER(vectrex_base_state::via_ca2_w) +void vectrex_base_state::via_ca2_w(int state) { if (state == 0) m_zero_integrators_timer->adjust(attotime::from_nsec(ANALOG_DELAY)); } -WRITE_LINE_MEMBER(vectrex_base_state::via_cb2_w) +void vectrex_base_state::via_cb2_w(int state) { if (m_cb2 != state) { diff --git a/src/mame/mips/mips.cpp b/src/mame/mips/mips.cpp index 7285d4cd561..59792fd1b6e 100644 --- a/src/mame/mips/mips.cpp +++ b/src/mame/mips/mips.cpp @@ -392,7 +392,7 @@ protected: u16 lance_r(offs_t offset, u16 mem_mask = 0xffff); void lance_w(offs_t offset, u16 data, u16 mem_mask = 0xffff); - template WRITE_LINE_MEMBER(irq_w); + template void irq_w(int state); private: // processors and memory @@ -1151,7 +1151,7 @@ void rx3230_state::rs3230(machine_config &config) } } -template WRITE_LINE_MEMBER(rx3230_state::irq_w) +template void rx3230_state::irq_w(int state) { if (state) m_int_reg |= Source; diff --git a/src/mame/mips/mips_rambo.cpp b/src/mame/mips/mips_rambo.cpp index f99b1626ecc..c06a979c8fa 100644 --- a/src/mame/mips/mips_rambo.cpp +++ b/src/mame/mips/mips_rambo.cpp @@ -356,10 +356,10 @@ u32 mips_rambo_device::screen_update(screen_device &screen, bitmap_rgb32 &bitmap return 0; } -template WRITE_LINE_MEMBER(mips_rambo_device::drq_w<0>); -template WRITE_LINE_MEMBER(mips_rambo_device::drq_w<1>); +template void mips_rambo_device::drq_w<0>(int state); +template void mips_rambo_device::drq_w<1>(int state); -template WRITE_LINE_MEMBER(mips_rambo_device::drq_w) +template void mips_rambo_device::drq_w(int state) { dma_t &channel = m_channel[Channel]; diff --git a/src/mame/mips/mips_rambo.h b/src/mame/mips/mips_rambo.h index 783689716c6..dabcca87c12 100644 --- a/src/mame/mips/mips_rambo.h +++ b/src/mame/mips/mips_rambo.h @@ -25,7 +25,7 @@ public: template auto dma_w() { return m_channel[Channel].write_cb.bind(); } // input lines - template DECLARE_WRITE_LINE_MEMBER(drq_w); + template void drq_w(int state); void map(address_map &map); u32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); diff --git a/src/mame/misc/acefruit.cpp b/src/mame/misc/acefruit.cpp index c8461635144..711a90c7f93 100644 --- a/src/mame/misc/acefruit.cpp +++ b/src/mame/misc/acefruit.cpp @@ -45,9 +45,9 @@ public: void init_sidewndr(); - template DECLARE_READ_LINE_MEMBER(sidewndr_payout_r); - template DECLARE_READ_LINE_MEMBER(starspnr_coinage_r); - template DECLARE_READ_LINE_MEMBER(starspnr_payout_r); + template int sidewndr_payout_r(); + template int starspnr_coinage_r(); + template int starspnr_payout_r(); protected: virtual void machine_start() override; diff --git a/src/mame/misc/amaticmg.cpp b/src/mame/misc/amaticmg.cpp index 6a1637fddcf..28aa72b6be5 100644 --- a/src/mame/misc/amaticmg.cpp +++ b/src/mame/misc/amaticmg.cpp @@ -495,7 +495,7 @@ private: void amaticmg2_palette(palette_device &palette) const; uint32_t screen_update_amaticmg(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); uint32_t screen_update_amaticmg2(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(amaticmg2_irq); + void amaticmg2_irq(int state); void encf(uint8_t ciphertext, int address, uint8_t &plaintext, int &newaddress); void decrypt(int key1, int key2); @@ -922,7 +922,7 @@ void amaticmg_state::amaticmg(machine_config &config) } -WRITE_LINE_MEMBER(amaticmg_state::amaticmg2_irq) +void amaticmg_state::amaticmg2_irq(int state) { if (state && m_nmi_mask) m_maincpu->pulse_input_line(INPUT_LINE_NMI, attotime::zero); diff --git a/src/mame/misc/amusco.cpp b/src/mame/misc/amusco.cpp index de05eab61c6..3b29e01c5fc 100644 --- a/src/mame/misc/amusco.cpp +++ b/src/mame/misc/amusco.cpp @@ -121,7 +121,7 @@ public: void amusco(machine_config &config); void draw88pkr(machine_config &config); - DECLARE_WRITE_LINE_MEMBER(coin_irq); + void coin_irq(int state); protected: virtual void video_start() override; @@ -433,7 +433,7 @@ static INPUT_PORTS_START( draw88pkr ) PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_UNUSED ) INPUT_PORTS_END -WRITE_LINE_MEMBER(amusco_state::coin_irq) +void amusco_state::coin_irq(int state) { m_pic->ir4_w(state ? CLEAR_LINE : HOLD_LINE); } diff --git a/src/mame/misc/arachnid.cpp b/src/mame/misc/arachnid.cpp index fe7f475f329..57bd9c2111d 100644 --- a/src/mame/misc/arachnid.cpp +++ b/src/mame/misc/arachnid.cpp @@ -178,18 +178,18 @@ private: virtual void machine_start() override; uint8_t pia_u4_pa_r(); uint8_t pia_u4_pb_r(); - DECLARE_READ_LINE_MEMBER( pia_u4_pca_r ); - DECLARE_READ_LINE_MEMBER( pia_u4_pcb_r ); + int pia_u4_pca_r(); + int pia_u4_pcb_r(); void pia_u4_pa_w(uint8_t data); void pia_u4_pb_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER( pia_u4_pca_w ); - DECLARE_WRITE_LINE_MEMBER( pia_u4_pcb_w ); + void pia_u4_pca_w(int state); + void pia_u4_pcb_w(int state); uint8_t pia_u17_pa_r(); void pia_u17_pb_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER( pia_u17_pcb_w ); + void pia_u17_pcb_w(int state); - DECLARE_WRITE_LINE_MEMBER(ptm_o1_callback); + void ptm_o1_callback(int state); uint8_t read_keyboard(int pa); void arachnid_map(address_map &map); @@ -334,7 +334,7 @@ INPUT_PORTS_END ptm6840_interface ptm_intf -------------------------------------------------*/ -WRITE_LINE_MEMBER(arachnid_state::ptm_o1_callback) +void arachnid_state::ptm_o1_callback(int state) { m_speaker->level_w(state); } @@ -402,7 +402,7 @@ uint8_t arachnid_state::pia_u4_pb_r() return data; } -READ_LINE_MEMBER( arachnid_state::pia_u4_pca_r ) +int arachnid_state::pia_u4_pca_r() { // CA1 - SW1 Coin In (Coin Door) @@ -412,7 +412,7 @@ READ_LINE_MEMBER( arachnid_state::pia_u4_pca_r ) return data; } -READ_LINE_MEMBER( arachnid_state::pia_u4_pcb_r ) +int arachnid_state::pia_u4_pcb_r() { // CB1 - SW2 Test Mode (Coin Door) @@ -446,12 +446,12 @@ void arachnid_state::pia_u4_pb_w(uint8_t data) // PA0 thru PA7 Pulses to Switch Matrix Part II } -WRITE_LINE_MEMBER( arachnid_state::pia_u4_pca_w ) +void arachnid_state::pia_u4_pca_w(int state) { // CA1 - Remove Darts Lamp } -WRITE_LINE_MEMBER( arachnid_state::pia_u4_pcb_w ) +void arachnid_state::pia_u4_pcb_w(int state) { // CB2 - Throw Darts Lamp } @@ -468,7 +468,7 @@ void arachnid_state::pia_u17_pb_w(uint8_t data) // PB7 - N/C } -WRITE_LINE_MEMBER( arachnid_state::pia_u17_pcb_w ) +void arachnid_state::pia_u17_pcb_w(int state) { // CB2 - Target Lamp } diff --git a/src/mame/misc/artmagic.cpp b/src/mame/misc/artmagic.cpp index 575980ad06c..4fddb18ed63 100644 --- a/src/mame/misc/artmagic.cpp +++ b/src/mame/misc/artmagic.cpp @@ -55,7 +55,7 @@ void artmagic_state::update_irq_state() } -WRITE_LINE_MEMBER(artmagic_state::m68k_gen_int) +void artmagic_state::m68k_gen_int(int state) { m_tms_irq = state; update_irq_state(); @@ -364,7 +364,7 @@ void artmagic_state::stonebal_protection() } -READ_LINE_MEMBER(artmagic_state::prot_r) +int artmagic_state::prot_r() { return m_prot_output_bit; } diff --git a/src/mame/misc/artmagic.h b/src/mame/misc/artmagic.h index 6cbee3d3a71..e05de763803 100644 --- a/src/mame/misc/artmagic.h +++ b/src/mame/misc/artmagic.h @@ -31,7 +31,7 @@ public: void artmagic(machine_config &config); void shtstar(machine_config &config); void stonebal(machine_config &config); - DECLARE_READ_LINE_MEMBER(prot_r); + int prot_r(); private: required_device m_maincpu; @@ -69,7 +69,7 @@ private: void protection_bit_w(offs_t offset, uint16_t data); uint16_t blitter_r(); void blitter_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); - DECLARE_WRITE_LINE_MEMBER(m68k_gen_int); + void m68k_gen_int(int state); TMS340X0_TO_SHIFTREG_CB_MEMBER(to_shiftreg); TMS340X0_FROM_SHIFTREG_CB_MEMBER(from_shiftreg); TMS340X0_SCANLINE_RGB32_CB_MEMBER(scanline); diff --git a/src/mame/misc/astrcorp.cpp b/src/mame/misc/astrcorp.cpp index c4a004a6936..91e177b4cc1 100644 --- a/src/mame/misc/astrcorp.cpp +++ b/src/mame/misc/astrcorp.cpp @@ -95,11 +95,11 @@ public: astro_cpucode_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); // read handlers - DECLARE_READ_LINE_MEMBER(do_read); // DO + int do_read(); // DO // write handlers - DECLARE_WRITE_LINE_MEMBER(cs_write); // CS signal (active high) - DECLARE_WRITE_LINE_MEMBER(clk_write); // CLK signal (active high) + void cs_write(int state); // CS signal (active high) + void clk_write(int state); // CLK signal (active high) protected: virtual void device_start() override; @@ -134,12 +134,12 @@ void astro_cpucode_device::device_reset() m_shift_register = 0; } -READ_LINE_MEMBER(astro_cpucode_device::do_read) +int astro_cpucode_device::do_read() { return BIT(m_shift_register, 15); } -WRITE_LINE_MEMBER(astro_cpucode_device::cs_write) +void astro_cpucode_device::cs_write(int state) { if (state != m_cs_state) { @@ -154,7 +154,7 @@ WRITE_LINE_MEMBER(astro_cpucode_device::cs_write) } } -WRITE_LINE_MEMBER(astro_cpucode_device::clk_write) +void astro_cpucode_device::clk_write(int state) { if (m_cs_state == ASSERT_LINE && state != m_clk_state) { diff --git a/src/mame/misc/avt.cpp b/src/mame/misc/avt.cpp index dba4d7eddc2..dd3f4b7bd23 100644 --- a/src/mame/misc/avt.cpp +++ b/src/mame/misc/avt.cpp @@ -464,8 +464,8 @@ private: uint8_t avt_6845_data_r(); void avt_videoram_w(offs_t offset, uint8_t data); void avt_colorram_w(offs_t offset, uint8_t data); - DECLARE_WRITE_LINE_MEMBER(avtnfl_w); - DECLARE_WRITE_LINE_MEMBER(avtbingo_w); + void avtnfl_w(int state); + void avtbingo_w(int state); TILE_GET_INFO_MEMBER(get_bg_tile_info); void avt_palette(palette_device &palette) const; uint32_t screen_update_avt(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); @@ -959,7 +959,7 @@ static const z80_daisy_config daisy_chain[] = }; // our pio cannot detect a static interrupt, so we push the current switch state in, then it will work -WRITE_LINE_MEMBER( avt_state::avtbingo_w ) +void avt_state::avtbingo_w(int state) { if (state) m_pio0->port_b_write(ioport("IN0")->read()); @@ -1016,7 +1016,7 @@ void avt_state::avt(machine_config &config) } // Leave avtnfl as it was until more is learnt. -WRITE_LINE_MEMBER( avt_state::avtnfl_w ) +void avt_state::avtnfl_w(int state) { m_pio1->port_b_write((m_pio1->port_b_read() & 0xbf) | (state ? 0x40 : 0)); } diff --git a/src/mame/misc/aztarac.cpp b/src/mame/misc/aztarac.cpp index 32ed301aeb4..43d03bea62b 100644 --- a/src/mame/misc/aztarac.cpp +++ b/src/mame/misc/aztarac.cpp @@ -79,7 +79,7 @@ private: uint8_t snd_status_r(); void snd_status_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(video_interrupt); + void video_interrupt(int state); INTERRUPT_GEN_MEMBER(snd_timed_irq); inline void read_vectorram(int addr, int *x, int *y, int *c); @@ -136,7 +136,7 @@ m_vector->add_point(m_xcenter + ((x) << 16), m_ycenter - ((y) << 16), color, int -WRITE_LINE_MEMBER(aztarac_state::video_interrupt) +void aztarac_state::video_interrupt(int state) { if (state) m_maincpu->set_input_line(M68K_IRQ_4, ASSERT_LINE); diff --git a/src/mame/misc/beezer.cpp b/src/mame/misc/beezer.cpp index e757ba05ce2..1c963c25000 100644 --- a/src/mame/misc/beezer.cpp +++ b/src/mame/misc/beezer.cpp @@ -78,16 +78,16 @@ public: void palette_w(offs_t offset, uint8_t data); uint8_t line_r(); - DECLARE_WRITE_LINE_MEMBER(noise_w); + void noise_w(int state); void dac_w(offs_t offset, uint8_t data); uint8_t via_audio_pa_r(); void via_audio_pa_w(uint8_t data); void via_audio_pb_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(ptm_o1_w); - DECLARE_WRITE_LINE_MEMBER(ptm_o2_w); - DECLARE_WRITE_LINE_MEMBER(ptm_o3_w); - DECLARE_WRITE_LINE_MEMBER(dmod_clr_w); - DECLARE_WRITE_LINE_MEMBER(dmod_data_w); + void ptm_o1_w(int state); + void ptm_o2_w(int state); + void ptm_o3_w(int state); + void dmod_clr_w(int state); + void dmod_data_w(int state); uint8_t via_system_pa_r(); uint8_t via_system_pb_r(); @@ -303,7 +303,7 @@ TIMER_CALLBACK_MEMBER( beezer_state::dac_update_cb ) m_dac->sb_w(m_ch_sign[ch] ^ BIT(m_dac_data[ch], 7)); } -WRITE_LINE_MEMBER( beezer_state::noise_w ) +void beezer_state::noise_w(int state) { m_noise = state; m_via_audio->write_pb6(m_noise); @@ -340,12 +340,12 @@ void beezer_state::via_audio_pb_w(uint8_t data) m_ch_sign[0] = BIT(data, 7); } -WRITE_LINE_MEMBER( beezer_state::ptm_o1_w ) +void beezer_state::ptm_o1_w(int state) { m_ch_sign[1] = state; } -WRITE_LINE_MEMBER( beezer_state::ptm_o2_w ) +void beezer_state::ptm_o2_w(int state) { // on rising edge, enable noise input to ptm c3 if (m_ch_sign[2] == 0 && state == 1) @@ -354,17 +354,17 @@ WRITE_LINE_MEMBER( beezer_state::ptm_o2_w ) m_ch_sign[2] = state; } -WRITE_LINE_MEMBER( beezer_state::ptm_o3_w ) +void beezer_state::ptm_o3_w(int state) { m_ch_sign[3] = state; } -WRITE_LINE_MEMBER( beezer_state::dmod_clr_w ) +void beezer_state::dmod_clr_w(int state) { // schematics don't show where this is connected } -WRITE_LINE_MEMBER( beezer_state::dmod_data_w ) +void beezer_state::dmod_data_w(int state) { // schematics don't show where this is connected } diff --git a/src/mame/misc/blitz68k.cpp b/src/mame/misc/blitz68k.cpp index 5284ffa45fb..d18d42ba936 100644 --- a/src/mame/misc/blitz68k.cpp +++ b/src/mame/misc/blitz68k.cpp @@ -210,9 +210,9 @@ private: void show_leds123(); void show_leds12(); void crtc_lpen_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); - DECLARE_WRITE_LINE_MEMBER(crtc_vsync_irq1); - DECLARE_WRITE_LINE_MEMBER(crtc_vsync_irq3); - DECLARE_WRITE_LINE_MEMBER(crtc_vsync_irq5); + void crtc_vsync_irq1(int state); + void crtc_vsync_irq3(int state); + void crtc_vsync_irq5(int state); DECLARE_VIDEO_START(blitz68k); DECLARE_VIDEO_START(blitz68k_addr_factor1); uint32_t screen_update_blitz68k(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); @@ -1766,17 +1766,17 @@ INPUT_PORTS_END // R6845AP used for video sync signals only -WRITE_LINE_MEMBER(blitz68k_state::crtc_vsync_irq1) +void blitz68k_state::crtc_vsync_irq1(int state) { m_maincpu->set_input_line(1, state ? ASSERT_LINE : CLEAR_LINE); } -WRITE_LINE_MEMBER(blitz68k_state::crtc_vsync_irq3) +void blitz68k_state::crtc_vsync_irq3(int state) { m_maincpu->set_input_line(3, state ? ASSERT_LINE : CLEAR_LINE); } -WRITE_LINE_MEMBER(blitz68k_state::crtc_vsync_irq5) +void blitz68k_state::crtc_vsync_irq5(int state) { m_maincpu->set_input_line(5, state ? ASSERT_LINE : CLEAR_LINE); } diff --git a/src/mame/misc/calomega.cpp b/src/mame/misc/calomega.cpp index c62546de6a3..643ff1b59d3 100644 --- a/src/mame/misc/calomega.cpp +++ b/src/mame/misc/calomega.cpp @@ -737,7 +737,7 @@ * Read/Write Handlers * **************************************************/ -WRITE_LINE_MEMBER(calomega_state::update_aciabaud_scale) +void calomega_state::update_aciabaud_scale(int state) { uint8_t dsw2 = m_sw2->read(); @@ -890,7 +890,7 @@ TIMER_DEVICE_CALLBACK_MEMBER( calomega_state::timer_2 ) // logerror("Timer_2 event : state=%d\n", m_timer); } -WRITE_LINE_MEMBER(calomega_state::vblank0_w) +void calomega_state::vblank0_w(int state) { m_pia[0]->read(0); m_pia[0]->read(0); @@ -899,14 +899,14 @@ WRITE_LINE_MEMBER(calomega_state::vblank0_w) // logerror("V_BLANK_0 event : state=%d\n", state); } -WRITE_LINE_MEMBER(calomega_state::vblank1_w) +void calomega_state::vblank1_w(int state) { m_pia[0]->read(2); m_pia[0]->cb1_w(state); // logerror("V_BLANK_1 event (sale ): state=%d\n", state); } -WRITE_LINE_MEMBER(calomega_state::vblank2_w) +void calomega_state::vblank2_w(int state) { m_pia[1]->read(0); m_pia[1]->read(0); @@ -915,7 +915,7 @@ WRITE_LINE_MEMBER(calomega_state::vblank2_w) // logerror("V_BLANK_2 event : state=%d\n", state); } -WRITE_LINE_MEMBER(calomega_state::pia1_cb2_w) +void calomega_state::pia1_cb2_w(int state) { // Output to L9 m_lamps[8] = ~state; // L9 (Door?) @@ -933,7 +933,7 @@ void calomega_state::dummy_pia_w(uint8_t data) m_pia_data = data; } -WRITE_LINE_MEMBER(calomega_state::dummy_pia_line_w) +void calomega_state::dummy_pia_line_w(int state) { } @@ -4562,14 +4562,14 @@ GFXDECODE_END * ACIA Interface * *************************************************/ -WRITE_LINE_MEMBER(calomega_state::write_acia_clock) +void calomega_state::write_acia_clock(int state) { m_acia6850[0]->write_txc(state); m_acia6850[0]->write_rxc(state); update_aciabaud_scale(0); } -WRITE_LINE_MEMBER(calomega_state::w_903kb_acia_clock) +void calomega_state::w_903kb_acia_clock(int state) { m_acia6850[0]->write_txc(state); m_acia6850[0]->write_rxc(state); diff --git a/src/mame/misc/calomega.h b/src/mame/misc/calomega.h index 05bad596fdc..837705e0680 100644 --- a/src/mame/misc/calomega.h +++ b/src/mame/misc/calomega.h @@ -92,14 +92,14 @@ private: void dummy_pia_w(uint8_t data); uint8_t keyb_903_r(); - DECLARE_WRITE_LINE_MEMBER(pia1_cb2_w); - DECLARE_WRITE_LINE_MEMBER(vblank0_w); - DECLARE_WRITE_LINE_MEMBER(vblank1_w); - DECLARE_WRITE_LINE_MEMBER(vblank2_w); - DECLARE_WRITE_LINE_MEMBER(dummy_pia_line_w); - DECLARE_WRITE_LINE_MEMBER(write_acia_clock); - DECLARE_WRITE_LINE_MEMBER(w_903kb_acia_clock); - DECLARE_WRITE_LINE_MEMBER(update_aciabaud_scale); + void pia1_cb2_w(int state); + void vblank0_w(int state); + void vblank1_w(int state); + void vblank2_w(int state); + void dummy_pia_line_w(int state); + void write_acia_clock(int state); + void w_903kb_acia_clock(int state); + void update_aciabaud_scale(int state); TIMER_DEVICE_CALLBACK_MEMBER(timer_0); TIMER_DEVICE_CALLBACK_MEMBER(timer_1); diff --git a/src/mame/misc/cardline.cpp b/src/mame/misc/cardline.cpp index 4d7f15aabc1..72dab6424f8 100644 --- a/src/mame/misc/cardline.cpp +++ b/src/mame/misc/cardline.cpp @@ -67,8 +67,8 @@ private: void cardline_palette(palette_device &palette) const; - DECLARE_WRITE_LINE_MEMBER(hsync_changed); - DECLARE_WRITE_LINE_MEMBER(vsync_changed); + void hsync_changed(int state); + void vsync_changed(int state); MC6845_BEGIN_UPDATE(crtc_begin_update); MC6845_UPDATE_ROW(crtc_update_row); @@ -149,7 +149,7 @@ MC6845_UPDATE_ROW( cardline_state::crtc_update_row ) } -WRITE_LINE_MEMBER(cardline_state::hsync_changed) +void cardline_state::hsync_changed(int state) { /* update any video up to the current scanline */ m_hsync_q = (state ? 0x00 : 0x10); @@ -157,7 +157,7 @@ WRITE_LINE_MEMBER(cardline_state::hsync_changed) m_screen->update_partial(m_screen->vpos()); } -WRITE_LINE_MEMBER(cardline_state::vsync_changed) +void cardline_state::vsync_changed(int state) { //m_maincpu->set_input_line(0, state ? ASSERT_LINE : CLEAR_LINE); } diff --git a/src/mame/misc/cave.cpp b/src/mame/misc/cave.cpp index 6b3b9f935b1..170dabef564 100644 --- a/src/mame/misc/cave.cpp +++ b/src/mame/misc/cave.cpp @@ -166,7 +166,7 @@ INTERRUPT_GEN_MEMBER(cave_state::interrupt_ppsatan) } /* Called by the YMZ280B to set the IRQ state */ -WRITE_LINE_MEMBER(cave_state::sound_irq_gen) +void cave_state::sound_irq_gen(int state) { m_sound_irq = (state != 0); update_irq_state(); @@ -718,7 +718,7 @@ void cave_state::korokoro_eeprom_w(offs_t offset, u16 data, u16 mem_mask) } } -READ_LINE_MEMBER(cave_state::korokoro_hopper_r) +int cave_state::korokoro_hopper_r() { return m_hopper ? 1 : 0; } @@ -1107,7 +1107,7 @@ void cave_state::tjumpman_leds_w(u8 data) // popmessage("led %04X", data); } -READ_LINE_MEMBER(cave_state::tjumpman_hopper_r) +int cave_state::tjumpman_hopper_r() { return (m_hopper && !(m_screen[0]->frame_number() % 10)) ? 0 : 1; } @@ -1199,12 +1199,12 @@ void cave_state::paceight_map(address_map &map) //TODO: leds need verifying -READ_LINE_MEMBER(cave_state::paccarn_bet4_r) +int cave_state::paccarn_bet4_r() { return (m_io_bet->read() & 0x5) ? 1 : 0; } -READ_LINE_MEMBER(cave_state::paccarn_bet8_r) +int cave_state::paccarn_bet8_r() { return (m_io_bet->read() & 0x6) ? 1 : 0; } diff --git a/src/mame/misc/cave.h b/src/mame/misc/cave.h index d1371fcb95c..a0b6ec2216e 100644 --- a/src/mame/misc/cave.h +++ b/src/mame/misc/cave.h @@ -55,10 +55,10 @@ public: , m_led_outputs(*this, "led%u", 0U) { } - DECLARE_READ_LINE_MEMBER(korokoro_hopper_r); - DECLARE_READ_LINE_MEMBER(tjumpman_hopper_r); - DECLARE_READ_LINE_MEMBER(paccarn_bet4_r); - DECLARE_READ_LINE_MEMBER(paccarn_bet8_r); + int korokoro_hopper_r(); + int tjumpman_hopper_r(); + int paccarn_bet4_r(); + int paccarn_bet8_r(); void init_uopoko(); void init_donpachi(); @@ -177,7 +177,7 @@ private: TIMER_DEVICE_CALLBACK_MEMBER(sailormn_startup); void get_sprite_info(int chip); void sailormn_tilebank_w(int bank); - DECLARE_WRITE_LINE_MEMBER(sound_irq_gen); + void sound_irq_gen(int state); void update_irq_state(); void unpack_sprites(int chip); void sailormn_unpack_tiles(int chip); diff --git a/src/mame/misc/clpoker.cpp b/src/mame/misc/clpoker.cpp index e9a28c73cec..cc23208fe26 100644 --- a/src/mame/misc/clpoker.cpp +++ b/src/mame/misc/clpoker.cpp @@ -65,7 +65,7 @@ private: void output_c_w(u8 data); void videoram_w(offs_t offset, u8 data); - DECLARE_WRITE_LINE_MEMBER(vblank_w); + void vblank_w(int state); u32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); @@ -230,7 +230,7 @@ void clpoker_state::video_start() save_item(NAME(m_nmi_enable)); } -WRITE_LINE_MEMBER(clpoker_state::vblank_w) +void clpoker_state::vblank_w(int state) { if (m_nmi_enable) m_maincpu->set_input_line(INPUT_LINE_NMI, state); diff --git a/src/mame/misc/coolpool.cpp b/src/mame/misc/coolpool.cpp index ae18ae08e16..fbeb16deb5d 100644 --- a/src/mame/misc/coolpool.cpp +++ b/src/mame/misc/coolpool.cpp @@ -214,7 +214,7 @@ void coolpool_state::amerdart_misc_w(uint16_t data) m_dsp->set_input_line(INPUT_LINE_RESET, (data & 0x0400) ? ASSERT_LINE : CLEAR_LINE); } -READ_LINE_MEMBER(coolpool_state::amerdart_dsp_bio_line_r) +int coolpool_state::amerdart_dsp_bio_line_r() { /* Skip idle checking */ if (m_old_cmd == m_main2dsp->pending_r()) diff --git a/src/mame/misc/coolpool.h b/src/mame/misc/coolpool.h index ee1401a6b13..859ea225786 100644 --- a/src/mame/misc/coolpool.h +++ b/src/mame/misc/coolpool.h @@ -74,7 +74,7 @@ private: void nvram_thrash_data_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); void amerdart_misc_w(uint16_t data); - DECLARE_READ_LINE_MEMBER(amerdart_dsp_bio_line_r); + int amerdart_dsp_bio_line_r(); uint16_t amerdart_trackball_r(offs_t offset); void coolpool_misc_w(uint16_t data); uint16_t dsp_bio_line_r(); diff --git a/src/mame/misc/cubeqst.cpp b/src/mame/misc/cubeqst.cpp index 8e873e775b2..7fe9997106f 100644 --- a/src/mame/misc/cubeqst.cpp +++ b/src/mame/misc/cubeqst.cpp @@ -87,7 +87,7 @@ public: virtual void machine_reset() override; virtual void video_start() override; uint32_t screen_update_cubeqst(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(vblank_irq); + void vblank_irq(int state); TIMER_CALLBACK_MEMBER(delayed_bank_swap); void swap_linecpu_banks(); void cubeqst(machine_config &config); @@ -206,7 +206,7 @@ uint16_t cubeqst_state::line_r() return m_screen->vpos(); } -WRITE_LINE_MEMBER(cubeqst_state::vblank_irq) +void cubeqst_state::vblank_irq(int state) { if (state) { diff --git a/src/mame/misc/dcheese.cpp b/src/mame/misc/dcheese.cpp index c3e9661446d..5d90102ac83 100644 --- a/src/mame/misc/dcheese.cpp +++ b/src/mame/misc/dcheese.cpp @@ -79,7 +79,7 @@ TIMER_CALLBACK_MEMBER(dcheese_state::signal_irq) } -WRITE_LINE_MEMBER(dcheese_state::vblank) +void dcheese_state::vblank(int state) { if (state) { diff --git a/src/mame/misc/dcheese.h b/src/mame/misc/dcheese.h index ca3140c31dc..9b5ba33cfcb 100644 --- a/src/mame/misc/dcheese.h +++ b/src/mame/misc/dcheese.h @@ -81,7 +81,7 @@ private: u16 blitter_vidparam_r(offs_t offset); void dcheese_palette(palette_device &palette) const; u32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(vblank); + void vblank(int state); TIMER_CALLBACK_MEMBER(blitter_done); TIMER_CALLBACK_MEMBER(signal_irq); void update_irq_state(); diff --git a/src/mame/misc/dfruit.cpp b/src/mame/misc/dfruit.cpp index 37f76bf26ae..b31575a5308 100644 --- a/src/mame/misc/dfruit.cpp +++ b/src/mame/misc/dfruit.cpp @@ -43,7 +43,7 @@ public: private: required_device m_maincpu; - DECLARE_WRITE_LINE_MEMBER(screen_vblank); + void screen_vblank(int state); void output_w(uint8_t data); @@ -52,7 +52,7 @@ private: void tc0091lvc_map(address_map &map); }; -WRITE_LINE_MEMBER(dfruit_state::screen_vblank) +void dfruit_state::screen_vblank(int state) { if (state) { diff --git a/src/mame/misc/discoboy.cpp b/src/mame/misc/discoboy.cpp index cfdd432173f..062b6708970 100644 --- a/src/mame/misc/discoboy.cpp +++ b/src/mame/misc/discoboy.cpp @@ -125,7 +125,7 @@ private: void sound_bankswitch_w(uint8_t data); uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(adpcm_int); + void adpcm_int(int state); void main_prg_map(address_map &map); void io_map(address_map &map); void sound_prg_map(address_map &map); @@ -416,7 +416,7 @@ void discoboy_state::machine_reset() m_toggle = false; } -WRITE_LINE_MEMBER(discoboy_state::adpcm_int) +void discoboy_state::adpcm_int(int state) { if (!state) return; diff --git a/src/mame/misc/dreamwld.cpp b/src/mame/misc/dreamwld.cpp index 6af0b738fa7..a5e8552f019 100644 --- a/src/mame/misc/dreamwld.cpp +++ b/src/mame/misc/dreamwld.cpp @@ -191,7 +191,7 @@ private: template void okibank_w(u8 data); template TILE_GET_INFO_MEMBER(get_tile_info); u32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(screen_vblank); + void screen_vblank(int state); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); void baryon_map(address_map &map); void dreamwld_map(address_map &map); @@ -310,7 +310,7 @@ void dreamwld_state::video_start() } -WRITE_LINE_MEMBER(dreamwld_state::screen_vblank) +void dreamwld_state::screen_vblank(int state) { // rising edge if (state) diff --git a/src/mame/misc/dwarfd.cpp b/src/mame/misc/dwarfd.cpp index 2d124330e54..febdc71ad92 100644 --- a/src/mame/misc/dwarfd.cpp +++ b/src/mame/misc/dwarfd.cpp @@ -350,8 +350,8 @@ private: void output1_w(uint8_t data); void output2_w(uint8_t data); uint8_t qc_b8_r(); - DECLARE_WRITE_LINE_MEMBER(dwarfd_sod_callback); - DECLARE_WRITE_LINE_MEMBER(drq_w); + void dwarfd_sod_callback(int state); + void drq_w(int state); void dwarfd_palette(palette_device &palette) const; I8275_DRAW_CHARACTER_MEMBER(display_pixels); I8275_DRAW_CHARACTER_MEMBER(pesp_display_pixels); @@ -676,12 +676,12 @@ I8275_DRAW_CHARACTER_MEMBER(dwarfd_state::qc_display_pixels) } } -WRITE_LINE_MEMBER(dwarfd_state::dwarfd_sod_callback) +void dwarfd_state::dwarfd_sod_callback(int state) { m_crt_access = state; } -WRITE_LINE_MEMBER(dwarfd_state::drq_w) +void dwarfd_state::drq_w(int state) { if(state && !m_crt_access) m_maincpu->set_input_line(I8085_RST65_LINE, ASSERT_LINE); diff --git a/src/mame/misc/ecoinf2.cpp b/src/mame/misc/ecoinf2.cpp index 87978623ab9..a0d10d76c93 100644 --- a/src/mame/misc/ecoinf2.cpp +++ b/src/mame/misc/ecoinf2.cpp @@ -43,7 +43,7 @@ public: void ecoinf2_oxo(machine_config &config); private: - template DECLARE_WRITE_LINE_MEMBER(reel_optic_cb) { if (state) m_optic_pattern |= (1 << N); else m_optic_pattern &= ~(1 << N); } + template void reel_optic_cb(int state) { if (state) m_optic_pattern |= (1 << N); else m_optic_pattern &= ~(1 << N); } void ox_port5c_out_w(uint8_t data); diff --git a/src/mame/misc/ecoinf3.cpp b/src/mame/misc/ecoinf3.cpp index 1782cbf55ee..24d340c80d2 100644 --- a/src/mame/misc/ecoinf3.cpp +++ b/src/mame/misc/ecoinf3.cpp @@ -60,7 +60,7 @@ private: save_item(NAME(m_percent_mux)); } - template DECLARE_WRITE_LINE_MEMBER(reel_optic_cb) { if (state) m_optic_pattern |= (1 << N); else m_optic_pattern &= ~(1 << N); } + template void reel_optic_cb(int state) { if (state) m_optic_pattern |= (1 << N); else m_optic_pattern &= ~(1 << N); } uint8_t ppi8255_intf_a_read_a() { int ret = 0x00; logerror("%04x - ppi8255_intf_a_read_a %02x\n", m_maincpu->pcbase(), ret); return ret; } uint8_t ppi8255_intf_a_read_b() diff --git a/src/mame/misc/ecoinfr.cpp b/src/mame/misc/ecoinfr.cpp index 72dd16155a4..59a64e5c9b5 100644 --- a/src/mame/misc/ecoinfr.cpp +++ b/src/mame/misc/ecoinfr.cpp @@ -70,9 +70,9 @@ public: void init_ecoinfr(); void init_ecoinfrmab(); - DECLARE_READ_LINE_MEMBER(reel1_opto_r); - DECLARE_READ_LINE_MEMBER(reel2_opto_r); - DECLARE_READ_LINE_MEMBER(reel3_opto_r); + int reel1_opto_r(); + int reel2_opto_r(); + int reel3_opto_r(); private: int irq_toggle = 0; @@ -88,7 +88,7 @@ private: uint8_t port16_value = 0; uint8_t port17_value = 0; - template DECLARE_WRITE_LINE_MEMBER(reel_optic_cb) { if (state) m_optic_pattern |= (1 << N); else m_optic_pattern &= ~(1 << N); } + template void reel_optic_cb(int state) { if (state) m_optic_pattern |= (1 << N); else m_optic_pattern &= ~(1 << N); } void ec_port00_out_w(uint8_t data); void ec_port01_out_w(uint8_t data); void ec_port02_out_w(uint8_t data); @@ -518,19 +518,19 @@ void ecoinfr_state::portmap(address_map &map) map(0x18, 0x18).w(FUNC(ecoinfr_state::ec_port18_out_w)); // 24 (Watchdog) } -READ_LINE_MEMBER(ecoinfr_state::reel1_opto_r) +int ecoinfr_state::reel1_opto_r() { if (m_optic_pattern & 0x1) return 1; return 0; } -READ_LINE_MEMBER(ecoinfr_state::reel2_opto_r) +int ecoinfr_state::reel2_opto_r() { if (m_optic_pattern & 0x2) return 1; return 0; } -READ_LINE_MEMBER(ecoinfr_state::reel3_opto_r) +int ecoinfr_state::reel3_opto_r() { if (m_optic_pattern & 0x4) return 1; return 0; diff --git a/src/mame/misc/efdt.cpp b/src/mame/misc/efdt.cpp index a3d1278ba90..cfa811327f5 100644 --- a/src/mame/misc/efdt.cpp +++ b/src/mame/misc/efdt.cpp @@ -228,13 +228,13 @@ void efdt_state::video_start() m_tilemap[1]->set_transparent_pen(0); } -WRITE_LINE_MEMBER(efdt_state::vblank_nmi_w) +void efdt_state::vblank_nmi_w(int state) { if (state && m_vlatch[0]->q0_r()) m_maincpu->set_input_line(INPUT_LINE_NMI, ASSERT_LINE); } -WRITE_LINE_MEMBER(efdt_state::nmi_clear_w) +void efdt_state::nmi_clear_w(int state) { if (!state) m_maincpu->set_input_line(INPUT_LINE_NMI, CLEAR_LINE); diff --git a/src/mame/misc/efdt.h b/src/mame/misc/efdt.h index 8d460d39f0d..73bcd36528b 100644 --- a/src/mame/misc/efdt.h +++ b/src/mame/misc/efdt.h @@ -53,8 +53,8 @@ private: void efdt_palette(palette_device &palette) const; - DECLARE_WRITE_LINE_MEMBER(vblank_nmi_w); - DECLARE_WRITE_LINE_MEMBER(nmi_clear_w); + void vblank_nmi_w(int state); + void nmi_clear_w(int state); uint8_t main_soundlatch_r(offs_t offset); void main_soundlatch_w(offs_t offset, uint8_t data); diff --git a/src/mame/misc/esh.cpp b/src/mame/misc/esh.cpp index d83598579d0..5162f10194d 100644 --- a/src/mame/misc/esh.cpp +++ b/src/mame/misc/esh.cpp @@ -72,7 +72,7 @@ private: void esh_palette(palette_device &palette) const; uint32_t screen_update_esh(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(vblank_callback_esh); - DECLARE_WRITE_LINE_MEMBER(ld_command_strobe_cb); + void ld_command_strobe_cb(int state); required_device m_maincpu; required_device m_gfxdecode; required_device m_beep; @@ -331,7 +331,7 @@ INTERRUPT_GEN_MEMBER(esh_state::vblank_callback_esh) } // TODO: 0xfe NMI enabled after writing to LD command port, NMI reads LD port. -WRITE_LINE_MEMBER(esh_state::ld_command_strobe_cb) +void esh_state::ld_command_strobe_cb(int state) { if(m_nmi_enable) m_maincpu->set_input_line(INPUT_LINE_NMI, state ? ASSERT_LINE : CLEAR_LINE); diff --git a/src/mame/misc/esripsys.cpp b/src/mame/misc/esripsys.cpp index 26e1dd1b4ca..39d06770330 100644 --- a/src/mame/misc/esripsys.cpp +++ b/src/mame/misc/esripsys.cpp @@ -42,7 +42,7 @@ * *************************************/ -WRITE_LINE_MEMBER(esripsys_state::ptm_irq) +void esripsys_state::ptm_irq(int state) { m_soundcpu->set_input_line(M6809_FIRQ_LINE, state ? ASSERT_LINE : CLEAR_LINE); } diff --git a/src/mame/misc/esripsys.h b/src/mame/misc/esripsys.h index 8b5bfef387e..b11abb818a1 100644 --- a/src/mame/misc/esripsys.h +++ b/src/mame/misc/esripsys.h @@ -125,7 +125,7 @@ private: void tms5220_w(offs_t offset, uint8_t data); void control_w(uint8_t data); void esripsys_bg_intensity_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(ptm_irq); + void ptm_irq(int state); void esripsys_dac_w(offs_t offset, uint8_t data); uint32_t screen_update_esripsys(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(esripsys_vblank_irq); diff --git a/src/mame/misc/fastinvaders.cpp b/src/mame/misc/fastinvaders.cpp index 68cbba9b998..6fdd9f7e9dc 100644 --- a/src/mame/misc/fastinvaders.cpp +++ b/src/mame/misc/fastinvaders.cpp @@ -69,14 +69,14 @@ private: void io_e0_w(uint8_t data); void io_f0_w(uint8_t data); - DECLARE_READ_LINE_MEMBER(sid_read); + int sid_read(); virtual void video_start() override; TIMER_DEVICE_CALLBACK_MEMBER(scanline_timer); TIMER_DEVICE_CALLBACK_MEMBER(count_ar); - DECLARE_WRITE_LINE_MEMBER(vsync); - DECLARE_WRITE_LINE_MEMBER(hsync); + void vsync_w(int state); + void hsync_w(int state); uint8_t memory_read_byte(offs_t offset); void memory_write_byte(offs_t offset, uint8_t data); void dark_1_clr(uint8_t data); @@ -356,7 +356,7 @@ void fastinvaders_state::io_f0_w(uint8_t data) m_pic8259->ir6_w(CLEAR_LINE); } -READ_LINE_MEMBER(fastinvaders_state::sid_read) +int fastinvaders_state::sid_read() { uint8_t tmp = m_start2_value ? ASSERT_LINE : CLEAR_LINE; m_start2_value = 0; @@ -442,7 +442,7 @@ INPUT_CHANGED_MEMBER(fastinvaders_state::in6) m_pic8259->ir6_w(HOLD_LINE); } -DECLARE_WRITE_LINE_MEMBER( fastinvaders_state::vsync) +void fastinvaders_state::vsync_w(int state) { //logerror("p8257_drq_w\n"); if (!state) @@ -458,7 +458,7 @@ DECLARE_WRITE_LINE_MEMBER( fastinvaders_state::vsync) } } -DECLARE_WRITE_LINE_MEMBER( fastinvaders_state::hsync) +void fastinvaders_state::hsync_w(int state) { //m_hsync=1; if (!state) @@ -686,8 +686,8 @@ void fastinvaders_state::fastinvaders_6845(machine_config &config) m_crtc6845->set_screen("screen"); m_crtc6845->set_show_border_area(false); m_crtc6845->set_char_width(16); - m_crtc6845->out_vsync_callback().set(FUNC(fastinvaders_state::vsync)); - m_crtc6845->out_hsync_callback().set(FUNC(fastinvaders_state::hsync)); + m_crtc6845->out_vsync_callback().set(FUNC(fastinvaders_state::vsync_w)); + m_crtc6845->out_hsync_callback().set(FUNC(fastinvaders_state::hsync_w)); } void fastinvaders_state::init_fi6845() diff --git a/src/mame/misc/flipjack.cpp b/src/mame/misc/flipjack.cpp index 4c4c338c0ae..0951e363e25 100644 --- a/src/mame/misc/flipjack.cpp +++ b/src/mame/misc/flipjack.cpp @@ -112,7 +112,7 @@ public: void flipjack(machine_config &config); - DECLARE_WRITE_LINE_MEMBER(coin_nmi_w); + void coin_nmi_w(int state); protected: virtual void machine_start() override; @@ -279,7 +279,7 @@ void flipjack_state::portc_w(uint8_t data) // vestigial hopper output? } -WRITE_LINE_MEMBER(flipjack_state::coin_nmi_w) +void flipjack_state::coin_nmi_w(int state) { m_maincpu->set_input_line(INPUT_LINE_NMI, state ? CLEAR_LINE : ASSERT_LINE); } diff --git a/src/mame/misc/freekick.cpp b/src/mame/misc/freekick.cpp index c775a9e7508..6fd106b42a9 100644 --- a/src/mame/misc/freekick.cpp +++ b/src/mame/misc/freekick.cpp @@ -124,33 +124,33 @@ TODO: * *************************************/ -WRITE_LINE_MEMBER(freekick_state::flipscreen_x_w) +void freekick_state::flipscreen_x_w(int state) { flip_screen_x_set(!state); } -WRITE_LINE_MEMBER(freekick_state::flipscreen_y_w) +void freekick_state::flipscreen_y_w(int state) { flip_screen_y_set(!state); } -WRITE_LINE_MEMBER(freekick_state::flipscreen_w) +void freekick_state::flipscreen_w(int state) { flip_screen_set(!state); } -WRITE_LINE_MEMBER(freekick_state::coin1_w) +void freekick_state::coin1_w(int state) { machine().bookkeeping().coin_counter_w(0, state); } -WRITE_LINE_MEMBER(freekick_state::coin2_w) +void freekick_state::coin2_w(int state) { machine().bookkeeping().coin_counter_w(1, state); } -WRITE_LINE_MEMBER(freekick_state::spinner_select_w) +void freekick_state::spinner_select_w(int state) { m_spinner = state; } @@ -172,14 +172,14 @@ void freekick_state::pbillrd_bankswitch_w(uint8_t data) m_bank1d->set_entry(data & 1); } -WRITE_LINE_MEMBER(freekick_state::nmi_enable_w) +void freekick_state::nmi_enable_w(int state) { m_nmi_en = state; if (!m_nmi_en) m_maincpu->set_input_line(INPUT_LINE_NMI, CLEAR_LINE); } -WRITE_LINE_MEMBER(freekick_state::vblank_irq) +void freekick_state::vblank_irq(int state) { if (state && m_nmi_en) m_maincpu->set_input_line(INPUT_LINE_NMI, ASSERT_LINE); diff --git a/src/mame/misc/freekick.h b/src/mame/misc/freekick.h index 5e370d5ad4c..e51b6cf3ca1 100644 --- a/src/mame/misc/freekick.h +++ b/src/mame/misc/freekick.h @@ -51,16 +51,16 @@ private: int m_nmi_en = 0; int m_ff_data = 0; std::unique_ptr m_decrypted_opcodes; - DECLARE_WRITE_LINE_MEMBER(flipscreen_x_w); - DECLARE_WRITE_LINE_MEMBER(flipscreen_y_w); - DECLARE_WRITE_LINE_MEMBER(flipscreen_w); - DECLARE_WRITE_LINE_MEMBER(coin1_w); - DECLARE_WRITE_LINE_MEMBER(coin2_w); - DECLARE_WRITE_LINE_MEMBER(spinner_select_w); + void flipscreen_x_w(int state); + void flipscreen_y_w(int state); + void flipscreen_w(int state); + void coin1_w(int state); + void coin2_w(int state); + void spinner_select_w(int state); void gigas_spinner_select_w(uint8_t data); uint8_t spinner_r(); void pbillrd_bankswitch_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(nmi_enable_w); + void nmi_enable_w(int state); void oigas_5_w(uint8_t data); uint8_t oigas_3_r(); uint8_t oigas_2_r(); @@ -80,10 +80,10 @@ private: uint32_t screen_update_pbillrd(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_freekick(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_gigas(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(vblank_irq); - void gigas_draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); - void pbillrd_draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); - void freekick_draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); + void vblank_irq(int state); + void gigas_draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); + void pbillrd_draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); + void freekick_draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); required_device m_maincpu; required_device m_gfxdecode; required_device m_palette; diff --git a/src/mame/misc/freeway.cpp b/src/mame/misc/freeway.cpp index 9e6088e273e..c7d9a022fb7 100644 --- a/src/mame/misc/freeway.cpp +++ b/src/mame/misc/freeway.cpp @@ -37,7 +37,7 @@ public: void freeway(machine_config &config); - DECLARE_WRITE_LINE_MEMBER(nmi_w); + void nmi_w(int state); protected: virtual void machine_start() override; @@ -74,7 +74,7 @@ void freeway_state::lamps_w(u8 data) m_lamps[n] = BIT(data, n); } -WRITE_LINE_MEMBER(freeway_state::nmi_w) +void freeway_state::nmi_w(int state) { m_maincpu->set_input_line(INPUT_LINE_NMI, state); } diff --git a/src/mame/misc/galaxi.cpp b/src/mame/misc/galaxi.cpp index c81d319b89a..9dedca47a4e 100644 --- a/src/mame/misc/galaxi.cpp +++ b/src/mame/misc/galaxi.cpp @@ -73,8 +73,8 @@ public: void lastfour(machine_config &config); void magjoker(machine_config &config); - DECLARE_READ_LINE_MEMBER(ticket_r); - DECLARE_READ_LINE_MEMBER(hopper_r); + int ticket_r(); + int hopper_r(); protected: virtual void machine_start() override; @@ -300,12 +300,12 @@ void galaxi_state::_500004_w(offs_t offset, uint16_t data, uint16_t mem_mask) show_out(); } -READ_LINE_MEMBER(galaxi_state::ticket_r) +int galaxi_state::ticket_r() { return m_ticket && !(m_screen->frame_number() % 10); } -READ_LINE_MEMBER(galaxi_state::hopper_r) +int galaxi_state::hopper_r() { return m_hopper && !(m_screen->frame_number() % 10); } diff --git a/src/mame/misc/homedata.h b/src/mame/misc/homedata.h index d2c7ddd6b19..fc6ef49d2a9 100644 --- a/src/mame/misc/homedata.h +++ b/src/mame/misc/homedata.h @@ -86,9 +86,9 @@ protected: DECLARE_VIDEO_START(mirderby); void mirderby_palette(palette_device &palette) const ATTR_COLD; uint32_t screen_update_mirderby(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(screen_vblank); + void screen_vblank(int state); INTERRUPT_GEN_MEMBER(homedata_irq); - void mrokumei_handleblit( int rom_base ); + void mrokumei_handleblit(int rom_base); void mirderby_info0(tile_data &tileinfo, int tile_index, int page, int gfxbank); void mirderby_info1(tile_data &tileinfo, int tile_index, int page, int gfxbank); diff --git a/src/mame/misc/homedata_v.cpp b/src/mame/misc/homedata_v.cpp index b432c920576..5f7961c74e9 100644 --- a/src/mame/misc/homedata_v.cpp +++ b/src/mame/misc/homedata_v.cpp @@ -995,7 +995,7 @@ uint32_t homedata_state::screen_update_mirderby(screen_device &screen, bitmap_in } -WRITE_LINE_MEMBER(homedata_state::screen_vblank) +void homedata_state::screen_vblank(int state) { // rising edge if (state) diff --git a/src/mame/misc/imolagp.cpp b/src/mame/misc/imolagp.cpp index bdd6197d774..02dcbcc2e78 100644 --- a/src/mame/misc/imolagp.cpp +++ b/src/mame/misc/imolagp.cpp @@ -161,7 +161,7 @@ private: uint8_t imola_draw_mode_r(offs_t offset); void vreg_control_w(uint8_t data); void vreg_data_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(vblank_irq); + void vblank_irq(int state); TIMER_DEVICE_CALLBACK_MEMBER(imolagp_pot_callback); void imolagp_palette(palette_device &palette) const; @@ -261,7 +261,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(imolagp_state::imolagp_pot_callback) m_steer_pot_timer->adjust(attotime::from_msec(20)); } -WRITE_LINE_MEMBER(imolagp_state::vblank_irq) +void imolagp_state::vblank_irq(int state) { if (state) { diff --git a/src/mame/misc/istellar.cpp b/src/mame/misc/istellar.cpp index adc0596cd27..6ae99e681ab 100644 --- a/src/mame/misc/istellar.cpp +++ b/src/mame/misc/istellar.cpp @@ -79,7 +79,7 @@ private: uint8_t z80_2_unknown_read(); void z80_2_ldp_write(uint8_t data); uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(vblank_irq); + void vblank_irq(int state); void z80_0_io(address_map &map); void z80_0_mem(address_map &map); void z80_1_io(address_map &map); @@ -271,7 +271,7 @@ static GFXDECODE_START( gfx_istellar ) GFXDECODE_ENTRY( "tiles", 0, istellar_gfx_layout, 0x0, 0x20 ) GFXDECODE_END -WRITE_LINE_MEMBER(istellar_state::vblank_irq) +void istellar_state::vblank_irq(int state) { if (state) { diff --git a/src/mame/misc/jackpool.cpp b/src/mame/misc/jackpool.cpp index 1c0456d7a9f..e893ee14a88 100644 --- a/src/mame/misc/jackpool.cpp +++ b/src/mame/misc/jackpool.cpp @@ -51,7 +51,7 @@ protected: private: uint8_t jackpool_io_r(offs_t offset); - DECLARE_WRITE_LINE_MEMBER(map_vreg_w); + void map_vreg_w(int state); uint32_t screen_update_jackpool(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(jackpool_interrupt); void jackpool_mem(address_map &map); @@ -142,7 +142,7 @@ uint8_t jackpool_state::jackpool_io_r(offs_t offset) return 0xff; } -WRITE_LINE_MEMBER(jackpool_state::map_vreg_w) +void jackpool_state::map_vreg_w(int state) { m_map_vreg = state; } diff --git a/src/mame/misc/jankenmn.cpp b/src/mame/misc/jankenmn.cpp index 6b201671496..af95b344fe0 100644 --- a/src/mame/misc/jankenmn.cpp +++ b/src/mame/misc/jankenmn.cpp @@ -171,7 +171,7 @@ public: , m_lamps(*this, "lamp%u", 0U) { } - DECLARE_READ_LINE_MEMBER(hopper_status_r); + int hopper_status_r(); void jankenmn(machine_config &config); @@ -253,7 +253,7 @@ void jankenmn_state::lamps3_w(uint8_t data) logerror("payout: %02X\n", (data & 0x04)); } -READ_LINE_MEMBER(jankenmn_state::hopper_status_r) +int jankenmn_state::hopper_status_r() { // temp workaround, needs hopper return machine().rand(); diff --git a/src/mame/misc/kurukuru.cpp b/src/mame/misc/kurukuru.cpp index 2fb575633a9..6e722a43ca6 100644 --- a/src/mame/misc/kurukuru.cpp +++ b/src/mame/misc/kurukuru.cpp @@ -437,7 +437,7 @@ private: void ym2149_aout_w(uint8_t data); void ym2149_bout_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(kurukuru_msm5205_vck); + void kurukuru_msm5205_vck(int state); void kurukuru_audio_io(address_map &map); void kurukuru_audio_map(address_map &map); void kurukuru_io(address_map &map); @@ -462,7 +462,7 @@ private: *************************************************/ -WRITE_LINE_MEMBER(kurukuru_state::kurukuru_msm5205_vck) +void kurukuru_state::kurukuru_msm5205_vck(int state) { m_soundirq->rst30_w(1); m_adpcm->data_w(m_adpcm_data); diff --git a/src/mame/misc/laserbas.cpp b/src/mame/misc/laserbas.cpp index 9590a07af8b..898984f572a 100644 --- a/src/mame/misc/laserbas.cpp +++ b/src/mame/misc/laserbas.cpp @@ -122,7 +122,7 @@ private: uint8_t track_dir_r(); uint8_t track_val_r(); void out_w(uint8_t data); - template DECLARE_WRITE_LINE_MEMBER(pit_out_w); + template void pit_out_w(int state); TIMER_DEVICE_CALLBACK_MEMBER(laserbas_scanline); MC6845_UPDATE_ROW(crtc_update_row); @@ -297,7 +297,7 @@ void laserbas_state::machine_reset() } template -WRITE_LINE_MEMBER(laserbas_state::pit_out_w) +void laserbas_state::pit_out_w(int state) { state ^= 1; // 7404 (6G) if (!state && m_cnt_out[Which]) // 0->1 rising edge CLK diff --git a/src/mame/misc/limenko.cpp b/src/mame/misc/limenko.cpp index ad94e4f5b64..a810d503693 100644 --- a/src/mame/misc/limenko.cpp +++ b/src/mame/misc/limenko.cpp @@ -69,7 +69,7 @@ public: void init_legendoh(); void init_spotty(); - DECLARE_READ_LINE_MEMBER(spriteram_bit_r); + int spriteram_bit_r(); protected: virtual void video_start() override; @@ -169,7 +169,7 @@ void limenko_state::fg_videoram_w(offs_t offset, u32 data, u32 mem_mask) m_fg_tilemap->mark_tile_dirty(offset); } -READ_LINE_MEMBER(limenko_state::spriteram_bit_r) +int limenko_state::spriteram_bit_r() { return m_spriteram_bit; } diff --git a/src/mame/misc/magicard.cpp b/src/mame/misc/magicard.cpp index 5aa81cb8367..11bbbccb9d3 100644 --- a/src/mame/misc/magicard.cpp +++ b/src/mame/misc/magicard.cpp @@ -242,12 +242,12 @@ protected: void pic_portb_w(offs_t offset, uint8_t data, uint8_t mask); void output_w(offs_t offset, uint16_t data); - DECLARE_WRITE_LINE_MEMBER(cpu_int1); + void cpu_int1(int state); - DECLARE_WRITE_LINE_MEMBER(scc66470_irq); - DECLARE_WRITE_LINE_MEMBER(cpu_i2c_scl); - DECLARE_WRITE_LINE_MEMBER(cpu_i2c_sda_write); - DECLARE_READ_LINE_MEMBER(cpu_i2c_sda_read); + void scc66470_irq(int state); + void cpu_i2c_scl(int state); + void cpu_i2c_sda_write(int state); + int cpu_i2c_sda_read(); void update_sda(uint8_t device, uint8_t state); void update_scl(uint8_t device, uint8_t state); @@ -322,7 +322,7 @@ private: void write_ds1207_ds2401(offs_t offset, uint8_t data); void output_w(offs_t offset, uint16_t data); - DECLARE_WRITE_LINE_MEMBER(cpu_int1); + void cpu_int1(int state); optional_device m_ds2401; optional_device m_ds1207; @@ -773,19 +773,19 @@ void magicard_base_state::machine_reset() * Machine Drivers * *************************/ -WRITE_LINE_MEMBER(magicard_base_state::scc66470_irq) +void magicard_base_state::scc66470_irq(int state) { m_maincpu->int2_w(state); } -WRITE_LINE_MEMBER(magicard_base_state::cpu_int1) +void magicard_base_state::cpu_int1(int state) { // TODO: is this used by games on magicard hardware ? m_maincpu->int1_w(1); m_maincpu->int1_w(0); } -WRITE_LINE_MEMBER(hotslots_state::cpu_int1) +void hotslots_state::cpu_int1(int state) { m_maincpu->int1_w(state); } @@ -822,17 +822,17 @@ void magicard_base_state::update_sda(uint8_t device, uint8_t state) m_i2cmem->write_sda(m_sda_state ? 0 : 1); } -WRITE_LINE_MEMBER(magicard_base_state::cpu_i2c_scl) +void magicard_base_state::cpu_i2c_scl(int state) { update_scl(I2C_CPU, state); } -WRITE_LINE_MEMBER(magicard_base_state::cpu_i2c_sda_write) +void magicard_base_state::cpu_i2c_sda_write(int state) { update_sda(I2C_CPU, state); } -READ_LINE_MEMBER(magicard_base_state::cpu_i2c_sda_read) +int magicard_base_state::cpu_i2c_sda_read() { return (m_sda_state ? 0 : 1) & (m_i2cmem->read_sda() ? 1 : 0); } diff --git a/src/mame/misc/mcatadv.cpp b/src/mame/misc/mcatadv.cpp index 3257ff399ca..d436899e2a6 100644 --- a/src/mame/misc/mcatadv.cpp +++ b/src/mame/misc/mcatadv.cpp @@ -215,7 +215,7 @@ private: void sound_banking_w(u8 data); template void get_banked_color(bool tiledim, u32 &color, u32 &pri, u32 &code); u32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(screen_vblank); + void screen_vblank(int state); void draw_sprites(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_tilemap_part(screen_device &screen, int layer, int i, bitmap_ind16 &bitmap, const rectangle &cliprect); void main_map(address_map &map); diff --git a/src/mame/misc/meyc8088.cpp b/src/mame/misc/meyc8088.cpp index 18dcf0cecf1..1b2997bcf9e 100644 --- a/src/mame/misc/meyc8088.cpp +++ b/src/mame/misc/meyc8088.cpp @@ -80,7 +80,7 @@ private: void meyc8088_palette(palette_device &palette) const; uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(screen_vblank); + void screen_vblank(int state); TIMER_DEVICE_CALLBACK_MEMBER(heartbeat_callback); void meyc8088_map(address_map &map); }; @@ -170,7 +170,7 @@ uint32_t meyc8088_state::screen_update(screen_device &screen, bitmap_ind16 &bitm return 0; } -WRITE_LINE_MEMBER(meyc8088_state::screen_vblank) +void meyc8088_state::screen_vblank(int state) { // LC255(200ns pulse) rising edge asserts INTR at start and end of vblank // INTA wired back to INTR to clear it, vector is hardwired to $20 diff --git a/src/mame/misc/micro3d.h b/src/mame/misc/micro3d.h index ff86d2f0592..cf50c115477 100644 --- a/src/mame/misc/micro3d.h +++ b/src/mame/misc/micro3d.h @@ -58,7 +58,7 @@ public: void init_micro3d(); void init_botss(); - DECLARE_READ_LINE_MEMBER(botss_hwchk_r); + int botss_hwchk_r(); protected: virtual void machine_start() override; @@ -177,11 +177,11 @@ private: INTERRUPT_GEN_MEMBER(micro3d_vblank); TIMER_CALLBACK_MEMBER(mac_done_callback); void micro3d_upd7759_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(duart_irq_handler); + void duart_irq_handler(int state); uint8_t duart_input_r(); void duart_output_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(duart_txb); - DECLARE_WRITE_LINE_MEMBER(tms_interrupt); + void duart_txb(int state); + void tms_interrupt(int state); TMS340X0_SCANLINE_IND16_CB_MEMBER(scanline_update); /* 3D graphics */ diff --git a/src/mame/misc/micro3d_m.cpp b/src/mame/misc/micro3d_m.cpp index b25c23252a7..2c268246dec 100644 --- a/src/mame/misc/micro3d_m.cpp +++ b/src/mame/misc/micro3d_m.cpp @@ -32,12 +32,12 @@ * *************************************/ -WRITE_LINE_MEMBER(micro3d_state::duart_irq_handler) +void micro3d_state::duart_irq_handler(int state) { m_maincpu->set_input_line(3, state); } -WRITE_LINE_MEMBER(micro3d_state::duart_txb) +void micro3d_state::duart_txb(int state) { if (state) m_sound_port_latch[3] |= 1; @@ -348,7 +348,7 @@ uint8_t micro3d_state::adc_volume_r() return (uint8_t)((255.0/100.0) * m_volume->read() + 0.5); } -READ_LINE_MEMBER(micro3d_state::botss_hwchk_r) +int micro3d_state::botss_hwchk_r() { return m_botss_latch; } diff --git a/src/mame/misc/micro3d_v.cpp b/src/mame/misc/micro3d_v.cpp index da7ecea4b54..525686801d9 100644 --- a/src/mame/misc/micro3d_v.cpp +++ b/src/mame/misc/micro3d_v.cpp @@ -115,7 +115,7 @@ void micro3d_state::micro3d_xfer3dk_w(uint16_t data) m_xfer3dk = data; } -WRITE_LINE_MEMBER(micro3d_state::tms_interrupt) +void micro3d_state::tms_interrupt(int state) { // mc68901_int_gen(device->machine(), GPIP4); } diff --git a/src/mame/misc/miniboy7.cpp b/src/mame/misc/miniboy7.cpp index 1910950fe9a..bf6347c6ab8 100644 --- a/src/mame/misc/miniboy7.cpp +++ b/src/mame/misc/miniboy7.cpp @@ -260,7 +260,7 @@ private: void ay_pa_w(uint8_t data); void ay_pb_w(uint8_t data); uint8_t pia_pb_r(); - DECLARE_WRITE_LINE_MEMBER(pia_ca2_w); + void pia_ca2_w(int state); uint8_t lamp_latch_r(); int get_color_offset(uint8_t tile, uint8_t attr, int ra, int px); @@ -469,7 +469,7 @@ uint8_t miniboy7_state::pia_pb_r() return (m_input2->read() & 0x0f) | ((m_dsw2->read() << (BIT(m_ay_pb, 7) ? 0 : 4)) & 0xf0); } -WRITE_LINE_MEMBER(miniboy7_state::pia_ca2_w) +void miniboy7_state::pia_ca2_w(int state) { m_gpri = state; } diff --git a/src/mame/misc/mirax.cpp b/src/mame/misc/mirax.cpp index 366f3faf878..7fc7092e5f9 100644 --- a/src/mame/misc/mirax.cpp +++ b/src/mame/misc/mirax.cpp @@ -153,12 +153,12 @@ private: uint8_t m_flipscreen_y = 0; void audio_w(offs_t offset, uint8_t data); - DECLARE_WRITE_LINE_MEMBER(nmi_mask_w); + void nmi_mask_w(int state); void sound_cmd_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(coin_counter0_w); - DECLARE_WRITE_LINE_MEMBER(coin_counter1_w); - DECLARE_WRITE_LINE_MEMBER(flip_screen_x_w); - DECLARE_WRITE_LINE_MEMBER(flip_screen_y_w); + void coin_counter0_w(int state); + void coin_counter1_w(int state); + void flip_screen_x_w(int state); + void flip_screen_y_w(int state); void ay1_sel(uint8_t data); void ay2_sel(uint8_t data); @@ -168,7 +168,7 @@ private: void draw_tilemap(bitmap_ind16 &bitmap, const rectangle &cliprect, uint8_t draw_flag); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(vblank_irq); + void vblank_irq(int state); void mirax_main_map(address_map &map); void mirax_sound_map(address_map &map); }; @@ -289,7 +289,7 @@ void mirax_state::ay2_sel(uint8_t data) m_ay[1]->data_w(data); } -WRITE_LINE_MEMBER(mirax_state::nmi_mask_w) +void mirax_state::nmi_mask_w(int state) { m_nmi_mask = state; if (!m_nmi_mask) @@ -303,22 +303,22 @@ void mirax_state::sound_cmd_w(uint8_t data) } -WRITE_LINE_MEMBER(mirax_state::coin_counter0_w) +void mirax_state::coin_counter0_w(int state) { machine().bookkeeping().coin_counter_w(0, state); } -WRITE_LINE_MEMBER(mirax_state::coin_counter1_w) +void mirax_state::coin_counter1_w(int state) { machine().bookkeeping().coin_counter_w(1, state); } -WRITE_LINE_MEMBER(mirax_state::flip_screen_x_w) +void mirax_state::flip_screen_x_w(int state) { m_flipscreen_x = state; } -WRITE_LINE_MEMBER(mirax_state::flip_screen_y_w) +void mirax_state::flip_screen_y_w(int state) { m_flipscreen_y = state; } @@ -467,7 +467,7 @@ static GFXDECODE_START( gfx_mirax ) GFXDECODE_END -WRITE_LINE_MEMBER(mirax_state::vblank_irq) +void mirax_state::vblank_irq(int state) { if (state && m_nmi_mask) m_maincpu->set_input_line(INPUT_LINE_NMI, ASSERT_LINE); diff --git a/src/mame/misc/monon_color.cpp b/src/mame/misc/monon_color.cpp index afaa678fe27..b7e574b828d 100644 --- a/src/mame/misc/monon_color.cpp +++ b/src/mame/misc/monon_color.cpp @@ -156,7 +156,7 @@ private: return m_cart->read(); } - DECLARE_WRITE_LINE_MEMBER(spidir_w) + void spidir_w(int state) { m_cart->dir_w(state); } diff --git a/src/mame/misc/mpu12wbk.cpp b/src/mame/misc/mpu12wbk.cpp index 9d2d8873a43..acf8a417f90 100644 --- a/src/mame/misc/mpu12wbk.cpp +++ b/src/mame/misc/mpu12wbk.cpp @@ -478,7 +478,7 @@ private: void mpu12wbk_videoram_w(offs_t offset, uint8_t data); void mpu12wbk_colorram_w(offs_t offset, uint8_t data); TILE_GET_INFO_MEMBER(get_bg_tile_info); - DECLARE_WRITE_LINE_MEMBER(crtc_vs); + void crtc_vs(int state); uint32_t screen_update_mpu12wbk(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); void mpu12wbk_map(address_map &map); @@ -602,7 +602,7 @@ uint32_t mpu12wbk_state::screen_update_mpu12wbk(screen_device &screen, bitmap_rg /******************************** * Interrupt Control * ********************************/ -WRITE_LINE_MEMBER( mpu12wbk_state::crtc_vs ) +void mpu12wbk_state::crtc_vs(int state) { if( m_frames++ > 120) { diff --git a/src/mame/misc/mtu130.cpp b/src/mame/misc/mtu130.cpp index 4a92e900fbd..913f560c178 100644 --- a/src/mame/misc/mtu130.cpp +++ b/src/mame/misc/mtu130.cpp @@ -196,7 +196,7 @@ private: void fdc_ctrl_w(u8 data); void fdc_irq_w(int state); void dma_adr_w(u8 data); - DECLARE_WRITE_LINE_MEMBER(dma_drq_w); + void dma_drq_w(int state); TIMER_CALLBACK_MEMBER(lightpen_hit); void lightpen_trigger(int state); @@ -473,7 +473,7 @@ void mtu130_state::dma_adr_w(u8 data) m_dma_adr = data << 6; } -WRITE_LINE_MEMBER(mtu130_state::dma_drq_w) +void mtu130_state::dma_drq_w(int state) { while(m_fdc->get_drq()) { if(m_dma_direction) { diff --git a/src/mame/misc/nabupc.cpp b/src/mame/misc/nabupc.cpp index 6cd262d9140..c9d7a69162a 100644 --- a/src/mame/misc/nabupc.cpp +++ b/src/mame/misc/nabupc.cpp @@ -210,11 +210,10 @@ private: void centronics_busy_handler(uint8_t state); void update_irq(); - DECLARE_WRITE_LINE_MEMBER(hcca_fe_w); - DECLARE_WRITE_LINE_MEMBER(hcca_oe_w); + void hcca_fe_w(int state); + void hcca_oe_w(int state); - template - DECLARE_WRITE_LINE_MEMBER(int_w); + template void int_w(int state); IRQ_CALLBACK_MEMBER(int_ack_cb); @@ -427,13 +426,13 @@ void nabupc_state::centronics_busy_handler(uint8_t state) } // HCCA Framing Error -WRITE_LINE_MEMBER(nabupc_state::hcca_fe_w) +void nabupc_state::hcca_fe_w(int state) { BIT_SET(m_portb, 5, state); } // HCCA Overrun Error -WRITE_LINE_MEMBER(nabupc_state::hcca_oe_w) +void nabupc_state::hcca_oe_w(int state) { BIT_SET(m_portb, 6, state); } @@ -444,7 +443,7 @@ WRITE_LINE_MEMBER(nabupc_state::hcca_oe_w) //************************************************************************** template -WRITE_LINE_MEMBER(nabupc_state::int_w) +void nabupc_state::int_w(int state) { BIT_SET(m_int_lines, N, state); update_irq(); diff --git a/src/mame/misc/nexus3d.cpp b/src/mame/misc/nexus3d.cpp index 23b9538aeae..4ccfd542c02 100644 --- a/src/mame/misc/nexus3d.cpp +++ b/src/mame/misc/nexus3d.cpp @@ -61,7 +61,7 @@ private: virtual void machine_reset() override; virtual void video_start() override; uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(screen_vblank); + void screen_vblank(int state); void nexus3d_map(address_map &map); uint32_t m_intpend = 0, m_intmask = 0, m_intlevel = 0; @@ -301,7 +301,7 @@ void nexus3d_state::machine_reset() memcpy(m_mainram, memregion("flash")->base(), 4 * 1024); } -WRITE_LINE_MEMBER(nexus3d_state::screen_vblank) +void nexus3d_state::screen_vblank(int state) { // rising edge if (state) diff --git a/src/mame/misc/norautp.cpp b/src/mame/misc/norautp.cpp index 1f0d339fd9a..dc6447fa643 100644 --- a/src/mame/misc/norautp.cpp +++ b/src/mame/misc/norautp.cpp @@ -723,7 +723,7 @@ void norautp_state::counterlamps_w(uint8_t data) //} -WRITE_LINE_MEMBER(norautp_state::ppi2_obf_w) +void norautp_state::ppi2_obf_w(int state) { machine().scheduler().synchronize(timer_expired_delegate(FUNC(norautp_state::ppi2_ack), this), state); } diff --git a/src/mame/misc/norautp.h b/src/mame/misc/norautp.h index bee30391634..98f0facbc47 100644 --- a/src/mame/misc/norautp.h +++ b/src/mame/misc/norautp.h @@ -56,7 +56,7 @@ protected: virtual void video_start() override; private: - DECLARE_WRITE_LINE_MEMBER(ppi2_obf_w); + void ppi2_obf_w(int state); TIMER_CALLBACK_MEMBER(ppi2_ack); uint8_t test2_r(); void mainlamps_w(uint8_t data); diff --git a/src/mame/misc/pachifev.cpp b/src/mame/misc/pachifev.cpp index b41d5adafeb..0d8d31fbcf4 100644 --- a/src/mame/misc/pachifev.cpp +++ b/src/mame/misc/pachifev.cpp @@ -119,7 +119,7 @@ private: uint8_t controls_r(); virtual void machine_start() override; virtual void machine_reset() override; - DECLARE_WRITE_LINE_MEMBER(vblank_w); + void vblank_w(int state); required_device m_maincpu; void pachifev_cru(address_map &map); void pachifev_map(address_map &map); @@ -267,7 +267,7 @@ INPUT_PORTS_END #if USE_MSM -WRITE_LINE_MEMBER(pachifev_state::pf_adpcm_int) +void pachifev_state::pf_adpcm_int(int state) { if (m_adpcm_pos >= 0x4000 || m_adpcm_idle) { @@ -312,7 +312,7 @@ void pachifev_state::machine_reset() } -WRITE_LINE_MEMBER(pachifev_state::vblank_w) +void pachifev_state::vblank_w(int state) { if (state) { diff --git a/src/mame/misc/photon2.cpp b/src/mame/misc/photon2.cpp index b341954cd63..0fc481caead 100644 --- a/src/mame/misc/photon2.cpp +++ b/src/mame/misc/photon2.cpp @@ -70,7 +70,7 @@ private: void photon2_palette(palette_device &palette) const; uint32_t screen_update_spectrum(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(screen_vblank_spectrum); + void screen_vblank_spectrum(int state); TIMER_DEVICE_CALLBACK_MEMBER(spec_interrupt_hack); void spectrum_io(address_map &map); @@ -152,7 +152,7 @@ static inline unsigned char get_display_color (unsigned char color, int invert) /* Code to change the FLASH status every 25 frames. Note this must be independent of frame skip etc. */ -WRITE_LINE_MEMBER(photon2_state::screen_vblank_spectrum) +void photon2_state::screen_vblank_spectrum(int state) { // rising edge if (state) diff --git a/src/mame/misc/pkscram.cpp b/src/mame/misc/pkscram.cpp index 89e1869fa71..d43896b7167 100644 --- a/src/mame/misc/pkscram.cpp +++ b/src/mame/misc/pkscram.cpp @@ -57,7 +57,7 @@ private: TILE_GET_INFO_MEMBER(get_md_tile_info); TILE_GET_INFO_MEMBER(get_fg_tile_info); TIMER_DEVICE_CALLBACK_MEMBER(scanline_callback); - DECLARE_WRITE_LINE_MEMBER(irqhandler); + void irqhandler(int state); uint32_t screen_update_pkscramble(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); @@ -297,7 +297,7 @@ static GFXDECODE_START( gfx_pkscram ) GFXDECODE_ENTRY( "gfx1", 0, tiles8x8_layout, 0, 0x80 ) GFXDECODE_END -WRITE_LINE_MEMBER(pkscram_state::irqhandler) +void pkscram_state::irqhandler(int state) { if(m_out & 0x10) m_maincpu->set_input_line(2, state ? ASSERT_LINE : CLEAR_LINE); diff --git a/src/mame/misc/policetr.cpp b/src/mame/misc/policetr.cpp index 7de898f7279..a83ef03d52a 100644 --- a/src/mame/misc/policetr.cpp +++ b/src/mame/misc/policetr.cpp @@ -109,7 +109,7 @@ PC5380-9651 5380-JY3306A 5380-N1045503A * *************************************/ -WRITE_LINE_MEMBER(policetr_state::vblank) +void policetr_state::vblank(int state) { m_maincpu->set_input_line(state ? INPUT_LINE_IRQ4 : INPUT_LINE_IRQ5, ASSERT_LINE); } @@ -192,7 +192,7 @@ void policetr_state::bsmt2000_data_w(offs_t offset, uint32_t data, uint32_t mem_ } -READ_LINE_MEMBER(policetr_state::bsmt_status_r) +int policetr_state::bsmt_status_r() { return m_bsmt->read_status(); } diff --git a/src/mame/misc/policetr.h b/src/mame/misc/policetr.h index 21a6cdbfdb9..94681624301 100644 --- a/src/mame/misc/policetr.h +++ b/src/mame/misc/policetr.h @@ -23,7 +23,7 @@ public: void policetr(machine_config &config); - DECLARE_READ_LINE_MEMBER(bsmt_status_r); + int bsmt_status_r(); protected: policetr_state(const machine_config &mconfig, device_type type, const char *tag, uint32_t speedup_pc, uint32_t speedup_addr) : @@ -62,7 +62,7 @@ protected: void video_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0); uint32_t video_r(); - DECLARE_WRITE_LINE_MEMBER(vblank); + void vblank(int state); void render_display_list(offs_t offset); uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); diff --git a/src/mame/misc/proconn.cpp b/src/mame/misc/proconn.cpp index bcd909e5670..fee6d4ed4dd 100644 --- a/src/mame/misc/proconn.cpp +++ b/src/mame/misc/proconn.cpp @@ -61,6 +61,9 @@ public: void init_proconn(); +protected: + virtual void machine_reset() override; + private: template void ay_w(uint8_t data) { m_ay->address_data_w(N, data); } @@ -86,49 +89,49 @@ private: /* PIO 1 */ - DECLARE_WRITE_LINE_MEMBER(pio_1_m_out_int_w) { /* logerror("pio_1_m_out_int_w %02x\n", state); */ } + void pio_1_m_out_int_w(int state) { /* logerror("pio_1_m_out_int_w %02x\n", state); */ } uint8_t pio_1_m_in_pa_r() { logerror("pio_1_m_in_pa_r (INPUT MATRIX)\n"); return machine().rand(); } void pio_1_m_out_pa_w(uint8_t data) { logerror("pio_1_m_out_pa_w %02x\n", data); } - DECLARE_WRITE_LINE_MEMBER(pio_1_m_out_ardy_w) { logerror("pio_1_m_out_ardy_w %02x\n", state); } + void pio_1_m_out_ardy_w(int state) { logerror("pio_1_m_out_ardy_w %02x\n", state); } uint8_t pio_1_m_in_pb_r() { logerror("pio_1_m_in_pb_r\n"); return 0x00; } void pio_1_m_out_pb_w(uint8_t data) { logerror("pio_1_m_out_pb_w %02x (REELS)\n", data); } - DECLARE_WRITE_LINE_MEMBER(pio_1_m_out_brdy_w) { logerror("pio_1_m_out_brdy_w %02x\n", state); } + void pio_1_m_out_brdy_w(int state) { logerror("pio_1_m_out_brdy_w %02x\n", state); } /* PIO 2 */ - DECLARE_WRITE_LINE_MEMBER(pio_2_m_out_int_w) { /* logerror("pio_2_m_out_int_w %02x\n", state); */ } + void pio_2_m_out_int_w(int state) { /* logerror("pio_2_m_out_int_w %02x\n", state); */ } uint8_t pio_2_m_in_pa_r() { logerror("pio_2_m_in_pa_r\n"); return 0x00; } void pio_2_m_out_pa_w(uint8_t data) { logerror("pio_2_m_out_pa_w %02x\n", data); } - DECLARE_WRITE_LINE_MEMBER(pio_2_m_out_ardy_w) { logerror("pio_2_m_out_ardy_w %02x\n", state); } + void pio_2_m_out_ardy_w(int state) { logerror("pio_2_m_out_ardy_w %02x\n", state); } uint8_t pio_2_m_in_pb_r() { logerror("pio_2_m_in_pb_r\n"); return 0x00; } void pio_2_m_out_pb_w(uint8_t data) { logerror("pio_2_m_out_pb_w %02x (ALPHA)\n", data); } - DECLARE_WRITE_LINE_MEMBER(pio_2_m_out_brdy_w) { logerror("pio_2_m_out_brdy_w %02x\n", state); } + void pio_2_m_out_brdy_w(int state) { logerror("pio_2_m_out_brdy_w %02x\n", state); } /* PIO 3 */ - DECLARE_WRITE_LINE_MEMBER(pio_3_m_out_int_w) { /* logerror("pio_3_m_out_int_w %02x\n", state); */ } + void pio_3_m_out_int_w(int state) { /* logerror("pio_3_m_out_int_w %02x\n", state); */ } uint8_t pio_3_m_in_pa_r() { logerror("pio_3_m_in_pa_r (REEL OPTICS)\n"); return 0x00; } void pio_3_m_out_pa_w(uint8_t data) { logerror("pio_3_m_out_pa_w %02x (STROBE)\n", data); } - DECLARE_WRITE_LINE_MEMBER(pio_3_m_out_ardy_w) { logerror("pio_3_m_out_ardy_w %02x\n", state); } + void pio_3_m_out_ardy_w(int state) { logerror("pio_3_m_out_ardy_w %02x\n", state); } uint8_t pio_3_m_in_pb_r() { logerror("pio_3_m_in_pb_r (COIN INPUT)\n"); return 0x00; } void pio_3_m_out_pb_w(uint8_t data) { logerror("pio_3_m_out_pb_w %02x\n", data); } - DECLARE_WRITE_LINE_MEMBER(pio_3_m_out_brdy_w) { logerror("pio_3_m_out_brdy_w %02x\n", state); } + void pio_3_m_out_brdy_w(int state) { logerror("pio_3_m_out_brdy_w %02x\n", state); } /* PIO 4 */ - DECLARE_WRITE_LINE_MEMBER(pio_4_m_out_int_w) { /* logerror("pio_4_m_out_int_w %02x\n", state); */ } + void pio_4_m_out_int_w(int state) { /* logerror("pio_4_m_out_int_w %02x\n", state); */ } uint8_t pio_4_m_in_pa_r() { logerror("pio_4_m_in_pa_r\n"); return 0x00; } void pio_4_m_out_pa_w(uint8_t data) { logerror("pio_4_m_out_pa_w %02x (TRIAC)\n", data); } - DECLARE_WRITE_LINE_MEMBER(pio_4_m_out_ardy_w) { logerror("pio_4_m_out_ardy_w %02x\n", state); } + void pio_4_m_out_ardy_w(int state) { logerror("pio_4_m_out_ardy_w %02x\n", state); } uint8_t pio_4_m_in_pb_r() { logerror("pio_4_m_in_pb_r\n"); return 0x00; } void pio_4_m_out_pb_w(uint8_t data) { logerror("pio_4_m_out_pb_w %02x (7SEG)\n", data); } - DECLARE_WRITE_LINE_MEMBER(pio_4_m_out_brdy_w) { logerror("pio_4_m_out_brdy_w %02x\n", state); } + void pio_4_m_out_brdy_w(int state) { logerror("pio_4_m_out_brdy_w %02x\n", state); } /* PIO 5 */ - DECLARE_WRITE_LINE_MEMBER(pio_5_m_out_int_w) { /* logerror("pio_5_m_out_int_w %02x\n", state); */ } + void pio_5_m_out_int_w(int state) { /* logerror("pio_5_m_out_int_w %02x\n", state); */ } uint8_t pio_5_m_in_pa_r() { logerror("pio_5_m_in_pa_r\n"); return 0x00; } void pio_5_m_out_pa_w(uint8_t data) { logerror("pio_5_m_out_pa_w %02x (LAMPS0)\n", data); } - DECLARE_WRITE_LINE_MEMBER(pio_5_m_out_ardy_w) { logerror("pio_5_m_out_ardy_w %02x\n", state); } + void pio_5_m_out_ardy_w(int state) { logerror("pio_5_m_out_ardy_w %02x\n", state); } uint8_t pio_5_m_in_pb_r() { logerror("pio_5_m_in_pb_r\n"); return 0x00; } void pio_5_m_out_pb_w(uint8_t data) { logerror("pio_5_m_out_pb_w %02x (LAMPS1)\n", data); } - DECLARE_WRITE_LINE_MEMBER(pio_5_m_out_brdy_w) { logerror("pio_5_m_out_brdy_w %02x\n", state); } + void pio_5_m_out_brdy_w(int state) { logerror("pio_5_m_out_brdy_w %02x\n", state); } void proconn_map(address_map &map); void proconn_portmap(address_map &map); @@ -143,7 +146,7 @@ private: required_device m_meters; int m_meter = 0; - virtual void machine_reset() override; + void meter_w(uint8_t data); [[maybe_unused]] void serial_transmit(offs_t offset, uint16_t data); [[maybe_unused]] uint16_t serial_receive(offs_t offset); diff --git a/src/mame/misc/rgum.cpp b/src/mame/misc/rgum.cpp index 9f59b0c292e..239df0452cc 100644 --- a/src/mame/misc/rgum.cpp +++ b/src/mame/misc/rgum.cpp @@ -49,7 +49,7 @@ public: void rgum(machine_config &config); - DECLARE_READ_LINE_MEMBER(heartbeat_r); + int heartbeat_r(); protected: virtual void video_start() override; @@ -186,7 +186,7 @@ void rgum_state::main_map(address_map &map) // TODO: map MK48Z08B-10 } -READ_LINE_MEMBER(rgum_state::heartbeat_r) +int rgum_state::heartbeat_r() { return m_hbeat; } diff --git a/src/mame/misc/savquest.cpp b/src/mame/misc/savquest.cpp index 0c67634410c..5c62923d21f 100644 --- a/src/mame/misc/savquest.cpp +++ b/src/mame/misc/savquest.cpp @@ -143,7 +143,7 @@ private: uint8_t parallel_port_r(offs_t offset); void parallel_port_w(offs_t offset, uint8_t data); - DECLARE_WRITE_LINE_MEMBER(vblank_assert); + void vblank_assert(int state); uint8_t smram_r(offs_t offset); void smram_w(offs_t offset, uint8_t data); @@ -833,7 +833,7 @@ void savquest_state::machine_reset() m_haspstate = HASPSTATE_NONE; } -WRITE_LINE_MEMBER(savquest_state::vblank_assert) +void savquest_state::vblank_assert(int state) { } diff --git a/src/mame/misc/shangkid.cpp b/src/mame/misc/shangkid.cpp index b22c9736696..286fbed1beb 100644 --- a/src/mame/misc/shangkid.cpp +++ b/src/mame/misc/shangkid.cpp @@ -64,47 +64,47 @@ Games by Nihon Game/Culture Brain: /***************************************************************************************/ -WRITE_LINE_MEMBER(chinhero_state::sound_enable_w) +void chinhero_state::sound_enable_w(int state) { if (!state) m_aysnd->reset(); } -WRITE_LINE_MEMBER(dynamski_state::int_enable_1_w) +void dynamski_state::int_enable_1_w(int state) { m_int_enable[0] = state; if (!m_int_enable[0]) m_maincpu->set_input_line(0, CLEAR_LINE); } -WRITE_LINE_MEMBER(chinhero_state::int_enable_2_w) +void chinhero_state::int_enable_2_w(int state) { m_int_enable[1] = state; if (!m_int_enable[1]) m_bbx->set_input_line(0, CLEAR_LINE); } -WRITE_LINE_MEMBER(chinhero_state::nmi_enable_1_w) +void chinhero_state::nmi_enable_1_w(int state) { m_nmi_enable[0] = state; if (!m_int_enable[0]) m_maincpu->set_input_line(INPUT_LINE_NMI, CLEAR_LINE); } -WRITE_LINE_MEMBER(chinhero_state::nmi_enable_2_w) +void chinhero_state::nmi_enable_2_w(int state) { m_nmi_enable[1] = state; if (!m_nmi_enable[1]) m_bbx->set_input_line(INPUT_LINE_NMI, CLEAR_LINE); } -WRITE_LINE_MEMBER(dynamski_state::irq_1_w) +void dynamski_state::irq_1_w(int state) { if (state && m_int_enable[0]) m_maincpu->set_input_line(0, ASSERT_LINE); } -WRITE_LINE_MEMBER(chinhero_state::irq_2_w) +void chinhero_state::irq_2_w(int state) { if (state && m_int_enable[1]) m_bbx->set_input_line(0, ASSERT_LINE); @@ -122,12 +122,12 @@ void chinhero_state::nmiq_2_w(uint8_t data) m_bbx->set_input_line(INPUT_LINE_NMI, ASSERT_LINE); } -WRITE_LINE_MEMBER(chinhero_state::coin_counter_1_w) +void chinhero_state::coin_counter_1_w(int state) { machine().bookkeeping().coin_counter_w(0, state); } -WRITE_LINE_MEMBER(chinhero_state::coin_counter_2_w) +void chinhero_state::coin_counter_2_w(int state) { machine().bookkeeping().coin_counter_w(1, state); } diff --git a/src/mame/misc/shangkid.h b/src/mame/misc/shangkid.h index 05b26a71b67..6976208e235 100644 --- a/src/mame/misc/shangkid.h +++ b/src/mame/misc/shangkid.h @@ -32,8 +32,8 @@ protected: bool m_int_enable[2]; - DECLARE_WRITE_LINE_MEMBER(int_enable_1_w); - DECLARE_WRITE_LINE_MEMBER(irq_1_w); + void int_enable_1_w(int state); + void irq_1_w(int state); private: void palette(palette_device &palette) const; @@ -80,13 +80,13 @@ private: void ay8910_porta_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(sound_enable_w); - DECLARE_WRITE_LINE_MEMBER(int_enable_2_w); - DECLARE_WRITE_LINE_MEMBER(nmi_enable_1_w); - DECLARE_WRITE_LINE_MEMBER(nmi_enable_2_w); - DECLARE_WRITE_LINE_MEMBER(irq_2_w); - DECLARE_WRITE_LINE_MEMBER(coin_counter_1_w); - DECLARE_WRITE_LINE_MEMBER(coin_counter_2_w); + void sound_enable_w(int state); + void int_enable_2_w(int state); + void nmi_enable_1_w(int state); + void nmi_enable_2_w(int state); + void irq_2_w(int state); + void coin_counter_1_w(int state); + void coin_counter_2_w(int state); TILE_GET_INFO_MEMBER(get_bg_tile_info); diff --git a/src/mame/misc/skeetsht.cpp b/src/mame/misc/skeetsht.cpp index fc2401d2ab7..effa081c743 100644 --- a/src/mame/misc/skeetsht.cpp +++ b/src/mame/misc/skeetsht.cpp @@ -57,7 +57,7 @@ private: uint8_t tms_r(offs_t offset); void hc11_porta_w(uint8_t data); void ay8910_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(tms_irq); + void tms_irq(int state); TMS340X0_SCANLINE_RGB32_CB_MEMBER(scanline_update); virtual void machine_reset() override; virtual void video_start() override; @@ -132,7 +132,7 @@ void skeetsht_state::ramdac_w(offs_t offset, uint16_t data) * *************************************/ -WRITE_LINE_MEMBER(skeetsht_state::tms_irq) +void skeetsht_state::tms_irq(int state) { m_68hc11->set_input_line(MC68HC11_IRQ_LINE, state ? ASSERT_LINE : CLEAR_LINE); } diff --git a/src/mame/misc/skimaxx.cpp b/src/mame/misc/skimaxx.cpp index eabc589b56b..dbe49a945bd 100644 --- a/src/mame/misc/skimaxx.cpp +++ b/src/mame/misc/skimaxx.cpp @@ -97,7 +97,7 @@ private: void unk1_w(u32 data); void sub_ctrl_w(offs_t offset, u32 data, u32 mem_mask = ~0); u32 analog_r(offs_t offset); - DECLARE_WRITE_LINE_MEMBER(tms_irq); + void tms_irq(int state); TMS340X0_TO_SHIFTREG_CB_MEMBER(to_shiftreg); TMS340X0_FROM_SHIFTREG_CB_MEMBER(from_shiftreg); @@ -500,7 +500,7 @@ INPUT_PORTS_END * *************************************/ -WRITE_LINE_MEMBER(skimaxx_state::tms_irq) +void skimaxx_state::tms_irq(int state) { // TODO } diff --git a/src/mame/misc/skyarmy.cpp b/src/mame/misc/skyarmy.cpp index 7fc37ad633b..3cc8ea73ccd 100644 --- a/src/mame/misc/skyarmy.cpp +++ b/src/mame/misc/skyarmy.cpp @@ -69,12 +69,12 @@ private: tilemap_t* m_tilemap = nullptr; int m_nmi = 0; - DECLARE_WRITE_LINE_MEMBER(flip_screen_x_w); - DECLARE_WRITE_LINE_MEMBER(flip_screen_y_w); + void flip_screen_x_w(int state); + void flip_screen_y_w(int state); void videoram_w(offs_t offset, uint8_t data); void colorram_w(offs_t offset, uint8_t data); - DECLARE_WRITE_LINE_MEMBER(coin_counter_w); - DECLARE_WRITE_LINE_MEMBER(nmi_enable_w); + void coin_counter_w(int state); + void nmi_enable_w(int state); TILE_GET_INFO_MEMBER(get_tile_info); @@ -92,12 +92,12 @@ void skyarmy_state::machine_start() save_item(NAME(m_nmi)); } -WRITE_LINE_MEMBER(skyarmy_state::flip_screen_x_w) +void skyarmy_state::flip_screen_x_w(int state) { flip_screen_x_set(state); } -WRITE_LINE_MEMBER(skyarmy_state::flip_screen_y_w) +void skyarmy_state::flip_screen_y_w(int state) { flip_screen_y_set(state); } @@ -199,13 +199,13 @@ INTERRUPT_GEN_MEMBER(skyarmy_state::nmi_source) } -WRITE_LINE_MEMBER(skyarmy_state::coin_counter_w) +void skyarmy_state::coin_counter_w(int state) { machine().bookkeeping().coin_counter_w(0, state); } -WRITE_LINE_MEMBER(skyarmy_state::nmi_enable_w) +void skyarmy_state::nmi_enable_w(int state) { m_nmi = state; if (!m_nmi) diff --git a/src/mame/misc/skylncr.cpp b/src/mame/misc/skylncr.cpp index 39bf6c1ba75..c431cdc0c14 100644 --- a/src/mame/misc/skylncr.cpp +++ b/src/mame/misc/skylncr.cpp @@ -172,7 +172,7 @@ public: void init_speedwaya(); void init_superb2k(); - READ_LINE_MEMBER(mbutrfly_prot_r); + int mbutrfly_prot_r(); protected: virtual void machine_start() override; @@ -359,7 +359,7 @@ void skylncr_state::mbutrfly_prot_w(uint8_t data) m_mbutrfly_prot = BIT(data, 7); } -READ_LINE_MEMBER(skylncr_state::mbutrfly_prot_r) +int skylncr_state::mbutrfly_prot_r() { return m_mbutrfly_prot; } diff --git a/src/mame/misc/sothello.cpp b/src/mame/misc/sothello.cpp index fdc4b532680..a581e6980e4 100644 --- a/src/mame/misc/sothello.cpp +++ b/src/mame/misc/sothello.cpp @@ -78,7 +78,7 @@ private: void soundcpu_int_clear_w(uint8_t data); void subcpu_status_w(uint8_t data); void msm_cfg_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(adpcm_int_w); + void adpcm_int_w(int state); void maincpu_io_map(address_map &map); void maincpu_mem_map(address_map &map); @@ -185,7 +185,7 @@ void sothello_state::maincpu_io_map(address_map &map) // sound Z80 -WRITE_LINE_MEMBER(sothello_state::adpcm_int_w) +void sothello_state::adpcm_int_w(int state) { // only 4 bits are used m_msm->data_w(m_msm_data & 0x0f); diff --git a/src/mame/misc/ssingles.cpp b/src/mame/misc/ssingles.cpp index e3dbe4104c8..1526f4b93a6 100644 --- a/src/mame/misc/ssingles.cpp +++ b/src/mame/misc/ssingles.cpp @@ -218,7 +218,7 @@ private: uint8_t atamanot_prot_r(offs_t offset); void atamanot_prot_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(atamanot_irq); + void atamanot_irq(int state); MC6845_UPDATE_ROW(ssingles_update_row); MC6845_UPDATE_ROW(atamanot_update_row); @@ -584,7 +584,7 @@ void ssingles_state::ssingles(machine_config &config) AY8910(config, "ay2", 1'500'000).add_route(ALL_OUTPUTS, "mono", 0.5); // ? MHz } -WRITE_LINE_MEMBER(ssingles_state::atamanot_irq) +void ssingles_state::atamanot_irq(int state) { // ... } diff --git a/src/mame/misc/statriv2.cpp b/src/mame/misc/statriv2.cpp index cb225c6da5a..ca792ccb9c4 100644 --- a/src/mame/misc/statriv2.cpp +++ b/src/mame/misc/statriv2.cpp @@ -109,7 +109,7 @@ public: void init_addr_xhl(); void init_laserdisc(); - DECLARE_READ_LINE_MEMBER(latched_coin_r); + int latched_coin_r(); private: required_device m_maincpu; @@ -293,7 +293,7 @@ uint8_t statriv2_state::question_data_r() * *************************************/ -READ_LINE_MEMBER(statriv2_state::latched_coin_r) +int statriv2_state::latched_coin_r() { return m_latched_coin; } diff --git a/src/mame/misc/stuntair.cpp b/src/mame/misc/stuntair.cpp index c51196e07d2..1f8f2cece94 100644 --- a/src/mame/misc/stuntair.cpp +++ b/src/mame/misc/stuntair.cpp @@ -142,13 +142,13 @@ private: void stuntair_bgram_w(offs_t offset, uint8_t data); void stuntair_bgattrram_w(offs_t offset, uint8_t data); void stuntair_bgxscroll_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(nmi_enable_w); - DECLARE_WRITE_LINE_MEMBER(spritebank0_w); - DECLARE_WRITE_LINE_MEMBER(spritebank1_w); + void nmi_enable_w(int state); + void spritebank0_w(int state); + void spritebank1_w(int state); void stuntair_coin_w(uint8_t data); void stuntair_sound_w(uint8_t data); void ay8910_portb_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(stuntair_irq); + void stuntair_irq(int state); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_stuntair(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void stuntair_palette(palette_device &palette) const; @@ -289,18 +289,18 @@ void stuntair_state::stuntair_bgxscroll_w(uint8_t data) } -WRITE_LINE_MEMBER(stuntair_state::spritebank0_w) +void stuntair_state::spritebank0_w(int state) { m_spritebank0 = state; } -WRITE_LINE_MEMBER(stuntair_state::spritebank1_w) +void stuntair_state::spritebank1_w(int state) { m_spritebank1 = state; } -WRITE_LINE_MEMBER(stuntair_state::nmi_enable_w) +void stuntair_state::nmi_enable_w(int state) { m_nmi_enable = state; if (!m_nmi_enable) @@ -487,7 +487,7 @@ void stuntair_state::ay8910_portb_w(uint8_t data) ***************************************************************************/ -WRITE_LINE_MEMBER(stuntair_state::stuntair_irq) +void stuntair_state::stuntair_irq(int state) { if (state && m_nmi_enable) m_maincpu->set_input_line(INPUT_LINE_NMI, ASSERT_LINE); diff --git a/src/mame/misc/supertnk.cpp b/src/mame/misc/supertnk.cpp index 164feaf2988..a2dd9374d3f 100644 --- a/src/mame/misc/supertnk.cpp +++ b/src/mame/misc/supertnk.cpp @@ -133,16 +133,16 @@ protected: virtual void video_start() override; private: - DECLARE_WRITE_LINE_MEMBER(bankswitch_0_w); - DECLARE_WRITE_LINE_MEMBER(bankswitch_1_w); - DECLARE_WRITE_LINE_MEMBER(interrupt_enable_w); - DECLARE_WRITE_LINE_MEMBER(watchdog_reset_w); + void bankswitch_0_w(int state); + void bankswitch_1_w(int state); + void interrupt_enable_w(int state); + void watchdog_reset_w(int state); void videoram_w(offs_t offset, uint8_t data); uint8_t videoram_r(offs_t offset); - DECLARE_WRITE_LINE_MEMBER(bitplane_select_0_w); - DECLARE_WRITE_LINE_MEMBER(bitplane_select_1_w); + void bitplane_select_0_w(int state); + void bitplane_select_1_w(int state); uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(vblank_interrupt); + void vblank_interrupt(int state); void io_map(address_map &map); void prg_map(address_map &map); @@ -178,14 +178,14 @@ void supertnk_state::machine_start() * *************************************/ -WRITE_LINE_MEMBER(supertnk_state::bankswitch_0_w) +void supertnk_state::bankswitch_0_w(int state) { m_rom_bank = (m_rom_bank & 0x02) | (state ? 0x01 : 0x00); m_prgbank->set_entry(m_rom_bank); } -WRITE_LINE_MEMBER(supertnk_state::bankswitch_1_w) +void supertnk_state::bankswitch_1_w(int state) { m_rom_bank = (m_rom_bank & 0x01) | (state ? 0x02 : 0x00); m_prgbank->set_entry(m_rom_bank); @@ -199,14 +199,14 @@ WRITE_LINE_MEMBER(supertnk_state::bankswitch_1_w) * *************************************/ -WRITE_LINE_MEMBER(supertnk_state::vblank_interrupt) +void supertnk_state::vblank_interrupt(int state) { if (state && m_interrupt_enable) m_maincpu->set_input_line(INT_9980A_LEVEL4, ASSERT_LINE); } -WRITE_LINE_MEMBER(supertnk_state::interrupt_enable_w) +void supertnk_state::interrupt_enable_w(int state) { m_interrupt_enable = state; if (!state) @@ -214,7 +214,7 @@ WRITE_LINE_MEMBER(supertnk_state::interrupt_enable_w) } -WRITE_LINE_MEMBER(supertnk_state::watchdog_reset_w) +void supertnk_state::watchdog_reset_w(int state) { m_watchdog->watchdog_enable(!state); } @@ -265,13 +265,13 @@ uint8_t supertnk_state::videoram_r(offs_t offset) } -WRITE_LINE_MEMBER(supertnk_state::bitplane_select_0_w) +void supertnk_state::bitplane_select_0_w(int state) { m_bitplane_select = (m_bitplane_select & 0x02) | (state ? 0x01 : 0x00); } -WRITE_LINE_MEMBER(supertnk_state::bitplane_select_1_w) +void supertnk_state::bitplane_select_1_w(int state) { m_bitplane_select = (m_bitplane_select & 0x01) | (state ? 0x02 : 0x00); } diff --git a/src/mame/misc/tapatune.cpp b/src/mame/misc/tapatune.cpp index f7e5782ca80..1e89dc53368 100644 --- a/src/mame/misc/tapatune.cpp +++ b/src/mame/misc/tapatune.cpp @@ -94,7 +94,7 @@ private: virtual void machine_start() override; virtual void machine_reset() override; - DECLARE_WRITE_LINE_MEMBER(crtc_vsync); + void crtc_vsync(int state); void palette_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); uint16_t read_from_z80(); @@ -213,7 +213,7 @@ void tapatune_state::palette_w(offs_t offset, uint16_t data, uint16_t mem_mask) } -WRITE_LINE_MEMBER(tapatune_state::crtc_vsync) +void tapatune_state::crtc_vsync(int state) { m_videocpu->set_input_line(2, state ? HOLD_LINE : CLEAR_LINE); } diff --git a/src/mame/misc/thayers.cpp b/src/mame/misc/thayers.cpp index 6a9b4883dae..581b4935232 100644 --- a/src/mame/misc/thayers.cpp +++ b/src/mame/misc/thayers.cpp @@ -55,8 +55,8 @@ public: void thayers(machine_config &config); - DECLARE_READ_LINE_MEMBER(laserdisc_enter_r); - DECLARE_READ_LINE_MEMBER(laserdisc_ready_r); + int laserdisc_enter_r(); + int laserdisc_ready_r(); private: virtual void machine_start() override; @@ -105,8 +105,8 @@ private: uint8_t cop_g_r(); void control_w(uint8_t data); void cop_g_w(uint8_t data); - DECLARE_READ_LINE_MEMBER(kbdata_r); - DECLARE_WRITE_LINE_MEMBER(kbclk_w); + int kbdata_r(); + void kbclk_w(int state); void control2_w(uint8_t data); uint8_t dsw_b_r(); uint8_t laserdsc_data_r(); @@ -316,13 +316,13 @@ void thayers_state::cop_g_w(uint8_t data) /* Keyboard */ -READ_LINE_MEMBER(thayers_state::kbdata_r) +int thayers_state::kbdata_r() { if (LOG) logerror("%s KBDATA %u BIT %u\n",machine().time().as_string(),m_kbdata,m_rx_bit); return m_kbdata; } -WRITE_LINE_MEMBER(thayers_state::kbclk_w) +void thayers_state::kbclk_w(int state) { if (m_kbclk != state) { if (LOG) logerror("%s %s KBCLK %u\n", machine().time().as_string(), machine().describe_context(),state); @@ -649,14 +649,14 @@ void thayers_state::thayers_io_map(address_map &map) /* Input Ports */ -READ_LINE_MEMBER(thayers_state::laserdisc_enter_r) +int thayers_state::laserdisc_enter_r() { if (m_pr7820 != nullptr) return m_pr7820_enter; if (m_ldv1000 != nullptr) return (m_ldv1000->status_strobe_r() == ASSERT_LINE) ? 0 : 1; return 0; } -READ_LINE_MEMBER(thayers_state::laserdisc_ready_r) +int thayers_state::laserdisc_ready_r() { if (m_pr7820 != nullptr) return (m_pr7820->ready_r() == ASSERT_LINE) ? 0 : 1; if (m_ldv1000 != nullptr) return (m_ldv1000->command_strobe_r() == ASSERT_LINE) ? 0 : 1; diff --git a/src/mame/misc/truco.cpp b/src/mame/misc/truco.cpp index b2b134597d6..81d35af8f80 100644 --- a/src/mame/misc/truco.cpp +++ b/src/mame/misc/truco.cpp @@ -253,10 +253,10 @@ private: uint8_t m_trigger = 0; void porta_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(pia_ca2_w); + void pia_ca2_w(int state); void portb_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(pia_irqa_w); - DECLARE_WRITE_LINE_MEMBER(pia_irqb_w); + void pia_irqa_w(int state); + void pia_irqb_w(int state); void palette(palette_device &palette) const; @@ -320,7 +320,7 @@ void truco_state::porta_w(uint8_t data) LOGPIA("Port A writes: %2x\n", data); } -WRITE_LINE_MEMBER(truco_state::pia_ca2_w) +void truco_state::pia_ca2_w(int state) { /* PIA CA2 line is connected to IC U19, leg 11. The IC was successfully identified as MAX691. @@ -341,12 +341,12 @@ void truco_state::portb_w(uint8_t data) LOGPIA("Port B writes: %2x\n", data); } -WRITE_LINE_MEMBER(truco_state::pia_irqa_w) +void truco_state::pia_irqa_w(int state) { LOGPIA("PIA irq A: %2x\n", state); } -WRITE_LINE_MEMBER(truco_state::pia_irqb_w) +void truco_state::pia_irqb_w(int state) { LOGPIA("PIA irq B: %2x\n", state); } diff --git a/src/mame/misc/vcombat.cpp b/src/mame/misc/vcombat.cpp index d1c96f9168b..1472cdd798a 100644 --- a/src/mame/misc/vcombat.cpp +++ b/src/mame/misc/vcombat.cpp @@ -160,7 +160,7 @@ private: void v1_fb_w(offs_t offset, uint64_t data, uint64_t mem_mask = ~0); void crtc_w(uint16_t data); void vcombat_dac_w(uint16_t data); - DECLARE_WRITE_LINE_MEMBER(sound_update); + void sound_update(int state); uint32_t update_screen(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect, int index); uint32_t screen_update_vcombat_main(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); @@ -680,7 +680,7 @@ static INPUT_PORTS_START( shadfgtr ) INPUT_PORTS_END -WRITE_LINE_MEMBER(vcombat_state::sound_update) +void vcombat_state::sound_update(int state) { /* Seems reasonable */ m_soundcpu->set_input_line(M68K_IRQ_1, state ? ASSERT_LINE : CLEAR_LINE); diff --git a/src/mame/misc/video21.cpp b/src/mame/misc/video21.cpp index 355c6711ace..e7da712bcf4 100644 --- a/src/mame/misc/video21.cpp +++ b/src/mame/misc/video21.cpp @@ -48,7 +48,7 @@ public: { } void video21(machine_config &config); - DECLARE_READ_LINE_MEMBER(hopper_coinout_r); + int hopper_coinout_r(); protected: virtual void machine_start() override; @@ -168,7 +168,7 @@ void video21_state::io_map(address_map &map) { } -READ_LINE_MEMBER(video21_state::hopper_coinout_r) +int video21_state::hopper_coinout_r() { return m_hopper_coin; } diff --git a/src/mame/misc/vpoker.cpp b/src/mame/misc/vpoker.cpp index 1a1adfd8c61..360cc943135 100644 --- a/src/mame/misc/vpoker.cpp +++ b/src/mame/misc/vpoker.cpp @@ -129,7 +129,7 @@ private: uint8_t m_blit_ram[8]; uint8_t blitter_r(offs_t offset); void blitter_w(offs_t offset, uint8_t data); - DECLARE_WRITE_LINE_MEMBER(ptm_irq); + void ptm_irq(int state); uint32_t screen_update_vpoker(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); required_device m_maincpu; required_device m_gfxdecode; @@ -634,7 +634,7 @@ static GFXDECODE_START( gfx_vpoker ) GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 1 ) GFXDECODE_END -WRITE_LINE_MEMBER(vpoker_state::ptm_irq) +void vpoker_state::ptm_irq(int state) { m_maincpu->set_input_line(M6809_IRQ_LINE, state ? ASSERT_LINE : CLEAR_LINE); } diff --git a/src/mame/misc/xtom3d.cpp b/src/mame/misc/xtom3d.cpp index 5a9b5729626..2130c1119af 100644 --- a/src/mame/misc/xtom3d.cpp +++ b/src/mame/misc/xtom3d.cpp @@ -316,7 +316,7 @@ private: void xtom3d_map(address_map &map); // void xtom3d_io(address_map &map); -// DECLARE_WRITE_LINE_MEMBER(vblank_assert); +// void vblank_assert(int state); static void romdisk_config(device_t *device); // static void cdrom_config(device_t *device); diff --git a/src/mame/misc/xyonix.cpp b/src/mame/misc/xyonix.cpp index ee3229a5956..27defbfc7bc 100644 --- a/src/mame/misc/xyonix.cpp +++ b/src/mame/misc/xyonix.cpp @@ -87,7 +87,7 @@ private: uint8_t m_prev_coin; bool m_nmi_mask; - DECLARE_WRITE_LINE_MEMBER(nmiclk_w); + void nmiclk_w(int state); void irqack_w(uint8_t data); void nmiack_w(uint8_t data); uint8_t io_r(); @@ -124,7 +124,7 @@ void xyonix_state::irqack_w(uint8_t data) m_maincpu->set_input_line(0, CLEAR_LINE); } -WRITE_LINE_MEMBER(xyonix_state::nmiclk_w) +void xyonix_state::nmiclk_w(int state) { if (state && m_nmi_mask) m_maincpu->set_input_line(INPUT_LINE_NMI, ASSERT_LINE); diff --git a/src/mame/misc/z80ne.cpp b/src/mame/misc/z80ne.cpp index 4694d636531..c354c96d7be 100644 --- a/src/mame/misc/z80ne.cpp +++ b/src/mame/misc/z80ne.cpp @@ -244,7 +244,7 @@ protected: void lx383_w(offs_t offset, uint8_t data); uint8_t lx385_ctrl_r(); void lx385_ctrl_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(lx385_uart_tx_clock_w); + void lx385_uart_tx_clock_w(int state); TIMER_CALLBACK_MEMBER(cassette_tc); TIMER_CALLBACK_MEMBER(kbd_scan); @@ -300,8 +300,8 @@ public: protected: virtual void machine_reset() override; - DECLARE_READ_LINE_MEMBER(lx387_shift_r); - DECLARE_READ_LINE_MEMBER(lx387_control_r); + int lx387_shift_r(); + int lx387_control_r(); uint8_t lx387_data_r(); uint8_t lx388_mc6847_videoram_r(offs_t offset); uint8_t lx388_read_field_sync(); @@ -898,18 +898,18 @@ void z80ne_state::lx385_ctrl_w(uint8_t data) } } -WRITE_LINE_MEMBER(z80ne_state::lx385_uart_tx_clock_w) +void z80ne_state::lx385_uart_tx_clock_w(int state) { if (BIT(m_lx385_ctrl, 2)) m_uart->write_tcp(state); } -READ_LINE_MEMBER(z80net_state::lx387_shift_r) +int z80net_state::lx387_shift_r() { return BIT(m_io_modifiers->read(), 0) || BIT(m_io_modifiers->read(), 2); } -READ_LINE_MEMBER(z80net_state::lx387_control_r) +int z80net_state::lx387_control_r() { return BIT(m_io_modifiers->read(), 1); } diff --git a/src/mame/mit/tx0.cpp b/src/mame/mit/tx0.cpp index 53d1f5b32d5..946983a8264 100644 --- a/src/mame/mit/tx0.cpp +++ b/src/mame/mit/tx0.cpp @@ -661,7 +661,7 @@ TIMER_CALLBACK_MEMBER(tx0_state::puncher_callback) /* Initiate read of a 6-bit word from tape */ -WRITE_LINE_MEMBER( tx0_state::tx0_io_r1l ) +void tx0_state::tx0_io_r1l(int state) { begin_tape_read( 0); } @@ -669,7 +669,7 @@ WRITE_LINE_MEMBER( tx0_state::tx0_io_r1l ) /* Initiate read of a 18-bit word from tape (used in read-in mode) */ -WRITE_LINE_MEMBER( tx0_state::tx0_io_r3l ) +void tx0_state::tx0_io_r3l(int state) { begin_tape_read(1); } @@ -677,7 +677,7 @@ WRITE_LINE_MEMBER( tx0_state::tx0_io_r3l ) /* Write a 7-bit word to tape (7th bit clear) */ -WRITE_LINE_MEMBER( tx0_state::tx0_io_p6h ) +void tx0_state::tx0_io_p6h(int state) { int ac; @@ -692,7 +692,7 @@ WRITE_LINE_MEMBER( tx0_state::tx0_io_p6h ) /* Write a 7-bit word to tape (7th bit set) */ -WRITE_LINE_MEMBER( tx0_state::tx0_io_p7h ) +void tx0_state::tx0_io_p7h(int state) { int ac; @@ -753,7 +753,7 @@ TIMER_CALLBACK_MEMBER(tx0_state::prt_callback) /* prt io callback */ -WRITE_LINE_MEMBER( tx0_state::tx0_io_prt ) +void tx0_state::tx0_io_prt(int state) { int ac; int ch; @@ -779,7 +779,7 @@ TIMER_CALLBACK_MEMBER(tx0_state::dis_callback) /* Plot one point on crt */ -WRITE_LINE_MEMBER( tx0_state::tx0_io_dis ) +void tx0_state::tx0_io_dis(int state) { int ac; int x; @@ -1339,7 +1339,7 @@ void tx0_state::magtape_callback() } } -WRITE_LINE_MEMBER( tx0_state::tx0_sel ) +void tx0_state::tx0_sel(int state) { m_magtape.sel_pending = true; @@ -1351,7 +1351,7 @@ WRITE_LINE_MEMBER( tx0_state::tx0_sel ) } } -WRITE_LINE_MEMBER( tx0_state::tx0_io_cpy ) +void tx0_state::tx0_io_cpy(int state) { switch (m_magtape.state) { @@ -1385,7 +1385,7 @@ WRITE_LINE_MEMBER( tx0_state::tx0_io_cpy ) IO devices should reset */ -WRITE_LINE_MEMBER( tx0_state::tx0_io_reset_callback ) +void tx0_state::tx0_io_reset_callback(int state) { m_tape_reader.rcl = m_tape_reader.rc = 0; if (m_tape_reader.timer) diff --git a/src/mame/mit/tx0.h b/src/mame/mit/tx0.h index 0470efbd874..8eb5d376410 100644 --- a/src/mame/mit/tx0.h +++ b/src/mame/mit/tx0.h @@ -175,7 +175,7 @@ protected: virtual void video_start() override; void tx0_palette(palette_device &palette) const; uint32_t screen_update_tx0(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(screen_vblank_tx0); + void screen_vblank_tx0(int state); INTERRUPT_GEN_MEMBER(tx0_interrupt); TIMER_CALLBACK_MEMBER(reader_callback); TIMER_CALLBACK_MEMBER(puncher_callback); @@ -202,15 +202,15 @@ protected: void typewriter_out(uint8_t data); void tx0_keyboard(); - DECLARE_WRITE_LINE_MEMBER(tx0_io_cpy); - DECLARE_WRITE_LINE_MEMBER(tx0_io_r1l); - DECLARE_WRITE_LINE_MEMBER(tx0_io_r3l); - DECLARE_WRITE_LINE_MEMBER(tx0_io_p6h); - DECLARE_WRITE_LINE_MEMBER(tx0_io_p7h); - DECLARE_WRITE_LINE_MEMBER(tx0_io_prt); - DECLARE_WRITE_LINE_MEMBER(tx0_io_dis); - DECLARE_WRITE_LINE_MEMBER(tx0_sel); - DECLARE_WRITE_LINE_MEMBER(tx0_io_reset_callback); + void tx0_io_cpy(int state); + void tx0_io_r1l(int state); + void tx0_io_r3l(int state); + void tx0_io_p6h(int state); + void tx0_io_p7h(int state); + void tx0_io_prt(int state); + void tx0_io_dis(int state); + void tx0_sel(int state); + void tx0_io_reset_callback(int state); void magtape_callback(); void tx0_64kw_map(address_map &map); diff --git a/src/mame/mit/tx0_v.cpp b/src/mame/mit/tx0_v.cpp index c14c670f29a..bed2e37e5e0 100644 --- a/src/mame/mit/tx0_v.cpp +++ b/src/mame/mit/tx0_v.cpp @@ -38,7 +38,7 @@ void tx0_state::video_start() } -WRITE_LINE_MEMBER(tx0_state::screen_vblank_tx0) +void tx0_state::screen_vblank_tx0(int state) { // rising edge if (state) diff --git a/src/mame/mitsubishi/multi8.cpp b/src/mame/mitsubishi/multi8.cpp index d825d790e30..b64932689d6 100644 --- a/src/mame/mitsubishi/multi8.cpp +++ b/src/mame/mitsubishi/multi8.cpp @@ -71,7 +71,7 @@ private: uint8_t ay8912_1_r(); TIMER_DEVICE_CALLBACK_MEMBER(keyboard_callback); TIMER_DEVICE_CALLBACK_MEMBER(kansas_r); - DECLARE_WRITE_LINE_MEMBER(kansas_w); + void kansas_w(int state); MC6845_UPDATE_ROW(crtc_update_row); void io_map(address_map &map); @@ -303,7 +303,7 @@ void multi8_state::kanji_w(offs_t offset, uint8_t data) m_knj_addr = (offset == 0) ? (m_knj_addr & 0xff00) | (data & 0xff) : (m_knj_addr & 0x00ff) | (data << 8); } -WRITE_LINE_MEMBER( multi8_state::kansas_w ) +void multi8_state::kansas_w(int state) { // incoming @19200Hz u8 twobit = m_cass_data[3] & 3; diff --git a/src/mame/morrow/mpz80.cpp b/src/mame/morrow/mpz80.cpp index 0c1f5f15098..fef2ceab601 100644 --- a/src/mame/morrow/mpz80.cpp +++ b/src/mame/morrow/mpz80.cpp @@ -639,14 +639,14 @@ INPUT_PORTS_END // S100_INTERFACE( s100_intf ) //------------------------------------------------- -WRITE_LINE_MEMBER( mpz80_state::s100_pint_w ) +void mpz80_state::s100_pint_w(int state) { m_pint = (state == ASSERT_LINE) ? 0 : 1; check_interrupt(); } -WRITE_LINE_MEMBER( mpz80_state::s100_nmi_w ) +void mpz80_state::s100_nmi_w(int state) { if (state == ASSERT_LINE) { diff --git a/src/mame/morrow/mpz80.h b/src/mame/morrow/mpz80.h index 5e6c616c458..33d88d70cbf 100644 --- a/src/mame/morrow/mpz80.h +++ b/src/mame/morrow/mpz80.h @@ -69,8 +69,8 @@ private: void disp_col_w(uint8_t data); void task_w(uint8_t data); void mask_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER( s100_pint_w ); - DECLARE_WRITE_LINE_MEMBER( s100_nmi_w ); + void s100_pint_w(int state); + void s100_nmi_w(int state); // memory state uint32_t m_addr = 0; diff --git a/src/mame/motorola/exorciser.cpp b/src/mame/motorola/exorciser.cpp index acfbce7eaeb..be2ca379ba4 100644 --- a/src/mame/motorola/exorciser.cpp +++ b/src/mame/motorola/exorciser.cpp @@ -175,7 +175,7 @@ public: void exorciser(machine_config &config); DECLARE_INPUT_CHANGED_MEMBER(maincpu_clock_change); - DECLARE_WRITE_LINE_MEMBER(abort_key_w); + void abort_key_w(int state); protected: virtual void machine_reset() override; @@ -185,7 +185,7 @@ private: void dbg_map(address_map &map); void mem_map(address_map &map); - DECLARE_WRITE_LINE_MEMBER(irq_line_w); + void irq_line_w(int state); u8 m_irq; address_space *m_banked_space; u8 main_r(offs_t offset); @@ -210,14 +210,14 @@ private: required_device_array m_floppy; // RS232 bit rate generator clocks - DECLARE_WRITE_LINE_MEMBER(write_f1_clock); - DECLARE_WRITE_LINE_MEMBER(write_f3_clock); - [[maybe_unused]] DECLARE_WRITE_LINE_MEMBER(write_f5_clock); - DECLARE_WRITE_LINE_MEMBER(write_f7_clock); - DECLARE_WRITE_LINE_MEMBER(write_f8_clock); - DECLARE_WRITE_LINE_MEMBER(write_f9_clock); - [[maybe_unused]] DECLARE_WRITE_LINE_MEMBER(write_f11_clock); - DECLARE_WRITE_LINE_MEMBER(write_f13_clock); + void write_f1_clock(int state); + void write_f3_clock(int state); + [[maybe_unused]] void write_f5_clock(int state); + void write_f7_clock(int state); + void write_f8_clock(int state); + void write_f9_clock(int state); + [[maybe_unused]] void write_f11_clock(int state); + void write_f13_clock(int state); u8 m_restart_count; @@ -225,10 +225,10 @@ private: TIMER_CALLBACK_MEMBER(assert_trace); void pia_dbg_pa_w(u8 data); - DECLARE_READ_LINE_MEMBER(pia_dbg_ca1_r); + int pia_dbg_ca1_r(); void pia_dbg_pb_w(u8 data); - DECLARE_WRITE_LINE_MEMBER(pia_dbg_ca2_w); - DECLARE_WRITE_LINE_MEMBER(pia_dbg_cb2_w); + void pia_dbg_ca2_w(int state); + void pia_dbg_cb2_w(int state); u16 m_stop_address; u8 m_stop_enabled; @@ -322,7 +322,7 @@ INPUT_CHANGED_MEMBER(exorciser_state::maincpu_clock_change) } -WRITE_LINE_MEMBER(exorciser_state::write_f1_clock) +void exorciser_state::write_f1_clock(int state) { if (BIT(m_rs232_baud->read(), 0)) { @@ -334,7 +334,7 @@ WRITE_LINE_MEMBER(exorciser_state::write_f1_clock) m_acia_prn->write_rxc(state); } -WRITE_LINE_MEMBER(exorciser_state::write_f3_clock) +void exorciser_state::write_f3_clock(int state) { if (BIT(m_rs232_baud->read(), 1)) { @@ -343,7 +343,7 @@ WRITE_LINE_MEMBER(exorciser_state::write_f3_clock) } } -WRITE_LINE_MEMBER(exorciser_state::write_f5_clock) +void exorciser_state::write_f5_clock(int state) { if (BIT(m_rs232_baud->read(), 2)) { @@ -352,7 +352,7 @@ WRITE_LINE_MEMBER(exorciser_state::write_f5_clock) } } -WRITE_LINE_MEMBER(exorciser_state::write_f7_clock) +void exorciser_state::write_f7_clock(int state) { if (BIT(m_rs232_baud->read(), 3)) { @@ -361,7 +361,7 @@ WRITE_LINE_MEMBER(exorciser_state::write_f7_clock) } } -WRITE_LINE_MEMBER(exorciser_state::write_f8_clock) +void exorciser_state::write_f8_clock(int state) { if (BIT(m_rs232_baud->read(), 4)) { @@ -370,7 +370,7 @@ WRITE_LINE_MEMBER(exorciser_state::write_f8_clock) } } -WRITE_LINE_MEMBER(exorciser_state::write_f9_clock) +void exorciser_state::write_f9_clock(int state) { if (BIT(m_rs232_baud->read(), 5)) { @@ -379,7 +379,7 @@ WRITE_LINE_MEMBER(exorciser_state::write_f9_clock) } } -WRITE_LINE_MEMBER(exorciser_state::write_f11_clock) +void exorciser_state::write_f11_clock(int state) { if (BIT(m_rs232_baud->read(), 6)) { @@ -388,7 +388,7 @@ WRITE_LINE_MEMBER(exorciser_state::write_f11_clock) } } -WRITE_LINE_MEMBER(exorciser_state::write_f13_clock) +void exorciser_state::write_f13_clock(int state) { if (BIT(m_rs232_baud->read(), 7)) { @@ -484,13 +484,13 @@ void exorciser_state::pia_dbg_pa_w(u8 data) m_stop_address = (m_stop_address & 0xff00) | data; } -WRITE_LINE_MEMBER(exorciser_state::abort_key_w) +void exorciser_state::abort_key_w(int state) { m_pia_dbg->ca1_w(!state); m_mainnmi->input_merger_device::in_w<2>(state); } -READ_LINE_MEMBER(exorciser_state::pia_dbg_ca1_r) +int exorciser_state::pia_dbg_ca1_r() { return !m_abort_key->read(); } @@ -500,7 +500,7 @@ void exorciser_state::pia_dbg_pb_w(u8 data) m_stop_address = (m_stop_address & 0x00ff) | (data << 8); } -WRITE_LINE_MEMBER(exorciser_state::pia_dbg_ca2_w) +void exorciser_state::pia_dbg_ca2_w(int state) { m_stop_enabled = !state; } @@ -515,7 +515,7 @@ TIMER_CALLBACK_MEMBER(exorciser_state::assert_trace) // cycles here to get it working. This is necessary because of inaccurate // cycle timing in the 6800 emulation, so change the delay to 11 cycles when // the cycle emulation is more accurate. -WRITE_LINE_MEMBER(exorciser_state::pia_dbg_cb2_w) +void exorciser_state::pia_dbg_cb2_w(int state) { if (state) { @@ -578,7 +578,7 @@ static void mdos_floppies(device_slot_interface &device) } -WRITE_LINE_MEMBER(exorciser_state::irq_line_w) +void exorciser_state::irq_line_w(int state) { m_maincpu->set_input_line(M6800_IRQ_LINE, state); m_irq = state; diff --git a/src/mame/motorola/mekd1.cpp b/src/mame/motorola/mekd1.cpp index cc3880370fc..615c49146ff 100644 --- a/src/mame/motorola/mekd1.cpp +++ b/src/mame/motorola/mekd1.cpp @@ -134,18 +134,18 @@ private: uint8_t pia0_pb_r(); void pia0_pa_w(uint8_t data); void pia0_pb_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(pia0_cb2_w); + void pia0_cb2_w(int state); // Clocks - DECLARE_WRITE_LINE_MEMBER(write_f1_clock); - DECLARE_WRITE_LINE_MEMBER(write_f2_clock); - DECLARE_WRITE_LINE_MEMBER(write_f4_clock); - DECLARE_WRITE_LINE_MEMBER(write_f5_clock); - DECLARE_WRITE_LINE_MEMBER(write_f7_clock); - DECLARE_WRITE_LINE_MEMBER(write_f8_clock); - DECLARE_WRITE_LINE_MEMBER(write_f9_clock); - DECLARE_WRITE_LINE_MEMBER(write_f11_clock); - DECLARE_WRITE_LINE_MEMBER(write_f13_clock); + void write_f1_clock(int state); + void write_f2_clock(int state); + void write_f4_clock(int state); + void write_f5_clock(int state); + void write_f7_clock(int state); + void write_f8_clock(int state); + void write_f9_clock(int state); + void write_f11_clock(int state); + void write_f13_clock(int state); TIMER_CALLBACK_MEMBER(bit_rate); TIMER_CALLBACK_MEMBER(bit_rate_half); @@ -270,7 +270,7 @@ void mekd1_state::pia0_pb_w(uint8_t data) } } -WRITE_LINE_MEMBER(mekd1_state::pia0_cb2_w) +void mekd1_state::pia0_cb2_w(int state) { // This is a tape reader control line. } @@ -285,7 +285,7 @@ TIMER_CALLBACK_MEMBER(mekd1_state::bit_rate_half) m_bit_rate_half_out = 1; } -WRITE_LINE_MEMBER(mekd1_state::write_f1_clock) +void mekd1_state::write_f1_clock(int state) { if (m_acia_baud_rate->read() == 1) { @@ -294,7 +294,7 @@ WRITE_LINE_MEMBER(mekd1_state::write_f1_clock) } } -WRITE_LINE_MEMBER(mekd1_state::write_f2_clock) +void mekd1_state::write_f2_clock(int state) { if (m_acia_baud_rate->read() == 2) { @@ -303,7 +303,7 @@ WRITE_LINE_MEMBER(mekd1_state::write_f2_clock) } } -WRITE_LINE_MEMBER(mekd1_state::write_f4_clock) +void mekd1_state::write_f4_clock(int state) { if (m_acia_baud_rate->read() == 4) { @@ -312,7 +312,7 @@ WRITE_LINE_MEMBER(mekd1_state::write_f4_clock) } } -WRITE_LINE_MEMBER(mekd1_state::write_f5_clock) +void mekd1_state::write_f5_clock(int state) { if (m_acia_baud_rate->read() == 5) { @@ -321,7 +321,7 @@ WRITE_LINE_MEMBER(mekd1_state::write_f5_clock) } } -WRITE_LINE_MEMBER(mekd1_state::write_f7_clock) +void mekd1_state::write_f7_clock(int state) { if (m_acia_baud_rate->read() == 7) { @@ -330,7 +330,7 @@ WRITE_LINE_MEMBER(mekd1_state::write_f7_clock) } } -WRITE_LINE_MEMBER(mekd1_state::write_f8_clock) +void mekd1_state::write_f8_clock(int state) { if (m_acia_baud_rate->read() == 8) { @@ -339,7 +339,7 @@ WRITE_LINE_MEMBER(mekd1_state::write_f8_clock) } } -WRITE_LINE_MEMBER(mekd1_state::write_f9_clock) +void mekd1_state::write_f9_clock(int state) { if (m_acia_baud_rate->read() == 9) { @@ -348,7 +348,7 @@ WRITE_LINE_MEMBER(mekd1_state::write_f9_clock) } } -WRITE_LINE_MEMBER(mekd1_state::write_f11_clock) +void mekd1_state::write_f11_clock(int state) { if (m_acia_baud_rate->read() == 11) { @@ -357,7 +357,7 @@ WRITE_LINE_MEMBER(mekd1_state::write_f11_clock) } } -WRITE_LINE_MEMBER(mekd1_state::write_f13_clock) +void mekd1_state::write_f13_clock(int state) { if (m_acia_baud_rate->read() == 13) { diff --git a/src/mame/motorola/mekd2.cpp b/src/mame/motorola/mekd2.cpp index d4044569849..7ba28284101 100644 --- a/src/mame/motorola/mekd2.cpp +++ b/src/mame/motorola/mekd2.cpp @@ -107,9 +107,9 @@ public: void mekd2(machine_config &config); private: - DECLARE_READ_LINE_MEMBER(key40_r); + int key40_r(); uint8_t key_r(); - DECLARE_WRITE_LINE_MEMBER(nmi_w); + void nmi_w(int state); void digit_w(uint8_t data); void segment_w(uint8_t data); DECLARE_QUICKLOAD_LOAD_MEMBER(quickload_cb); @@ -211,7 +211,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(mekd2_state::trace_timer) } -WRITE_LINE_MEMBER( mekd2_state::nmi_w ) +void mekd2_state::nmi_w(int state) { if (state) m_maincpu->set_input_line(INPUT_LINE_NMI, CLEAR_LINE); @@ -227,7 +227,7 @@ WRITE_LINE_MEMBER( mekd2_state::nmi_w ) ************************************************************/ -READ_LINE_MEMBER( mekd2_state::key40_r ) +int mekd2_state::key40_r() { return BIT(m_keydata, 6); } diff --git a/src/mame/motorola/mekd3.cpp b/src/mame/motorola/mekd3.cpp index 5c78b533e05..175823d8d57 100644 --- a/src/mame/motorola/mekd3.cpp +++ b/src/mame/motorola/mekd3.cpp @@ -174,13 +174,13 @@ public: void mekd3(machine_config &config); void init_mekd3(); - DECLARE_WRITE_LINE_MEMBER(reset_key_w); + void reset_key_w(int state); DECLARE_INPUT_CHANGED_MEMBER(keypad_changed); DECLARE_INPUT_CHANGED_MEMBER(rs232_cts_route_change); DECLARE_INPUT_CHANGED_MEMBER(rs232_dcd_route_change); private: - DECLARE_READ_LINE_MEMBER(keypad_cb1_r); + int keypad_cb1_r(); uint8_t keypad_key_r(); void led_digit_w(uint8_t data); void led_segment_w(uint8_t data); @@ -212,24 +212,24 @@ private: // MEK68IO - DECLARE_WRITE_LINE_MEMBER(rs232_route_cts); - DECLARE_WRITE_LINE_MEMBER(rs232_route_dcd); + void rs232_route_cts(int state); + void rs232_route_dcd(int state); int m_cts; int m_dcd; // Clocks - DECLARE_WRITE_LINE_MEMBER(write_f1_clock); - DECLARE_WRITE_LINE_MEMBER(write_f2_clock); - DECLARE_WRITE_LINE_MEMBER(write_f4_clock); - DECLARE_WRITE_LINE_MEMBER(write_f5_clock); - DECLARE_WRITE_LINE_MEMBER(write_f7_clock); - DECLARE_WRITE_LINE_MEMBER(write_f8_clock); - DECLARE_WRITE_LINE_MEMBER(write_f9_clock); - DECLARE_WRITE_LINE_MEMBER(write_f13_clock); + void write_f1_clock(int state); + void write_f2_clock(int state); + void write_f4_clock(int state); + void write_f5_clock(int state); + void write_f7_clock(int state); + void write_f8_clock(int state); + void write_f9_clock(int state); + void write_f13_clock(int state); TIMER_DEVICE_CALLBACK_MEMBER(kansas_r); - DECLARE_WRITE_LINE_MEMBER(acia_cas_clock300_w); - DECLARE_WRITE_LINE_MEMBER(acia_cas_clock1200_w); + void acia_cas_clock300_w(int state); + void acia_cas_clock1200_w(int state); uint8_t pia_io2a_r(); required_device m_pia_io1; @@ -466,7 +466,7 @@ void mekd3_state::page_w(uint8_t data) ************************************************************/ -WRITE_LINE_MEMBER(mekd3_state::reset_key_w) +void mekd3_state::reset_key_w(int state) { m_maincpu->set_input_line(INPUT_LINE_RESET, state ? CLEAR_LINE : ASSERT_LINE); @@ -503,7 +503,7 @@ INPUT_CHANGED_MEMBER(mekd3_state::keypad_changed) m_kpd_pia->cb1_w(mekd3_state::keypad_key_pressed()); } -READ_LINE_MEMBER(mekd3_state::keypad_cb1_r) +int mekd3_state::keypad_cb1_r() { return mekd3_state::keypad_key_pressed(); } @@ -544,7 +544,7 @@ void mekd3_state::led_digit_w(uint8_t data) ************************************************************/ -WRITE_LINE_MEMBER(mekd3_state::rs232_route_cts) +void mekd3_state::rs232_route_cts(int state) { if (m_rs232_cts_route->read()) m_acia_io1->write_cts(state); @@ -553,7 +553,7 @@ WRITE_LINE_MEMBER(mekd3_state::rs232_route_cts) m_cts = state; } -WRITE_LINE_MEMBER(mekd3_state::rs232_route_dcd) +void mekd3_state::rs232_route_dcd(int state) { if (m_rs232_dcd_route->read()) m_acia_io1->write_dcd(state); @@ -578,7 +578,7 @@ INPUT_CHANGED_MEMBER(mekd3_state::rs232_dcd_route_change) m_acia_io1->write_dcd(0); } -WRITE_LINE_MEMBER(mekd3_state::write_f1_clock) +void mekd3_state::write_f1_clock(int state) { if (BIT(m_rs232_tx_baud->read(), 0)) m_acia_io1->write_txc(state); @@ -586,7 +586,7 @@ WRITE_LINE_MEMBER(mekd3_state::write_f1_clock) m_acia_io1->write_rxc(state); } -WRITE_LINE_MEMBER(mekd3_state::write_f2_clock) +void mekd3_state::write_f2_clock(int state) { if (BIT(m_rs232_tx_baud->read(), 1)) m_acia_io1->write_txc(state); @@ -594,7 +594,7 @@ WRITE_LINE_MEMBER(mekd3_state::write_f2_clock) m_acia_io1->write_rxc(state); } -WRITE_LINE_MEMBER(mekd3_state::write_f4_clock) +void mekd3_state::write_f4_clock(int state) { if (BIT(m_rs232_tx_baud->read(), 2)) m_acia_io1->write_txc(state); @@ -602,7 +602,7 @@ WRITE_LINE_MEMBER(mekd3_state::write_f4_clock) m_acia_io1->write_rxc(state); } -WRITE_LINE_MEMBER(mekd3_state::write_f5_clock) +void mekd3_state::write_f5_clock(int state) { if (BIT(m_rs232_tx_baud->read(), 3)) m_acia_io1->write_txc(state); @@ -610,7 +610,7 @@ WRITE_LINE_MEMBER(mekd3_state::write_f5_clock) m_acia_io1->write_rxc(state); } -WRITE_LINE_MEMBER(mekd3_state::write_f7_clock) +void mekd3_state::write_f7_clock(int state) { if (BIT(m_rs232_tx_baud->read(), 4)) m_acia_io1->write_txc(state); @@ -622,7 +622,7 @@ WRITE_LINE_MEMBER(mekd3_state::write_f7_clock) acia_cas_clock1200_w(state); } -WRITE_LINE_MEMBER(mekd3_state::write_f8_clock) +void mekd3_state::write_f8_clock(int state) { if (BIT(m_rs232_tx_baud->read(), 5)) m_acia_io1->write_txc(state); @@ -630,7 +630,7 @@ WRITE_LINE_MEMBER(mekd3_state::write_f8_clock) m_acia_io1->write_rxc(state); } -WRITE_LINE_MEMBER(mekd3_state::write_f9_clock) +void mekd3_state::write_f9_clock(int state) { if (BIT(m_rs232_tx_baud->read(), 6)) m_acia_io1->write_txc(state); @@ -642,7 +642,7 @@ WRITE_LINE_MEMBER(mekd3_state::write_f9_clock) acia_cas_clock300_w(state); } -WRITE_LINE_MEMBER(mekd3_state::write_f13_clock) +void mekd3_state::write_f13_clock(int state) { if (BIT(m_rs232_tx_baud->read(), 7)) m_acia_io1->write_txc(state); @@ -680,7 +680,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(mekd3_state::kansas_r) } } -WRITE_LINE_MEMBER(mekd3_state::acia_cas_clock300_w) +void mekd3_state::acia_cas_clock300_w(int state) { // The Kansas City cassette format encodes a '0' bit by four cycles of // a 1200 Hz sine wave, and a '1' bit as eight cycles of 2400 Hz, @@ -706,7 +706,7 @@ WRITE_LINE_MEMBER(mekd3_state::acia_cas_clock300_w) m_acia_cas->write_rxc(state); } -WRITE_LINE_MEMBER(mekd3_state::acia_cas_clock1200_w) +void mekd3_state::acia_cas_clock1200_w(int state) { // For the 1200 baud rate the number of cycles in reduced to just one // cycle at 1200 Hz and two at 2400 Hz. diff --git a/src/mame/motorola/mekd4.cpp b/src/mame/motorola/mekd4.cpp index 6f3828dbc26..87dc130f420 100644 --- a/src/mame/motorola/mekd4.cpp +++ b/src/mame/motorola/mekd4.cpp @@ -303,7 +303,7 @@ public: void mekd4(machine_config &config); void init_mekd4(); - DECLARE_WRITE_LINE_MEMBER(reset_key_w); + void reset_key_w(int state); DECLARE_INPUT_CHANGED_MEMBER(keypad_changed); DECLARE_INPUT_CHANGED_MEMBER(rs232_cts_route_change); DECLARE_INPUT_CHANGED_MEMBER(rs232_dcd_route_change); @@ -319,24 +319,24 @@ private: void stop_pia_pb_w(uint8_t data); uint16_t m_stop_address; - DECLARE_WRITE_LINE_MEMBER(rs232_route_cts); - DECLARE_WRITE_LINE_MEMBER(rs232_route_dcd); + void rs232_route_cts(int state); + void rs232_route_dcd(int state); // Clocks - DECLARE_WRITE_LINE_MEMBER(write_f1_clock); - DECLARE_WRITE_LINE_MEMBER(write_f3_clock); - DECLARE_WRITE_LINE_MEMBER(write_f7_clock); - DECLARE_WRITE_LINE_MEMBER(write_f8_clock); - DECLARE_WRITE_LINE_MEMBER(write_f9_clock); - DECLARE_WRITE_LINE_MEMBER(write_f13_clock); - - DECLARE_READ_LINE_MEMBER(keypad_cb1_r); + void write_f1_clock(int state); + void write_f3_clock(int state); + void write_f7_clock(int state); + void write_f8_clock(int state); + void write_f9_clock(int state); + void write_f13_clock(int state); + + int keypad_cb1_r(); uint8_t keypad_key_r(); void led_digit_w(uint8_t data); void led_segment_w(uint8_t data); - DECLARE_READ_LINE_MEMBER(stop_pia_cb1_r); - DECLARE_WRITE_LINE_MEMBER(stop_pia_cb2_w); + int stop_pia_cb1_r(); + void stop_pia_cb2_w(int state); void mekd4_stop_mem(address_map &map); void mekd4_mem(address_map &map); @@ -622,7 +622,7 @@ void mekd4_state::page_w(uint8_t data) ************************************************************/ -WRITE_LINE_MEMBER(mekd4_state::reset_key_w) +void mekd4_state::reset_key_w(int state) { m_maincpu->set_input_line(INPUT_LINE_RESET, state ? CLEAR_LINE : ASSERT_LINE); @@ -642,7 +642,7 @@ INPUT_CHANGED_MEMBER(mekd4_state::keypad_changed) m_kpd_pia->cb1_w(mekd4_state::keypad_key_pressed()); } -READ_LINE_MEMBER(mekd4_state::keypad_cb1_r) +int mekd4_state::keypad_cb1_r() { return mekd4_state::keypad_key_pressed(); } @@ -684,13 +684,13 @@ void mekd4_state::led_digit_w(uint8_t data) ************************************************************/ -READ_LINE_MEMBER(mekd4_state::stop_pia_cb1_r) +int mekd4_state::stop_pia_cb1_r() { uint8_t state = m_cass->input() > +0.0; return state; } -WRITE_LINE_MEMBER(mekd4_state::stop_pia_cb2_w) +void mekd4_state::stop_pia_cb2_w(int state) { m_cass->output(state ? -1.0 : +1.0); } @@ -701,7 +701,7 @@ WRITE_LINE_MEMBER(mekd4_state::stop_pia_cb2_w) ************************************************************/ -WRITE_LINE_MEMBER(mekd4_state::rs232_route_cts) +void mekd4_state::rs232_route_cts(int state) { if (m_rs232_cts_route->read()) m_acia->write_cts(state); @@ -710,7 +710,7 @@ WRITE_LINE_MEMBER(mekd4_state::rs232_route_cts) m_cts = state; } -WRITE_LINE_MEMBER(mekd4_state::rs232_route_dcd) +void mekd4_state::rs232_route_dcd(int state) { if (m_rs232_dcd_route->read()) m_acia->write_dcd(state); @@ -735,7 +735,7 @@ INPUT_CHANGED_MEMBER(mekd4_state::rs232_dcd_route_change) m_acia->write_dcd(0); } -WRITE_LINE_MEMBER(mekd4_state::write_f1_clock) +void mekd4_state::write_f1_clock(int state) { if (BIT(m_rs232_tx_baud->read(), 0)) m_acia->write_txc(state); @@ -743,7 +743,7 @@ WRITE_LINE_MEMBER(mekd4_state::write_f1_clock) m_acia->write_rxc(state); } -WRITE_LINE_MEMBER(mekd4_state::write_f3_clock) +void mekd4_state::write_f3_clock(int state) { if (BIT(m_rs232_tx_baud->read(), 1)) m_acia->write_txc(state); @@ -751,7 +751,7 @@ WRITE_LINE_MEMBER(mekd4_state::write_f3_clock) m_acia->write_rxc(state); } -WRITE_LINE_MEMBER(mekd4_state::write_f7_clock) +void mekd4_state::write_f7_clock(int state) { if (BIT(m_rs232_tx_baud->read(), 2)) m_acia->write_txc(state); @@ -759,7 +759,7 @@ WRITE_LINE_MEMBER(mekd4_state::write_f7_clock) m_acia->write_rxc(state); } -WRITE_LINE_MEMBER(mekd4_state::write_f8_clock) +void mekd4_state::write_f8_clock(int state) { if (BIT(m_rs232_tx_baud->read(), 3)) m_acia->write_txc(state); @@ -767,7 +767,7 @@ WRITE_LINE_MEMBER(mekd4_state::write_f8_clock) m_acia->write_rxc(state); } -WRITE_LINE_MEMBER(mekd4_state::write_f9_clock) +void mekd4_state::write_f9_clock(int state) { if (BIT(m_rs232_tx_baud->read(), 4)) m_acia->write_txc(state); @@ -775,7 +775,7 @@ WRITE_LINE_MEMBER(mekd4_state::write_f9_clock) m_acia->write_rxc(state); } -WRITE_LINE_MEMBER(mekd4_state::write_f13_clock) +void mekd4_state::write_f13_clock(int state) { if (BIT(m_rs232_tx_baud->read(), 5)) m_acia->write_txc(state); diff --git a/src/mame/motorola/mekd5.cpp b/src/mame/motorola/mekd5.cpp index b9f7e676667..168edbed75c 100644 --- a/src/mame/motorola/mekd5.cpp +++ b/src/mame/motorola/mekd5.cpp @@ -112,28 +112,28 @@ public: void mekd5(machine_config &config); - DECLARE_WRITE_LINE_MEMBER(reset_key_w); + void reset_key_w(int state); DECLARE_INPUT_CHANGED_MEMBER(keypad_changed); private: virtual void machine_start() override; virtual void machine_reset() override; - DECLARE_WRITE_LINE_MEMBER(trace_timer_clear_w); + void trace_timer_clear_w(int state); - DECLARE_READ_LINE_MEMBER(keypad_cb1_r); + int keypad_cb1_r(); uint8_t keypad_key_r(); void led_digit_w(uint8_t data); void led_segment_w(uint8_t data); - DECLARE_READ_LINE_MEMBER(kansas_r); + int kansas_r(); // Clocks - DECLARE_WRITE_LINE_MEMBER(write_f1_clock); - DECLARE_WRITE_LINE_MEMBER(write_f3_clock); - DECLARE_WRITE_LINE_MEMBER(write_f5_clock); - DECLARE_WRITE_LINE_MEMBER(write_f7_clock); - DECLARE_WRITE_LINE_MEMBER(write_f9_clock); - DECLARE_WRITE_LINE_MEMBER(write_f13_clock); + void write_f1_clock(int state); + void write_f3_clock(int state); + void write_f5_clock(int state); + void write_f7_clock(int state); + void write_f9_clock(int state); + void write_f13_clock(int state); void mekd5_mem(address_map &map); @@ -256,7 +256,7 @@ TIMER_CALLBACK_MEMBER(mekd5_state::trace_tick) // account for the store that writes here as occuring at the start of that // instruction adding 5 cycles to give an effective 21 cycles. TODO adjust // this back to 16 cycles when the 6800 cycle timing becomes more accurate. -WRITE_LINE_MEMBER(mekd5_state::trace_timer_clear_w) +void mekd5_state::trace_timer_clear_w(int state) { if (state) m_kpd_pia->cb2_w(0); @@ -272,7 +272,7 @@ WRITE_LINE_MEMBER(mekd5_state::trace_timer_clear_w) // Keypad input is disable on views with the RS232 input. -WRITE_LINE_MEMBER(mekd5_state::reset_key_w) +void mekd5_state::reset_key_w(int state) { uint8_t view = machine().render().first_target()->view(); if (view > 1) return; @@ -299,7 +299,7 @@ INPUT_CHANGED_MEMBER(mekd5_state::keypad_changed) m_kpd_pia->cb1_w(mekd5_state::keypad_key_pressed()); } -READ_LINE_MEMBER(mekd5_state::keypad_cb1_r) +int mekd5_state::keypad_cb1_r() { return mekd5_state::keypad_key_pressed(); } @@ -339,7 +339,7 @@ void mekd5_state::led_digit_w(uint8_t data) m_kpd_pia->cb1_w(mekd5_state::keypad_key_pressed()); } -READ_LINE_MEMBER(mekd5_state::kansas_r) +int mekd5_state::kansas_r() { uint8_t data = m_cass->input() > +0.0; return data; @@ -352,7 +352,7 @@ READ_LINE_MEMBER(mekd5_state::kansas_r) ************************************************************/ -WRITE_LINE_MEMBER(mekd5_state::write_f1_clock) +void mekd5_state::write_f1_clock(int state) { if (BIT(m_baud_rate->read(), 0)) { @@ -361,7 +361,7 @@ WRITE_LINE_MEMBER(mekd5_state::write_f1_clock) } } -WRITE_LINE_MEMBER(mekd5_state::write_f3_clock) +void mekd5_state::write_f3_clock(int state) { if (BIT(m_baud_rate->read(), 1)) { @@ -370,7 +370,7 @@ WRITE_LINE_MEMBER(mekd5_state::write_f3_clock) } } -WRITE_LINE_MEMBER(mekd5_state::write_f5_clock) +void mekd5_state::write_f5_clock(int state) { if (BIT(m_baud_rate->read(), 2)) { @@ -379,7 +379,7 @@ WRITE_LINE_MEMBER(mekd5_state::write_f5_clock) } } -WRITE_LINE_MEMBER(mekd5_state::write_f7_clock) +void mekd5_state::write_f7_clock(int state) { if (BIT(m_baud_rate->read(), 3)) { @@ -388,7 +388,7 @@ WRITE_LINE_MEMBER(mekd5_state::write_f7_clock) } } -WRITE_LINE_MEMBER(mekd5_state::write_f9_clock) +void mekd5_state::write_f9_clock(int state) { if (BIT(m_baud_rate->read(), 4)) { @@ -397,7 +397,7 @@ WRITE_LINE_MEMBER(mekd5_state::write_f9_clock) } } -WRITE_LINE_MEMBER(mekd5_state::write_f13_clock) +void mekd5_state::write_f13_clock(int state) { if (BIT(m_baud_rate->read(), 5)) { diff --git a/src/mame/motorola/uchroma68.cpp b/src/mame/motorola/uchroma68.cpp index 44205a454c3..28f5161be88 100644 --- a/src/mame/motorola/uchroma68.cpp +++ b/src/mame/motorola/uchroma68.cpp @@ -175,7 +175,7 @@ private: bool m_video_inv; TIMER_DEVICE_CALLBACK_MEMBER(kansas_r); - DECLARE_WRITE_LINE_MEMBER(kansas_w); + void kansas_w(int state); required_device m_maincpu; required_device m_mc6846; @@ -358,7 +358,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(uchroma68_state::kansas_r) m_acia->write_rxc(1); } -WRITE_LINE_MEMBER(uchroma68_state::kansas_w) +void uchroma68_state::kansas_w(int state) { // The Kansas City cassette format encodes a '0' bit by four cycles of // a 1200 Hz sine wave, and a '1' bit as eight cycles of 2400 Hz, diff --git a/src/mame/mr/subhuntr.cpp b/src/mame/mr/subhuntr.cpp index 752b58c6c6e..2a784eb392d 100644 --- a/src/mame/mr/subhuntr.cpp +++ b/src/mame/mr/subhuntr.cpp @@ -65,9 +65,9 @@ private: void txtram_w(offs_t offset, u8 data); u8 intack_r(); - DECLARE_WRITE_LINE_MEMBER(pvi1_intreq_w); - DECLARE_WRITE_LINE_MEMBER(pvi2_intreq_w); - DECLARE_WRITE_LINE_MEMBER(pvi3_intreq_w); + void pvi1_intreq_w(int state); + void pvi2_intreq_w(int state); + void pvi3_intreq_w(int state); void palette_init(palette_device &palette) const; u32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, rectangle const &cliprect); @@ -156,19 +156,19 @@ u8 subhuntr_state::intack_r() return vector; } -WRITE_LINE_MEMBER(subhuntr_state::pvi1_intreq_w) +void subhuntr_state::pvi1_intreq_w(int state) { if (state) set_intreq(6, 0x02); else clr_intreq(6); } -WRITE_LINE_MEMBER(subhuntr_state::pvi2_intreq_w) +void subhuntr_state::pvi2_intreq_w(int state) { if (state) set_intreq(5, 0x04); else clr_intreq(5); } -WRITE_LINE_MEMBER(subhuntr_state::pvi3_intreq_w) +void subhuntr_state::pvi3_intreq_w(int state) { if (state) set_intreq(3, 0x08); else clr_intreq(3); diff --git a/src/mame/msx/msx.cpp b/src/mame/msx/msx.cpp index 5fc5ef5bae1..b28ec33b865 100644 --- a/src/mame/msx/msx.cpp +++ b/src/mame/msx/msx.cpp @@ -726,7 +726,7 @@ void msx2_base_state::switched_w(offs_t offset, u8 data) } // Some MSX2+ can switch the z80 clock between 3.5 and 5.3 MHz -WRITE_LINE_MEMBER(msx2_base_state::turbo_w) +void msx2_base_state::turbo_w(int state) { // 0 - 5.369317 MHz // 1 - 3.579545 MHz diff --git a/src/mame/msx/msx.h b/src/mame/msx/msx.h index a7975adafae..19f1dc8fd1c 100644 --- a/src/mame/msx/msx.h +++ b/src/mame/msx/msx.h @@ -356,7 +356,7 @@ protected: void rtc_latch_w(u8 data); u8 switched_r(offs_t offset); void switched_w(offs_t offset, u8 data); - DECLARE_WRITE_LINE_MEMBER(turbo_w); + void turbo_w(int state); void msx2_base_io_map(address_map &map); void msx2_io_map(address_map &map); void msx2plus_io_map(address_map &map); diff --git a/src/mame/msx/sfkick.cpp b/src/mame/msx/sfkick.cpp index cb2d7f766ec..a56702a788c 100644 --- a/src/mame/msx/sfkick.cpp +++ b/src/mame/msx/sfkick.cpp @@ -194,7 +194,7 @@ private: uint8_t ppi_port_b_r(); void ppi_port_a_w(uint8_t data); void ppi_port_c_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(irqhandler); + void irqhandler(int state); void sfkick_io_map(address_map &map); void sfkick_map(address_map &map); void sfkick_sound_io_map(address_map &map); @@ -399,7 +399,7 @@ void sfkick_state::machine_reset() m_bank[i]->set_entry(i); } -WRITE_LINE_MEMBER(sfkick_state::irqhandler) +void sfkick_state::irqhandler(int state) { m_soundcpu->set_input_line_and_vector(0, state ? ASSERT_LINE : CLEAR_LINE, 0xff); // Z80 } diff --git a/src/mame/mupid/mdisk.cpp b/src/mame/mupid/mdisk.cpp index d37295fb43f..a447a2af52a 100644 --- a/src/mame/mupid/mdisk.cpp +++ b/src/mame/mupid/mdisk.cpp @@ -53,10 +53,10 @@ protected: private: TIMER_CALLBACK_MEMBER(rom_timer_callback); - DECLARE_WRITE_LINE_MEMBER(uart1_rxrdy_w); - DECLARE_WRITE_LINE_MEMBER(uart1_txrdy_w); - DECLARE_WRITE_LINE_MEMBER(fdc_irq_w); - DECLARE_WRITE_LINE_MEMBER(fdc_motor_w); + void uart1_rxrdy_w(int state); + void uart1_txrdy_w(int state); + void fdc_irq_w(int state); + void fdc_motor_w(int state); void fdc_side_w(uint8_t data); void update_irq(uint8_t vector); @@ -112,7 +112,7 @@ INPUT_PORTS_END // FLOPPY //************************************************************************** -WRITE_LINE_MEMBER(mdisk_state::fdc_motor_w) +void mdisk_state::fdc_motor_w(int state) { if (m_floppy[0]->get_device()) m_floppy[0]->get_device()->mon_w(!state); if (m_floppy[1]->get_device()) m_floppy[1]->get_device()->mon_w(!state); @@ -170,19 +170,19 @@ void mdisk_state::update_irq(uint8_t vector) m_cpu->set_input_line(INPUT_LINE_IRQ0, CLEAR_LINE); } -WRITE_LINE_MEMBER(mdisk_state::fdc_irq_w) +void mdisk_state::fdc_irq_w(int state) { m_fdc_irq = state; update_irq(0x00); } -WRITE_LINE_MEMBER(mdisk_state::uart1_rxrdy_w) +void mdisk_state::uart1_rxrdy_w(int state) { m_uart1_rxrdy = state; update_irq(0x18); } -WRITE_LINE_MEMBER(mdisk_state::uart1_txrdy_w) +void mdisk_state::uart1_txrdy_w(int state) { m_uart1_txrdy = state; update_irq(0x1c); diff --git a/src/mame/namco/20pacgal.cpp b/src/mame/namco/20pacgal.cpp index 1c3a29e607c..90677021271 100644 --- a/src/mame/namco/20pacgal.cpp +++ b/src/mame/namco/20pacgal.cpp @@ -395,7 +395,7 @@ void _25pacman_state::machine_start() m_game_selected = 0; } -WRITE_LINE_MEMBER(_20pacgal_state::vblank_irq) +void _20pacgal_state::vblank_irq(int state) { if (state && m_irq_mask) m_maincpu->set_input_line(0, HOLD_LINE); // TODO: assert breaks the inputs in 25pacman test mode diff --git a/src/mame/namco/20pacgal.h b/src/mame/namco/20pacgal.h index 20df9be76e3..60052a51088 100644 --- a/src/mame/namco/20pacgal.h +++ b/src/mame/namco/20pacgal.h @@ -88,7 +88,7 @@ protected: virtual void machine_start() override; virtual void video_start() override; uint32_t screen_update_20pacgal(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(vblank_irq); + void vblank_irq(int state); void starpal_init(palette_device &palette) const; void get_pens(); void do_pen_lookup(bitmap_rgb32 &bitmap, const rectangle &cliprect); diff --git a/src/mame/namco/baraduke.cpp b/src/mame/namco/baraduke.cpp index 60866b94f65..f78af33a669 100644 --- a/src/mame/namco/baraduke.cpp +++ b/src/mame/namco/baraduke.cpp @@ -165,7 +165,7 @@ private: TILE_GET_INFO_MEMBER(get_tile_info1); void palette(palette_device &palette) const; uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(screen_vblank); + void screen_vblank(int state); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect, int sprite_priority); void set_scroll(int layer); void main_map(address_map &map); @@ -497,7 +497,7 @@ uint32_t baraduke_state::screen_update(screen_device &screen, bitmap_ind16 &bitm } -WRITE_LINE_MEMBER(baraduke_state::screen_vblank) +void baraduke_state::screen_vblank(int state) { // rising edge if (state) diff --git a/src/mame/namco/bosco.cpp b/src/mame/namco/bosco.cpp index b4bb9162954..58c94f37b28 100644 --- a/src/mame/namco/bosco.cpp +++ b/src/mame/namco/bosco.cpp @@ -281,7 +281,7 @@ uint32_t bosco_state::screen_update_bosco(screen_device &screen, bitmap_ind16 &b } -WRITE_LINE_MEMBER(bosco_state::screen_vblank_bosco) +void bosco_state::screen_vblank_bosco(int state) { // falling edge if (!state) diff --git a/src/mame/namco/bosco.h b/src/mame/namco/bosco.h index d83e94b8026..8293cf12e2e 100644 --- a/src/mame/namco/bosco.h +++ b/src/mame/namco/bosco.h @@ -41,7 +41,7 @@ private: TILE_GET_INFO_MEMBER(fg_get_tile_info); void bosco_palette(palette_device &palette) const; uint32_t screen_update_bosco(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(screen_vblank_bosco); + void screen_vblank_bosco(int state); inline void get_tile_info_bosco(tile_data &tileinfo,int tile_index,int ram_offs); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect, int flip); diff --git a/src/mame/namco/cgang.cpp b/src/mame/namco/cgang.cpp index 625ca0d0a1a..4ed20484541 100644 --- a/src/mame/namco/cgang.cpp +++ b/src/mame/namco/cgang.cpp @@ -154,11 +154,11 @@ private: void sound_map(address_map &map); // I/O handlers - DECLARE_WRITE_LINE_MEMBER(main_irq_w); - DECLARE_WRITE_LINE_MEMBER(main_firq_w); + void main_irq_w(int state); + void main_firq_w(int state); void main_irq_clear_w(u8 data); void main_firq_clear_w(u8 data); - template DECLARE_WRITE_LINE_MEMBER(motor_clock_w); + template void motor_clock_w(int state); void cg_motor_tick(int i); TIMER_DEVICE_CALLBACK_MEMBER(door_motor_tick); void refresh_motor_output(); @@ -259,7 +259,7 @@ void cgang_state::machine_reset() // maincpu (misc) -WRITE_LINE_MEMBER(cgang_state::main_irq_w) +void cgang_state::main_irq_w(int state) { // irq on rising edge if (state && !m_main_irq) @@ -268,7 +268,7 @@ WRITE_LINE_MEMBER(cgang_state::main_irq_w) m_main_irq = state; } -WRITE_LINE_MEMBER(cgang_state::main_firq_w) +void cgang_state::main_firq_w(int state) { // firq on rising edge if (state && !m_main_firq) @@ -288,7 +288,7 @@ void cgang_state::main_firq_clear_w(u8 data) } template -WRITE_LINE_MEMBER(cgang_state::motor_clock_w) +void cgang_state::motor_clock_w(int state) { // clock stepper motors if (state && !m_cg_motor_clk[N] && BIT(m_cg_motor_on, N)) diff --git a/src/mame/namco/digdug.cpp b/src/mame/namco/digdug.cpp index c88bfeb617f..4542d1d10ff 100644 --- a/src/mame/namco/digdug.cpp +++ b/src/mame/namco/digdug.cpp @@ -188,14 +188,14 @@ void digdug_state::bg_select_w(uint8_t data) } } -WRITE_LINE_MEMBER(digdug_state::tx_color_mode_w) +void digdug_state::tx_color_mode_w(int state) { // select alpha layer color mode (see tx_get_tile_info) m_tx_color_mode = state; m_fg_tilemap->mark_all_dirty(); } -WRITE_LINE_MEMBER(digdug_state::bg_disable_w) +void digdug_state::bg_disable_w(int state) { // "disable" background (see bg_get_tile_info) m_bg_disable = state; diff --git a/src/mame/namco/digdug.h b/src/mame/namco/digdug.h index 35ec019f8a9..5cd40624ab6 100644 --- a/src/mame/namco/digdug.h +++ b/src/mame/namco/digdug.h @@ -45,8 +45,8 @@ private: void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); void digdug_videoram_w(offs_t offset, uint8_t data); void bg_select_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(tx_color_mode_w); - DECLARE_WRITE_LINE_MEMBER(bg_disable_w); + void tx_color_mode_w(int state); + void bg_disable_w(int state); uint8_t earom_read(); void earom_write(offs_t offset, uint8_t data); diff --git a/src/mame/namco/galaga.cpp b/src/mame/namco/galaga.cpp index 33956e29d09..bb23c24e219 100644 --- a/src/mame/namco/galaga.cpp +++ b/src/mame/namco/galaga.cpp @@ -730,26 +730,26 @@ uint8_t galaga_state::bosco_dsw_r(offs_t offset) return bit0 | (bit1 << 1); } -WRITE_LINE_MEMBER(galaga_state::flip_screen_w) +void galaga_state::flip_screen_w(int state) { flip_screen_set(state); } -WRITE_LINE_MEMBER(galaga_state::irq1_clear_w) +void galaga_state::irq1_clear_w(int state) { m_main_irq_mask = state; if (!m_main_irq_mask) m_maincpu->set_input_line(0, CLEAR_LINE); } -WRITE_LINE_MEMBER(galaga_state::irq2_clear_w) +void galaga_state::irq2_clear_w(int state) { m_sub_irq_mask = state; if (!m_sub_irq_mask) m_subcpu->set_input_line(0, CLEAR_LINE); } -WRITE_LINE_MEMBER(galaga_state::nmion_w) +void galaga_state::nmion_w(int state) { m_sub2_nmi_mask = !state; } @@ -762,7 +762,7 @@ void galaga_state::out(uint8_t data) machine().bookkeeping().coin_counter_w(0,~data & 8); } -WRITE_LINE_MEMBER(galaga_state::lockout) +void galaga_state::lockout(int state) { machine().bookkeeping().coin_lockout_global_w(state); } @@ -1544,7 +1544,7 @@ static const char *const battles_sample_names[] = nullptr /* end of array */ }; -WRITE_LINE_MEMBER(galaga_state::vblank_irq) +void galaga_state::vblank_irq(int state) { if (state && m_main_irq_mask) m_maincpu->set_input_line(0, ASSERT_LINE); diff --git a/src/mame/namco/galaga.h b/src/mame/namco/galaga.h index 3a613b6bb33..9f318b01e1f 100644 --- a/src/mame/namco/galaga.h +++ b/src/mame/namco/galaga.h @@ -41,14 +41,14 @@ public: { } uint8_t bosco_dsw_r(offs_t offset); - DECLARE_WRITE_LINE_MEMBER(flip_screen_w); - DECLARE_WRITE_LINE_MEMBER(irq1_clear_w); - DECLARE_WRITE_LINE_MEMBER(irq2_clear_w); - DECLARE_WRITE_LINE_MEMBER(nmion_w); + void flip_screen_w(int state); + void irq1_clear_w(int state); + void irq2_clear_w(int state); + void nmion_w(int state); void galaga_videoram_w(offs_t offset, uint8_t data); - DECLARE_WRITE_LINE_MEMBER(gatsbee_bank_w); + void gatsbee_bank_w(int state); void out(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(lockout); + void lockout(int state); uint8_t namco_52xx_rom_r(offs_t offset); uint8_t namco_52xx_si_r(); void init_galaga(); @@ -57,8 +57,8 @@ public: TILE_GET_INFO_MEMBER(get_tile_info); void galaga_palette(palette_device &palette) const; uint32_t screen_update_galaga(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(screen_vblank_galaga); - DECLARE_WRITE_LINE_MEMBER(vblank_irq); + void screen_vblank_galaga(int state); + void vblank_irq(int state); TIMER_CALLBACK_MEMBER(cpu3_interrupt_callback); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect ); uint16_t get_next_lfsr_state(uint16_t lfsr); diff --git a/src/mame/namco/galaga_v.cpp b/src/mame/namco/galaga_v.cpp index 71b8d84b0a5..7e0999fb98f 100644 --- a/src/mame/namco/galaga_v.cpp +++ b/src/mame/namco/galaga_v.cpp @@ -161,7 +161,7 @@ void galaga_state::galaga_videoram_w(offs_t offset, uint8_t data) m_fg_tilemap->mark_tile_dirty(offset & 0x3ff); } -WRITE_LINE_MEMBER(galaga_state::gatsbee_bank_w) +void galaga_state::gatsbee_bank_w(int state) { m_galaga_gfxbank = state; m_fg_tilemap->mark_all_dirty(); @@ -234,7 +234,7 @@ uint32_t galaga_state::screen_update_galaga(screen_device &screen, bitmap_ind16 -WRITE_LINE_MEMBER(galaga_state::screen_vblank_galaga) +void galaga_state::screen_vblank_galaga(int state) { // falling edge if (!state) diff --git a/src/mame/namco/gaplus.cpp b/src/mame/namco/gaplus.cpp index 4cff7348ca3..93b87107622 100644 --- a/src/mame/namco/gaplus.cpp +++ b/src/mame/namco/gaplus.cpp @@ -220,7 +220,7 @@ TIMER_CALLBACK_MEMBER(gaplus_base_state::namcoio1_run) m_namco56xx->customio_run(); } -WRITE_LINE_MEMBER(gaplus_base_state::vblank_irq) +void gaplus_base_state::vblank_irq(int state) { if (!state) return; @@ -241,7 +241,7 @@ WRITE_LINE_MEMBER(gaplus_base_state::vblank_irq) m_subcpu2->set_input_line(0, ASSERT_LINE); } -WRITE_LINE_MEMBER(gapluso_state::vblank_irq) +void gapluso_state::vblank_irq(int state) { if (!state) return; diff --git a/src/mame/namco/gaplus.h b/src/mame/namco/gaplus.h index 699011693e2..fc261ac3a92 100644 --- a/src/mame/namco/gaplus.h +++ b/src/mame/namco/gaplus.h @@ -57,12 +57,12 @@ public: TILEMAP_MAPPER_MEMBER(tilemap_scan); TILE_GET_INFO_MEMBER(get_tile_info); - DECLARE_WRITE_LINE_MEMBER(vblank_irq); + void vblank_irq(int state); TIMER_CALLBACK_MEMBER(namcoio0_run); TIMER_CALLBACK_MEMBER(namcoio1_run); uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(screen_vblank); + void screen_vblank(int state); void starfield_init(); void starfield_render(bitmap_ind16 &bitmap); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect ) const; @@ -131,7 +131,7 @@ public: void gapluso(machine_config &config); protected: - DECLARE_WRITE_LINE_MEMBER(vblank_irq); + void vblank_irq(int state); }; class gaplus_state : public gaplus_base_state { diff --git a/src/mame/namco/gaplus_v.cpp b/src/mame/namco/gaplus_v.cpp index 44aafc8eda7..ccd7061bdc0 100644 --- a/src/mame/namco/gaplus_v.cpp +++ b/src/mame/namco/gaplus_v.cpp @@ -339,7 +339,7 @@ uint32_t gaplus_base_state::screen_update(screen_device &screen, bitmap_ind16 &b } -WRITE_LINE_MEMBER(gaplus_base_state::screen_vblank)/* update starfields */ +void gaplus_base_state::screen_vblank(int state) /* update starfields */ { // falling edge if (!state) diff --git a/src/mame/namco/kungfur.cpp b/src/mame/namco/kungfur.cpp index cd396109f0e..408bf2143fe 100644 --- a/src/mame/namco/kungfur.cpp +++ b/src/mame/namco/kungfur.cpp @@ -111,7 +111,7 @@ private: void control_w(u8 data); template void digit_data_w(u8 data) { m_digit_data[N] = data; } template void adpcm_data_w(u8 data) { m_adpcm_data[N] = data; } - template DECLARE_WRITE_LINE_MEMBER(adpcm_int); + template void adpcm_int(int state); u8 m_control = 0; u8 m_digit_data[3] = { 0, 0, 0 }; @@ -207,7 +207,7 @@ void kungfur_state::control_w(u8 data) } template -WRITE_LINE_MEMBER(kungfur_state::adpcm_int) +void kungfur_state::adpcm_int(int state) { if (!state) return; diff --git a/src/mame/namco/mappy.cpp b/src/mame/namco/mappy.cpp index d9daf26865f..8989dd0ded2 100644 --- a/src/mame/namco/mappy.cpp +++ b/src/mame/namco/mappy.cpp @@ -582,28 +582,28 @@ TODO: /***************************************************************************/ -WRITE_LINE_MEMBER(mappy_state::int_on_w) +void mappy_state::int_on_w(int state) { m_main_irq_mask = state; if (!state) m_maincpu->set_input_line(0, CLEAR_LINE); } -WRITE_LINE_MEMBER(mappy_state::int_on_2_w) +void mappy_state::int_on_2_w(int state) { m_sub_irq_mask = state; if (!state) m_subcpu->set_input_line(0, CLEAR_LINE); } -WRITE_LINE_MEMBER(mappy_state::int_on_3_w) +void mappy_state::int_on_3_w(int state) { m_sub2_irq_mask = state; if (!state) m_subcpu2->set_input_line(0, CLEAR_LINE); } -WRITE_LINE_MEMBER(mappy_state::mappy_flip_w) +void mappy_state::mappy_flip_w(int state) { flip_screen_set(state); } @@ -615,7 +615,7 @@ TIMER_CALLBACK_MEMBER(mappy_state::namcoio_run_timer) m_namcoio[Chip]->customio_run(); } -WRITE_LINE_MEMBER(mappy_state::vblank_irq) +void mappy_state::vblank_irq(int state) { if (!state) return; diff --git a/src/mame/namco/mappy.h b/src/mame/namco/mappy.h index f725431195a..a4001686122 100644 --- a/src/mame/namco/mappy.h +++ b/src/mame/namco/mappy.h @@ -70,10 +70,10 @@ private: emu_timer *m_namcoio_run_timer[2]{}; - DECLARE_WRITE_LINE_MEMBER(int_on_w); - DECLARE_WRITE_LINE_MEMBER(int_on_2_w); - DECLARE_WRITE_LINE_MEMBER(int_on_3_w); - DECLARE_WRITE_LINE_MEMBER(mappy_flip_w); + void int_on_w(int state); + void int_on_2_w(int state); + void int_on_3_w(int state); + void mappy_flip_w(int state); void superpac_videoram_w(offs_t offset, uint8_t data); void mappy_videoram_w(offs_t offset, uint8_t data); void superpac_flipscreen_w(uint8_t data); @@ -96,7 +96,7 @@ private: uint32_t screen_update_superpac(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_phozon(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_mappy(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(vblank_irq); + void vblank_irq(int state); void mappy_draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect, uint8_t *spriteram_base); void phozon_draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect, uint8_t *spriteram_base); diff --git a/src/mame/namco/namco50.cpp b/src/mame/namco/namco50.cpp index 8baf8cb4bd5..c474fe326e5 100644 --- a/src/mame/namco/namco50.cpp +++ b/src/mame/namco/namco50.cpp @@ -135,7 +135,7 @@ Flags: 80=high score, 40=first bonus, 20=interval bonus, 10=? #include "emu.h" #include "namco50.h" -WRITE_LINE_MEMBER( namco_50xx_device::reset ) +void namco_50xx_device::reset(int state) { // The incoming signal is active low m_cpu->set_input_line(INPUT_LINE_RESET, !state); @@ -171,7 +171,7 @@ TIMER_CALLBACK_MEMBER( namco_50xx_device::O_w_sync ) m_portO = (m_portO & 0xf0) | (out); } -WRITE_LINE_MEMBER( namco_50xx_device::rw ) +void namco_50xx_device::rw(int state) { machine().scheduler().synchronize(timer_expired_delegate(FUNC(namco_50xx_device::rw_sync),this), state); } @@ -181,7 +181,7 @@ TIMER_CALLBACK_MEMBER( namco_50xx_device::rw_sync ) m_rw = param; } -WRITE_LINE_MEMBER( namco_50xx_device::chip_select ) +void namco_50xx_device::chip_select(int state) { m_cpu->set_input_line(0, state); } diff --git a/src/mame/namco/namco50.h b/src/mame/namco/namco50.h index 23ca251f4e5..00ec415f8cd 100644 --- a/src/mame/namco/namco50.h +++ b/src/mame/namco/namco50.h @@ -13,9 +13,9 @@ class namco_50xx_device : public device_t public: namco_50xx_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - WRITE_LINE_MEMBER( reset ); - WRITE_LINE_MEMBER( chip_select ); - WRITE_LINE_MEMBER( rw ); + void reset(int state); + void chip_select(int state); + void rw(int state); void write(uint8_t data); uint8_t read(); diff --git a/src/mame/namco/namco51.cpp b/src/mame/namco/namco51.cpp index 1e574993a89..dda2a9d7a90 100644 --- a/src/mame/namco/namco51.cpp +++ b/src/mame/namco/namco51.cpp @@ -61,19 +61,19 @@ #include "screen.h" -WRITE_LINE_MEMBER( namco_51xx_device::reset ) +void namco_51xx_device::reset(int state) { // Reset line is active low. m_cpu->set_input_line(INPUT_LINE_RESET, !state); } -WRITE_LINE_MEMBER( namco_51xx_device::vblank ) +void namco_51xx_device::vblank(int state) { // The timer is active on falling edges. m_cpu->clock_w(!state); } -WRITE_LINE_MEMBER(namco_51xx_device::rw) +void namco_51xx_device::rw(int state) { machine().scheduler().synchronize(timer_expired_delegate(FUNC(namco_51xx_device::rw_sync),this), state); } @@ -83,7 +83,7 @@ TIMER_CALLBACK_MEMBER( namco_51xx_device::rw_sync ) m_rw = param; } -WRITE_LINE_MEMBER( namco_51xx_device::chip_select ) +void namco_51xx_device::chip_select(int state) { m_cpu->set_input_line(0, state); } diff --git a/src/mame/namco/namco51.h b/src/mame/namco/namco51.h index c25b82188f9..34d2a8a1328 100644 --- a/src/mame/namco/namco51.h +++ b/src/mame/namco/namco51.h @@ -17,10 +17,10 @@ public: auto output_callback() { return m_out.bind(); } auto lockout_callback() { return m_lockout.bind(); } - DECLARE_WRITE_LINE_MEMBER( reset ); - DECLARE_WRITE_LINE_MEMBER( vblank ); - DECLARE_WRITE_LINE_MEMBER( rw ); - DECLARE_WRITE_LINE_MEMBER( chip_select ); + void reset(int state); + void vblank(int state); + void rw(int state); + void chip_select(int state); void write(uint8_t data); uint8_t read(); diff --git a/src/mame/namco/namco52.cpp b/src/mame/namco/namco52.cpp index 564b25cd82c..ebce96da818 100644 --- a/src/mame/namco/namco52.cpp +++ b/src/mame/namco/namco52.cpp @@ -50,7 +50,7 @@ #include "emu.h" #include "namco52.h" -WRITE_LINE_MEMBER( namco_52xx_device::reset ) +void namco_52xx_device::reset(int state) { // The incoming signal is active low m_cpu->set_input_line(INPUT_LINE_RESET, !state); @@ -61,7 +61,7 @@ uint8_t namco_52xx_device::K_r() return m_latched_cmd & 0x0f; } -READ_LINE_MEMBER( namco_52xx_device::SI_r ) +int namco_52xx_device::SI_r() { return m_si(0) ? 1 : 0; } @@ -111,7 +111,7 @@ TIMER_CALLBACK_MEMBER( namco_52xx_device::write_sync ) m_latched_cmd = param; } -WRITE_LINE_MEMBER( namco_52xx_device::chip_select ) +void namco_52xx_device::chip_select(int state) { m_cpu->set_input_line(0, state); } diff --git a/src/mame/namco/namco52.h b/src/mame/namco/namco52.h index badd340de19..063af1eeaf3 100644 --- a/src/mame/namco/namco52.h +++ b/src/mame/namco/namco52.h @@ -17,8 +17,8 @@ public: auto romread_callback() { return m_romread.bind(); } auto si_callback() { return m_si.bind(); } - DECLARE_WRITE_LINE_MEMBER( reset ); - WRITE_LINE_MEMBER( chip_select ); + void reset(int state); + void chip_select(int state); void write(uint8_t data); protected: @@ -45,7 +45,7 @@ private: uint32_t m_address; uint8_t K_r(); - DECLARE_READ_LINE_MEMBER( SI_r ); + int SI_r(); uint8_t R0_r(); uint8_t R1_r(); void P_w(uint8_t data); diff --git a/src/mame/namco/namco53.cpp b/src/mame/namco/namco53.cpp index 7a6a8ea9181..295012d1c50 100644 --- a/src/mame/namco/namco53.cpp +++ b/src/mame/namco/namco53.cpp @@ -60,7 +60,7 @@ #include "namco53.h" -WRITE_LINE_MEMBER( namco_53xx_device::reset ) +void namco_53xx_device::reset(int state) { // The incoming signal is active low m_cpu->set_input_line(INPUT_LINE_RESET, !state); @@ -105,7 +105,7 @@ void namco_53xx_device::P_w(uint8_t data) m_p(0, data); } -WRITE_LINE_MEMBER(namco_53xx_device::chip_select) +void namco_53xx_device::chip_select(int state) { m_cpu->set_input_line(0, state); } diff --git a/src/mame/namco/namco53.h b/src/mame/namco/namco53.h index 7fe105524ec..e7509760889 100644 --- a/src/mame/namco/namco53.h +++ b/src/mame/namco/namco53.h @@ -17,8 +17,8 @@ public: auto k_port_callback() { return m_k.bind(); } auto p_port_callback() { return m_p.bind(); } - DECLARE_WRITE_LINE_MEMBER( reset ); - DECLARE_WRITE_LINE_MEMBER( chip_select ); + void reset(int state); + void chip_select(int state); uint8_t read(); protected: diff --git a/src/mame/namco/namco54.cpp b/src/mame/namco/namco54.cpp index 891cb957d0c..69123867989 100644 --- a/src/mame/namco/namco54.cpp +++ b/src/mame/namco/namco54.cpp @@ -53,7 +53,7 @@ #include "namco54.h" -WRITE_LINE_MEMBER( namco_54xx_device::reset ) +void namco_54xx_device::reset(int state) { // The incoming signal is active low m_cpu->set_input_line(INPUT_LINE_RESET, !state); @@ -97,7 +97,7 @@ TIMER_CALLBACK_MEMBER( namco_54xx_device::write_sync ) } -WRITE_LINE_MEMBER( namco_54xx_device::chip_select ) +void namco_54xx_device::chip_select(int state) { m_cpu->set_input_line(0, state); } diff --git a/src/mame/namco/namco54.h b/src/mame/namco/namco54.h index 4e93895237e..5edfbf12e6e 100644 --- a/src/mame/namco/namco54.h +++ b/src/mame/namco/namco54.h @@ -15,8 +15,8 @@ public: template void set_discrete(T &&tag) { m_discrete.set_tag(std::forward(tag)); } void set_basenote(int node) { m_basenode = node; } - DECLARE_WRITE_LINE_MEMBER( reset ); - WRITE_LINE_MEMBER( chip_select ); + void reset(int state); + void chip_select(int state); void write(uint8_t data); protected: diff --git a/src/mame/namco/namco_settings.cpp b/src/mame/namco/namco_settings.cpp index 1df580b9574..e2d6b16c556 100644 --- a/src/mame/namco/namco_settings.cpp +++ b/src/mame/namco/namco_settings.cpp @@ -10,7 +10,7 @@ namco_settings_device::namco_settings_device(const machine_config &mconfig, cons { } -WRITE_LINE_MEMBER( namco_settings_device::ce_w ) +void namco_settings_device::ce_w(int state) { if(ce != state) { ce = state; @@ -19,7 +19,7 @@ WRITE_LINE_MEMBER( namco_settings_device::ce_w ) } } -WRITE_LINE_MEMBER( namco_settings_device::clk_w ) +void namco_settings_device::clk_w(int state) { if(clk != state) { clk = state; @@ -37,7 +37,7 @@ WRITE_LINE_MEMBER( namco_settings_device::clk_w ) } } -WRITE_LINE_MEMBER( namco_settings_device::data_w ) +void namco_settings_device::data_w(int state) { data = state; } diff --git a/src/mame/namco/namco_settings.h b/src/mame/namco/namco_settings.h index 735148d3b59..496e2efe2f3 100644 --- a/src/mame/namco/namco_settings.h +++ b/src/mame/namco/namco_settings.h @@ -12,9 +12,9 @@ class namco_settings_device : public device_t { public: namco_settings_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - DECLARE_WRITE_LINE_MEMBER( ce_w ); - DECLARE_WRITE_LINE_MEMBER( clk_w ); - DECLARE_WRITE_LINE_MEMBER( data_w ); + void ce_w(int state); + void clk_w(int state); + void data_w(int state); protected: virtual void device_start() override; diff --git a/src/mame/namco/namcoio.cpp b/src/mame/namco/namcoio.cpp index a7efb5164ff..ee6d5767c6d 100644 --- a/src/mame/namco/namcoio.cpp +++ b/src/mame/namco/namcoio.cpp @@ -496,7 +496,7 @@ void namcoio_device::write(offs_t offset, uint8_t data) m_ram[offset] = data; } -WRITE_LINE_MEMBER( namcoio_device::set_reset_line ) +void namcoio_device::set_reset_line(int state) { m_reset = (state == ASSERT_LINE) ? 1 : 0; if (state != CLEAR_LINE) @@ -513,7 +513,7 @@ WRITE_LINE_MEMBER( namcoio_device::set_reset_line ) } } -READ_LINE_MEMBER( namcoio_device::read_reset_line ) +int namcoio_device::read_reset_line() { return m_reset; } diff --git a/src/mame/namco/namcoio.h b/src/mame/namco/namcoio.h index ed789a150b2..a2126ef6fcc 100644 --- a/src/mame/namco/namcoio.h +++ b/src/mame/namco/namcoio.h @@ -17,8 +17,8 @@ public: uint8_t read(offs_t offset); void write(offs_t offset, uint8_t data); - WRITE_LINE_MEMBER( set_reset_line ); - READ_LINE_MEMBER( read_reset_line ); + void set_reset_line(int state); + int read_reset_line(); virtual void customio_run() = 0; diff --git a/src/mame/namco/namcoio_gearbox.cpp b/src/mame/namco/namcoio_gearbox.cpp index 995129dbb86..5e8aefd6aa1 100644 --- a/src/mame/namco/namcoio_gearbox.cpp +++ b/src/mame/namco/namcoio_gearbox.cpp @@ -129,7 +129,7 @@ CUSTOM_INPUT_MEMBER( namcoio_gearbox_device::in_r ) return 0xf; // return neutral while changing gear } -READ_LINE_MEMBER( namcoio_gearbox_device::clutch_r ) +int namcoio_gearbox_device::clutch_r() { return ioport("CLUTCH")->read() & 1; } diff --git a/src/mame/namco/namcoio_gearbox.h b/src/mame/namco/namcoio_gearbox.h index 36c5480ba4c..86bd04cfb31 100644 --- a/src/mame/namco/namcoio_gearbox.h +++ b/src/mame/namco/namcoio_gearbox.h @@ -25,7 +25,7 @@ public: // I/O operations DECLARE_CUSTOM_INPUT_MEMBER( in_r ); - DECLARE_READ_LINE_MEMBER( clutch_r ); + int clutch_r(); uint8_t m_gearbox_state = 0; virtual ioport_constructor device_input_ports() const override; diff --git a/src/mame/namco/namconb1.h b/src/mame/namco/namconb1.h index 9d8e4b38d75..98b1b23075f 100644 --- a/src/mame/namco/namconb1.h +++ b/src/mame/namco/namconb1.h @@ -141,7 +141,7 @@ private: void video_update_common(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); u32 screen_update_namconb1(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); u32 screen_update_namconb2(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(screen_vblank); + void screen_vblank(int state); TIMER_DEVICE_CALLBACK_MEMBER(scantimer); TIMER_DEVICE_CALLBACK_MEMBER(mcu_irq0_cb); diff --git a/src/mame/namco/namconb1_v.cpp b/src/mame/namco/namconb1_v.cpp index c507889959b..3a8bcffe57f 100644 --- a/src/mame/namco/namconb1_v.cpp +++ b/src/mame/namco/namconb1_v.cpp @@ -107,7 +107,7 @@ void namconb1_state::video_update_common(screen_device &screen, bitmap_ind16 &bi } } /* video_update_common */ -WRITE_LINE_MEMBER(namconb1_state::screen_vblank) +void namconb1_state::screen_vblank(int state) { m_c355spr->vblank(state); if (state) diff --git a/src/mame/namco/namcos1.h b/src/mame/namco/namcos1.h index 1cb504081ef..c68fed0e308 100644 --- a/src/mame/namco/namcos1.h +++ b/src/mame/namco/namcos1.h @@ -116,7 +116,7 @@ private: bool m_copy_sprites = false; u8 m_drawmode_table[16]{}; - DECLARE_WRITE_LINE_MEMBER(subres_w); + void subres_w(int state); void audiocpu_irq_ack_w(u8 data); void mcu_irq_ack_w(u8 data); u8 dsw_r(offs_t offset); @@ -147,7 +147,7 @@ private: void draw_sprites(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); u32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(screen_vblank); + void screen_vblank(int state); void main_map(address_map &map); void mcu_map(address_map &map); diff --git a/src/mame/namco/namcos10.cpp b/src/mame/namco/namcos10.cpp index 1f3d2bddd8c..30fcefd4426 100644 --- a/src/mame/namco/namcos10.cpp +++ b/src/mame/namco/namcos10.cpp @@ -748,8 +748,8 @@ private: template uint16_t exio_lightgun_io_r(); TIMER_DEVICE_CALLBACK_MEMBER(io_update_interrupt_callback); - DECLARE_WRITE_LINE_MEMBER(cdrom_interrupt); - DECLARE_WRITE_LINE_MEMBER(cdrom_dmarq); + void cdrom_interrupt(int state); + void cdrom_dmarq(int state); devcb_write_line m_io_update_interrupt; @@ -1086,7 +1086,7 @@ void namcos10_state::namcos10_base(machine_config &config) m_ata->dmarq_handler().set(FUNC(namcos10_state::cdrom_dmarq)); } -WRITE_LINE_MEMBER(namcos10_state::cdrom_interrupt) +void namcos10_state::cdrom_interrupt(int state) { if (state) m_int |= 4; @@ -1096,7 +1096,7 @@ WRITE_LINE_MEMBER(namcos10_state::cdrom_interrupt) m_io_update_interrupt(state); } -WRITE_LINE_MEMBER(namcos10_state::cdrom_dmarq) +void namcos10_state::cdrom_dmarq(int state) { if (!state) return; diff --git a/src/mame/namco/namcos12.cpp b/src/mame/namco/namcos12.cpp index 8e835692bd5..4041d6190e5 100644 --- a/src/mame/namco/namcos12.cpp +++ b/src/mame/namco/namcos12.cpp @@ -1220,7 +1220,7 @@ private: inline void ATTR_PRINTF(3,4) verboselog( int n_level, const char *s_fmt, ... ); void namcos12_rom_read( uint32_t *p_n_psxram, uint32_t n_address, int32_t n_size ); - DECLARE_WRITE_LINE_MEMBER(namcos12_sub_irq); + void namcos12_sub_irq(int state); }; @@ -1362,7 +1362,7 @@ void namcos12_state::namcos12_rom_read( uint32_t *p_n_psxram, uint32_t n_address } } -WRITE_LINE_MEMBER(namcos12_state::namcos12_sub_irq) +void namcos12_state::namcos12_sub_irq(int state) { m_sub->set_input_line(1, state ? ASSERT_LINE : CLEAR_LINE); m_adc->adtrg_w(state); diff --git a/src/mame/namco/namcos1_m.cpp b/src/mame/namco/namcos1_m.cpp index 4a37b387e4b..fc6de0665df 100644 --- a/src/mame/namco/namcos1_m.cpp +++ b/src/mame/namco/namcos1_m.cpp @@ -489,7 +489,7 @@ void namcos1_state::sound_bankswitch_w(u8 data) * * *******************************************************************************/ -WRITE_LINE_MEMBER(namcos1_state::subres_w) +void namcos1_state::subres_w(int state) { // logerror("reset control %s %02x\n",machine().describe_context(),data); if (state != m_reset) diff --git a/src/mame/namco/namcos1_v.cpp b/src/mame/namco/namcos1_v.cpp index a61f43aa099..711f88ea19c 100644 --- a/src/mame/namco/namcos1_v.cpp +++ b/src/mame/namco/namcos1_v.cpp @@ -245,7 +245,7 @@ u32 namcos1_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, co } -WRITE_LINE_MEMBER(namcos1_state::screen_vblank) +void namcos1_state::screen_vblank(int state) { // rising edge if (state) diff --git a/src/mame/namco/namcos21_c67.cpp b/src/mame/namco/namcos21_c67.cpp index 3f3ae942ba4..b0dc280156b 100644 --- a/src/mame/namco/namcos21_c67.cpp +++ b/src/mame/namco/namcos21_c67.cpp @@ -353,7 +353,7 @@ private: TIMER_DEVICE_CALLBACK_MEMBER(screen_scanline); - DECLARE_WRITE_LINE_MEMBER(yield_hack); + void yield_hack(int state); uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); @@ -870,7 +870,7 @@ void namcos21_c67_state::cybsled(machine_config &config) m_namcos21_dsp_c67->set_gametype(namcos21_dsp_c67_device::NAMCOS21_CYBERSLED); } -WRITE_LINE_MEMBER(namcos21_c67_state::yield_hack) +void namcos21_c67_state::yield_hack(int state) { m_maincpu->yield(); } diff --git a/src/mame/namco/namcos22.cpp b/src/mame/namco/namcos22.cpp index 6ddb808f29f..333f4135cd3 100644 --- a/src/mame/namco/namcos22.cpp +++ b/src/mame/namco/namcos22.cpp @@ -3209,7 +3209,7 @@ INPUT_PORTS_END /*********************************************************************************************/ template -READ_LINE_MEMBER(alpine_state::alpine_motor_r) +int alpine_state::alpine_motor_r() { return BIT(m_motor_status, N); } diff --git a/src/mame/namco/namcos22.h b/src/mame/namco/namcos22.h index e1c09146dde..e16cf9e401c 100644 --- a/src/mame/namco/namcos22.h +++ b/src/mame/namco/namcos22.h @@ -507,7 +507,7 @@ protected: bool m_skipped_this_frame = false; void render_frame_active(); - DECLARE_WRITE_LINE_MEMBER(screen_vblank); + void screen_vblank(int state); bool m_pdp_render_done = false; bool m_render_refresh = false; u64 m_pdp_frame = 0; @@ -597,7 +597,7 @@ public: void init_alpiner(); void init_alpiner2(); - template DECLARE_READ_LINE_MEMBER(alpine_motor_r); + template int alpine_motor_r(); protected: required_device m_motor_timer; diff --git a/src/mame/namco/namcos22_v.cpp b/src/mame/namco/namcos22_v.cpp index 077d310d5aa..0fc1bbe7a69 100644 --- a/src/mame/namco/namcos22_v.cpp +++ b/src/mame/namco/namcos22_v.cpp @@ -1547,7 +1547,7 @@ void namcos22_state::render_frame_active() m_render_refresh = false; } -WRITE_LINE_MEMBER(namcos22_state::screen_vblank) +void namcos22_state::screen_vblank(int state) { if (state) { diff --git a/src/mame/namco/namcos23.cpp b/src/mame/namco/namcos23.cpp index b336d07e684..29d690a1b8f 100644 --- a/src/mame/namco/namcos23.cpp +++ b/src/mame/namco/namcos23.cpp @@ -1710,7 +1710,7 @@ private: uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(interrupt); TIMER_CALLBACK_MEMBER(c361_timer_cb); - DECLARE_WRITE_LINE_MEMBER(sub_irq); + void sub_irq(int state); uint8_t nthbyte(const uint32_t *pSource, int offs); uint16_t nthword(const uint32_t *pSource, int offs); inline int32_t u32_to_s24(uint32_t v); @@ -2681,7 +2681,7 @@ INTERRUPT_GEN_MEMBER(namcos23_state::interrupt) m_render.count[m_render.cur] = 0; } -WRITE_LINE_MEMBER(namcos23_state::sub_irq) +void namcos23_state::sub_irq(int state) { m_subcpu->set_input_line(1, state ? ASSERT_LINE : CLEAR_LINE); m_adc->adtrg_w(state); diff --git a/src/mame/namco/namcos86.h b/src/mame/namco/namcos86.h index 79bf443bc4b..1bc38b89f4a 100644 --- a/src/mame/namco/namcos86.h +++ b/src/mame/namco/namcos86.h @@ -75,7 +75,7 @@ private: void namcos86_palette(palette_device &palette); uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(screen_vblank); + void screen_vblank(int state); void draw_sprites(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void scroll_w(offs_t offset, int data, int layer); diff --git a/src/mame/namco/namcos86_v.cpp b/src/mame/namco/namcos86_v.cpp index fdcf9ba2aca..d4027691eb4 100644 --- a/src/mame/namco/namcos86_v.cpp +++ b/src/mame/namco/namcos86_v.cpp @@ -366,7 +366,7 @@ uint32_t namcos86_state::screen_update(screen_device &screen, bitmap_ind16 &bitm } -WRITE_LINE_MEMBER(namcos86_state::screen_vblank) +void namcos86_state::screen_vblank(int state) { // rising edge if (state) diff --git a/src/mame/namco/pacland.cpp b/src/mame/namco/pacland.cpp index aab4584b8a1..95d08594902 100644 --- a/src/mame/namco/pacland.cpp +++ b/src/mame/namco/pacland.cpp @@ -272,7 +272,7 @@ private: void palette(palette_device &palette); - DECLARE_WRITE_LINE_MEMBER(vblank_irq); + void vblank_irq(int state); uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void switch_palette(); @@ -880,7 +880,7 @@ static GFXDECODE_START( gfx_pacland ) GFXDECODE_END -WRITE_LINE_MEMBER(pacland_state::vblank_irq) +void pacland_state::vblank_irq(int state) { if (state && m_main_irq_mask) m_maincpu->set_input_line(0, ASSERT_LINE); diff --git a/src/mame/namco/polepos.cpp b/src/mame/namco/polepos.cpp index ceb6c5c6749..c76cc263df1 100644 --- a/src/mame/namco/polepos.cpp +++ b/src/mame/namco/polepos.cpp @@ -292,12 +292,12 @@ uint8_t polepos_state::ready_r() return ret; } -WRITE_LINE_MEMBER(polepos_state::gasel_w) +void polepos_state::gasel_w(int state) { m_adc_input = state; } -WRITE_LINE_MEMBER(polepos_state::sb0_w) +void polepos_state::sb0_w(int state) { m_auto_start_mask = !state; } @@ -311,7 +311,7 @@ template void polepos_state::z8002_nvi_enable_w(uint16_t data) (sub1 ? m_subcpu : m_subcpu2)->set_input_line(z8002_device::NVI_LINE, CLEAR_LINE); } -READ_LINE_MEMBER(polepos_state::auto_start_r) +int polepos_state::auto_start_r() { return m_auto_start_mask; } @@ -325,7 +325,7 @@ void polepos_state::out(uint8_t data) machine().bookkeeping().coin_counter_w(0,~data & 8); } -WRITE_LINE_MEMBER(polepos_state::lockout) +void polepos_state::lockout(int state) { machine().bookkeeping().coin_lockout_global_w(state); } diff --git a/src/mame/namco/polepos.h b/src/mame/namco/polepos.h index 1216a1b22d6..71cf12ed402 100644 --- a/src/mame/namco/polepos.h +++ b/src/mame/namco/polepos.h @@ -42,7 +42,7 @@ public: m_palette(*this, "palette") { } - DECLARE_READ_LINE_MEMBER(auto_start_r); + int auto_start_r(); void init_polepos2(); @@ -92,9 +92,9 @@ private: uint16_t polepos2_ic25_r(offs_t offset); uint8_t analog_r(); uint8_t ready_r(); - DECLARE_WRITE_LINE_MEMBER(gasel_w); - DECLARE_WRITE_LINE_MEMBER(sb0_w); - DECLARE_WRITE_LINE_MEMBER(chacl_w); + void gasel_w(int state); + void sb0_w(int state); + void chacl_w(int state); template void z8002_nvi_enable_w(uint16_t data); uint8_t sprite_r(offs_t offset); void sprite_w(offs_t offset, uint8_t data); @@ -109,7 +109,7 @@ private: uint8_t alpha_r(offs_t offset); void alpha_w(offs_t offset, uint8_t data); void out(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(lockout); + void lockout(int state); uint8_t namco_52xx_rom_r(offs_t offset); uint8_t namco_52xx_si_r(); uint8_t namco_53xx_k_r(); diff --git a/src/mame/namco/polepos_a.cpp b/src/mame/namco/polepos_a.cpp index 46fc1ca16b0..95a52451207 100644 --- a/src/mame/namco/polepos_a.cpp +++ b/src/mame/namco/polepos_a.cpp @@ -304,7 +304,7 @@ void polepos_sound_device::sound_stream_update(sound_stream &stream, std::vector } -WRITE_LINE_MEMBER(polepos_sound_device::clson_w) +void polepos_sound_device::clson_w(int state) { if (!state) { diff --git a/src/mame/namco/polepos_a.h b/src/mame/namco/polepos_a.h index 657e1e7b05c..558b418ceaa 100644 --- a/src/mame/namco/polepos_a.h +++ b/src/mame/namco/polepos_a.h @@ -22,7 +22,7 @@ protected: virtual void sound_stream_update(sound_stream &stream, std::vector const &inputs, std::vector &outputs) override; public: - DECLARE_WRITE_LINE_MEMBER(clson_w); + void clson_w(int state); void polepos_engine_sound_lsb_w(uint8_t data); void polepos_engine_sound_msb_w(uint8_t data); diff --git a/src/mame/namco/polepos_v.cpp b/src/mame/namco/polepos_v.cpp index 4c7014494cc..e6823539c76 100644 --- a/src/mame/namco/polepos_v.cpp +++ b/src/mame/namco/polepos_v.cpp @@ -269,7 +269,7 @@ void polepos_state::view16_hscroll_w(offs_t offset, uint16_t data, uint16_t mem_ m_bg_tilemap->set_scrollx(0,m_scroll); } -WRITE_LINE_MEMBER(polepos_state::chacl_w) +void polepos_state::chacl_w(int state) { m_chacl = state; m_tx_tilemap->mark_all_dirty(); diff --git a/src/mame/namco/skykid.cpp b/src/mame/namco/skykid.cpp index be24e4205a5..018a8f76bb8 100644 --- a/src/mame/namco/skykid.cpp +++ b/src/mame/namco/skykid.cpp @@ -104,7 +104,7 @@ private: TILE_GET_INFO_MEMBER(bg_get_tile_info); void palette(palette_device &palette) const; uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(vblank_irq); + void vblank_irq(int state); void draw_sprites(bitmap_ind16 &bitmap,const rectangle &cliprect); void mcu_map(address_map &map); void main_map(address_map &map); @@ -690,7 +690,7 @@ static GFXDECODE_START( gfx_skykid ) GFXDECODE_END -WRITE_LINE_MEMBER(skykid_state::vblank_irq) +void skykid_state::vblank_irq(int state) { if (state && m_main_irq_mask) m_maincpu->set_input_line(0, ASSERT_LINE); diff --git a/src/mame/namco/tankbatt.cpp b/src/mame/namco/tankbatt.cpp index 37f0925c0d3..d762320cbea 100644 --- a/src/mame/namco/tankbatt.cpp +++ b/src/mame/namco/tankbatt.cpp @@ -261,12 +261,12 @@ void tankbatt_state::intack_w(uint8_t data) m_maincpu->set_input_line(m6502_device::IRQ_LINE, CLEAR_LINE); } -WRITE_LINE_MEMBER(tankbatt_state::coincounter_w) +void tankbatt_state::coincounter_w(int state) { machine().bookkeeping().coin_counter_w(0, state); } -WRITE_LINE_MEMBER(tankbatt_state::coinlockout_w) +void tankbatt_state::coinlockout_w(int state) { machine().bookkeeping().coin_lockout_w(0, state); machine().bookkeeping().coin_lockout_w(1, state); diff --git a/src/mame/namco/tceptor.h b/src/mame/namco/tceptor.h index 2b95e96684f..7ec072953ef 100644 --- a/src/mame/namco/tceptor.h +++ b/src/mame/namco/tceptor.h @@ -103,7 +103,7 @@ private: TILE_GET_INFO_MEMBER(get_bg2_tile_info); void tceptor_palette(palette_device &palette); uint32_t screen_update_tceptor(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(screen_vblank_tceptor); + void screen_vblank_tceptor(int state); INTERRUPT_GEN_MEMBER(m6809_vb_interrupt); INTERRUPT_GEN_MEMBER(m68k_vb_interrupt); INTERRUPT_GEN_MEMBER(mcu_vb_interrupt); diff --git a/src/mame/namco/tceptor_v.cpp b/src/mame/namco/tceptor_v.cpp index 1124603f990..c74aa3de7cc 100644 --- a/src/mame/namco/tceptor_v.cpp +++ b/src/mame/namco/tceptor_v.cpp @@ -523,7 +523,7 @@ uint32_t tceptor_state::screen_update_tceptor(screen_device &screen, bitmap_ind1 return 0; } -WRITE_LINE_MEMBER(tceptor_state::screen_vblank_tceptor) +void tceptor_state::screen_vblank_tceptor(int state) { // rising edge if (state) diff --git a/src/mame/namco/toypop.cpp b/src/mame/namco/toypop.cpp index ae6aaf664c2..3577c4f663d 100644 --- a/src/mame/namco/toypop.cpp +++ b/src/mame/namco/toypop.cpp @@ -88,7 +88,7 @@ private: uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); TIMER_DEVICE_CALLBACK_MEMBER(master_scanline); - DECLARE_WRITE_LINE_MEMBER(slave_vblank_irq); + void slave_vblank_irq(int state); uint8_t irq_enable_r(); void irq_disable_w(uint8_t data); @@ -690,7 +690,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(namcos16_state::master_scanline) } } -WRITE_LINE_MEMBER(namcos16_state::slave_vblank_irq) +void namcos16_state::slave_vblank_irq(int state) { if (state && m_slave_irq_enable == true) m_slave_cpu->set_input_line(6, HOLD_LINE); diff --git a/src/mame/namco/turrett.cpp b/src/mame/namco/turrett.cpp index 9b361bef92c..229db6c8b7a 100644 --- a/src/mame/namco/turrett.cpp +++ b/src/mame/namco/turrett.cpp @@ -157,13 +157,13 @@ INPUT_PORTS_END * *************************************/ -READ_LINE_MEMBER( turrett_state::sbrc2_r ) +int turrett_state::sbrc2_r() { return m_screen->vblank(); } -READ_LINE_MEMBER( turrett_state::sbrc3_r ) +int turrett_state::sbrc3_r() { return m_dma_idle; } diff --git a/src/mame/namco/turrett.h b/src/mame/namco/turrett.h index d8e4188c7e3..cf706179bdc 100644 --- a/src/mame/namco/turrett.h +++ b/src/mame/namco/turrett.h @@ -55,8 +55,8 @@ private: void video_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0); uint32_t int_r(); void int_w(uint32_t data); - DECLARE_READ_LINE_MEMBER(sbrc2_r); - DECLARE_READ_LINE_MEMBER(sbrc3_r); + int sbrc2_r(); + int sbrc3_r(); TIMER_CALLBACK_MEMBER(dma_complete); INTERRUPT_GEN_MEMBER(vblank); diff --git a/src/mame/namco/wacky_gator.cpp b/src/mame/namco/wacky_gator.cpp index a717918fcc5..9cb816f41f7 100644 --- a/src/mame/namco/wacky_gator.cpp +++ b/src/mame/namco/wacky_gator.cpp @@ -56,7 +56,7 @@ private: virtual void machine_start() override; virtual void machine_reset() override; - DECLARE_WRITE_LINE_MEMBER(adpcm_int); + void adpcm_int(int state); void sample_ctrl_w(uint8_t data); void alligators_ctrl1_w(uint8_t data); void alligators_ctrl2_w(uint8_t data); @@ -69,7 +69,7 @@ private: template void disp_w(uint8_t data) { set_digits(N << 1, data); } void pmm8713_ck(int i, int state); - template DECLARE_WRITE_LINE_MEMBER(alligator_ck) { pmm8713_ck(N, state); } + template void alligator_ck(int state) { pmm8713_ck(N, state); } void irq_ack_w(uint8_t data) { m_maincpu->set_input_line(M6809_IRQ_LINE, CLEAR_LINE); } void firq_ack_w(uint8_t data) { m_maincpu->set_input_line(M6809_FIRQ_LINE, CLEAR_LINE); } @@ -250,7 +250,7 @@ static INPUT_PORTS_START( wackygtr ) PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) INPUT_PORTS_END -WRITE_LINE_MEMBER(wackygtr_state::adpcm_int) +void wackygtr_state::adpcm_int(int state) { if (!(m_adpcm_ctrl & 0x80)) { diff --git a/src/mame/namco/warpwarp.cpp b/src/mame/namco/warpwarp.cpp index a9dcaee9c7a..9a2748a2834 100644 --- a/src/mame/namco/warpwarp.cpp +++ b/src/mame/namco/warpwarp.cpp @@ -220,7 +220,7 @@ void warpwarp_state::machine_start() } /* Interrupt Gen */ -WRITE_LINE_MEMBER(warpwarp_state::vblank_irq) +void warpwarp_state::vblank_irq(int state) { if (state && m_ball_on) m_maincpu->set_input_line(0, ASSERT_LINE); @@ -266,30 +266,30 @@ void warpwarp_state::geebee_out6_w(offs_t offset, uint8_t data) } } -WRITE_LINE_MEMBER(warpwarp_state::counter_w) +void warpwarp_state::counter_w(int state) { machine().bookkeeping().coin_counter_w(0, state); } -WRITE_LINE_MEMBER(warpwarp_state::lock_out_w) +void warpwarp_state::lock_out_w(int state) { machine().bookkeeping().coin_lockout_global_w(!state); } -WRITE_LINE_MEMBER(warpwarp_state::geebee_bgw_w) +void warpwarp_state::geebee_bgw_w(int state) { m_geebee_bgw = state; machine().tilemap().mark_all_dirty(); } -WRITE_LINE_MEMBER(warpwarp_state::ball_on_w) +void warpwarp_state::ball_on_w(int state) { m_ball_on = state; if (!state) m_maincpu->set_input_line(0, CLEAR_LINE); } -WRITE_LINE_MEMBER(warpwarp_state::inv_w) +void warpwarp_state::inv_w(int state) { flip_screen_set(state); } diff --git a/src/mame/namco/warpwarp.h b/src/mame/namco/warpwarp.h index 3de5f129c43..855a787566e 100644 --- a/src/mame/namco/warpwarp.h +++ b/src/mame/namco/warpwarp.h @@ -91,11 +91,11 @@ private: //geebee and navarone uint8_t geebee_in_r(offs_t offset); void geebee_out6_w(offs_t offset, uint8_t data); - DECLARE_WRITE_LINE_MEMBER(counter_w); - DECLARE_WRITE_LINE_MEMBER(lock_out_w); - DECLARE_WRITE_LINE_MEMBER(geebee_bgw_w); - DECLARE_WRITE_LINE_MEMBER(ball_on_w); - DECLARE_WRITE_LINE_MEMBER(inv_w); + void counter_w(int state); + void lock_out_w(int state); + void geebee_bgw_w(int state); + void ball_on_w(int state); + void inv_w(int state); void geebee_videoram_w(offs_t offset, uint8_t data); virtual void machine_start() override; @@ -118,7 +118,7 @@ private: inline void plot(bitmap_ind16 &bitmap, const rectangle &cliprect, int x, int y, pen_t pen); void draw_ball(bitmap_ind16 &bitmap, const rectangle &cliprect,pen_t pen); - DECLARE_WRITE_LINE_MEMBER(vblank_irq); + void vblank_irq(int state); void bombbee_map(address_map &map); void geebee_map(address_map &map); diff --git a/src/mame/namco/xevious.h b/src/mame/namco/xevious.h index 9fd0c4fb5ed..fc3a344a19c 100644 --- a/src/mame/namco/xevious.h +++ b/src/mame/namco/xevious.h @@ -77,7 +77,7 @@ protected: virtual void machine_reset() override; private: - DECLARE_WRITE_LINE_MEMBER(interrupt_4); + void interrupt_4(int state); TIMER_DEVICE_CALLBACK_MEMBER(nmi_generate); void battles_mem4(address_map &map); diff --git a/src/mame/namco/xevious_m.cpp b/src/mame/namco/xevious_m.cpp index e7857ac920c..968303d7fe1 100644 --- a/src/mame/namco/xevious_m.cpp +++ b/src/mame/namco/xevious_m.cpp @@ -163,7 +163,7 @@ uint8_t battles_state::input_port_r(offs_t offset) } -WRITE_LINE_MEMBER(battles_state::interrupt_4) +void battles_state::interrupt_4(int state) { if (state) m_subcpu3->set_input_line(0, HOLD_LINE); diff --git a/src/mame/nasco/crgolf.cpp b/src/mame/nasco/crgolf.cpp index 9e762c05d95..a5f43518f80 100644 --- a/src/mame/nasco/crgolf.cpp +++ b/src/mame/nasco/crgolf.cpp @@ -151,10 +151,10 @@ private: uint8_t analog_input_r(); void switch_input_select_w(uint8_t data); void unknown_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(color_select_w); - DECLARE_WRITE_LINE_MEMBER(screen_flip_w); - DECLARE_WRITE_LINE_MEMBER(screen_select_w); - template DECLARE_WRITE_LINE_MEMBER(screen_enable_w); + void color_select_w(int state); + void screen_flip_w(int state); + void screen_select_w(int state); + template void screen_enable_w(int state); void palette(palette_device &palette) const; uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void main_map(address_map &map); @@ -187,7 +187,7 @@ private: uint8_t m_sample_count = 0U; void sample_w(offs_t offset, uint8_t data); - DECLARE_WRITE_LINE_MEMBER(vck_callback); + void vck_callback(int state); void sound_map(address_map &map); }; @@ -423,7 +423,7 @@ void crgolf_state::unknown_w(uint8_t data) * *************************************/ -WRITE_LINE_MEMBER(crgolfhi_state::vck_callback) +void crgolfhi_state::vck_callback(int state) { // only play back if we have data remaining if (m_sample_count != 0xff) @@ -474,20 +474,20 @@ void crgolfhi_state::sample_w(offs_t offset, uint8_t data) } -WRITE_LINE_MEMBER(crgolf_state::color_select_w) +void crgolf_state::color_select_w(int state) { m_color_select = state; } -WRITE_LINE_MEMBER(crgolf_state::screen_flip_w) +void crgolf_state::screen_flip_w(int state) { m_screen_flip = state; } template -WRITE_LINE_MEMBER(crgolf_state::screen_enable_w) +void crgolf_state::screen_enable_w(int state) { m_screen_enable[Which] = state; } diff --git a/src/mame/nasco/suprgolf.cpp b/src/mame/nasco/suprgolf.cpp index ddccc1737b7..3de25cf0262 100644 --- a/src/mame/nasco/suprgolf.cpp +++ b/src/mame/nasco/suprgolf.cpp @@ -92,7 +92,7 @@ private: uint8_t p2_r(); void writeA(uint8_t data); void writeB(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(adpcm_int); + void adpcm_int(int state); TILE_GET_INFO_MEMBER(get_tile_info); @@ -437,7 +437,7 @@ void suprgolf_state::writeB(uint8_t data) osd_printf_debug("ymwA\n"); } -WRITE_LINE_MEMBER(suprgolf_state::adpcm_int) +void suprgolf_state::adpcm_int(int state) { m_msm->reset_w(0); m_toggle ^= 1; diff --git a/src/mame/nascom/nascom1.cpp b/src/mame/nascom/nascom1.cpp index cee10805acf..6bba0de3df6 100644 --- a/src/mame/nascom/nascom1.cpp +++ b/src/mame/nascom/nascom1.cpp @@ -83,8 +83,8 @@ protected: uint8_t nascom1_port_01_r(); void nascom1_port_01_w(uint8_t data); uint8_t nascom1_port_02_r(); - DECLARE_READ_LINE_MEMBER(hd6402_si); - DECLARE_WRITE_LINE_MEMBER(hd6402_so); + int hd6402_si(); + void hd6402_so(int state); void screen_update(bitmap_ind16 &bitmap, const rectangle &cliprect, int char_height); @@ -119,7 +119,7 @@ private: void nascom1_io(address_map &map); void nascom1_mem(address_map &map); TIMER_DEVICE_CALLBACK_MEMBER(nascom1_kansas_r); - DECLARE_WRITE_LINE_MEMBER(nascom1_kansas_w); + void nascom1_kansas_w(int state); u16 m_cass_cnt[2]; }; @@ -147,9 +147,9 @@ protected: private: TIMER_DEVICE_CALLBACK_MEMBER(nascom2_kansas_r); - DECLARE_WRITE_LINE_MEMBER(nascom2_kansas_w); - DECLARE_WRITE_LINE_MEMBER(ram_disable_w); - DECLARE_WRITE_LINE_MEMBER(ram_disable_cpm_w); + void nascom2_kansas_w(int state); + void ram_disable_w(int state); + void ram_disable_cpm_w(int state); uint32_t screen_update_nascom(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); std::pair load_cart(device_image_interface &image, generic_slot_device *slot, int slot_id); @@ -227,17 +227,17 @@ uint8_t nascom_state::nascom1_port_02_r() return data; } -READ_LINE_MEMBER( nascom_state::hd6402_si ) +int nascom_state::hd6402_si() { return m_cassinbit; } -WRITE_LINE_MEMBER( nascom_state::hd6402_so ) +void nascom_state::hd6402_so(int state) { m_cassoutbit = state; } -WRITE_LINE_MEMBER( nascom1_state::nascom1_kansas_w ) +void nascom1_state::nascom1_kansas_w(int state) { // incoming 3906.25Hz if (state) @@ -272,7 +272,7 @@ TIMER_DEVICE_CALLBACK_MEMBER( nascom1_state::nascom1_kansas_r ) } } -WRITE_LINE_MEMBER( nascom2_state::nascom2_kansas_w ) +void nascom2_state::nascom2_kansas_w(int state) { // incoming @19230Hz u8 twobit = m_cass_data[3] & 3; @@ -461,7 +461,7 @@ void nascom_state::init_nascom() // since we don't know for which regions we should disable ram, we just let other devices // overwrite the region they need, and re-install our ram when they are disabled -WRITE_LINE_MEMBER( nascom2_state::ram_disable_w ) +void nascom2_state::ram_disable_w(int state) { if (state) { @@ -476,7 +476,7 @@ void nascom2_state::init_nascom2c() m_maincpu->space(AS_PROGRAM).install_ram(0x0000, 0x0000 + m_ram->size() - 1, m_ram->pointer()); } -WRITE_LINE_MEMBER( nascom2_state::ram_disable_cpm_w ) +void nascom2_state::ram_disable_cpm_w(int state) { if (state) { diff --git a/src/mame/ncd/ncdmips.cpp b/src/mame/ncd/ncdmips.cpp index 64669b3befd..724d57f77b8 100644 --- a/src/mame/ncd/ncdmips.cpp +++ b/src/mame/ncd/ncdmips.cpp @@ -40,7 +40,7 @@ public: uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(duart_irq_handler); + void duart_irq_handler(int state); INTERRUPT_GEN_MEMBER(vblank); private: @@ -99,7 +99,7 @@ void ncd_mips_state::hmxpro_map(address_map &map) map(0x20000000, 0x207fffff).ram(); } -WRITE_LINE_MEMBER(ncd_mips_state::duart_irq_handler) +void ncd_mips_state::duart_irq_handler(int state) { //m_maincpu->set_input_line(M68K_IRQ_6, state); } diff --git a/src/mame/nec/apc.cpp b/src/mame/nec/apc.cpp index fb285a5194c..b8dd3a74930 100644 --- a/src/mame/nec/apc.cpp +++ b/src/mame/nec/apc.cpp @@ -158,12 +158,12 @@ private: }m_keyb; uint8_t get_slave_ack(offs_t offset); - DECLARE_WRITE_LINE_MEMBER(apc_dma_hrq_changed); - DECLARE_WRITE_LINE_MEMBER(apc_tc_w); - DECLARE_WRITE_LINE_MEMBER(apc_dack0_w); - DECLARE_WRITE_LINE_MEMBER(apc_dack1_w); - DECLARE_WRITE_LINE_MEMBER(apc_dack2_w); - DECLARE_WRITE_LINE_MEMBER(apc_dack3_w); + void apc_dma_hrq_changed(int state); + void apc_tc_w(int state); + void apc_dack0_w(int state); + void apc_dack1_w(int state); + void apc_dack2_w(int state); + void apc_dack3_w(int state); uint8_t apc_dma_read_byte(offs_t offset); void apc_dma_write_byte(offs_t offset, uint8_t data); @@ -848,7 +848,7 @@ uint8_t apc_state::get_slave_ack(offs_t offset) * ****************************************/ -WRITE_LINE_MEMBER(apc_state::apc_dma_hrq_changed) +void apc_state::apc_dma_hrq_changed(int state) { m_maincpu->set_input_line(INPUT_LINE_HALT, state ? ASSERT_LINE : CLEAR_LINE); @@ -857,7 +857,7 @@ WRITE_LINE_MEMBER(apc_state::apc_dma_hrq_changed) // printf("%02x HLDA\n",state); } -WRITE_LINE_MEMBER( apc_state::apc_tc_w ) +void apc_state::apc_tc_w(int state) { /* floppy terminal count */ m_fdc->tc_w(state); @@ -891,10 +891,10 @@ inline void apc_state::set_dma_channel(int channel, int state) if (!state) m_dack = channel; } -WRITE_LINE_MEMBER(apc_state::apc_dack0_w){ /*printf("%02x 0\n",state);*/ set_dma_channel(0, state); } -WRITE_LINE_MEMBER(apc_state::apc_dack1_w){ /*printf("%02x 1\n",state);*/ set_dma_channel(1, state); } -WRITE_LINE_MEMBER(apc_state::apc_dack2_w){ /*printf("%02x 2\n",state);*/ set_dma_channel(2, state); } -WRITE_LINE_MEMBER(apc_state::apc_dack3_w){ /*printf("%02x 3\n",state);*/ set_dma_channel(3, state); } +void apc_state::apc_dack0_w(int state) { /*printf("%02x 0\n",state);*/ set_dma_channel(0, state); } +void apc_state::apc_dack1_w(int state) { /*printf("%02x 1\n",state);*/ set_dma_channel(1, state); } +void apc_state::apc_dack2_w(int state) { /*printf("%02x 2\n",state);*/ set_dma_channel(2, state); } +void apc_state::apc_dack3_w(int state) { /*printf("%02x 3\n",state);*/ set_dma_channel(3, state); } /* CH0: CRT diff --git a/src/mame/nec/pc100.cpp b/src/mame/nec/pc100.cpp index 53186ea2af0..39798218e1e 100644 --- a/src/mame/nec/pc100.cpp +++ b/src/mame/nec/pc100.cpp @@ -127,8 +127,8 @@ private: void rtc_porta_w(uint8_t data); uint8_t rtc_portc_r(); void rtc_portc_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(irqnmi_w); - DECLARE_WRITE_LINE_MEMBER(drqnmi_w); + void irqnmi_w(int state); + void drqnmi_w(int state); uint16_t m_kanji_addr = 0; uint8_t m_timer_mode = 0; @@ -151,10 +151,10 @@ private: TIMER_DEVICE_CALLBACK_MEMBER(pc100_10hz_irq); - WRITE_LINE_MEMBER(rtc_portc_0_w) { m_rtc_portc = (m_rtc_portc & ~(1 << 0)) | ((state & 1) << 0); } - WRITE_LINE_MEMBER(rtc_portc_1_w) { m_rtc_portc = (m_rtc_portc & ~(1 << 1)) | ((state & 1) << 1); } - WRITE_LINE_MEMBER(rtc_portc_2_w) { m_rtc_portc = (m_rtc_portc & ~(1 << 2)) | ((state & 1) << 2); } - WRITE_LINE_MEMBER(rtc_portc_3_w) { m_rtc_portc = (m_rtc_portc & ~(1 << 3)) | ((state & 1) << 3); } + void rtc_portc_0_w(int state) { m_rtc_portc = (m_rtc_portc & ~(1 << 0)) | ((state & 1) << 0); } + void rtc_portc_1_w(int state) { m_rtc_portc = (m_rtc_portc & ~(1 << 1)) | ((state & 1) << 1); } + void rtc_portc_2_w(int state) { m_rtc_portc = (m_rtc_portc & ~(1 << 2)) | ((state & 1) << 2); } + void rtc_portc_3_w(int state) { m_rtc_portc = (m_rtc_portc & ~(1 << 3)) | ((state & 1) << 3); } uint8_t m_rtc_portc; void pc100_io(address_map &map); void pc100_map(address_map &map); @@ -205,14 +205,14 @@ uint32_t pc100_state::screen_update_pc100(screen_device &screen, bitmap_ind16 &b return 0; } -WRITE_LINE_MEMBER(pc100_state::irqnmi_w) +void pc100_state::irqnmi_w(int state) { if(!m_nmi_mask) m_maincpu->set_input_line(INPUT_LINE_NMI, ((state == ASSERT_LINE) || m_drq_state) ? ASSERT_LINE : CLEAR_LINE); m_irq_state = state == ASSERT_LINE; } -WRITE_LINE_MEMBER(pc100_state::drqnmi_w) +void pc100_state::drqnmi_w(int state) { if(!m_nmi_mask) m_maincpu->set_input_line(INPUT_LINE_NMI, ((state == ASSERT_LINE) || m_irq_state) ? ASSERT_LINE : CLEAR_LINE); diff --git a/src/mame/nec/pc8001.cpp b/src/mame/nec/pc8001.cpp index 03da324d488..f9e31d4fdfe 100644 --- a/src/mame/nec/pc8001.cpp +++ b/src/mame/nec/pc8001.cpp @@ -44,7 +44,7 @@ #include "speaker.h" #include "utf8.h" -WRITE_LINE_MEMBER( pc8001_base_state::crtc_reverse_w ) +void pc8001_base_state::crtc_reverse_w(int state) { // rvv acts as a global flip for reverse attribute meaning // (does not act on underlying palette) @@ -271,12 +271,12 @@ void pc8001mk2_state::port31_w(uint8_t data) membank("bank2")->set_entry(data & 1); } -WRITE_LINE_MEMBER( pc8001_base_state::write_centronics_busy ) +void pc8001_base_state::write_centronics_busy(int state) { m_centronics_busy = state; } -WRITE_LINE_MEMBER( pc8001_base_state::write_centronics_ack ) +void pc8001_base_state::write_centronics_ack(int state) { m_centronics_ack = state; } @@ -634,7 +634,7 @@ INPUT_PORTS_END /* 8257 Interface */ -WRITE_LINE_MEMBER( pc8001_base_state::hrq_w ) +void pc8001_base_state::hrq_w(int state) { /* HACK - this should be connected to the BUSREQ line of Z80 */ m_maincpu->set_input_line(INPUT_LINE_HALT, state); diff --git a/src/mame/nec/pc8001.h b/src/mame/nec/pc8001.h index d73342f2e60..8eab710f4cb 100644 --- a/src/mame/nec/pc8001.h +++ b/src/mame/nec/pc8001.h @@ -70,14 +70,14 @@ protected: void set_screen_frequency(bool is_24KHz) { m_screen_is_24KHz = is_24KHz; } bool get_screen_frequency() { return m_screen_is_24KHz; } - DECLARE_WRITE_LINE_MEMBER( crtc_reverse_w ); + void crtc_reverse_w(int state); UPD3301_DRAW_CHARACTER_MEMBER( draw_text ); virtual UPD3301_FETCH_ATTRIBUTE( attr_fetch ); - DECLARE_WRITE_LINE_MEMBER( hrq_w ); + void hrq_w(int state); virtual uint8_t dma_mem_r(offs_t offset); - DECLARE_WRITE_LINE_MEMBER(write_centronics_busy); - DECLARE_WRITE_LINE_MEMBER(write_centronics_ack); + void write_centronics_busy(int state); + void write_centronics_ack(int state); int m_centronics_busy = 0; int m_centronics_ack = 0; diff --git a/src/mame/nec/pc8801.cpp b/src/mame/nec/pc8801.cpp index 17c8e102640..252d0e191e9 100644 --- a/src/mame/nec/pc8801.cpp +++ b/src/mame/nec/pc8801.cpp @@ -1547,12 +1547,12 @@ void pc8801mk2sr_state::opn_portb_w(uint8_t data) } // Cassette Configuration -WRITE_LINE_MEMBER( pc8801_state::txdata_callback ) +void pc8801_state::txdata_callback(int state) { //m_cassette->output( (state) ? 1.0 : -1.0); } -WRITE_LINE_MEMBER( pc8801_state::rxrdy_irq_w ) +void pc8801_state::rxrdy_irq_w(int state) { if (state) assert_irq(RXRDY_IRQ_LEVEL); @@ -1580,7 +1580,7 @@ IRQ_CALLBACK_MEMBER(pc8801_state::int_ack_cb) return (7 - level) * 2; } -WRITE_LINE_MEMBER(pc8801_state::int4_irq_w) +void pc8801_state::int4_irq_w(int state) { bool irq_state = m_sound_irq_enable & state; @@ -1594,7 +1594,7 @@ WRITE_LINE_MEMBER(pc8801_state::int4_irq_w) m_sound_irq_pending = state; } -// FIXME: convert to pure WRITE_LINE_MEMBER +// FIXME: convert to pure write-line-style member // Works with 0 -> 1 F/F transitions TIMER_DEVICE_CALLBACK_MEMBER(pc8801_state::clock_irq_w) { @@ -1629,7 +1629,7 @@ void pc8801_state::assert_irq(u8 level) m_irq_state.pending |= mask; } -WRITE_LINE_MEMBER(pc8801_state::vrtc_irq_w) +void pc8801_state::vrtc_irq_w(int state) { // bool irq_state = m_vrtc_irq_enable & state; if (state) @@ -1638,7 +1638,7 @@ WRITE_LINE_MEMBER(pc8801_state::vrtc_irq_w) } } -WRITE_LINE_MEMBER(pc8801_state::irq_w) +void pc8801_state::irq_w(int state) { m_maincpu->set_input_line(0, state ? ASSERT_LINE : CLEAR_LINE); } diff --git a/src/mame/nec/pc8801.h b/src/mame/nec/pc8801.h index 3aaca31ff68..b4f4c0782a2 100644 --- a/src/mame/nec/pc8801.h +++ b/src/mame/nec/pc8801.h @@ -102,7 +102,7 @@ protected: required_device m_mouse_port; required_device m_exp; - DECLARE_WRITE_LINE_MEMBER(int4_irq_w); + void int4_irq_w(int state); uint8_t m_gfx_ctrl = 0; @@ -178,7 +178,7 @@ private: template void kanji_w(offs_t offset, uint8_t data); // void rtc_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(txdata_callback); + void txdata_callback(int state); // video section void draw_bitmap(bitmap_rgb32 &bitmap, const rectangle &cliprect, palette_device *palette, std::function dot_func); @@ -188,11 +188,11 @@ private: bitmap_rgb32 m_text_bitmap; // irq section - DECLARE_WRITE_LINE_MEMBER(rxrdy_irq_w); - DECLARE_WRITE_LINE_MEMBER(vrtc_irq_w); + void rxrdy_irq_w(int state); + void vrtc_irq_w(int state); TIMER_DEVICE_CALLBACK_MEMBER(clock_irq_w); IRQ_CALLBACK_MEMBER(int_ack_cb); - DECLARE_WRITE_LINE_MEMBER(irq_w); + void irq_w(int state); struct { u8 enable = 0, pending = 0; diff --git a/src/mame/nec/pc88va.cpp b/src/mame/nec/pc88va.cpp index c8d5a417cd8..de2e9f56c1c 100644 --- a/src/mame/nec/pc88va.cpp +++ b/src/mame/nec/pc88va.cpp @@ -1026,7 +1026,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(pc88va_state::vrtc_irq) } } -WRITE_LINE_MEMBER( pc88va_state::fdc_irq ) +void pc88va_state::fdc_irq(int state) { if(m_fdc_mode && state) { @@ -1035,7 +1035,7 @@ WRITE_LINE_MEMBER( pc88va_state::fdc_irq ) } } -WRITE_LINE_MEMBER(pc88va_state::int4_irq_w) +void pc88va_state::int4_irq_w(int state) { bool irq_state = m_sound_irq_enable & state; @@ -1048,7 +1048,7 @@ WRITE_LINE_MEMBER(pc88va_state::int4_irq_w) m_sound_irq_pending = state; } -WRITE_LINE_MEMBER( pc88va_state::tc_w ) +void pc88va_state::tc_w(int state) { m_fdc->tc_w(state); } diff --git a/src/mame/nec/pc88va.h b/src/mame/nec/pc88va.h index 7a3a66b4e58..54953cc840d 100644 --- a/src/mame/nec/pc88va.h +++ b/src/mame/nec/pc88va.h @@ -138,9 +138,9 @@ private: TIMER_CALLBACK_MEMBER(pc88va_fdc_timer); TIMER_CALLBACK_MEMBER(pc88va_fdc_motor_start_0); TIMER_CALLBACK_MEMBER(pc88va_fdc_motor_start_1); - DECLARE_WRITE_LINE_MEMBER(tc_w); + void tc_w(int state); - DECLARE_WRITE_LINE_MEMBER(fdc_irq); + void fdc_irq(int state); static void floppy_formats(format_registration &fr); void pc88va_fdc_update_ready(floppy_image_device *, int); uint8_t fake_subfdc_r(); @@ -275,7 +275,7 @@ private: u8 m_misc_ctrl = 0x80; bool m_sound_irq_enable = false; bool m_sound_irq_pending = false; - DECLARE_WRITE_LINE_MEMBER(int4_irq_w); + void int4_irq_w(int state); }; diff --git a/src/mame/nec/pc9801.cpp b/src/mame/nec/pc9801.cpp index c38a39da8b9..56e56c4debd 100644 --- a/src/mame/nec/pc9801.cpp +++ b/src/mame/nec/pc9801.cpp @@ -507,7 +507,7 @@ void pc9801_state::sasi_data_w(uint8_t data) } } -WRITE_LINE_MEMBER( pc9801_state::write_sasi_io ) +void pc9801_state::write_sasi_io(int state) { m_sasi_ctrl_in->write_bit2(state); @@ -527,7 +527,7 @@ WRITE_LINE_MEMBER( pc9801_state::write_sasi_io ) m_pic2->ir1_w(0); } -WRITE_LINE_MEMBER( pc9801_state::write_sasi_req ) +void pc9801_state::write_sasi_req(int state) { m_sasi_ctrl_in->write_bit7(state); @@ -1467,7 +1467,7 @@ uint8_t pc9801_state::get_slave_ack(offs_t offset) * ****************************************/ -WRITE_LINE_MEMBER(pc9801_state::dma_hrq_changed) +void pc9801_state::dma_hrq_changed(int state) { m_maincpu->set_input_line(INPUT_LINE_HALT, state ? ASSERT_LINE : CLEAR_LINE); @@ -1476,7 +1476,7 @@ WRITE_LINE_MEMBER(pc9801_state::dma_hrq_changed) // logerror("%02x HLDA\n",state); } -WRITE_LINE_MEMBER(pc9801_state::tc_w ) +void pc9801_state::tc_w(int state) { /* floppy terminal count */ m_fdc_2hd->tc_w(state); @@ -1548,10 +1548,10 @@ ch2 FDC ch3 SCSI */ -WRITE_LINE_MEMBER(pc9801_state::dack0_w){ /*logerror("%02x 0\n",state);*/ set_dma_channel(0, state); } -WRITE_LINE_MEMBER(pc9801_state::dack1_w){ /*logerror("%02x 1\n",state);*/ set_dma_channel(1, state); } -WRITE_LINE_MEMBER(pc9801_state::dack2_w){ /*logerror("%02x 2\n",state);*/ set_dma_channel(2, state); } -WRITE_LINE_MEMBER(pc9801_state::dack3_w){ /*logerror("%02x 3\n",state);*/ set_dma_channel(3, state); } +void pc9801_state::dack0_w(int state) { /*logerror("%02x 0\n",state);*/ set_dma_channel(0, state); } +void pc9801_state::dack1_w(int state) { /*logerror("%02x 1\n",state);*/ set_dma_channel(1, state); } +void pc9801_state::dack2_w(int state) { /*logerror("%02x 2\n",state);*/ set_dma_channel(2, state); } +void pc9801_state::dack3_w(int state) { /*logerror("%02x 3\n",state);*/ set_dma_channel(3, state); } /* * PPI "system" I/F @@ -1836,7 +1836,7 @@ static void pc9801_cbus_devices(device_slot_interface &device) // Jast Sound, could be installed independently -WRITE_LINE_MEMBER( pc9801_state::fdc_2dd_irq ) +void pc9801_state::fdc_2dd_irq(int state) { logerror("IRQ 2DD %d\n",state); @@ -1848,7 +1848,7 @@ WRITE_LINE_MEMBER( pc9801_state::fdc_2dd_irq ) } } -WRITE_LINE_MEMBER( pc9801vm_state::fdc_irq_w ) +void pc9801vm_state::fdc_irq_w(int state) { if(m_fdc_mode & 1) m_pic2->ir3_w(state); @@ -1856,7 +1856,7 @@ WRITE_LINE_MEMBER( pc9801vm_state::fdc_irq_w ) m_pic2->ir2_w(state); } -WRITE_LINE_MEMBER( pc9801vm_state::fdc_drq_w ) +void pc9801vm_state::fdc_drq_w(int state) { if(m_fdc_mode & 1) m_dmac->dreq2_w(state ^ 1); @@ -2021,7 +2021,7 @@ MACHINE_RESET_MEMBER(pc9801bx_state,pc9801bx2) m_dma_access_ctrl = 0x00; } -WRITE_LINE_MEMBER(pc9801_state::vrtc_irq) +void pc9801_state::vrtc_irq(int state) { if(state) m_pic1->ir2_w(1); diff --git a/src/mame/nec/pc9801.h b/src/mame/nec/pc9801.h index 578fb956238..6347a0e31f5 100644 --- a/src/mame/nec/pc9801.h +++ b/src/mame/nec/pc9801.h @@ -218,8 +218,8 @@ private: void sasi_data_w(uint8_t data); uint8_t sasi_data_r(); - DECLARE_WRITE_LINE_MEMBER(write_sasi_io); - DECLARE_WRITE_LINE_MEMBER(write_sasi_req); + void write_sasi_io(int state); + void write_sasi_req(int state); uint8_t sasi_status_r(); void sasi_ctrl_w(uint8_t data); @@ -245,7 +245,7 @@ protected: bool fdc_drive_ready_r(upd765a_device *fdc); private: - DECLARE_WRITE_LINE_MEMBER(fdc_2dd_irq); + void fdc_2dd_irq(int state); uint8_t fdc_2dd_ctrl_r(); void fdc_2dd_ctrl_w(uint8_t data); @@ -263,14 +263,14 @@ private: inline void set_dma_channel(int channel, int state); - DECLARE_WRITE_LINE_MEMBER(dma_hrq_changed); - DECLARE_WRITE_LINE_MEMBER(tc_w); + void dma_hrq_changed(int state); + void tc_w(int state); uint8_t dma_read_byte(offs_t offset); void dma_write_byte(offs_t offset, uint8_t data); - DECLARE_WRITE_LINE_MEMBER(dack0_w); - DECLARE_WRITE_LINE_MEMBER(dack1_w); - DECLARE_WRITE_LINE_MEMBER(dack2_w); - DECLARE_WRITE_LINE_MEMBER(dack3_w); + void dack0_w(int state); + void dack1_w(int state); + void dack2_w(int state); + void dack3_w(int state); // Video protected: @@ -310,7 +310,7 @@ protected: private: UPD7220_DRAW_TEXT_LINE_MEMBER( hgdc_draw_text ); - DECLARE_WRITE_LINE_MEMBER(vrtc_irq); + void vrtc_irq(int state); void vrtc_clear_w(uint8_t data); uint8_t txt_scrl_r(offs_t offset); void txt_scrl_w(offs_t offset, uint8_t data); @@ -447,8 +447,8 @@ private: template u8 fdc_2hd_2dd_ctrl_r(); template void fdc_2hd_2dd_ctrl_w(u8 data); - DECLARE_WRITE_LINE_MEMBER(fdc_irq_w); - DECLARE_WRITE_LINE_MEMBER(fdc_drq_w); + void fdc_irq_w(int state); + void fdc_drq_w(int state); emu_timer *m_fdc_timer = nullptr; diff --git a/src/mame/nec/pce_cd.cpp b/src/mame/nec/pce_cd.cpp index 6f8e0acb170..58493c1a9c5 100644 --- a/src/mame/nec/pce_cd.cpp +++ b/src/mame/nec/pce_cd.cpp @@ -308,7 +308,7 @@ void pce_cd_device::adpcm_play() the MSM5205. Currently we can only use static clocks for the MSM5205. */ -WRITE_LINE_MEMBER( pce_cd_device::msm5205_int ) +void pce_cd_device::msm5205_int(int state) { uint8_t msm_data; @@ -877,7 +877,7 @@ void pce_cd_device::handle_data_output() } } -WRITE_LINE_MEMBER(pce_cd_device::cdda_end_mark_cb) +void pce_cd_device::cdda_end_mark_cb(int state) { if (state != ASSERT_LINE) return; diff --git a/src/mame/nec/pce_cd.h b/src/mame/nec/pce_cd.h index b77ebbad788..f7da64b9a16 100644 --- a/src/mame/nec/pce_cd.h +++ b/src/mame/nec/pce_cd.h @@ -211,10 +211,10 @@ private: emu_timer *m_ack_clear_timer = nullptr; - DECLARE_WRITE_LINE_MEMBER(msm5205_int); + void msm5205_int(int state); void nvram_init(nvram_device &nvram, void *data, size_t size); - DECLARE_WRITE_LINE_MEMBER(cdda_end_mark_cb); + void cdda_end_mark_cb(int state); }; diff --git a/src/mame/nec/pcfx.cpp b/src/mame/nec/pcfx.cpp index 610e4d36646..62cd4cb0580 100644 --- a/src/mame/nec/pcfx.cpp +++ b/src/mame/nec/pcfx.cpp @@ -49,14 +49,14 @@ private: [[maybe_unused]] uint8_t extio_r(offs_t offset); [[maybe_unused]] void extio_w(offs_t offset, uint8_t data); - [[maybe_unused]] DECLARE_WRITE_LINE_MEMBER( irq8_w ); - [[maybe_unused]] DECLARE_WRITE_LINE_MEMBER( irq9_w ); - [[maybe_unused]] DECLARE_WRITE_LINE_MEMBER( irq10_w ); - [[maybe_unused]] DECLARE_WRITE_LINE_MEMBER( irq11_w ); - DECLARE_WRITE_LINE_MEMBER( irq12_w ); - DECLARE_WRITE_LINE_MEMBER( irq13_w ); - DECLARE_WRITE_LINE_MEMBER( irq14_w ); - [[maybe_unused]] DECLARE_WRITE_LINE_MEMBER( irq15_w ); + [[maybe_unused]] void irq8_w(int state); + [[maybe_unused]] void irq9_w(int state); + [[maybe_unused]] void irq10_w(int state); + [[maybe_unused]] void irq11_w(int state); + void irq12_w(int state); + void irq13_w(int state); + void irq14_w(int state); + [[maybe_unused]] void irq15_w(int state); template TIMER_CALLBACK_MEMBER(pad_func); void pcfx_io(address_map &map); @@ -353,42 +353,42 @@ inline void pcfx_state::set_irq_line(int line, int state) check_irqs(); } -WRITE_LINE_MEMBER( pcfx_state::irq8_w ) +void pcfx_state::irq8_w(int state) { set_irq_line(8, state); } -WRITE_LINE_MEMBER( pcfx_state::irq9_w ) +void pcfx_state::irq9_w(int state) { set_irq_line(9, state); } -WRITE_LINE_MEMBER( pcfx_state::irq10_w ) +void pcfx_state::irq10_w(int state) { set_irq_line(10, state); } -WRITE_LINE_MEMBER( pcfx_state::irq11_w ) +void pcfx_state::irq11_w(int state) { set_irq_line(11, state); } -WRITE_LINE_MEMBER( pcfx_state::irq12_w ) +void pcfx_state::irq12_w(int state) { set_irq_line(12, state); } -WRITE_LINE_MEMBER( pcfx_state::irq13_w ) +void pcfx_state::irq13_w(int state) { set_irq_line(13, state); } -WRITE_LINE_MEMBER( pcfx_state::irq14_w ) +void pcfx_state::irq14_w(int state) { set_irq_line(14, state); } -WRITE_LINE_MEMBER( pcfx_state::irq15_w ) +void pcfx_state::irq15_w(int state) { set_irq_line(15, state); } diff --git a/src/mame/neogeo/midas.cpp b/src/mame/neogeo/midas.cpp index 3419f0acd82..e6e622bf4a5 100644 --- a/src/mame/neogeo/midas.cpp +++ b/src/mame/neogeo/midas.cpp @@ -115,7 +115,7 @@ private: required_shared_ptr m_zoomram; required_region_ptr m_zoomtable; - DECLARE_WRITE_LINE_MEMBER(screen_vblank); + void screen_vblank(int state); void hammer_map(address_map &map); void livequiz_map(address_map &map); @@ -616,7 +616,7 @@ void midas_state::machine_reset() { } -WRITE_LINE_MEMBER(midas_state::screen_vblank) +void midas_state::screen_vblank(int state) { if (state) m_sprgen->buffer_vram(); } diff --git a/src/mame/neogeo/neogeo.cpp b/src/mame/neogeo/neogeo.cpp index 8ab79ec86a3..925a252c1fe 100644 --- a/src/mame/neogeo/neogeo.cpp +++ b/src/mame/neogeo/neogeo.cpp @@ -1039,7 +1039,7 @@ uint16_t neogeo_base_state::unmapped_r(address_space &space) * *************************************/ -WRITE_LINE_MEMBER(ngarcade_base_state::set_save_ram_unlock) +void ngarcade_base_state::set_save_ram_unlock(int state) { m_save_ram_unlocked = state; } @@ -1124,13 +1124,13 @@ uint8_t neogeo_base_state::audio_cpu_bank_select_r(offs_t offset) *************************************/ -WRITE_LINE_MEMBER(neogeo_base_state::set_use_cart_vectors) +void neogeo_base_state::set_use_cart_vectors(int state) { m_use_cart_vectors = state; } -WRITE_LINE_MEMBER(neogeo_base_state::set_use_cart_audio) +void neogeo_base_state::set_use_cart_audio(int state) { m_use_cart_audio = state; m_sprgen->neogeo_set_fixed_layer_source(state); diff --git a/src/mame/neogeo/neogeo.h b/src/mame/neogeo/neogeo.h index bb1aa54bb03..a555bc9aaef 100644 --- a/src/mame/neogeo/neogeo.h +++ b/src/mame/neogeo/neogeo.h @@ -88,8 +88,8 @@ protected: virtual void io_control_w(offs_t offset, uint8_t data); void audio_command_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(set_use_cart_vectors); - DECLARE_WRITE_LINE_MEMBER(set_use_cart_audio); + void set_use_cart_vectors(int state); + void set_use_cart_audio(int state); uint16_t banked_vectors_r(offs_t offset); void write_banksel(uint16_t data); void write_bankprot(uint16_t data); @@ -99,8 +99,8 @@ protected: void write_bankprot_kof10th(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); uint16_t read_lorom_kof10th(offs_t offset); - DECLARE_WRITE_LINE_MEMBER(set_screen_shadow); - DECLARE_WRITE_LINE_MEMBER(set_palette_bank); + void set_screen_shadow(int state); + void set_palette_bank(int state); void neogeo_base(machine_config &config); void neogeo_stereo(machine_config &config); @@ -231,7 +231,7 @@ protected: virtual void machine_reset() override; virtual void io_control_w(offs_t offset, uint8_t data) override; - DECLARE_WRITE_LINE_MEMBER(set_save_ram_unlock); + void set_save_ram_unlock(int state); void save_ram_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); uint16_t in0_edge_r(); uint16_t in0_edge_joy_r(); diff --git a/src/mame/neogeo/neogeo_v.cpp b/src/mame/neogeo/neogeo_v.cpp index 8f334ec913c..79ec4dc4050 100644 --- a/src/mame/neogeo/neogeo_v.cpp +++ b/src/mame/neogeo/neogeo_v.cpp @@ -74,14 +74,14 @@ void neogeo_base_state::set_pens() } -WRITE_LINE_MEMBER(neogeo_base_state::set_screen_shadow) +void neogeo_base_state::set_screen_shadow(int state) { m_screen_shadow = state; set_pens(); } -WRITE_LINE_MEMBER(neogeo_base_state::set_palette_bank) +void neogeo_base_state::set_palette_bank(int state) { m_palette_bank = state ? 0x1000 : 0; set_pens(); diff --git a/src/mame/neogeo/ng_memcard.cpp b/src/mame/neogeo/ng_memcard.cpp index fee2f74a13c..76682597f17 100644 --- a/src/mame/neogeo/ng_memcard.cpp +++ b/src/mame/neogeo/ng_memcard.cpp @@ -107,17 +107,17 @@ void ng_memcard_device::write(offs_t offset, uint16_t data) } -WRITE_LINE_MEMBER(ng_memcard_device::lock1_w) +void ng_memcard_device::lock1_w(int state) { m_lock1 = state; } -WRITE_LINE_MEMBER(ng_memcard_device::unlock2_w) +void ng_memcard_device::unlock2_w(int state) { m_unlock2 = state; } -WRITE_LINE_MEMBER(ng_memcard_device::regsel_w) +void ng_memcard_device::regsel_w(int state) { m_regsel = state; } diff --git a/src/mame/neogeo/ng_memcard.h b/src/mame/neogeo/ng_memcard.h index dbbb902dd08..f1faa8d9386 100644 --- a/src/mame/neogeo/ng_memcard.h +++ b/src/mame/neogeo/ng_memcard.h @@ -32,9 +32,9 @@ public: void write(offs_t offset, uint16_t data); // control lines - DECLARE_WRITE_LINE_MEMBER(lock1_w); - DECLARE_WRITE_LINE_MEMBER(unlock2_w); - DECLARE_WRITE_LINE_MEMBER(regsel_w); + void lock1_w(int state); + void unlock2_w(int state); + void regsel_w(int state); bool present() { return is_loaded(); } diff --git a/src/mame/netronics/elf.cpp b/src/mame/netronics/elf.cpp index f6ca137c719..f5a11dcb0ca 100644 --- a/src/mame/netronics/elf.cpp +++ b/src/mame/netronics/elf.cpp @@ -139,22 +139,22 @@ INPUT_PORTS_END /* CDP1802 Configuration */ -READ_LINE_MEMBER( elf2_state::wait_r ) +int elf2_state::wait_r() { return LOAD; } -READ_LINE_MEMBER( elf2_state::clear_r ) +int elf2_state::clear_r() { return RUN; } -READ_LINE_MEMBER( elf2_state::ef4_r ) +int elf2_state::ef4_r() { return INPUT; } -WRITE_LINE_MEMBER( elf2_state::q_w ) +void elf2_state::q_w(int state) { m_led = state ? 1 : 0; } @@ -181,7 +181,7 @@ void elf2_state::sc_w(uint8_t data) /* MM74C923 Interface */ -WRITE_LINE_MEMBER( elf2_state::da_w ) +void elf2_state::da_w(int state) { if (state) { diff --git a/src/mame/netronics/elf.h b/src/mame/netronics/elf.h index bd166673963..857b40093ea 100644 --- a/src/mame/netronics/elf.h +++ b/src/mame/netronics/elf.h @@ -48,13 +48,13 @@ private: uint8_t data_r(); void data_w(uint8_t data); void memory_w(offs_t offset, uint8_t data); - DECLARE_READ_LINE_MEMBER( wait_r ); - DECLARE_READ_LINE_MEMBER( clear_r ); - DECLARE_READ_LINE_MEMBER( ef4_r ); - DECLARE_WRITE_LINE_MEMBER( q_w ); + int wait_r(); + int clear_r(); + int ef4_r(); + void q_w(int state); uint8_t dma_r(); void sc_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER( da_w ); + void da_w(int state); template void digit_w(uint8_t data) { m_7segs[N] = data; } DECLARE_QUICKLOAD_LOAD_MEMBER( quickload_cb ); diff --git a/src/mame/netronics/exp85.cpp b/src/mame/netronics/exp85.cpp index 4449118cd4c..2040f5ea527 100644 --- a/src/mame/netronics/exp85.cpp +++ b/src/mame/netronics/exp85.cpp @@ -77,8 +77,8 @@ private: uint8_t i8355_a_r(); void i8355_a_w(uint8_t data); - DECLARE_READ_LINE_MEMBER( sid_r ); - DECLARE_WRITE_LINE_MEMBER( sod_w ); + int sid_r(); + void sod_w(int state); /* cassette state */ bool m_tape_control; @@ -173,7 +173,7 @@ void exp85_state::i8355_a_w(uint8_t data) /* I8085A Interface */ -READ_LINE_MEMBER( exp85_state::sid_r ) +int exp85_state::sid_r() { int data = 1; @@ -189,7 +189,7 @@ READ_LINE_MEMBER( exp85_state::sid_r ) return data; } -WRITE_LINE_MEMBER( exp85_state::sod_w ) +void exp85_state::sod_w(int state) { if (m_tape_control) { diff --git a/src/mame/next/next.cpp b/src/mame/next/next.cpp index 61334bb9c4f..c3da8e0dfd1 100644 --- a/src/mame/next/next.cpp +++ b/src/mame/next/next.cpp @@ -718,72 +718,72 @@ void next_state::timer_start() timer_tm->adjust(attotime::from_usec(timer_vbase)); } -WRITE_LINE_MEMBER(next_state::scc_irq) +void next_state::scc_irq(int state) { irq_set(17, state); } -WRITE_LINE_MEMBER(next_state::keyboard_irq) +void next_state::keyboard_irq(int state) { irq_set(3, state); } -WRITE_LINE_MEMBER(next_state::power_irq) +void next_state::power_irq(int state) { irq_set(2, state); } -WRITE_LINE_MEMBER(next_state::nmi_irq) +void next_state::nmi_irq(int state) { irq_set(31, state); } -WRITE_LINE_MEMBER(next_state::fdc_irq) +void next_state::fdc_irq(int state) { irq_set(7, state); } -WRITE_LINE_MEMBER(next_state::fdc_drq) +void next_state::fdc_drq(int state) { dma_drq_w(1, state); } -WRITE_LINE_MEMBER(next_state::net_tx_irq) +void next_state::net_tx_irq(int state) { irq_set(10, state); } -WRITE_LINE_MEMBER(next_state::net_rx_irq) +void next_state::net_rx_irq(int state) { irq_set(9, state); } -WRITE_LINE_MEMBER(next_state::net_tx_drq) +void next_state::net_tx_drq(int state) { dma_drq_w(17, state); } -WRITE_LINE_MEMBER(next_state::net_rx_drq) +void next_state::net_rx_drq(int state) { dma_drq_w(21, state); } -WRITE_LINE_MEMBER(next_state::mo_irq) +void next_state::mo_irq(int state) { irq_set(13, state); } -WRITE_LINE_MEMBER(next_state::mo_drq) +void next_state::mo_drq(int state) { dma_drq_w(5, state); } -WRITE_LINE_MEMBER(next_state::scsi_irq) +void next_state::scsi_irq(int state) { irq_set(12, state); } -WRITE_LINE_MEMBER(next_state::scsi_drq) +void next_state::scsi_drq(int state) { dma_drq_w(1, state); } @@ -877,7 +877,7 @@ void next_state::machine_reset() dma_drq_w(4, true); // soundout } -WRITE_LINE_MEMBER(next_state::vblank_w) +void next_state::vblank_w(int state) { if(vbl_enabled) { if(screen_color) diff --git a/src/mame/next/next.h b/src/mame/next/next.h index 78aca6cf6cd..f3c9d966618 100644 --- a/src/mame/next/next.h +++ b/src/mame/next/next.h @@ -125,26 +125,26 @@ private: uint32_t eventc_latch = 0; - DECLARE_WRITE_LINE_MEMBER(scc_irq); - DECLARE_WRITE_LINE_MEMBER(keyboard_irq); - DECLARE_WRITE_LINE_MEMBER(power_irq); - DECLARE_WRITE_LINE_MEMBER(nmi_irq); + void scc_irq(int state); + void keyboard_irq(int state); + void power_irq(int state); + void nmi_irq(int state); - DECLARE_WRITE_LINE_MEMBER(scsi_irq); - DECLARE_WRITE_LINE_MEMBER(scsi_drq); + void scsi_irq(int state); + void scsi_drq(int state); - DECLARE_WRITE_LINE_MEMBER(fdc_irq); - DECLARE_WRITE_LINE_MEMBER(fdc_drq); + void fdc_irq(int state); + void fdc_drq(int state); - DECLARE_WRITE_LINE_MEMBER(net_tx_irq); - DECLARE_WRITE_LINE_MEMBER(net_rx_irq); - DECLARE_WRITE_LINE_MEMBER(net_tx_drq); - DECLARE_WRITE_LINE_MEMBER(net_rx_drq); + void net_tx_irq(int state); + void net_rx_irq(int state); + void net_tx_drq(int state); + void net_rx_drq(int state); - DECLARE_WRITE_LINE_MEMBER(mo_irq); - DECLARE_WRITE_LINE_MEMBER(mo_drq); + void mo_irq(int state); + void mo_drq(int state); - DECLARE_WRITE_LINE_MEMBER(vblank_w); + void vblank_w(int state); void ncr53c90(device_t *device); void next_0b_m_mem(address_map &map); diff --git a/src/mame/nichibutsu/clshroad.cpp b/src/mame/nichibutsu/clshroad.cpp index ec4bde8aa04..807a2494d95 100644 --- a/src/mame/nichibutsu/clshroad.cpp +++ b/src/mame/nichibutsu/clshroad.cpp @@ -111,8 +111,8 @@ protected: tilemap_t *m_tilemap_1 = nullptr; u8 input_r(offs_t offset); - DECLARE_WRITE_LINE_MEMBER(main_irq_mask_w); - DECLARE_WRITE_LINE_MEMBER(sound_irq_mask_w); + void main_irq_mask_w(int state); + void sound_irq_mask_w(int state); void vram_0_w(offs_t offset, u8 data); void vram_1_w(offs_t offset, u8 data); @@ -510,12 +510,12 @@ u8 clshroad_state::input_r(offs_t offset) // irq/reset controls like in wiping.cpp -WRITE_LINE_MEMBER(clshroad_state::main_irq_mask_w) +void clshroad_state::main_irq_mask_w(int state) { m_main_irq_mask = state; } -WRITE_LINE_MEMBER(clshroad_state::sound_irq_mask_w) +void clshroad_state::sound_irq_mask_w(int state) { m_sound_irq_mask = state; } diff --git a/src/mame/nichibutsu/cop01.cpp b/src/mame/nichibutsu/cop01.cpp index b7c94e4973b..66b8c33637a 100644 --- a/src/mame/nichibutsu/cop01.cpp +++ b/src/mame/nichibutsu/cop01.cpp @@ -150,7 +150,7 @@ public: void mightguy(machine_config &config); - template DECLARE_READ_LINE_MEMBER(area_r); + template int area_r(); void init_mightguy(); @@ -389,7 +389,7 @@ uint8_t cop01_state::sound_command_r() template -READ_LINE_MEMBER(mightguy_state::area_r) +int mightguy_state::area_r() { return (m_fake->read() & Mask) ? 1 : 0; } diff --git a/src/mame/nichibutsu/dacholer.cpp b/src/mame/nichibutsu/dacholer.cpp index b9b2e6870fd..36acbec34a8 100644 --- a/src/mame/nichibutsu/dacholer.cpp +++ b/src/mame/nichibutsu/dacholer.cpp @@ -66,7 +66,7 @@ public: void itaten(machine_config &config); void dacholer(machine_config &config); - DECLARE_READ_LINE_MEMBER(snd_ack_r); + int snd_ack_r(); private: void bg_scroll_x_w(uint8_t data); @@ -86,7 +86,7 @@ private: uint32_t screen_update_dacholer(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(sound_irq); void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); - DECLARE_WRITE_LINE_MEMBER(adpcm_int); + void adpcm_int(int state); void itaten_main_map(address_map &map); void itaten_snd_io_map(address_map &map); void itaten_snd_map(address_map &map); @@ -306,7 +306,7 @@ void dacholer_state::snd_ack_w(uint8_t data) m_snd_ack = data; } -READ_LINE_MEMBER(dacholer_state::snd_ack_r) +int dacholer_state::snd_ack_r() { return m_snd_ack; //guess ... } @@ -571,7 +571,7 @@ INTERRUPT_GEN_MEMBER(dacholer_state::sound_irq) } } -WRITE_LINE_MEMBER(dacholer_state::adpcm_int) +void dacholer_state::adpcm_int(int state) { if (m_snd_interrupt_enable == 1 || (m_snd_interrupt_enable == 0 && m_msm_toggle == 1)) { diff --git a/src/mame/nichibutsu/hrdvd.cpp b/src/mame/nichibutsu/hrdvd.cpp index 3f6f1032595..3a2981c5f15 100644 --- a/src/mame/nichibutsu/hrdvd.cpp +++ b/src/mame/nichibutsu/hrdvd.cpp @@ -110,8 +110,8 @@ public: void hrdvd_mux_w(uint16_t data); void tmp68301_parallel_port_w(uint16_t data); - DECLARE_WRITE_LINE_MEMBER(ata_irq); - DECLARE_WRITE_LINE_MEMBER(ata_drq); + void ata_irq(int state); + void ata_drq(int state); virtual void machine_reset() override; @@ -409,12 +409,12 @@ void hrdvd_state::machine_reset() m_pb = 0; } -WRITE_LINE_MEMBER(hrdvd_state::ata_irq) +void hrdvd_state::ata_irq(int state) { // logerror("ata irq %d\n", state); } -WRITE_LINE_MEMBER(hrdvd_state::ata_drq) +void hrdvd_state::ata_drq(int state) { // logerror("ata drq %d\n", state); m_pb = (m_pb & 0x7f) | (state ? 0x00 : 0x80); diff --git a/src/mame/nichibutsu/jangou.cpp b/src/mame/nichibutsu/jangou.cpp index 20d00d6f025..0b9559cdaeb 100644 --- a/src/mame/nichibutsu/jangou.cpp +++ b/src/mame/nichibutsu/jangou.cpp @@ -182,7 +182,7 @@ private: void slave_com_w(uint8_t data); uint8_t rng_r(); - DECLARE_WRITE_LINE_MEMBER(vclk_cb); + void vclk_cb(int state); void jngolady_cpu0_map(address_map &map); void jngolady_cpu1_io(address_map &map); @@ -323,7 +323,7 @@ void jngolady_state::adpcm_w(uint8_t data) m_adpcm_byte = data; } -WRITE_LINE_MEMBER(jngolady_state::vclk_cb) +void jngolady_state::vclk_cb(int state) { if (!m_msm5205_vclk_toggle) { diff --git a/src/mame/nichibutsu/nb1413m3.cpp b/src/mame/nichibutsu/nb1413m3.cpp index 9ec5a549bdb..d0d1e7d90a9 100644 --- a/src/mame/nichibutsu/nb1413m3.cpp +++ b/src/mame/nichibutsu/nb1413m3.cpp @@ -349,12 +349,12 @@ void nb1413m3_device::inputportsel_w(uint8_t data) m_inputport = data; } -READ_LINE_MEMBER( nb1413m3_device::busyflag_r ) +int nb1413m3_device::busyflag_r() { return m_busyflag & 0x01; } -WRITE_LINE_MEMBER( nb1413m3_device::busyflag_w ) +void nb1413m3_device::busyflag_w(int state) { m_busyflag = state; } diff --git a/src/mame/nichibutsu/nb1413m3.h b/src/mame/nichibutsu/nb1413m3.h index 1ed8c5c7480..d259cc852e0 100644 --- a/src/mame/nichibutsu/nb1413m3.h +++ b/src/mame/nichibutsu/nb1413m3.h @@ -58,8 +58,8 @@ public: uint8_t dipsw3_h_r(); void outcoin_w(uint8_t data); void vcrctrl_w(uint8_t data); - DECLARE_READ_LINE_MEMBER( busyflag_r ); - DECLARE_WRITE_LINE_MEMBER( busyflag_w ); + int busyflag_r(); + void busyflag_w(int state); required_device m_maincpu; const char * m_sndromrgntag; diff --git a/src/mame/nichibutsu/nbmj8891.cpp b/src/mame/nichibutsu/nbmj8891.cpp index d14d41e8a4a..210a9459572 100644 --- a/src/mame/nichibutsu/nbmj8891.cpp +++ b/src/mame/nichibutsu/nbmj8891.cpp @@ -565,7 +565,7 @@ void nbmj8891_state::taiwanmb_io_map(address_map &map) * However, a few games (lovehous, maiko, mmaiko, hanaoji and the ones using inputport3_r below) * read nb1413m3_outcoin_flag also at inputport3! Is this the correct behaviour for these games * or should they only check the flag at inputport3? */ -READ_LINE_MEMBER( nbmj8891_state::nb1413m3_outcoin_flag_r ) +int nbmj8891_state::nb1413m3_outcoin_flag_r() { return m_nb1413m3->m_outcoin_flag & 0x01; } diff --git a/src/mame/nichibutsu/nbmj8891.h b/src/mame/nichibutsu/nbmj8891.h index 5d73155047d..6405eedb4fe 100644 --- a/src/mame/nichibutsu/nbmj8891.h +++ b/src/mame/nichibutsu/nbmj8891.h @@ -58,7 +58,7 @@ public: void init_pairsnb(); void init_mjnanpas(); - DECLARE_READ_LINE_MEMBER(nb1413m3_outcoin_flag_r); + int nb1413m3_outcoin_flag_r(); private: required_device m_maincpu; diff --git a/src/mame/nichibutsu/niyanpai.cpp b/src/mame/nichibutsu/niyanpai.cpp index bacfc43cf35..53e6f14f1ca 100644 --- a/src/mame/nichibutsu/niyanpai.cpp +++ b/src/mame/nichibutsu/niyanpai.cpp @@ -107,7 +107,7 @@ void niyanpai_state::tmp68301_parallel_port_w(uint16_t data) machine().bookkeeping().coin_lockout_w(0,data & 0x08); } -READ_LINE_MEMBER(niyanpai_state::musobana_outcoin_flag_r) +int niyanpai_state::musobana_outcoin_flag_r() { if (m_motor_on) m_musobana_outcoin_flag ^= 1; else m_musobana_outcoin_flag = 1; diff --git a/src/mame/nichibutsu/niyanpai.h b/src/mame/nichibutsu/niyanpai.h index 8f5fa2ac689..5894dffbb80 100644 --- a/src/mame/nichibutsu/niyanpai.h +++ b/src/mame/nichibutsu/niyanpai.h @@ -25,7 +25,7 @@ public: void init_niyanpai(); - DECLARE_READ_LINE_MEMBER(musobana_outcoin_flag_r); + int musobana_outcoin_flag_r(); private: required_device m_maincpu; @@ -97,7 +97,7 @@ private: void update_pixel(int vram, int x, int y); void gfxdraw(int vram); - DECLARE_WRITE_LINE_MEMBER(vblank_irq); + void vblank_irq(int state); void mhhonban_map(address_map &map); void musobana_map(address_map &map); diff --git a/src/mame/nichibutsu/tubep.cpp b/src/mame/nichibutsu/tubep.cpp index 5d86dcafaf0..07f2dca80d0 100644 --- a/src/mame/nichibutsu/tubep.cpp +++ b/src/mame/nichibutsu/tubep.cpp @@ -125,12 +125,12 @@ TP-S.1 TP-S.2 TP-S.3 TP-B.1 8212 TP-B.2 TP-B.3 TP-B.4 *************************************/ -WRITE_LINE_MEMBER(tubep_state::coin1_counter_w) +void tubep_state::coin1_counter_w(int state) { machine().bookkeeping().coin_counter_w(0, state); } -WRITE_LINE_MEMBER(tubep_state::coin2_counter_w) +void tubep_state::coin2_counter_w(int state) { machine().bookkeeping().coin_counter_w(1, state); } @@ -500,7 +500,7 @@ void rjammer_state::voice_frequency_select_w(uint8_t data) } -WRITE_LINE_MEMBER(rjammer_state::adpcm_vck_w) +void rjammer_state::adpcm_vck_w(int state) { if (state) { diff --git a/src/mame/nichibutsu/tubep.h b/src/mame/nichibutsu/tubep.h index a0f3235324e..302113076f4 100644 --- a/src/mame/nichibutsu/tubep.h +++ b/src/mame/nichibutsu/tubep.h @@ -49,16 +49,16 @@ protected: void nsc_map(address_map &map); - DECLARE_WRITE_LINE_MEMBER(coin1_counter_w); - DECLARE_WRITE_LINE_MEMBER(coin2_counter_w); + void coin1_counter_w(int state); + void coin2_counter_w(int state); void main_cpu_irq_line_clear_w(uint8_t data); void second_cpu_irq_line_clear_w(uint8_t data); uint8_t tubep_soundlatch_r(); uint8_t tubep_sound_irq_ack(); void tubep_textram_w(offs_t offset, uint8_t data); - DECLARE_WRITE_LINE_MEMBER(screen_flip_w); - DECLARE_WRITE_LINE_MEMBER(background_romselect_w); - DECLARE_WRITE_LINE_MEMBER(colorproms_A4_line_w); + void screen_flip_w(int state); + void background_romselect_w(int state); + void colorproms_A4_line_w(int state); void background_a000_w(uint8_t data); void background_c000_w(uint8_t data); void sprite_control_w(offs_t offset, uint8_t data); @@ -147,7 +147,7 @@ private: void voice_input_w(uint8_t data); void voice_intensity_control_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(adpcm_vck_w); + void adpcm_vck_w(int state); uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); diff --git a/src/mame/nichibutsu/tubep_v.cpp b/src/mame/nichibutsu/tubep_v.cpp index 771f5a95a50..bfb198621bd 100644 --- a/src/mame/nichibutsu/tubep_v.cpp +++ b/src/mame/nichibutsu/tubep_v.cpp @@ -388,20 +388,20 @@ void tubep_state::tubep_textram_w(offs_t offset, uint8_t data) } -WRITE_LINE_MEMBER(tubep_state::screen_flip_w) +void tubep_state::screen_flip_w(int state) { // screen flip, active high } -WRITE_LINE_MEMBER(tubep_state::background_romselect_w) +void tubep_state::background_romselect_w(int state) { // 0->select roms: B1,B3,B5; 1->select roms: B2,B4,B6 m_background_romsel = state; } -WRITE_LINE_MEMBER(tubep_state::colorproms_A4_line_w) +void tubep_state::colorproms_A4_line_w(int state) { // line A4 (color proms address) state m_color_A4 = state << 4; diff --git a/src/mame/nichibutsu/wiping.cpp b/src/mame/nichibutsu/wiping.cpp index 80d601f2858..8dc2431feab 100644 --- a/src/mame/nichibutsu/wiping.cpp +++ b/src/mame/nichibutsu/wiping.cpp @@ -94,9 +94,9 @@ private: uint8_t m_sound_irq_mask = 0; uint8_t ports_r(offs_t offset); - DECLARE_WRITE_LINE_MEMBER(main_irq_mask_w); - DECLARE_WRITE_LINE_MEMBER(sound_irq_mask_w); - DECLARE_WRITE_LINE_MEMBER(flipscreen_w); + void main_irq_mask_w(int state); + void sound_irq_mask_w(int state); + void flipscreen_w(int state); void palette(palette_device &palette) const; @@ -176,7 +176,7 @@ void wiping_state::palette(palette_device &palette) const -WRITE_LINE_MEMBER(wiping_state::flipscreen_w) +void wiping_state::flipscreen_w(int state) { m_flipscreen = state; } @@ -314,12 +314,12 @@ uint8_t wiping_state::ports_r(offs_t offset) // irq / reset controls like in clshroad.cpp -WRITE_LINE_MEMBER(wiping_state::main_irq_mask_w) +void wiping_state::main_irq_mask_w(int state) { m_main_irq_mask = state; } -WRITE_LINE_MEMBER(wiping_state::sound_irq_mask_w) +void wiping_state::sound_irq_mask_w(int state) { m_sound_irq_mask = state; } diff --git a/src/mame/nintendo/dkong.cpp b/src/mame/nintendo/dkong.cpp index c1321c31ae8..bbc0ae6dec1 100644 --- a/src/mame/nintendo/dkong.cpp +++ b/src/mame/nintendo/dkong.cpp @@ -452,7 +452,7 @@ void dkong_state::memory_write_byte(offs_t offset, uint8_t data) * *************************************/ -WRITE_LINE_MEMBER(dkong_state::s2650_interrupt) +void dkong_state::s2650_interrupt(int state) { if (state) m_maincpu->set_input_line(0, ASSERT_LINE); @@ -672,7 +672,7 @@ void dkong_state::s2650_data_w(uint8_t data) m_hunchloopback = data; } -WRITE_LINE_MEMBER(dkong_state::s2650_fo_w) +void dkong_state::s2650_fo_w(int state) { #if DEBUG_PROTECTION logerror("%s write : FO = %02x\n", machine().describe_context(), data); @@ -1623,7 +1623,7 @@ uint8_t dkong_state::braze_eeprom_r() return m_eeprom->do_read(); } -WRITE_LINE_MEMBER(dkong_state::dk_braze_a15) +void dkong_state::dk_braze_a15(int state) { m_bank1->set_entry(state & 0x01); m_bank2->set_entry(state & 0x01); @@ -1667,13 +1667,13 @@ void dkong_state::braze_decrypt_rom(uint8_t *dest) * *************************************/ -WRITE_LINE_MEMBER(dkong_state::vblank_irq) +void dkong_state::vblank_irq(int state) { if (state && m_nmi_mask) m_maincpu->set_input_line(INPUT_LINE_NMI, ASSERT_LINE); } -WRITE_LINE_MEMBER(dkong_state::busreq_w ) +void dkong_state::busreq_w(int state) { // since our Z80 has no support for BUSACK, we assume it is granted immediately m_maincpu->set_input_line(Z80_INPUT_LINE_BUSRQ, state); diff --git a/src/mame/nintendo/dkong.h b/src/mame/nintendo/dkong.h index 5a353eef4ea..ee351bfd96c 100644 --- a/src/mame/nintendo/dkong.h +++ b/src/mame/nintendo/dkong.h @@ -160,7 +160,7 @@ public: void init_dkong3(); void init_dkong3hs(); - DECLARE_WRITE_LINE_MEMBER(dk_braze_a15); + void dk_braze_a15(int state); private: /* devices */ @@ -261,7 +261,7 @@ private: uint8_t dkong_in2_r(offs_t offset); uint8_t epos_decrypt_rom(offs_t offset); void s2650_data_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(s2650_fo_w); + void s2650_fo_w(int state); uint8_t s2650_port0_r(); uint8_t s2650_port1_r(); void dkong3_2a03_reset_w(uint8_t data); @@ -310,10 +310,10 @@ private: uint32_t screen_update_dkong(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_pestplce(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_spclforc(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(s2650_interrupt); - DECLARE_WRITE_LINE_MEMBER(vblank_irq); + void s2650_interrupt(int state); + void vblank_irq(int state); TIMER_CALLBACK_MEMBER(scanline_callback); - DECLARE_WRITE_LINE_MEMBER(busreq_w); + void busreq_w(int state); void braze_decrypt_rom(uint8_t *dest); void dk_braze_decrypt(); diff --git a/src/mame/nintendo/famibox.cpp b/src/mame/nintendo/famibox.cpp index f7e1b9565ed..38f2ee91126 100644 --- a/src/mame/nintendo/famibox.cpp +++ b/src/mame/nintendo/famibox.cpp @@ -91,7 +91,7 @@ public: void init_famibox(); void init_famistat(); - DECLARE_READ_LINE_MEMBER(coin_r); + int coin_r(); DECLARE_INPUT_CHANGED_MEMBER(famibox_keyswitch_changed); DECLARE_INPUT_CHANGED_MEMBER(coin_inserted); @@ -434,7 +434,7 @@ INPUT_CHANGED_MEMBER(famibox_state::coin_inserted) } } -READ_LINE_MEMBER(famibox_state::coin_r) +int famibox_state::coin_r() { return m_coins > 0; } diff --git a/src/mame/nintendo/gba.cpp b/src/mame/nintendo/gba.cpp index 83d88df5237..265c2972bfe 100644 --- a/src/mame/nintendo/gba.cpp +++ b/src/mame/nintendo/gba.cpp @@ -1201,22 +1201,22 @@ uint32_t gba_state::gba_10000000_r(offs_t offset, uint32_t mem_mask) return data; } -WRITE_LINE_MEMBER(gba_state::int_hblank_callback) +void gba_state::int_hblank_callback(int state) { request_irq(INT_HBL); } -WRITE_LINE_MEMBER(gba_state::int_vblank_callback) +void gba_state::int_vblank_callback(int state) { request_irq(INT_VBL); } -WRITE_LINE_MEMBER(gba_state::int_vcount_callback) +void gba_state::int_vcount_callback(int state) { request_irq(INT_VCNT); } -WRITE_LINE_MEMBER(gba_state::dma_hblank_callback) +void gba_state::dma_hblank_callback(int state) { for (int ch = 0; ch < 4; ch++) { @@ -1227,7 +1227,7 @@ WRITE_LINE_MEMBER(gba_state::dma_hblank_callback) } } -WRITE_LINE_MEMBER(gba_state::dma_vblank_callback) +void gba_state::dma_vblank_callback(int state) { for (int ch = 0; ch < 4; ch++) { diff --git a/src/mame/nintendo/gba.h b/src/mame/nintendo/gba.h index d6c13a02d8b..d78db749fdb 100644 --- a/src/mame/nintendo/gba.h +++ b/src/mame/nintendo/gba.h @@ -73,11 +73,11 @@ private: uint32_t gba_io_r(offs_t offset, uint32_t mem_mask = ~0); void gba_io_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0); uint32_t gba_10000000_r(offs_t offset, uint32_t mem_mask = ~0); - DECLARE_WRITE_LINE_MEMBER(int_hblank_callback); - DECLARE_WRITE_LINE_MEMBER(int_vblank_callback); - DECLARE_WRITE_LINE_MEMBER(int_vcount_callback); - DECLARE_WRITE_LINE_MEMBER(dma_hblank_callback); - DECLARE_WRITE_LINE_MEMBER(dma_vblank_callback); + void int_hblank_callback(int state); + void int_vblank_callback(int state); + void int_vcount_callback(int state); + void dma_hblank_callback(int state); + void dma_vblank_callback(int state); TIMER_CALLBACK_MEMBER(dma_complete); TIMER_CALLBACK_MEMBER(timer_expire); TIMER_CALLBACK_MEMBER(handle_irq); diff --git a/src/mame/nintendo/mario.cpp b/src/mame/nintendo/mario.cpp index 4e932e3e3a9..c575ec3e8d0 100644 --- a/src/mame/nintendo/mario.cpp +++ b/src/mame/nintendo/mario.cpp @@ -118,19 +118,19 @@ void mario_state::memory_write_byte(offs_t offset, uint8_t data) return prog_space.write_byte(offset, data); } -WRITE_LINE_MEMBER(mario_state::nmi_mask_w) +void mario_state::nmi_mask_w(int state) { m_nmi_mask = state; if (!state) m_maincpu->set_input_line(INPUT_LINE_NMI, CLEAR_LINE); } -WRITE_LINE_MEMBER(mario_state::coin_counter_1_w) +void mario_state::coin_counter_1_w(int state) { machine().bookkeeping().coin_counter_w(0, state); } -WRITE_LINE_MEMBER(mario_state::coin_counter_2_w) +void mario_state::coin_counter_2_w(int state) { machine().bookkeeping().coin_counter_w(1, state); } @@ -329,7 +329,7 @@ GFXDECODE_END * *************************************/ -WRITE_LINE_MEMBER(mario_state::vblank_irq) +void mario_state::vblank_irq(int state) { if (state && m_nmi_mask) m_maincpu->set_input_line(INPUT_LINE_NMI, ASSERT_LINE); diff --git a/src/mame/nintendo/mario.h b/src/mame/nintendo/mario.h index ac913f1824a..8888a7c2a3f 100644 --- a/src/mame/nintendo/mario.h +++ b/src/mame/nintendo/mario.h @@ -117,18 +117,18 @@ private: int m_monitor; bool m_nmi_mask = false; - DECLARE_WRITE_LINE_MEMBER(nmi_mask_w); - DECLARE_WRITE_LINE_MEMBER(coin_counter_1_w); - DECLARE_WRITE_LINE_MEMBER(coin_counter_2_w); + void nmi_mask_w(int state); + void coin_counter_1_w(int state); + void coin_counter_2_w(int state); void mario_videoram_w(offs_t offset, uint8_t data); - DECLARE_WRITE_LINE_MEMBER(gfx_bank_w); - DECLARE_WRITE_LINE_MEMBER(palette_bank_w); + void gfx_bank_w(int state); + void palette_bank_w(int state); void mario_scroll_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(flip_w); + void flip_w(int state); uint8_t mario_sh_p1_r(); uint8_t mario_sh_p2_r(); - DECLARE_READ_LINE_MEMBER(mario_sh_t0_r); - DECLARE_READ_LINE_MEMBER(mario_sh_t1_r); + int mario_sh_t0_r(); + int mario_sh_t1_r(); uint8_t mario_sh_tune_r(offs_t offset); void mario_sh_p1_w(uint8_t data); void mario_sh_p2_w(uint8_t data); @@ -141,7 +141,7 @@ private: virtual void sound_reset() override; void mario_palette(palette_device &palette) const; uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(vblank_irq); + void vblank_irq(int state); void mario_sh_sound_w(uint8_t data); void mario_sh1_w(uint8_t data); void mario_sh2_w(uint8_t data); diff --git a/src/mame/nintendo/mario_a.cpp b/src/mame/nintendo/mario_a.cpp index fca0c8ba98b..94bf6a06bc1 100644 --- a/src/mame/nintendo/mario_a.cpp +++ b/src/mame/nintendo/mario_a.cpp @@ -477,12 +477,12 @@ uint8_t mario_state::mario_sh_p2_r() return I8035_P2_R() & 0xEF; /* Bit 4 connected to GND! */ } -READ_LINE_MEMBER(mario_state::mario_sh_t0_r) +int mario_state::mario_sh_t0_r() { return I8035_T_R(0); } -READ_LINE_MEMBER(mario_state::mario_sh_t1_r) +int mario_state::mario_sh_t1_r() { return I8035_T_R(1); } diff --git a/src/mame/nintendo/mario_v.cpp b/src/mame/nintendo/mario_v.cpp index 8cf57a15765..3f29bde1ede 100644 --- a/src/mame/nintendo/mario_v.cpp +++ b/src/mame/nintendo/mario_v.cpp @@ -84,13 +84,13 @@ void mario_state::mario_videoram_w(offs_t offset, uint8_t data) m_bg_tilemap->mark_tile_dirty(offset); } -WRITE_LINE_MEMBER(mario_state::gfx_bank_w) +void mario_state::gfx_bank_w(int state) { m_gfx_bank = state; machine().tilemap().mark_all_dirty(); } -WRITE_LINE_MEMBER(mario_state::palette_bank_w) +void mario_state::palette_bank_w(int state) { m_palette_bank = state; machine().tilemap().mark_all_dirty(); @@ -101,7 +101,7 @@ void mario_state::mario_scroll_w(uint8_t data) m_gfx_scroll = data + 17; } -WRITE_LINE_MEMBER(mario_state::flip_w) +void mario_state::flip_w(int state) { m_flip = state; if (m_flip) diff --git a/src/mame/nintendo/multigam.cpp b/src/mame/nintendo/multigam.cpp index a247ac893d5..a9b394c80c9 100644 --- a/src/mame/nintendo/multigam.cpp +++ b/src/mame/nintendo/multigam.cpp @@ -141,7 +141,7 @@ public: void init_multigam(); void init_multigm3(); - DECLARE_READ_LINE_MEMBER(multigam_inputs_r); + int multigam_inputs_r(); protected: virtual void machine_start() override; @@ -317,7 +317,7 @@ uint8_t multigam_state::multigam_IN1_r() return ((m_in_1 >> m_in_1_shift++) & 0x01) | 0x40; } -READ_LINE_MEMBER(multigam_state::multigam_inputs_r) +int multigam_state::multigam_inputs_r() { /* bit 0: serial input (dsw) bit 1: coin */ diff --git a/src/mame/nintendo/n64.h b/src/mame/nintendo/n64.h index 5adafa79999..547d90cd2cc 100644 --- a/src/mame/nintendo/n64.h +++ b/src/mame/nintendo/n64.h @@ -43,7 +43,7 @@ public: void n64_machine_stop(); uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(screen_vblank); + void screen_vblank(int state); // Getters n64_rdp* rdp() { return m_rdp.get(); } diff --git a/src/mame/nintendo/n64_v.cpp b/src/mame/nintendo/n64_v.cpp index ecf65dabdfa..31a56fbac74 100644 --- a/src/mame/nintendo/n64_v.cpp +++ b/src/mame/nintendo/n64_v.cpp @@ -190,7 +190,7 @@ uint32_t n64_state::screen_update(screen_device &screen, bitmap_rgb32 &bitmap, c return 0; } -WRITE_LINE_MEMBER(n64_state::screen_vblank) +void n64_state::screen_vblank(int state) { if (state) m_rcp_periphs->field_update(); diff --git a/src/mame/nintendo/n8080.cpp b/src/mame/nintendo/n8080.cpp index e99c9ff8eaf..148fecbfac1 100644 --- a/src/mame/nintendo/n8080.cpp +++ b/src/mame/nintendo/n8080.cpp @@ -538,7 +538,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(n8080_state::rst2_tick) m_maincpu->set_input_line_and_vector(INPUT_LINE_IRQ0, state, 0xd7); // I8080 } -WRITE_LINE_MEMBER(n8080_state::n8080_inte_callback) +void n8080_state::n8080_inte_callback(int state) { m_inte = state; } diff --git a/src/mame/nintendo/n8080.h b/src/mame/nintendo/n8080.h index 6ca77595b11..650a71df3a6 100644 --- a/src/mame/nintendo/n8080.h +++ b/src/mame/nintendo/n8080.h @@ -72,10 +72,10 @@ protected: void n8080_sound_1_w(uint8_t data); void n8080_sound_2_w(uint8_t data); uint8_t n8080_8035_p1_r(); - DECLARE_READ_LINE_MEMBER(n8080_8035_t0_r); - DECLARE_READ_LINE_MEMBER(n8080_8035_t1_r); + int n8080_8035_t0_r(); + int n8080_8035_t1_r(); void n8080_dac_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(n8080_inte_callback); + void n8080_inte_callback(int state); void n8080_status_callback(uint8_t data); void n8080_palette(palette_device &palette) const; TIMER_DEVICE_CALLBACK_MEMBER(rst1_tick); @@ -178,8 +178,8 @@ private: void helifire_sound(machine_config &config); TIMER_DEVICE_CALLBACK_MEMBER(dac_volume_timer); - DECLARE_READ_LINE_MEMBER(helifire_8035_t0_r); - DECLARE_READ_LINE_MEMBER(helifire_8035_t1_r); + int helifire_8035_t0_r(); + int helifire_8035_t1_r(); uint8_t helifire_8035_external_ram_r(); uint8_t helifire_8035_p2_r(); void sound_ctrl_w(uint8_t data); @@ -187,7 +187,7 @@ private: void helifire_palette(palette_device &palette) const; void next_line(); - DECLARE_WRITE_LINE_MEMBER(screen_vblank); + void screen_vblank(int state); uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void main_cpu_map(address_map &map); diff --git a/src/mame/nintendo/n8080_a.cpp b/src/mame/nintendo/n8080_a.cpp index cb9b9b5ae4d..a15b776eb2b 100644 --- a/src/mame/nintendo/n8080_a.cpp +++ b/src/mame/nintendo/n8080_a.cpp @@ -277,21 +277,23 @@ uint8_t n8080_state::n8080_8035_p1_r() } -READ_LINE_MEMBER(n8080_state::n8080_8035_t0_r) +int n8080_state::n8080_8035_t0_r() { return (m_curr_sound_pins >> 0x7) & 1; } -READ_LINE_MEMBER(n8080_state::n8080_8035_t1_r) + +int n8080_state::n8080_8035_t1_r() { return (m_curr_sound_pins >> 0xc) & 1; } -READ_LINE_MEMBER(helifire_state::helifire_8035_t0_r) +int helifire_state::helifire_8035_t0_r() { return (m_curr_sound_pins >> 0x3) & 1; } -READ_LINE_MEMBER(helifire_state::helifire_8035_t1_r) + +int helifire_state::helifire_8035_t1_r() { return (m_curr_sound_pins >> 0x4) & 1; } diff --git a/src/mame/nintendo/n8080_v.cpp b/src/mame/nintendo/n8080_v.cpp index 75861c87f59..b6ce7d075b8 100644 --- a/src/mame/nintendo/n8080_v.cpp +++ b/src/mame/nintendo/n8080_v.cpp @@ -317,7 +317,7 @@ uint32_t helifire_state::screen_update(screen_device &screen, bitmap_ind16 &bitm } -WRITE_LINE_MEMBER(helifire_state::screen_vblank) +void helifire_state::screen_vblank(int state) { // falling edge if (!state) diff --git a/src/mame/nintendo/nes_sh6578.cpp b/src/mame/nintendo/nes_sh6578.cpp index 8fb5f72162e..0fb438dccc5 100644 --- a/src/mame/nintendo/nes_sh6578.cpp +++ b/src/mame/nintendo/nes_sh6578.cpp @@ -109,7 +109,7 @@ private: uint8_t apu_read_mem(offs_t offset); - DECLARE_WRITE_LINE_MEMBER(apu_irq); + void apu_irq(int state); int m_initial_startup_state; @@ -444,7 +444,7 @@ void nes_sh6578_max10in1_state::extio_w(uint8_t data) -WRITE_LINE_MEMBER(nes_sh6578_state::apu_irq) +void nes_sh6578_state::apu_irq(int state) { // unimplemented } diff --git a/src/mame/nintendo/nes_vt_soc.cpp b/src/mame/nintendo/nes_vt_soc.cpp index a5bcaae1108..36d59df526b 100644 --- a/src/mame/nintendo/nes_vt_soc.cpp +++ b/src/mame/nintendo/nes_vt_soc.cpp @@ -1072,7 +1072,7 @@ void nes_vt02_vt03_soc_device::nes_vt_map(address_map &map) -WRITE_LINE_MEMBER(nes_vt02_vt03_soc_device::apu_irq) +void nes_vt02_vt03_soc_device::apu_irq(int state) { // TODO // set_input_line(RP2A03_APU_IRQ_LINE, state ? ASSERT_LINE : CLEAR_LINE); diff --git a/src/mame/nintendo/nes_vt_soc.h b/src/mame/nintendo/nes_vt_soc.h index 0404fe65abd..3d826806366 100644 --- a/src/mame/nintendo/nes_vt_soc.h +++ b/src/mame/nintendo/nes_vt_soc.h @@ -125,7 +125,7 @@ protected: std::unique_ptr m_ntram; std::unique_ptr m_chrram; - DECLARE_WRITE_LINE_MEMBER(apu_irq); + void apu_irq(int state); uint8_t apu_read_mem(offs_t offset); uint8_t external_space_read(offs_t offset); diff --git a/src/mame/nintendo/nss.cpp b/src/mame/nintendo/nss.cpp index 10a1bd00f9c..7ae28593a16 100644 --- a/src/mame/nintendo/nss.cpp +++ b/src/mame/nintendo/nss.cpp @@ -328,7 +328,7 @@ public: void init_nss(); - DECLARE_READ_LINE_MEMBER(game_over_flag_r); + int game_over_flag_r(); protected: virtual void machine_start() override; @@ -361,7 +361,7 @@ private: void port_04_w(uint8_t data); void port_07_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(nss_vblank_irq); + void nss_vblank_irq(int state); void bios_io_map(address_map &map); void bios_map(address_map &map); void snes_map(address_map &map); @@ -643,7 +643,7 @@ void nss_state::machine_start() } -READ_LINE_MEMBER(nss_state::game_over_flag_r) +int nss_state::game_over_flag_r() { return m_game_over_flag; } @@ -799,7 +799,7 @@ static INPUT_PORTS_START( snes ) INPUT_PORTS_END -WRITE_LINE_MEMBER(nss_state::nss_vblank_irq) +void nss_state::nss_vblank_irq(int state) { if (state && m_nmi_enable) m_bioscpu->pulse_input_line(INPUT_LINE_NMI, attotime::zero); diff --git a/src/mame/nintendo/playch10.cpp b/src/mame/nintendo/playch10.cpp index f6f24744b44..a7be093f7df 100644 --- a/src/mame/nintendo/playch10.cpp +++ b/src/mame/nintendo/playch10.cpp @@ -362,20 +362,20 @@ public: void init_pckboard(); void init_pc_hrz(); - DECLARE_READ_LINE_MEMBER(int_detect_r); + int int_detect_r(); private: - DECLARE_WRITE_LINE_MEMBER(up8w_w); + void up8w_w(int state); u8 ram_8w_r(offs_t offset); void ram_8w_w(offs_t offset, u8 data); void time_w(offs_t offset, u8 data); - DECLARE_WRITE_LINE_MEMBER(sdcs_w); - DECLARE_WRITE_LINE_MEMBER(cntrl_mask_w); - DECLARE_WRITE_LINE_MEMBER(disp_mask_w); - DECLARE_WRITE_LINE_MEMBER(sound_mask_w); - DECLARE_WRITE_LINE_MEMBER(nmi_enable_w); - DECLARE_WRITE_LINE_MEMBER(dog_di_w); - DECLARE_WRITE_LINE_MEMBER(ppu_reset_w); + void sdcs_w(int state); + void cntrl_mask_w(int state); + void disp_mask_w(int state); + void sound_mask_w(int state); + void nmi_enable_w(int state); + void dog_di_w(int state); + void ppu_reset_w(int state); u8 pc10_detectclr_r(); void cart_sel_w(u8 data); u8 pc10_prot_r(); @@ -425,12 +425,12 @@ private: }; void playch10_palette(palette_device &palette) const; - DECLARE_WRITE_LINE_MEMBER(vblank_irq); + void vblank_irq(int state); void pc10_set_videorom_bank(int first, int count, int bank, int size); void pc10_set_videoram_bank(int first, int count, int bank, int size); void gboard_scanline_cb(int scanline, bool vblank, bool blanked); - DECLARE_WRITE_LINE_MEMBER(int_detect_w); + void int_detect_w(int state); void mapper9_latch(offs_t offset); void pc10_set_mirroring(int mirroring); @@ -536,7 +536,7 @@ void playch10_state::playch10_palette(palette_device &palette) const } } -WRITE_LINE_MEMBER(playch10_state::int_detect_w) +void playch10_state::int_detect_w(int state) { if (state) m_pc10_int_detect = 1; @@ -628,7 +628,7 @@ u32 playch10_state::screen_update_playch10_bottom(screen_device &screen, bitmap_ //****************************************************************************** -WRITE_LINE_MEMBER(playch10_state::up8w_w) +void playch10_state::up8w_w(int state) { m_up_8w = state; } @@ -722,12 +722,12 @@ void playch10_state::machine_start() * *************************************/ -READ_LINE_MEMBER(playch10_state::int_detect_r) +int playch10_state::int_detect_r() { return ~m_pc10_int_detect & 1; } -WRITE_LINE_MEMBER(playch10_state::sdcs_w) +void playch10_state::sdcs_w(int state) { /* Hooked to CLR on LS194A - Sheet 2, bottom left. @@ -738,32 +738,32 @@ WRITE_LINE_MEMBER(playch10_state::sdcs_w) m_pc10_sdcs = !state; } -WRITE_LINE_MEMBER(playch10_state::cntrl_mask_w) +void playch10_state::cntrl_mask_w(int state) { m_cntrl_mask = !state; } -WRITE_LINE_MEMBER(playch10_state::disp_mask_w) +void playch10_state::disp_mask_w(int state) { m_pc10_dispmask = !state; } -WRITE_LINE_MEMBER(playch10_state::sound_mask_w) +void playch10_state::sound_mask_w(int state) { machine().sound().system_mute(!state); } -WRITE_LINE_MEMBER(playch10_state::nmi_enable_w) +void playch10_state::nmi_enable_w(int state) { m_pc10_nmi_enable = state; } -WRITE_LINE_MEMBER(playch10_state::dog_di_w) +void playch10_state::dog_di_w(int state) { m_pc10_dog_di = state; } -WRITE_LINE_MEMBER(playch10_state::ppu_reset_w) +void playch10_state::ppu_reset_w(int state) { if (state) m_ppu->reset(); @@ -1884,7 +1884,7 @@ static GFXDECODE_START( gfx_playch10 ) GFXDECODE_ENTRY( "gfx1", 0, bios_charlayout, 0, 32 ) GFXDECODE_END -WRITE_LINE_MEMBER(playch10_state::vblank_irq) +void playch10_state::vblank_irq(int state) { if (state) { diff --git a/src/mame/nintendo/popeye.cpp b/src/mame/nintendo/popeye.cpp index f5b78979447..70b59fe3e37 100644 --- a/src/mame/nintendo/popeye.cpp +++ b/src/mame/nintendo/popeye.cpp @@ -103,7 +103,7 @@ void tpp2_state::refresh_w(offs_t offset, uint8_t data) m_watchdog_enabled = ((offset >> 9) & 1) != 0; } -WRITE_LINE_MEMBER(tnx1_state::screen_vblank) +void tnx1_state::screen_vblank(int state) { if (state) { @@ -117,7 +117,7 @@ WRITE_LINE_MEMBER(tnx1_state::screen_vblank) } } -WRITE_LINE_MEMBER(tpp2_state::screen_vblank) +void tpp2_state::screen_vblank(int state) { tnx1_state::screen_vblank(state); @@ -281,7 +281,7 @@ protected: }; -READ_LINE_MEMBER(tnx1_state::dsw1_read) +int tnx1_state::dsw1_read() { return m_io_dsw1->read() >> m_dswbit; } @@ -369,7 +369,7 @@ static INPUT_PORTS_START( skyskipr ) PORT_CONFSETTING( 0x02, "Interlaced (bitmap)" ) INPUT_PORTS_END -READ_LINE_MEMBER( tnx1_state::pop_field_r ) +int tnx1_state::pop_field_r() { return m_field ^ 1; } diff --git a/src/mame/nintendo/popeye.h b/src/mame/nintendo/popeye.h index e654621b67d..6223570faab 100644 --- a/src/mame/nintendo/popeye.h +++ b/src/mame/nintendo/popeye.h @@ -42,8 +42,8 @@ public: m_field(0) { } - DECLARE_READ_LINE_MEMBER(dsw1_read); - DECLARE_READ_LINE_MEMBER(pop_field_r); + int dsw1_read(); + int pop_field_r(); virtual void config(machine_config &config); @@ -94,7 +94,7 @@ protected: virtual void video_start() override; virtual void tnx1_palette(palette_device &palette); uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - virtual DECLARE_WRITE_LINE_MEMBER(screen_vblank); + virtual void screen_vblank(int state); void update_palette(); virtual void decrypt_rom(); virtual void draw_background(bitmap_ind16 &bitmap, const rectangle &cliprect); @@ -143,7 +143,7 @@ protected: virtual void driver_start() override; virtual void refresh_w(offs_t offset, uint8_t data) override; - virtual DECLARE_WRITE_LINE_MEMBER(screen_vblank) override; + virtual void screen_vblank(int state) override; virtual void maincpu_program_map(address_map &map) override; virtual void decrypt_rom() override; virtual void draw_background(bitmap_ind16 &bitmap, const rectangle &cliprect) override; diff --git a/src/mame/nintendo/punchout.cpp b/src/mame/nintendo/punchout.cpp index 21c2320eb63..60407e983ae 100644 --- a/src/mame/nintendo/punchout.cpp +++ b/src/mame/nintendo/punchout.cpp @@ -135,7 +135,7 @@ DIP locations verified for: // Z80 (main) -WRITE_LINE_MEMBER(punchout_state::nmi_mask_w) +void punchout_state::nmi_mask_w(int state) { m_nmi_mask = state; if (!m_nmi_mask) @@ -593,7 +593,7 @@ static GFXDECODE_START( gfx_armwrest ) GFXDECODE_END -WRITE_LINE_MEMBER(punchout_state::vblank_irq) +void punchout_state::vblank_irq(int state) { if (state && m_nmi_mask) m_maincpu->set_input_line(INPUT_LINE_NMI, ASSERT_LINE); diff --git a/src/mame/nintendo/punchout.h b/src/mame/nintendo/punchout.h index 98d0b635a78..9fa59414a1d 100644 --- a/src/mame/nintendo/punchout.h +++ b/src/mame/nintendo/punchout.h @@ -73,7 +73,7 @@ private: void spunchout_exp_w(offs_t offset, uint8_t data); void spunchout_rp5h01_reset_w(uint8_t data); void spunchout_rp5h01_clock_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(nmi_mask_w); + void nmi_mask_w(int state); void punchout_bg_top_videoram_w(offs_t offset, uint8_t data); void punchout_bg_bot_videoram_w(offs_t offset, uint8_t data); void armwrest_fg_videoram_w(offs_t offset, uint8_t data); @@ -95,7 +95,7 @@ private: uint32_t screen_update_punchout_bottom(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_armwrest_top(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_armwrest_bottom(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(vblank_irq); + void vblank_irq(int state); void draw_big_sprite(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int palette); void armwrest_draw_big_sprite(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int palette); void drawbs2(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); diff --git a/src/mame/nintendo/snes.h b/src/mame/nintendo/snes.h index a778afe06d8..606bcb4de6a 100644 --- a/src/mame/nintendo/snes.h +++ b/src/mame/nintendo/snes.h @@ -427,7 +427,7 @@ protected: TIMER_CALLBACK_MEMBER(snes_update_io); TIMER_CALLBACK_MEMBER(snes_scanline_tick); TIMER_CALLBACK_MEMBER(snes_hblank_tick); - DECLARE_WRITE_LINE_MEMBER(snes_extern_irq_w); + void snes_extern_irq_w(int state); void snes_init_timers(); void scpu_irq_refresh(); }; diff --git a/src/mame/nintendo/snes_m.cpp b/src/mame/nintendo/snes_m.cpp index 4e386454b6d..02b207359c6 100644 --- a/src/mame/nintendo/snes_m.cpp +++ b/src/mame/nintendo/snes_m.cpp @@ -571,7 +571,7 @@ void snes_state::wrio_write(uint8_t data) } } -WRITE_LINE_MEMBER(snes_state::snes_extern_irq_w) +void snes_state::snes_extern_irq_w(int state) { m_maincpu->set_input_line(G65816_LINE_IRQ, state); } diff --git a/src/mame/nintendo/vt1682.cpp b/src/mame/nintendo/vt1682.cpp index 6223a28331c..960a0f60f6a 100644 --- a/src/mame/nintendo/vt1682.cpp +++ b/src/mame/nintendo/vt1682.cpp @@ -150,10 +150,10 @@ protected: required_device m_screen; required_device m_soundcpu; - DECLARE_WRITE_LINE_MEMBER(soundcpu_timera_irq); - DECLARE_WRITE_LINE_MEMBER(soundcpu_timerb_irq); + void soundcpu_timera_irq(int state); + void soundcpu_timerb_irq(int state); - DECLARE_WRITE_LINE_MEMBER(maincpu_timer_irq); + void maincpu_timer_irq(int state); required_device m_soundcpu_timer_a_dev; required_device m_soundcpu_timer_b_dev; @@ -5326,7 +5326,7 @@ void vt_vt1682_state::vt1682_sound_reset_hack_w(offs_t offset, uint8_t data) m_soundcpu->set_input_line(INPUT_LINE_RESET, ASSERT_LINE); } -WRITE_LINE_MEMBER(vt_vt1682_state::soundcpu_timera_irq) +void vt_vt1682_state::soundcpu_timera_irq(int state) { if (state && !m_scpu_is_in_reset) m_soundcpu->set_input_line(0, ASSERT_LINE); @@ -5334,7 +5334,7 @@ WRITE_LINE_MEMBER(vt_vt1682_state::soundcpu_timera_irq) m_soundcpu->set_input_line(0, CLEAR_LINE); } -WRITE_LINE_MEMBER(vt_vt1682_state::soundcpu_timerb_irq) +void vt_vt1682_state::soundcpu_timerb_irq(int state) { // need to set proper vector (need IRQ priority manager function?) /* @@ -5345,7 +5345,7 @@ WRITE_LINE_MEMBER(vt_vt1682_state::soundcpu_timerb_irq) */ } -WRITE_LINE_MEMBER(vt_vt1682_state::maincpu_timer_irq) +void vt_vt1682_state::maincpu_timer_irq(int state) { // need to set proper vector (need IRQ priority manager function?) diff --git a/src/mame/nix/pirates.cpp b/src/mame/nix/pirates.cpp index b4875ce9ac1..592dfe6942e 100644 --- a/src/mame/nix/pirates.cpp +++ b/src/mame/nix/pirates.cpp @@ -138,7 +138,7 @@ public: void init_pirates(); void init_genix(); - DECLARE_READ_LINE_MEMBER(prot_r); + int prot_r(); protected: virtual void video_start() override; @@ -305,7 +305,7 @@ void pirates_state::out_w(uint8_t data) LOGOUT("%06x: out_w %04x\n", m_maincpu->pc(), data); } -READ_LINE_MEMBER(pirates_state::prot_r) +int pirates_state::prot_r() { // static int prot = 0xa3; // offs_t pc; diff --git a/src/mame/nmk/macrossp.cpp b/src/mame/nmk/macrossp.cpp index 833a5b668c0..3afa1272dd9 100644 --- a/src/mame/nmk/macrossp.cpp +++ b/src/mame/nmk/macrossp.cpp @@ -396,10 +396,10 @@ private: virtual void machine_reset() override; virtual void video_start() override; uint32_t screen_update_macrossp(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(screen_vblank_macrossp); + void screen_vblank_macrossp(int state); void draw_sprites(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); void draw_layer(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect, int layer, int linem, int pri); - DECLARE_WRITE_LINE_MEMBER(irqhandler); + void irqhandler(int state); void macrossp_map(address_map &map); void macrossp_es5506_bank1_map(address_map &map); @@ -857,7 +857,7 @@ uint32_t macrossp_state::screen_update_macrossp(screen_device &screen, bitmap_rg return 0; } -WRITE_LINE_MEMBER(macrossp_state::screen_vblank_macrossp) +void macrossp_state::screen_vblank_macrossp(int state) { // rising edge if (state) @@ -1098,7 +1098,7 @@ GFXDECODE_END /*** MACHINE DRIVER **********************************************************/ -WRITE_LINE_MEMBER(macrossp_state::irqhandler) +void macrossp_state::irqhandler(int state) { logerror("ES5506 irq %d\n", state); diff --git a/src/mame/nmk/nmk004.h b/src/mame/nmk/nmk004.h index 3194ca0cb8b..77f3e7c916a 100644 --- a/src/mame/nmk/nmk004.h +++ b/src/mame/nmk/nmk004.h @@ -23,7 +23,7 @@ public: // host interface void write(uint8_t data); uint8_t read(); - DECLARE_WRITE_LINE_MEMBER( nmi_w ) { m_cpu->set_input_line(INPUT_LINE_NMI, state); } + void nmi_w(int state) { m_cpu->set_input_line(INPUT_LINE_NMI, state); } void port4_w(uint8_t data); void ym2203_irq_handler(int irq); diff --git a/src/mame/nmk/powerins.h b/src/mame/nmk/powerins.h index 9459ed31caf..9452650d104 100644 --- a/src/mame/nmk/powerins.h +++ b/src/mame/nmk/powerins.h @@ -29,8 +29,8 @@ private: TILE_GET_INFO_MEMBER(powerins_get_bg_tile_info); - DECLARE_WRITE_LINE_MEMBER(screen_vblank); - DECLARE_WRITE_LINE_MEMBER(screen_vblank_powerinsa); + void screen_vblank(int state); + void screen_vblank_powerinsa(int state); virtual void video_start() override; diff --git a/src/mame/nmk/powerins_v.cpp b/src/mame/nmk/powerins_v.cpp index 5905eac1f7a..76c0bde3fc4 100644 --- a/src/mame/nmk/powerins_v.cpp +++ b/src/mame/nmk/powerins_v.cpp @@ -211,7 +211,7 @@ if (machine().input().code_pressed(KEYCODE_Z)) return 0; } -WRITE_LINE_MEMBER(powerins_state::screen_vblank) +void powerins_state::screen_vblank(int state) { if (state) { @@ -220,7 +220,7 @@ WRITE_LINE_MEMBER(powerins_state::screen_vblank) } } -WRITE_LINE_MEMBER(powerins_state::screen_vblank_powerinsa) +void powerins_state::screen_vblank_powerinsa(int state) { if (state) { diff --git a/src/mame/nokia/mikromik.cpp b/src/mame/nokia/mikromik.cpp index d028d02f4a4..59146091532 100644 --- a/src/mame/nokia/mikromik.cpp +++ b/src/mame/nokia/mikromik.cpp @@ -139,7 +139,7 @@ void mm1_state::write(offs_t offset, uint8_t data) // a8_w - //------------------------------------------------- -WRITE_LINE_MEMBER( mm1_state::a8_w ) +void mm1_state::a8_w(int state) { LOG("IC24 A8 %u\n", state); m_a8 = state; @@ -150,7 +150,7 @@ WRITE_LINE_MEMBER( mm1_state::a8_w ) // recall_w - //------------------------------------------------- -WRITE_LINE_MEMBER( mm1_state::recall_w ) +void mm1_state::recall_w(int state) { LOG("RECALL %u\n", state); m_recall = state; @@ -162,7 +162,7 @@ WRITE_LINE_MEMBER( mm1_state::recall_w ) // rx21_w - //------------------------------------------------- -WRITE_LINE_MEMBER( mm1_state::rx21_w ) +void mm1_state::rx21_w(int state) { m_rx21 = state; } @@ -172,7 +172,7 @@ WRITE_LINE_MEMBER( mm1_state::rx21_w ) // tx21_w - //------------------------------------------------- -WRITE_LINE_MEMBER( mm1_state::tx21_w ) +void mm1_state::tx21_w(int state) { m_tx21 = state; } @@ -182,7 +182,7 @@ WRITE_LINE_MEMBER( mm1_state::tx21_w ) // rcl_w - //------------------------------------------------- -WRITE_LINE_MEMBER( mm1_state::rcl_w ) +void mm1_state::rcl_w(int state) { m_rcl = state; } @@ -192,7 +192,7 @@ WRITE_LINE_MEMBER( mm1_state::rcl_w ) // intc_w - //------------------------------------------------- -WRITE_LINE_MEMBER( mm1_state::intc_w ) +void mm1_state::intc_w(int state) { m_intc = state; } @@ -202,7 +202,7 @@ WRITE_LINE_MEMBER( mm1_state::intc_w ) // llen_w - //------------------------------------------------- -WRITE_LINE_MEMBER( mm1_state::llen_w ) +void mm1_state::llen_w(int state) { LOG("LLEN %u\n", state); m_llen = state; @@ -213,7 +213,7 @@ WRITE_LINE_MEMBER( mm1_state::llen_w ) // motor_on_w - //------------------------------------------------- -WRITE_LINE_MEMBER( mm1_state::motor_on_w ) +void mm1_state::motor_on_w(int state) { LOG("MOTOR %u\n", state); m_floppy[0]->mon_w(!state); @@ -287,7 +287,7 @@ void mm1_state::update_tc() } } -WRITE_LINE_MEMBER( mm1_state::dma_hrq_w ) +void mm1_state::dma_hrq_w(int state) { m_maincpu->set_input_line(INPUT_LINE_HALT, state ? ASSERT_LINE : CLEAR_LINE); @@ -311,7 +311,7 @@ void mm1_state::mpsc_dack_w(uint8_t data) m_dmac->dreq1_w(CLEAR_LINE); } -WRITE_LINE_MEMBER( mm1_state::dma_eop_w ) +void mm1_state::dma_eop_w(int state) { m_maincpu->set_input_line(I8085_RST75_LINE, state); @@ -319,13 +319,13 @@ WRITE_LINE_MEMBER( mm1_state::dma_eop_w ) update_tc(); } -WRITE_LINE_MEMBER( mm1_state::dack3_w ) +void mm1_state::dack3_w(int state) { m_dack3 = state; update_tc(); } -WRITE_LINE_MEMBER( mm1_state::itxc_w ) +void mm1_state::itxc_w(int state) { if (!m_intc) { @@ -333,7 +333,7 @@ WRITE_LINE_MEMBER( mm1_state::itxc_w ) } } -WRITE_LINE_MEMBER( mm1_state::irxc_w ) +void mm1_state::irxc_w(int state) { if (!m_intc) { @@ -341,7 +341,7 @@ WRITE_LINE_MEMBER( mm1_state::irxc_w ) } } -WRITE_LINE_MEMBER( mm1_state::auxc_w ) +void mm1_state::auxc_w(int state) { m_mpsc->txcb_w(state); m_mpsc->rxcb_w(state); @@ -351,7 +351,7 @@ WRITE_LINE_MEMBER( mm1_state::auxc_w ) // UPD7201 //------------------------------------------------- -WRITE_LINE_MEMBER( mm1_state::drq2_w ) +void mm1_state::drq2_w(int state) { if (state) { @@ -359,7 +359,7 @@ WRITE_LINE_MEMBER( mm1_state::drq2_w ) } } -WRITE_LINE_MEMBER( mm1_state::drq1_w ) +void mm1_state::drq1_w(int state) { if (state) { @@ -367,7 +367,7 @@ WRITE_LINE_MEMBER( mm1_state::drq1_w ) } } -READ_LINE_MEMBER( mm1_state::dsra_r ) +int mm1_state::dsra_r() { return 1; } diff --git a/src/mame/nokia/mikromik.h b/src/mame/nokia/mikromik.h index 91484ef17ea..a27ba06cd1d 100644 --- a/src/mame/nokia/mikromik.h +++ b/src/mame/nokia/mikromik.h @@ -119,25 +119,25 @@ private: uint8_t read(offs_t offset); void write(offs_t offset, uint8_t data); - DECLARE_WRITE_LINE_MEMBER( a8_w ); - DECLARE_WRITE_LINE_MEMBER( recall_w ); - DECLARE_WRITE_LINE_MEMBER( rx21_w ); - DECLARE_WRITE_LINE_MEMBER( tx21_w ); - DECLARE_WRITE_LINE_MEMBER( rcl_w ); - DECLARE_WRITE_LINE_MEMBER( intc_w ); - DECLARE_WRITE_LINE_MEMBER( llen_w ); - DECLARE_WRITE_LINE_MEMBER( motor_on_w ); - DECLARE_WRITE_LINE_MEMBER( dma_hrq_w ); + void a8_w(int state); + void recall_w(int state); + void rx21_w(int state); + void tx21_w(int state); + void rcl_w(int state); + void intc_w(int state); + void llen_w(int state); + void motor_on_w(int state); + void dma_hrq_w(int state); uint8_t mpsc_dack_r(); void mpsc_dack_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER( dma_eop_w ); - DECLARE_WRITE_LINE_MEMBER( dack3_w ); - DECLARE_WRITE_LINE_MEMBER( itxc_w ); - DECLARE_WRITE_LINE_MEMBER( irxc_w ); - DECLARE_WRITE_LINE_MEMBER( auxc_w ); - DECLARE_WRITE_LINE_MEMBER( drq2_w ); - DECLARE_WRITE_LINE_MEMBER( drq1_w ); - DECLARE_READ_LINE_MEMBER( dsra_r ); + void dma_eop_w(int state); + void dack3_w(int state); + void itxc_w(int state); + void irxc_w(int state); + void auxc_w(int state); + void drq2_w(int state); + void drq1_w(int state); + int dsra_r(); void update_tc(); diff --git a/src/mame/nokia/mm1kb.h b/src/mame/nokia/mm1kb.h index e4be360848a..294c1dd989c 100644 --- a/src/mame/nokia/mm1kb.h +++ b/src/mame/nokia/mm1kb.h @@ -30,7 +30,7 @@ public: uint8_t read() { return m_data; } - DECLARE_WRITE_LINE_MEMBER( bell_w ) + void bell_w(int state) { if (state == 1) { diff --git a/src/mame/olivetti/m20.cpp b/src/mame/olivetti/m20.cpp index 87606243ae6..29421e25b2e 100644 --- a/src/mame/olivetti/m20.cpp +++ b/src/mame/olivetti/m20.cpp @@ -104,10 +104,10 @@ private: void i8259_w(offs_t offset, uint16_t data); uint16_t port21_r(); void port21_w(uint16_t data); - DECLARE_WRITE_LINE_MEMBER(tty_clock_tick_w); - DECLARE_WRITE_LINE_MEMBER(kbd_clock_tick_w); - DECLARE_WRITE_LINE_MEMBER(timer_tick_w); - DECLARE_WRITE_LINE_MEMBER(int_w); + void tty_clock_tick_w(int state); + void kbd_clock_tick_w(int state); + void timer_tick_w(int state); + void int_w(int state); MC6845_UPDATE_ROW(update_row); void m20_data_mem(address_map &map); @@ -213,19 +213,19 @@ void m20_state::i8259_w(offs_t offset, uint16_t data) m_i8259->write(offset, (data>>1)); } -WRITE_LINE_MEMBER( m20_state::tty_clock_tick_w ) +void m20_state::tty_clock_tick_w(int state) { m_ttyi8251->write_txc(state); m_ttyi8251->write_rxc(state); } -WRITE_LINE_MEMBER( m20_state::kbd_clock_tick_w ) +void m20_state::kbd_clock_tick_w(int state) { m_kbdi8251->write_txc(state); m_kbdi8251->write_rxc(state); } -WRITE_LINE_MEMBER( m20_state::timer_tick_w ) +void m20_state::timer_tick_w(int state) { /* The output of the 8253 is connected to a 74LS74 flop chip. * The output of the flop chip is connected to NVI CPU input. @@ -695,7 +695,7 @@ uint16_t m20_state::nviack_r() return 0xffff; } -WRITE_LINE_MEMBER(m20_state::int_w) +void m20_state::int_w(int state) { if(m_apb && !m_apb->halted()) m_apb->vi_w(state); diff --git a/src/mame/olivetti/m20_8086.cpp b/src/mame/olivetti/m20_8086.cpp index fb1680e4183..e230e50b23b 100644 --- a/src/mame/olivetti/m20_8086.cpp +++ b/src/mame/olivetti/m20_8086.cpp @@ -87,13 +87,13 @@ IRQ_CALLBACK_MEMBER(m20_8086_device::int_cb) return m_pic->acknowledge() << 1; } -WRITE_LINE_MEMBER(m20_8086_device::nvi_w) +void m20_8086_device::nvi_w(int state) { m_nvi = state; m_8086->set_input_line(INPUT_LINE_IRQ0, (state || m_vi) ? ASSERT_LINE : CLEAR_LINE); } -WRITE_LINE_MEMBER(m20_8086_device::vi_w) +void m20_8086_device::vi_w(int state) { m_vi = state; m_8086->set_input_line(INPUT_LINE_IRQ0, (state || m_nvi) ? ASSERT_LINE : CLEAR_LINE); diff --git a/src/mame/olivetti/m20_8086.h b/src/mame/olivetti/m20_8086.h index 0886792e717..cc81ed00afe 100644 --- a/src/mame/olivetti/m20_8086.h +++ b/src/mame/olivetti/m20_8086.h @@ -23,8 +23,8 @@ public: uint16_t z8000_io_r(offs_t offset, uint16_t mem_mask = ~0); void z8000_io_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); - DECLARE_WRITE_LINE_MEMBER(vi_w); - DECLARE_WRITE_LINE_MEMBER(nvi_w); + void vi_w(int state); + void nvi_w(int state); void handshake_w(offs_t offset, uint16_t data); void halt() { m_8086->set_input_line(INPUT_LINE_HALT, ASSERT_LINE); } diff --git a/src/mame/olivetti/m24.cpp b/src/mame/olivetti/m24.cpp index feb3ff6eb70..9369be3bea2 100644 --- a/src/mame/olivetti/m24.cpp +++ b/src/mame/olivetti/m24.cpp @@ -73,15 +73,15 @@ protected: private: void dma_segment_w(offs_t offset, u8 data); - DECLARE_WRITE_LINE_MEMBER(dma_hrq_w); + void dma_hrq_w(int state); u8 dma_memory_read(offs_t offset); void dma_memory_write(offs_t offset, u8 data); template u8 dma_io_read(offs_t offset); template void dma_io_write(offs_t offset, u8 data); - template DECLARE_WRITE_LINE_MEMBER(dma_dack_w); - DECLARE_WRITE_LINE_MEMBER(dma_tc_w); - DECLARE_WRITE_LINE_MEMBER(dreq0_ck_w); - DECLARE_WRITE_LINE_MEMBER(speaker_ck_w); + template void dma_dack_w(int state); + void dma_tc_w(int state); + void dreq0_ck_w(int state); + void speaker_ck_w(int state); void update_speaker(); u8 keyboard_data_r(); @@ -93,8 +93,8 @@ private: u8 ctrlport_b_r(); void alt_w(u8 data); - DECLARE_WRITE_LINE_MEMBER(chck_w); - DECLARE_WRITE_LINE_MEMBER(int87_w); + void chck_w(int state); + void int87_w(int state); void nmi_enable_w(u8 data); void update_nmi(); @@ -129,9 +129,9 @@ private: void pb_w(u8 data); u8 kbcdata_r(); void kbcdata_w(u8 data); - DECLARE_WRITE_LINE_MEMBER(kbcin_w); - DECLARE_WRITE_LINE_MEMBER(int_w); - DECLARE_WRITE_LINE_MEMBER(halt_i86_w); + void kbcin_w(int state); + void int_w(int state); + void halt_i86_w(int state); static void floppy_formats(format_registration &fr); static void cfg_m20_format(device_t *device); @@ -192,7 +192,7 @@ void m24_state::dma_segment_w(offs_t offset, u8 data) m_dma_segment[offset] = data & 0x0f; } -WRITE_LINE_MEMBER(m24_state::dma_hrq_w) +void m24_state::dma_hrq_w(int state) { if(!m_i86_halt) m_maincpu->set_input_line(INPUT_LINE_HALT, state ? ASSERT_LINE : CLEAR_LINE); @@ -228,7 +228,7 @@ void m24_state::dma_io_write(offs_t offset, u8 data) } template -WRITE_LINE_MEMBER(m24_state::dma_dack_w) +void m24_state::dma_dack_w(int state) { m_isabus->dack_line_w(Channel, state); @@ -248,7 +248,7 @@ WRITE_LINE_MEMBER(m24_state::dma_dack_w) } } -WRITE_LINE_MEMBER(m24_state::dma_tc_w) +void m24_state::dma_tc_w(int state) { m_tc = (state == ASSERT_LINE); for (int channel = 0; channel < 4; channel++) @@ -256,7 +256,7 @@ WRITE_LINE_MEMBER(m24_state::dma_tc_w) m_isabus->eop_w(channel, state); } -WRITE_LINE_MEMBER(m24_state::dreq0_ck_w) +void m24_state::dreq0_ck_w(int state) { if (state && !m_dreq0_ck && !BIT(m_dma_active, 0)) m_dmac->dreq0_w(1); @@ -264,7 +264,7 @@ WRITE_LINE_MEMBER(m24_state::dreq0_ck_w) m_dreq0_ck = state; } -WRITE_LINE_MEMBER(m24_state::speaker_ck_w) +void m24_state::speaker_ck_w(int state) { if (state) m_ctrlport_b |= 0x20; @@ -364,7 +364,7 @@ void m24_state::alt_w(u8 data) m_i86_halt_perm = true; } -WRITE_LINE_MEMBER(m24_state::chck_w) +void m24_state::chck_w(int state) { m_chck_active = (state == 0); if (m_chck_active) @@ -379,7 +379,7 @@ WRITE_LINE_MEMBER(m24_state::chck_w) m_ctrlport_b &= 0xbf; } -WRITE_LINE_MEMBER(m24_state::int87_w) +void m24_state::int87_w(int state) { m_87int = state; update_nmi(); @@ -425,12 +425,12 @@ void m24_state::kbcdata_w(u8 data) m_kbcout = data; } -WRITE_LINE_MEMBER(m24_state::kbcin_w) +void m24_state::kbcin_w(int state) { m_kbdata = state; } -WRITE_LINE_MEMBER(m24_state::int_w) +void m24_state::int_w(int state) { if(!m_i86_halt) m_maincpu->set_input_line(INPUT_LINE_IRQ0, state ? ASSERT_LINE : CLEAR_LINE); @@ -438,7 +438,7 @@ WRITE_LINE_MEMBER(m24_state::int_w) m_z8000_apb->int_w(state ? ASSERT_LINE : CLEAR_LINE); } -WRITE_LINE_MEMBER(m24_state::halt_i86_w) +void m24_state::halt_i86_w(int state) { if(m_i86_halt_perm) return; diff --git a/src/mame/olivetti/m24_kbd.cpp b/src/mame/olivetti/m24_kbd.cpp index dc45fec3c3c..cb141da8be9 100644 --- a/src/mame/olivetti/m24_kbd.cpp +++ b/src/mame/olivetti/m24_kbd.cpp @@ -252,12 +252,12 @@ uint8_t m24_keyboard_device::p2_r() return (m_keypress << 7) | m_mousebtn->read(); } -READ_LINE_MEMBER( m24_keyboard_device::t0_r ) +int m24_keyboard_device::t0_r() { return 0; } -READ_LINE_MEMBER( m24_keyboard_device::t1_r ) +int m24_keyboard_device::t1_r() { return 0; } @@ -268,7 +268,7 @@ void m24_keyboard_device::bus_w(uint8_t data) m_keypress = (col & (1 << (data & 7))) ? 1 : 0; } -WRITE_LINE_MEMBER( m24_keyboard_device::clock_w ) +void m24_keyboard_device::clock_w(int state) { m_mcu->set_input_line(MCS48_INPUT_IRQ, !state); if(!state) @@ -280,7 +280,7 @@ WRITE_LINE_MEMBER( m24_keyboard_device::clock_w ) } } -WRITE_LINE_MEMBER( m24_keyboard_device::data_w ) +void m24_keyboard_device::data_w(int state) { m_kbcdata = state; } diff --git a/src/mame/olivetti/m24_kbd.h b/src/mame/olivetti/m24_kbd.h index 9afe65df0ec..53664e111e3 100644 --- a/src/mame/olivetti/m24_kbd.h +++ b/src/mame/olivetti/m24_kbd.h @@ -15,8 +15,8 @@ public: auto out_data_handler() { return m_out_data.bind(); } - DECLARE_WRITE_LINE_MEMBER(clock_w); - DECLARE_WRITE_LINE_MEMBER(data_w); + void clock_w(int state); + void data_w(int state); protected: virtual void device_start() override; @@ -40,8 +40,8 @@ private: uint8_t p1_r(); void p1_w(uint8_t data); uint8_t p2_r(); - DECLARE_READ_LINE_MEMBER(t0_r); - DECLARE_READ_LINE_MEMBER(t1_r); + int t0_r(); + int t1_r(); }; DECLARE_DEVICE_TYPE(M24_KEYBOARD, m24_keyboard_device) diff --git a/src/mame/olivetti/m24_z8000.cpp b/src/mame/olivetti/m24_z8000.cpp index 6f0712ca5fe..ea91fab297c 100644 --- a/src/mame/olivetti/m24_z8000.cpp +++ b/src/mame/olivetti/m24_z8000.cpp @@ -212,13 +212,13 @@ void m24_z8000_device::handshake_w(uint8_t data) } } -WRITE_LINE_MEMBER(m24_z8000_device::mo_w) +void m24_z8000_device::mo_w(int state) { m_z8000->mi_w(state ? ASSERT_LINE : CLEAR_LINE); m_halt_out(state); } -WRITE_LINE_MEMBER(m24_z8000_device::timer_irq_w) +void m24_z8000_device::timer_irq_w(int state) { m_timer_irq = state ? true : false; m_z8000->set_input_line(z8001_device::NVI_LINE, state ? ASSERT_LINE : CLEAR_LINE); diff --git a/src/mame/olivetti/m24_z8000.h b/src/mame/olivetti/m24_z8000.h index 6553b5e361a..cd267caba91 100644 --- a/src/mame/olivetti/m24_z8000.h +++ b/src/mame/olivetti/m24_z8000.h @@ -29,8 +29,8 @@ public: uint8_t handshake_r(); void handshake_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(halt_w) { m_z8000->set_input_line(INPUT_LINE_HALT, state); } - DECLARE_WRITE_LINE_MEMBER(int_w) { m_z8000->set_input_line(z8001_device::VI_LINE, state); } + void halt_w(int state) { m_z8000->set_input_line(INPUT_LINE_HALT, state); } + void int_w(int state) { m_z8000->set_input_line(z8001_device::VI_LINE, state); } bool halted() const { return m_z8000_halt; } @@ -53,8 +53,8 @@ private: uint8_t m_handshake, m_irq; bool m_z8000_halt, m_z8000_mem, m_timer_irq; - DECLARE_WRITE_LINE_MEMBER(mo_w); - DECLARE_WRITE_LINE_MEMBER(timer_irq_w); + void mo_w(int state); + void timer_irq_w(int state); uint16_t nviack_r(); uint16_t viack_r(); }; diff --git a/src/mame/olympia/vega.cpp b/src/mame/olympia/vega.cpp index 5b9251df65b..ceb538272bd 100644 --- a/src/mame/olympia/vega.cpp +++ b/src/mame/olympia/vega.cpp @@ -153,7 +153,7 @@ private: void extern_w(offs_t offset, uint8_t data); void p2_w(uint8_t data); uint8_t p2_r(); - DECLARE_READ_LINE_MEMBER(t1_r); + int t1_r(); void rombank_w(uint8_t data); uint8_t txtram_r(); @@ -383,7 +383,7 @@ void vega_state::p2_w(uint8_t data) m_p2_data=data; } -READ_LINE_MEMBER(vega_state::t1_r) +int vega_state::t1_r() { return machine().rand(); } diff --git a/src/mame/olympiaint/olyboss.cpp b/src/mame/olympiaint/olyboss.cpp index 3c7e9d93b04..e67a95c5406 100644 --- a/src/mame/olympiaint/olyboss.cpp +++ b/src/mame/olympiaint/olyboss.cpp @@ -95,9 +95,9 @@ private: UPD3301_DRAW_CHARACTER_MEMBER( olyboss_display_pixels ); - DECLARE_WRITE_LINE_MEMBER( hrq_w ); - DECLARE_WRITE_LINE_MEMBER( tc_w ); - DECLARE_WRITE_LINE_MEMBER( romdis_w ); + void hrq_w(int state); + void tc_w(int state); + void romdis_w(int state); u8 dma_mem_r(offs_t offset); void dma_mem_w(offs_t offset, u8 data); u8 fdcctrl_r(); @@ -250,7 +250,7 @@ void olyboss_state::vchrram_w(offs_t offset, u8 data) m_vchrram[(m_vchrpage << 4) + (offset ^ 0xf)] = data; } -WRITE_LINE_MEMBER( olyboss_state::romdis_w ) +void olyboss_state::romdis_w(int state) { m_romen = state ? false : true; } @@ -336,14 +336,14 @@ void olyboss_state::keyboard85_put(u8 data) /* 8257 Interface */ -WRITE_LINE_MEMBER( olyboss_state::hrq_w ) +void olyboss_state::hrq_w(int state) { //logerror("hrq_w\n"); m_maincpu->set_input_line(INPUT_LINE_HALT,state); m_dma->hlda_w(state); } -WRITE_LINE_MEMBER( olyboss_state::tc_w ) +void olyboss_state::tc_w(int state) { if((m_channel == 0) && state) { diff --git a/src/mame/olympiaint/peoplepc.cpp b/src/mame/olympiaint/peoplepc.cpp index d12518c6183..4e1a6644c50 100644 --- a/src/mame/olympiaint/peoplepc.cpp +++ b/src/mame/olympiaint/peoplepc.cpp @@ -87,8 +87,8 @@ private: void charram_w(offs_t offset, uint16_t data); void dmapg_w(uint8_t data); void p7c_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(tc_w); - DECLARE_WRITE_LINE_MEMBER(hrq_w); + void tc_w(int state); + void hrq_w(int state); uint8_t memory_read_byte(offs_t offset); void memory_write_byte(offs_t offset, uint8_t data); static void floppy_formats(format_registration &fr); @@ -168,12 +168,12 @@ void peoplepc_state::p7c_w(uint8_t data) m_crtc->set_hpixels_per_column(BIT(data, 1) ? 16 : 8); } -WRITE_LINE_MEMBER(peoplepc_state::tc_w) +void peoplepc_state::tc_w(int state) { m_fdc->tc_w(state); } -WRITE_LINE_MEMBER(peoplepc_state::hrq_w) +void peoplepc_state::hrq_w(int state) { m_maincpu->set_input_line(INPUT_LINE_HALT, state); m_dmac->hlda_w(state); diff --git a/src/mame/omron/luna_kbd.h b/src/mame/omron/luna_kbd.h index 7212ee090b4..ccb9c785ed6 100644 --- a/src/mame/omron/luna_kbd.h +++ b/src/mame/omron/luna_kbd.h @@ -20,7 +20,7 @@ class luna_keyboard_device public: luna_keyboard_device(machine_config const &mconfig, char const *tag, device_t *owner, u32 clock); - virtual DECLARE_WRITE_LINE_MEMBER(input_txd) override { device_buffered_serial_interface::rx_w(state); } + virtual void input_txd(int state) override { device_buffered_serial_interface::rx_w(state); } protected: // device overrides diff --git a/src/mame/openuni/hektor.cpp b/src/mame/openuni/hektor.cpp index 7e80cded2dc..bc9517765de 100644 --- a/src/mame/openuni/hektor.cpp +++ b/src/mame/openuni/hektor.cpp @@ -124,8 +124,8 @@ protected: void i8155_porta_w(uint8_t data); uint8_t i8155_portb_r(); - DECLARE_READ_LINE_MEMBER(sid_r); - DECLARE_WRITE_LINE_MEMBER(sod_w); + int sid_r(); + void sod_w(int state); required_device m_maincpu; required_device m_i8155; @@ -252,7 +252,7 @@ void hektor3_state::i8155_portc_w(uint8_t data) } -READ_LINE_MEMBER(hektor_base_state::sid_r) +int hektor_base_state::sid_r() { if (m_motor) return (m_cassette->input() > 0.0 ? 1 : 0); @@ -260,7 +260,7 @@ READ_LINE_MEMBER(hektor_base_state::sid_r) return m_rs232->rxd_r(); } -WRITE_LINE_MEMBER(hektor_base_state::sod_w) +void hektor_base_state::sod_w(int state) { /* tv out (confirmed for Hektor 2 only) */ m_speaker->level_w(state); diff --git a/src/mame/orca/akazukin.cpp b/src/mame/orca/akazukin.cpp index 42024a7f1f5..30a42b46d22 100644 --- a/src/mame/orca/akazukin.cpp +++ b/src/mame/orca/akazukin.cpp @@ -60,7 +60,7 @@ private: uint8_t m_nmi_mask = 0; uint8_t m_nmi_sub_mask = 0; - DECLARE_WRITE_LINE_MEMBER(nmi_mask_w); + void nmi_mask_w(int state); INTERRUPT_GEN_MEMBER(vblank_irq); void nmi_sub_mask_w(uint8_t data); @@ -89,7 +89,7 @@ void akazukin_state::machine_reset() // ... } -WRITE_LINE_MEMBER(akazukin_state::nmi_mask_w) +void akazukin_state::nmi_mask_w(int state) { m_nmi_mask = state; } diff --git a/src/mame/orca/funkybee.cpp b/src/mame/orca/funkybee.cpp index 4ff953cc40c..8f2e7d589e0 100644 --- a/src/mame/orca/funkybee.cpp +++ b/src/mame/orca/funkybee.cpp @@ -127,10 +127,10 @@ private: tilemap_t *m_bg_tilemap = nullptr; uint8_t m_gfx_bank = 0U; uint8_t input_port_0_r(); - template DECLARE_WRITE_LINE_MEMBER(coin_counter_w); + template void coin_counter_w(int state); void videoram_w(offs_t offset, uint8_t data); void colorram_w(offs_t offset, uint8_t data); - DECLARE_WRITE_LINE_MEMBER(gfx_bank_w); + void gfx_bank_w(int state); void scroll_w(uint8_t data); TILE_GET_INFO_MEMBER(get_bg_tile_info); TILEMAP_MAPPER_MEMBER(tilemap_scan); @@ -188,7 +188,7 @@ void funkybee_state::colorram_w(offs_t offset, uint8_t data) m_bg_tilemap->mark_tile_dirty(offset); } -WRITE_LINE_MEMBER(funkybee_state::gfx_bank_w) +void funkybee_state::gfx_bank_w(int state) { m_gfx_bank = state; machine().tilemap().mark_all_dirty(); @@ -295,7 +295,7 @@ uint8_t funkybee_state::input_port_0_r() } template -WRITE_LINE_MEMBER(funkybee_state::coin_counter_w) +void funkybee_state::coin_counter_w(int state) { machine().bookkeeping().coin_counter_w(Which, state); } diff --git a/src/mame/orca/marineb.cpp b/src/mame/orca/marineb.cpp index ab192722183..af84252f358 100644 --- a/src/mame/orca/marineb.cpp +++ b/src/mame/orca/marineb.cpp @@ -110,8 +110,8 @@ private: void column_scroll_w(uint8_t data); void palette_bank_0_w(uint8_t data); void palette_bank_1_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(flipscreen_x_w); - DECLARE_WRITE_LINE_MEMBER(flipscreen_y_w); + void flipscreen_x_w(int state); + void flipscreen_y_w(int state); TILE_GET_INFO_MEMBER(get_tile_info); void palette(palette_device &palette) const; void set_tilemap_scrolly(int cols); @@ -125,15 +125,15 @@ private: // marineb, changes, springer, hoccer, hopprobo - DECLARE_WRITE_LINE_MEMBER(nmi_mask_w); + void nmi_mask_w(int state); uint8_t system_watchdog_r(); - DECLARE_WRITE_LINE_MEMBER(marineb_vblank_irq); + void marineb_vblank_irq(int state); void marineb_map(address_map &map); void marineb_io_map(address_map &map); // wanted, bcruzm12 - DECLARE_WRITE_LINE_MEMBER(irq_mask_w); - DECLARE_WRITE_LINE_MEMBER(wanted_vblank_irq); + void irq_mask_w(int state); + void wanted_vblank_irq(int state); void wanted_map(address_map &map); void wanted_io_map(address_map &map); }; @@ -259,14 +259,14 @@ void marineb_state::palette_bank_1_w(uint8_t data) } -WRITE_LINE_MEMBER(marineb_state::flipscreen_x_w) +void marineb_state::flipscreen_x_w(int state) { m_flipscreen_x = state; m_bg_tilemap->set_flip((m_flipscreen_x ? TILEMAP_FLIPX : 0) | (m_flipscreen_y ? TILEMAP_FLIPY : 0)); } -WRITE_LINE_MEMBER(marineb_state::flipscreen_y_w) +void marineb_state::flipscreen_y_w(int state) { m_flipscreen_y = state; m_bg_tilemap->set_flip((m_flipscreen_x ? TILEMAP_FLIPX : 0) | (m_flipscreen_y ? TILEMAP_FLIPY : 0)); @@ -596,14 +596,14 @@ void marineb_state::machine_start() save_item(NAME(m_irq_mask)); } -WRITE_LINE_MEMBER(marineb_state::irq_mask_w) +void marineb_state::irq_mask_w(int state) { m_irq_mask = state; if (!m_irq_mask) m_maincpu->set_input_line(0, CLEAR_LINE); } -WRITE_LINE_MEMBER(marineb_state::nmi_mask_w) +void marineb_state::nmi_mask_w(int state) { m_irq_mask = state; if (!m_irq_mask) @@ -1072,13 +1072,13 @@ static GFXDECODE_START( gfx_hopprobo ) GFXDECODE_ENTRY( "sprites", 0x0000, marineb_big_spritelayout, 0, 64 ) GFXDECODE_END -WRITE_LINE_MEMBER(marineb_state::marineb_vblank_irq) +void marineb_state::marineb_vblank_irq(int state) { if (state && m_irq_mask) m_maincpu->set_input_line(INPUT_LINE_NMI, ASSERT_LINE); } -WRITE_LINE_MEMBER(marineb_state::wanted_vblank_irq) +void marineb_state::wanted_vblank_irq(int state) { if (state && m_irq_mask) m_maincpu->set_input_line(0, ASSERT_LINE); diff --git a/src/mame/orca/sub.cpp b/src/mame/orca/sub.cpp index 45fdda167ba..6e16832b0d8 100644 --- a/src/mame/orca/sub.cpp +++ b/src/mame/orca/sub.cpp @@ -162,7 +162,7 @@ private: tilemap_t *m_tilemap = nullptr; - DECLARE_WRITE_LINE_MEMBER(int_mask_w); + void int_mask_w(int state); void nmi_mask_w(uint8_t data); void sub_palette(palette_device &palette) const; @@ -173,7 +173,7 @@ private: void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(main_irq); + void main_irq(int state); INTERRUPT_GEN_MEMBER(sound_irq); void main_io_map(address_map &map); @@ -302,7 +302,7 @@ void sub_state::machine_start() } -WRITE_LINE_MEMBER(sub_state::int_mask_w) +void sub_state::int_mask_w(int state) { m_int_en = state; if (!m_int_en) @@ -468,7 +468,7 @@ static GFXDECODE_START( gfx_sub ) GFXDECODE_ENTRY( "sprites", 0, tiles16x32_layout, 0, 0x80 ) GFXDECODE_END -WRITE_LINE_MEMBER(sub_state::main_irq) +void sub_state::main_irq(int state) { if (state && m_int_en) m_maincpu->set_input_line(0, ASSERT_LINE); diff --git a/src/mame/orca/vastar.cpp b/src/mame/orca/vastar.cpp index 47690d95612..ea725a02356 100644 --- a/src/mame/orca/vastar.cpp +++ b/src/mame/orca/vastar.cpp @@ -153,7 +153,7 @@ protected: uint8_t m_nmi_mask = 0; - DECLARE_WRITE_LINE_MEMBER(nmi_mask_w); + void nmi_mask_w(int state); INTERRUPT_GEN_MEMBER(vblank_irq); void cpu2_map(address_map &map); @@ -205,7 +205,7 @@ void vastar_state::machine_reset() { } -WRITE_LINE_MEMBER(vastar_common_state::nmi_mask_w) +void vastar_common_state::nmi_mask_w(int state) { m_nmi_mask = state; } diff --git a/src/mame/orca/vastar_viddev.cpp b/src/mame/orca/vastar_viddev.cpp index 03e3c64543a..13d9998c8d1 100644 --- a/src/mame/orca/vastar_viddev.cpp +++ b/src/mame/orca/vastar_viddev.cpp @@ -102,7 +102,7 @@ void vastar_video_device::device_start() save_item(NAME(m_flip_screen)); } -WRITE_LINE_MEMBER(vastar_video_device::flipscreen_w) +void vastar_video_device::flipscreen_w(int state) { m_flip_screen = state ? 1 : 0; diff --git a/src/mame/orca/vastar_viddev.h b/src/mame/orca/vastar_viddev.h index 8b599f647a5..4030ff94a91 100644 --- a/src/mame/orca/vastar_viddev.h +++ b/src/mame/orca/vastar_viddev.h @@ -51,7 +51,7 @@ public: m_bg_tilemap[Which]->mark_tile_dirty(offset & 0x3ff); } - DECLARE_WRITE_LINE_MEMBER(flipscreen_w); + void flipscreen_w(int state); void priority_w(uint8_t data) { m_fg_vregs = data; } protected: diff --git a/src/mame/orca/zodiack.cpp b/src/mame/orca/zodiack.cpp index 33fd1fb8b08..7137dd64a10 100644 --- a/src/mame/orca/zodiack.cpp +++ b/src/mame/orca/zodiack.cpp @@ -143,7 +143,7 @@ private: uint8_t m_sound_nmi_enabled = 0; INTERRUPT_GEN_MEMBER(sound_nmi_gen); - DECLARE_WRITE_LINE_MEMBER(vblank_main_nmi_w); + void vblank_main_nmi_w(int state); void io_map(address_map &map); void main_map(address_map &map); @@ -160,7 +160,7 @@ void zodiack_state::sound_nmi_enable_w(uint8_t data) m_sound_nmi_enabled = data & 1; } -WRITE_LINE_MEMBER(zodiack_state::vblank_main_nmi_w) +void zodiack_state::vblank_main_nmi_w(int state) { if (state && m_main_nmi_enabled) m_maincpu->pulse_input_line(INPUT_LINE_NMI, attotime::zero); diff --git a/src/mame/osborne/osbexec.cpp b/src/mame/osborne/osbexec.cpp index a2cc03c4809..42a2f0cff00 100644 --- a/src/mame/osborne/osbexec.cpp +++ b/src/mame/osborne/osbexec.cpp @@ -125,13 +125,13 @@ private: void osbexec_pia0_a_w(uint8_t data); uint8_t osbexec_pia0_b_r(); void osbexec_pia0_b_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(osbexec_pia0_ca2_w); - DECLARE_WRITE_LINE_MEMBER(osbexec_pia0_cb2_w); - DECLARE_WRITE_LINE_MEMBER(modem_txclk_w); - DECLARE_WRITE_LINE_MEMBER(modem_rxclk_w); - DECLARE_WRITE_LINE_MEMBER(modem_dsr_w); - DECLARE_WRITE_LINE_MEMBER(modem_ri_w); - DECLARE_WRITE_LINE_MEMBER(comm_clk_a_w); + void osbexec_pia0_ca2_w(int state); + void osbexec_pia0_cb2_w(int state); + void modem_txclk_w(int state); + void modem_rxclk_w(int state); + void modem_dsr_w(int state); + void modem_ri_w(int state); + void comm_clk_a_w(int state); void osbexec_io(address_map &map); void osbexec_mem(address_map &map); }; @@ -391,33 +391,33 @@ void osbexec_state::osbexec_pia0_b_w(uint8_t data) } -WRITE_LINE_MEMBER(osbexec_state::osbexec_pia0_ca2_w) +void osbexec_state::osbexec_pia0_ca2_w(int state) { logerror("osbexec_pia0_ca2_w: state = %d\n", state); } -WRITE_LINE_MEMBER(osbexec_state::osbexec_pia0_cb2_w) +void osbexec_state::osbexec_pia0_cb2_w(int state) { m_pia0_cb2 = state; } -WRITE_LINE_MEMBER(osbexec_state::modem_txclk_w) +void osbexec_state::modem_txclk_w(int state) { if (BIT(m_pia0_portb, 5)) m_sio->txca_w(state); } -WRITE_LINE_MEMBER(osbexec_state::modem_rxclk_w) +void osbexec_state::modem_rxclk_w(int state) { if (BIT(m_pia0_portb, 4)) m_sio->rxca_w(state); } -WRITE_LINE_MEMBER(osbexec_state::modem_dsr_w) +void osbexec_state::modem_dsr_w(int state) { if (state) m_pia0_portb |= 0x40; @@ -426,7 +426,7 @@ WRITE_LINE_MEMBER(osbexec_state::modem_dsr_w) } -WRITE_LINE_MEMBER(osbexec_state::modem_ri_w) +void osbexec_state::modem_ri_w(int state) { if (state) m_pia0_portb |= 0x80; @@ -435,7 +435,7 @@ WRITE_LINE_MEMBER(osbexec_state::modem_ri_w) } -WRITE_LINE_MEMBER(osbexec_state::comm_clk_a_w) +void osbexec_state::comm_clk_a_w(int state) { if (!BIT(m_pia0_portb, 5)) m_sio->txca_w(state); diff --git a/src/mame/osborne/osborne1.cpp b/src/mame/osborne/osborne1.cpp index 67b4e80d891..7a607c22ec0 100644 --- a/src/mame/osborne/osborne1.cpp +++ b/src/mame/osborne/osborne1.cpp @@ -174,7 +174,7 @@ protected: void attrram_w(offs_t offset, u8 data); u8 opcode_r(offs_t offset); void bankswitch_w(offs_t offset, u8 data); - DECLARE_WRITE_LINE_MEMBER(irqack_w); + void irqack_w(int state); bool rom_mode() const { return 0 != m_rom_mode; } u8 scroll_x() const { return m_scroll_x; } @@ -192,14 +192,14 @@ protected: private: u8 ieee_pia_pb_r(); void ieee_pia_pb_w(u8 data); - DECLARE_WRITE_LINE_MEMBER(ieee_pia_irq_a_func); + void ieee_pia_irq_a_func(int state); void video_pia_port_a_w(u8 data); void video_pia_port_b_w(u8 data); - DECLARE_WRITE_LINE_MEMBER(video_pia_out_cb2_dummy); - DECLARE_WRITE_LINE_MEMBER(video_pia_irq_a_func); + void video_pia_out_cb2_dummy(int state); + void video_pia_irq_a_func(int state); - DECLARE_WRITE_LINE_MEMBER(serial_acia_irq_func); + void serial_acia_irq_func(int state); u32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); @@ -422,7 +422,7 @@ void osborne1_state::bankswitch_w(offs_t offset, u8 data) } } -WRITE_LINE_MEMBER( osborne1_state::irqack_w ) +void osborne1_state::irqack_w(int state) { // Update the flipflops that control bank selection and NMI if (!rom_mode()) @@ -478,7 +478,7 @@ void osborne1_state::ieee_pia_pb_w(u8 data) m_ieee->host_nrfd_w(BIT(data, 7)); } -WRITE_LINE_MEMBER( osborne1_state::ieee_pia_irq_a_func ) +void osborne1_state::ieee_pia_irq_a_func(int state) { update_irq(); } @@ -511,17 +511,17 @@ void osborne1_state::video_pia_port_b_w(u8 data) } } -WRITE_LINE_MEMBER( osborne1_state::video_pia_out_cb2_dummy ) +void osborne1_state::video_pia_out_cb2_dummy(int state) { } -WRITE_LINE_MEMBER( osborne1_state::video_pia_irq_a_func ) +void osborne1_state::video_pia_irq_a_func(int state) { update_irq(); } -WRITE_LINE_MEMBER( osborne1_state::serial_acia_irq_func ) +void osborne1_state::serial_acia_irq_func(int state) { m_acia_irq_state = state; update_irq(); diff --git a/src/mame/osborne/vixen.cpp b/src/mame/osborne/vixen.cpp index 835cf2e7b92..085914c778c 100644 --- a/src/mame/osborne/vixen.cpp +++ b/src/mame/osborne/vixen.cpp @@ -120,12 +120,12 @@ private: void i8155_pc_w(uint8_t data); void io_i8155_pb_w(uint8_t data); void io_i8155_pc_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER( io_i8155_to_w ); - DECLARE_WRITE_LINE_MEMBER( srq_w ); - DECLARE_WRITE_LINE_MEMBER( atn_w ); - DECLARE_WRITE_LINE_MEMBER( rxrdy_w ); - DECLARE_WRITE_LINE_MEMBER( txrdy_w ); - DECLARE_WRITE_LINE_MEMBER( fdc_intrq_w ); + void io_i8155_to_w(int state); + void srq_w(int state); + void atn_w(int state); + void rxrdy_w(int state); + void txrdy_w(int state); + void fdc_intrq_w(int state); TIMER_DEVICE_CALLBACK_MEMBER(vsync_tick); IRQ_CALLBACK_MEMBER(vixen_int_ack); uint8_t opram_r(offs_t offset); @@ -696,7 +696,7 @@ void vixen_state::io_i8155_pc_w(uint8_t data) m_enb_srq_int = BIT(data, 5); } -WRITE_LINE_MEMBER( vixen_state::io_i8155_to_w ) +void vixen_state::io_i8155_to_w(int state) { if (m_int_clk) { @@ -709,13 +709,13 @@ WRITE_LINE_MEMBER( vixen_state::io_i8155_to_w ) // i8251_interface usart_intf //------------------------------------------------- -WRITE_LINE_MEMBER( vixen_state::rxrdy_w ) +void vixen_state::rxrdy_w(int state) { m_rxrdy = state; update_interrupt(); } -WRITE_LINE_MEMBER( vixen_state::txrdy_w ) +void vixen_state::txrdy_w(int state) { m_txrdy = state; update_interrupt(); @@ -725,13 +725,13 @@ WRITE_LINE_MEMBER( vixen_state::txrdy_w ) // IEEE488 interface //------------------------------------------------- -WRITE_LINE_MEMBER( vixen_state::srq_w ) +void vixen_state::srq_w(int state) { m_srq = state; update_interrupt(); } -WRITE_LINE_MEMBER( vixen_state::atn_w ) +void vixen_state::atn_w(int state) { m_atn = state; update_interrupt(); @@ -742,7 +742,7 @@ static void vixen_floppies(device_slot_interface &device) device.option_add("525dd", FLOPPY_525_DD); } -WRITE_LINE_MEMBER( vixen_state::fdc_intrq_w ) +void vixen_state::fdc_intrq_w(int state) { m_fdint = state; update_interrupt(); diff --git a/src/mame/osi/osi.cpp b/src/mame/osi/osi.cpp index 2d6e06aeaa8..8a817dc40a2 100644 --- a/src/mame/osi/osi.cpp +++ b/src/mame/osi/osi.cpp @@ -452,7 +452,7 @@ void c1pmf_state::osi470_pia_pb_w(uint8_t data) */ } -WRITE_LINE_MEMBER( c1pmf_state::osi470_pia_cb2_w ) +void c1pmf_state::osi470_pia_cb2_w(int state) { } diff --git a/src/mame/osi/osi.h b/src/mame/osi/osi.h index b1a10c3ef1f..ce0f2c5f413 100644 --- a/src/mame/osi/osi.h +++ b/src/mame/osi/osi.h @@ -132,7 +132,7 @@ protected: uint8_t osi470_pia_pa_r(); void osi470_pia_pa_w(uint8_t data); void osi470_pia_pb_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER( osi470_pia_cb2_w ); + void osi470_pia_cb2_w(int state); void c1pmf_mem(address_map &map); diff --git a/src/mame/pacific/thief.cpp b/src/mame/pacific/thief.cpp index 9bc135ce420..0f8cfdced25 100644 --- a/src/mame/pacific/thief.cpp +++ b/src/mame/pacific/thief.cpp @@ -56,7 +56,7 @@ public: void sharkatt(machine_config &config); - DECLARE_WRITE_LINE_MEMBER(slam_w); + void slam_w(int state); protected: virtual void video_start() override; @@ -450,7 +450,7 @@ void thief_state::coprocessor_w(offs_t offset, uint8_t data) // machine -WRITE_LINE_MEMBER(sharkatt_state::slam_w) +void sharkatt_state::slam_w(int state) { // SLAM switch causes an NMI if it's pressed m_maincpu->set_input_line(INPUT_LINE_NMI, state ? CLEAR_LINE : ASSERT_LINE); diff --git a/src/mame/pacman/pacman.cpp b/src/mame/pacman/pacman.cpp index aa6ada3031b..9cc62ad0d7e 100644 --- a/src/mame/pacman/pacman.cpp +++ b/src/mame/pacman/pacman.cpp @@ -408,7 +408,7 @@ MACHINE_RESET_MEMBER(pacman_state,maketrax) * *************************************/ -WRITE_LINE_MEMBER(pacman_state::vblank_irq) +void pacman_state::vblank_irq(int state) { if (state && m_irq_mask) m_maincpu->set_input_line(INPUT_LINE_IRQ0, ASSERT_LINE); @@ -420,20 +420,20 @@ INTERRUPT_GEN_MEMBER(pacman_state::periodic_irq) m_maincpu->set_input_line(INPUT_LINE_IRQ0, ASSERT_LINE); } -WRITE_LINE_MEMBER(pacman_state::vblank_nmi) +void pacman_state::vblank_nmi(int state) { if (state && m_irq_mask) m_maincpu->set_input_line(INPUT_LINE_NMI, ASSERT_LINE); } -WRITE_LINE_MEMBER(pacman_state::irq_mask_w) +void pacman_state::irq_mask_w(int state) { m_irq_mask = state; if (!state) m_maincpu->set_input_line(INPUT_LINE_IRQ0, CLEAR_LINE); } -WRITE_LINE_MEMBER(pacman_state::nmi_mask_w) +void pacman_state::nmi_mask_w(int state) { m_irq_mask = state; if (!state) @@ -539,13 +539,13 @@ void pacman_state::mspacii_interrupt_vector_w(uint8_t data) * *************************************/ -WRITE_LINE_MEMBER(pacman_state::coin_counter_w) +void pacman_state::coin_counter_w(int state) { machine().bookkeeping().coin_counter_w(0, state); } -WRITE_LINE_MEMBER(pacman_state::coin_lockout_global_w) +void pacman_state::coin_lockout_global_w(int state) { machine().bookkeeping().coin_lockout_global_w(!state); } @@ -741,7 +741,7 @@ uint8_t pacman_state::bigbucks_question_r(offs_t offset) * ************************************/ -WRITE_LINE_MEMBER(pacman_state::s2650_interrupt) +void pacman_state::s2650_interrupt(int state) { if (state) m_maincpu->set_input_line(0, ASSERT_LINE); diff --git a/src/mame/pacman/pacman.h b/src/mame/pacman/pacman.h index b8dedf9ba98..6a08b030a56 100644 --- a/src/mame/pacman/pacman.h +++ b/src/mame/pacman/pacman.h @@ -109,8 +109,8 @@ protected: void nmouse_interrupt_vector_w(uint8_t data); void mspacii_interrupt_vector_w(uint8_t data); IRQ_CALLBACK_MEMBER(interrupt_vector_r); - DECLARE_WRITE_LINE_MEMBER(coin_counter_w); - DECLARE_WRITE_LINE_MEMBER(coin_lockout_global_w); + void coin_counter_w(int state); + void coin_lockout_global_w(int state); void alibaba_sound_w(offs_t offset, uint8_t data); uint8_t alibaba_mystery_1_r(); uint8_t alibaba_mystery_2_r(); @@ -143,25 +143,25 @@ protected: void mspacman_disable_decode_w(uint8_t data); uint8_t mspacman_enable_decode_r_0x3ff8(offs_t offset); void mspacman_enable_decode_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(irq_mask_w); - DECLARE_WRITE_LINE_MEMBER(nmi_mask_w); + void irq_mask_w(int state); + void nmi_mask_w(int state); uint8_t mspacii_protection_r(offs_t offset); uint8_t cannonbp_protection_r(offs_t offset); void pacman_videoram_w(offs_t offset, uint8_t data); void pacman_colorram_w(offs_t offset, uint8_t data); - DECLARE_WRITE_LINE_MEMBER(flipscreen_w); - DECLARE_WRITE_LINE_MEMBER(pengo_palettebank_w); - DECLARE_WRITE_LINE_MEMBER(pengo_colortablebank_w); - DECLARE_WRITE_LINE_MEMBER(pengo_gfxbank_w); + void flipscreen_w(int state); + void pengo_palettebank_w(int state); + void pengo_colortablebank_w(int state); + void pengo_gfxbank_w(int state); void s2650games_videoram_w(offs_t offset, uint8_t data); void s2650games_colorram_w(offs_t offset, uint8_t data); void s2650games_scroll_w(offs_t offset, uint8_t data); void s2650games_tilesbank_w(offs_t offset, uint8_t data); void jrpacman_videoram_w(offs_t offset, uint8_t data); - DECLARE_WRITE_LINE_MEMBER(jrpacman_charbank_w); - DECLARE_WRITE_LINE_MEMBER(jrpacman_spritebank_w); + void jrpacman_charbank_w(int state); + void jrpacman_spritebank_w(int state); void jrpacman_scroll_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(jrpacman_bgpriority_w); + void jrpacman_bgpriority_w(int state); void superabc_bank_w(uint8_t data); public: @@ -201,10 +201,10 @@ protected: DECLARE_VIDEO_START(jrpacman); uint32_t screen_update_pacman(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_s2650games(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(vblank_irq); + void vblank_irq(int state); INTERRUPT_GEN_MEMBER(periodic_irq); - DECLARE_WRITE_LINE_MEMBER(vblank_nmi); - DECLARE_WRITE_LINE_MEMBER(s2650_interrupt); + void vblank_nmi(int state); + void s2650_interrupt(int state); private: void init_save_state(); @@ -308,7 +308,7 @@ public: void init_mspactwin(); - DECLARE_WRITE_LINE_MEMBER(flipscreen_w); + void flipscreen_w(int state); private: required_device m_screen; diff --git a/src/mame/pacman/pacman_v.cpp b/src/mame/pacman/pacman_v.cpp index b530ab2e291..0ea2b8b1d16 100644 --- a/src/mame/pacman/pacman_v.cpp +++ b/src/mame/pacman/pacman_v.cpp @@ -194,7 +194,7 @@ void pacman_state::pacman_colorram_w(offs_t offset, uint8_t data) m_bg_tilemap->mark_tile_dirty(offset); } -WRITE_LINE_MEMBER(pacman_state::flipscreen_w) +void pacman_state::flipscreen_w(int state) { m_flipscreen = state; m_bg_tilemap->set_flip(m_flipscreen * (TILEMAP_FLIPX + TILEMAP_FLIPY)); @@ -207,7 +207,7 @@ void mspactwin_state::mspactwin_videoram_w(offs_t offset, uint8_t data) pacman_videoram_w(offset, data); } -WRITE_LINE_MEMBER(mspactwin_state::flipscreen_w) +void mspactwin_state::flipscreen_w(int state) { m_flipscreen = state; m_bg_tilemap->set_flip(m_flipscreen * (TILEMAP_FLIPX + TILEMAP_FLIPY)); @@ -338,19 +338,19 @@ VIDEO_START_MEMBER(pacman_state,pengo) m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(*this, FUNC(pacman_state::pacman_get_tile_info)), tilemap_mapper_delegate(*this, FUNC(pacman_state::pacman_scan_rows)), 8, 8, 36, 28); } -WRITE_LINE_MEMBER(pacman_state::pengo_palettebank_w) +void pacman_state::pengo_palettebank_w(int state) { m_palettebank = state; m_bg_tilemap->mark_all_dirty(); } -WRITE_LINE_MEMBER(pacman_state::pengo_colortablebank_w) +void pacman_state::pengo_colortablebank_w(int state) { m_colortablebank = state; m_bg_tilemap->mark_all_dirty(); } -WRITE_LINE_MEMBER(pacman_state::pengo_gfxbank_w) +void pacman_state::pengo_gfxbank_w(int state) { m_spritebank = state; m_charbank = state; @@ -569,13 +569,13 @@ void pacman_state::jrpacman_videoram_w(offs_t offset, uint8_t data) jrpacman_mark_tile_dirty(offset); } -WRITE_LINE_MEMBER(pacman_state::jrpacman_charbank_w) +void pacman_state::jrpacman_charbank_w(int state) { m_charbank = state; m_bg_tilemap->mark_all_dirty(); } -WRITE_LINE_MEMBER(pacman_state::jrpacman_spritebank_w) +void pacman_state::jrpacman_spritebank_w(int state) { m_spritebank = state; } @@ -588,7 +588,7 @@ void pacman_state::jrpacman_scroll_w(uint8_t data) } } -WRITE_LINE_MEMBER(pacman_state::jrpacman_bgpriority_w) +void pacman_state::jrpacman_bgpriority_w(int state) { m_bgpriority = state; } diff --git a/src/mame/pacman/pengo.cpp b/src/mame/pacman/pengo.cpp index 8a11aa03e06..c436c3771b8 100644 --- a/src/mame/pacman/pengo.cpp +++ b/src/mame/pacman/pengo.cpp @@ -95,7 +95,7 @@ public: void init_pengo6(); private: - template DECLARE_WRITE_LINE_MEMBER(coin_counter_w); + template void coin_counter_w(int state); void decode_pengo6(int end, int nodecend); @@ -137,7 +137,7 @@ private: *************************************/ template -WRITE_LINE_MEMBER(pengo_state::coin_counter_w) +void pengo_state::coin_counter_w(int state) { machine().bookkeeping().coin_counter_w(Which, state); } diff --git a/src/mame/pacman/schick.cpp b/src/mame/pacman/schick.cpp index 08ea82c7a80..abd943a4c86 100644 --- a/src/mame/pacman/schick.cpp +++ b/src/mame/pacman/schick.cpp @@ -58,14 +58,14 @@ protected: virtual void machine_start() override; private: - DECLARE_WRITE_LINE_MEMBER(coin_counter_1_w); - DECLARE_WRITE_LINE_MEMBER(coin_counter_2_w); - DECLARE_WRITE_LINE_MEMBER(irq_mask_w); - DECLARE_WRITE_LINE_MEMBER(vblank_irq); + void coin_counter_1_w(int state); + void coin_counter_2_w(int state); + void irq_mask_w(int state); + void vblank_irq(int state); - DECLARE_WRITE_LINE_MEMBER(schick_palettebank_w); - DECLARE_WRITE_LINE_MEMBER(schick_colortablebank_w); - DECLARE_WRITE_LINE_MEMBER(schick_gfxbank_w); + void schick_palettebank_w(int state); + void schick_colortablebank_w(int state); + void schick_gfxbank_w(int state); TILEMAP_MAPPER_MEMBER(schick_scan_rows); TILE_GET_INFO_MEMBER(schick_get_tile_info); @@ -199,21 +199,21 @@ void schick_state::schick_colorram_w(offs_t offset, uint8_t data) m_bg_tilemap->mark_tile_dirty(offset ); } -WRITE_LINE_MEMBER(schick_state::schick_palettebank_w) +void schick_state::schick_palettebank_w(int state) { logerror("%s: schick_palettebank_w %d\n", machine().describe_context(), state); m_palettebank = state; m_bg_tilemap->mark_all_dirty(); } -WRITE_LINE_MEMBER(schick_state::schick_colortablebank_w) +void schick_state::schick_colortablebank_w(int state) { logerror("%s: schick_colortablebank_w %d\n", machine().describe_context(), state); m_colortablebank = state; m_bg_tilemap->mark_all_dirty(); } -WRITE_LINE_MEMBER(schick_state::schick_gfxbank_w) +void schick_state::schick_gfxbank_w(int state) { logerror("%s: schick_gfxbank_w %d\n", machine().describe_context(), state); m_spritebank = state; @@ -221,17 +221,17 @@ WRITE_LINE_MEMBER(schick_state::schick_gfxbank_w) m_bg_tilemap->mark_all_dirty(); } -WRITE_LINE_MEMBER(schick_state::coin_counter_1_w) +void schick_state::coin_counter_1_w(int state) { machine().bookkeeping().coin_counter_w(0, state); } -WRITE_LINE_MEMBER(schick_state::coin_counter_2_w) +void schick_state::coin_counter_2_w(int state) { machine().bookkeeping().coin_counter_w(1, state); } -WRITE_LINE_MEMBER(schick_state::irq_mask_w) +void schick_state::irq_mask_w(int state) { m_irq_mask = state; } @@ -569,7 +569,7 @@ static GFXDECODE_START( gfx_schick ) GFXDECODE_ENTRY( "gfx1", 0x7000, spritelayout, 0, 128/4 ) // gameplay, has C, K, ? block tiles (and different scenery items) (for levels 4,5,6?) GFXDECODE_END -WRITE_LINE_MEMBER(schick_state::vblank_irq) +void schick_state::vblank_irq(int state) { if (state && m_irq_mask) m_maincpu->set_input_line(0, HOLD_LINE); diff --git a/src/mame/pc/at.cpp b/src/mame/pc/at.cpp index 14bab36586f..40293b91b58 100644 --- a/src/mame/pc/at.cpp +++ b/src/mame/pc/at.cpp @@ -247,9 +247,9 @@ private: uint16_t wd7600_ior(offs_t offset); void wd7600_iow(offs_t offset, uint16_t data); - DECLARE_WRITE_LINE_MEMBER( wd7600_hold ); + void wd7600_hold(int state); void wd7600_tc(offs_t offset, uint8_t data) { m_isabus->eop_w(offset, data); } - DECLARE_WRITE_LINE_MEMBER( wd7600_spkr ) { m_speaker->level_w(state); } + void wd7600_spkr(int state) { m_speaker->level_w(state); } void megapc_io(address_map &map); void megapc_map(address_map &map); void megapcpl_io(address_map &map); @@ -403,7 +403,7 @@ void megapc_state::wd7600_iow(offs_t offset, uint16_t data) m_isabus->dack16_w(offset, data); } -WRITE_LINE_MEMBER( megapc_state::wd7600_hold ) +void megapc_state::wd7600_hold(int state) { // halt cpu m_maincpu->set_input_line(INPUT_LINE_HALT, state ? ASSERT_LINE : CLEAR_LINE); diff --git a/src/mame/pc/ct486.cpp b/src/mame/pc/ct486.cpp index 2262edf42fd..77dd93dd360 100644 --- a/src/mame/pc/ct486.cpp +++ b/src/mame/pc/ct486.cpp @@ -51,9 +51,9 @@ public: uint16_t cs4031_ior(offs_t offset); void cs4031_iow(offs_t offset, uint16_t data); - DECLARE_WRITE_LINE_MEMBER( cs4031_hold ); + void cs4031_hold(int state); void cs4031_tc(offs_t offset, uint8_t data) { m_isabus->eop_w(offset, data); } - DECLARE_WRITE_LINE_MEMBER( cs4031_spkr ) { m_speaker->level_w(state); } + void cs4031_spkr(int state) { m_speaker->level_w(state); } void ct486(machine_config &config); void ct486_io(address_map &map); void ct486_map(address_map &map); @@ -84,7 +84,7 @@ void ct486_state::cs4031_iow(offs_t offset, uint16_t data) m_isabus->dack16_w(offset, data); } -WRITE_LINE_MEMBER( ct486_state::cs4031_hold ) +void ct486_state::cs4031_hold(int state) { // halt cpu m_maincpu->set_input_line(INPUT_LINE_HALT, state ? ASSERT_LINE : CLEAR_LINE); diff --git a/src/mame/pc/europc.cpp b/src/mame/pc/europc.cpp index 1f3ef1d8d0f..cb15139cf2d 100644 --- a/src/mame/pc/europc.cpp +++ b/src/mame/pc/europc.cpp @@ -124,7 +124,7 @@ private: required_device m_rtc; uint8_t europc_portc_r(); - DECLARE_WRITE_LINE_MEMBER(reset_in_w); + void reset_in_w(int state); void europc_jim_w(offs_t offset, uint8_t data); uint8_t europc_jim_r(offs_t offset); @@ -339,7 +339,7 @@ uint8_t europc_pc_state::europc_portc_r() return data; } -WRITE_LINE_MEMBER(europc_pc_state::reset_in_w) +void europc_pc_state::reset_in_w(int state) { m_maincpu->set_input_line(INPUT_LINE_RESET, state ? CLEAR_LINE : ASSERT_LINE); if (!state) diff --git a/src/mame/pc/europc_kbd.cpp b/src/mame/pc/europc_kbd.cpp index c76a97dfccf..a7c42bfd3b4 100644 --- a/src/mame/pc/europc_kbd.cpp +++ b/src/mame/pc/europc_kbd.cpp @@ -67,7 +67,7 @@ void europc_keyboard_device::device_start() // INPUT LINES //************************************************************************** -WRITE_LINE_MEMBER(europc_keyboard_device::kbdata_w) +void europc_keyboard_device::kbdata_w(int state) { machine().scheduler().synchronize(timer_expired_delegate(FUNC(europc_keyboard_device::kbdata_sync_w), this), state); } @@ -82,7 +82,7 @@ TIMER_CALLBACK_MEMBER(europc_keyboard_device::kbdata_sync_w) m_kbdata_callback(param); } -WRITE_LINE_MEMBER(europc_keyboard_device::kbclk_w) +void europc_keyboard_device::kbclk_w(int state) { machine().scheduler().synchronize(timer_expired_delegate(FUNC(europc_keyboard_device::kbclk_sync_w), this), state); } diff --git a/src/mame/pc/europc_kbd.h b/src/mame/pc/europc_kbd.h index bfeac14c98e..dce930982e1 100644 --- a/src/mame/pc/europc_kbd.h +++ b/src/mame/pc/europc_kbd.h @@ -25,8 +25,8 @@ public: auto reset_callback() { return m_reset_callback.bind(); } // line inputs - DECLARE_WRITE_LINE_MEMBER(kbdata_w); - DECLARE_WRITE_LINE_MEMBER(kbclk_w); + void kbdata_w(int state); + void kbclk_w(int state); protected: // device-level overrides diff --git a/src/mame/pc/ibmpcjr.cpp b/src/mame/pc/ibmpcjr.cpp index 44d5bce7da8..3e56c77e135 100644 --- a/src/mame/pc/ibmpcjr.cpp +++ b/src/mame/pc/ibmpcjr.cpp @@ -75,12 +75,12 @@ private: required_device m_fdc; required_device m_keyboard; - DECLARE_WRITE_LINE_MEMBER(out2_changed); - DECLARE_WRITE_LINE_MEMBER(keyb_interrupt); + void out2_changed(int state); + void keyb_interrupt(int state); void pc_nmi_enable_w(uint8_t data); uint8_t pcjr_nmi_enable_r(); - DECLARE_WRITE_LINE_MEMBER(pic8259_set_int_line); + void pic8259_set_int_line(int state); void pcjr_ppi_portb_w(uint8_t data); uint8_t pcjr_ppi_portc_r(); @@ -192,7 +192,7 @@ TIMER_CALLBACK_MEMBER(pcjr_state::kb_signal) * *************************************************************/ -WRITE_LINE_MEMBER(pcjr_state::pic8259_set_int_line) +void pcjr_state::pic8259_set_int_line(int state) { uint32_t pc = m_maincpu->pc(); if ( (pc == 0xF0453) || (pc == 0xFF196) ) @@ -216,7 +216,7 @@ void pcjr_state::pc_speaker_set_spkrdata(uint8_t data) m_speaker->level_w(m_pc_spkrdata & m_pit_out2); } -WRITE_LINE_MEMBER(pcjr_state::out2_changed) +void pcjr_state::out2_changed(int state) { m_pit_out2 = state ? 1 : 0; m_speaker->level_w(m_pc_spkrdata & m_pit_out2); @@ -261,7 +261,7 @@ WRITE_LINE_MEMBER(pcjr_state::out2_changed) * *************************************************************/ -WRITE_LINE_MEMBER(pcjr_state::keyb_interrupt) +void pcjr_state::keyb_interrupt(int state) { int data; diff --git a/src/mame/pc/mc1502.cpp b/src/mame/pc/mc1502.cpp index 75d7c1ab8d3..dd47022b30b 100644 --- a/src/mame/pc/mc1502.cpp +++ b/src/mame/pc/mc1502.cpp @@ -104,10 +104,10 @@ private: uint8_t m_ppi_portc = 0; uint8_t m_spkrdata = 0; - DECLARE_WRITE_LINE_MEMBER(mc1502_pit8253_out1_changed); - DECLARE_WRITE_LINE_MEMBER(mc1502_pit8253_out2_changed); - DECLARE_WRITE_LINE_MEMBER(mc1502_speaker_set_spkrdata); - DECLARE_WRITE_LINE_MEMBER(mc1502_i8251_syndet); + void mc1502_pit8253_out1_changed(int state); + void mc1502_pit8253_out2_changed(int state); + void mc1502_speaker_set_spkrdata(int state); + void mc1502_i8251_syndet(int state); void mc1502_ppi_portb_w(uint8_t data); void mc1502_ppi_portc_w(uint8_t data); @@ -233,26 +233,26 @@ void mc1502_state::mc1502_kppi_portc_w(uint8_t data) LOGPPI("mc1502_kppi_portc_w ( %02X -> %04X )\n", data, m_kbd.mask); } -WRITE_LINE_MEMBER(mc1502_state::mc1502_i8251_syndet) +void mc1502_state::mc1502_i8251_syndet(int state) { if (!BIT(m_ppi_portc, 3)) m_maincpu->set_input_line(INPUT_LINE_NMI, state ? ASSERT_LINE : CLEAR_LINE); } -WRITE_LINE_MEMBER(mc1502_state::mc1502_pit8253_out1_changed) +void mc1502_state::mc1502_pit8253_out1_changed(int state) { m_upd8251->write_txc(state); m_upd8251->write_rxc(state); } -WRITE_LINE_MEMBER(mc1502_state::mc1502_pit8253_out2_changed) +void mc1502_state::mc1502_pit8253_out2_changed(int state) { m_pit_out2 = state; m_speaker->level_w(m_spkrdata & m_pit_out2); m_cassette->output(state ? 1 : -1); } -WRITE_LINE_MEMBER(mc1502_state::mc1502_speaker_set_spkrdata) +void mc1502_state::mc1502_speaker_set_spkrdata(int state) { m_spkrdata = state ? 1 : 0; m_speaker->level_w(m_spkrdata & m_pit_out2); diff --git a/src/mame/pc/nforcepc.cpp b/src/mame/pc/nforcepc.cpp index 0f4bd4c53c9..66f8e36b6a9 100644 --- a/src/mame/pc/nforcepc.cpp +++ b/src/mame/pc/nforcepc.cpp @@ -749,155 +749,155 @@ uint16_t it8703f_device::read_logical_configuration_register(int index) return ret; } -WRITE_LINE_MEMBER(it8703f_device::irq_floppy_w) +void it8703f_device::irq_floppy_w(int state) { if (enabled_logical[LogicalDevice::FDC] == false) return; lpchost->set_virtual_line(configuration_registers[LogicalDevice::FDC][0x70], state ? ASSERT_LINE : CLEAR_LINE); } -WRITE_LINE_MEMBER(it8703f_device::drq_floppy_w) +void it8703f_device::drq_floppy_w(int state) { if (enabled_logical[LogicalDevice::FDC] == false) return; lpchost->set_virtual_line(configuration_registers[LogicalDevice::FDC][0x74] + 16, state ? ASSERT_LINE : CLEAR_LINE); } -WRITE_LINE_MEMBER(it8703f_device::irq_parallel_w) +void it8703f_device::irq_parallel_w(int state) { if (enabled_logical[LogicalDevice::Parallel] == false) return; lpchost->set_virtual_line(configuration_registers[LogicalDevice::Parallel][0x70], state ? ASSERT_LINE : CLEAR_LINE); } -WRITE_LINE_MEMBER(it8703f_device::drq_parallel_w) +void it8703f_device::drq_parallel_w(int state) { if (enabled_logical[LogicalDevice::Parallel] == false) return; lpchost->set_virtual_line(configuration_registers[LogicalDevice::Parallel][0x74] + 16, state ? ASSERT_LINE : CLEAR_LINE); } -WRITE_LINE_MEMBER(it8703f_device::irq_serial1_w) +void it8703f_device::irq_serial1_w(int state) { if (enabled_logical[LogicalDevice::Serial1] == false) return; lpchost->set_virtual_line(configuration_registers[LogicalDevice::Serial1][0x70], state ? ASSERT_LINE : CLEAR_LINE); } -WRITE_LINE_MEMBER(it8703f_device::txd_serial1_w) +void it8703f_device::txd_serial1_w(int state) { if (enabled_logical[LogicalDevice::Serial1] == false) return; m_txd1_callback(state); } -WRITE_LINE_MEMBER(it8703f_device::dtr_serial1_w) +void it8703f_device::dtr_serial1_w(int state) { if (enabled_logical[LogicalDevice::Serial1] == false) return; m_ndtr1_callback(state); } -WRITE_LINE_MEMBER(it8703f_device::rts_serial1_w) +void it8703f_device::rts_serial1_w(int state) { if (enabled_logical[LogicalDevice::Serial1] == false) return; m_nrts1_callback(state); } -WRITE_LINE_MEMBER(it8703f_device::irq_serial2_w) +void it8703f_device::irq_serial2_w(int state) { if (enabled_logical[LogicalDevice::Serial2] == false) return; lpchost->set_virtual_line(configuration_registers[LogicalDevice::Serial2][0x70], state ? ASSERT_LINE : CLEAR_LINE); } -WRITE_LINE_MEMBER(it8703f_device::txd_serial2_w) +void it8703f_device::txd_serial2_w(int state) { if (enabled_logical[LogicalDevice::Serial2] == false) return; m_txd2_callback(state); } -WRITE_LINE_MEMBER(it8703f_device::dtr_serial2_w) +void it8703f_device::dtr_serial2_w(int state) { if (enabled_logical[LogicalDevice::Serial2] == false) return; m_ndtr2_callback(state); } -WRITE_LINE_MEMBER(it8703f_device::rts_serial2_w) +void it8703f_device::rts_serial2_w(int state) { if (enabled_logical[LogicalDevice::Serial2] == false) return; m_nrts2_callback(state); } -WRITE_LINE_MEMBER(it8703f_device::rxd1_w) +void it8703f_device::rxd1_w(int state) { pc_serial1_comdev->rx_w(state); } -WRITE_LINE_MEMBER(it8703f_device::ndcd1_w) +void it8703f_device::ndcd1_w(int state) { pc_serial1_comdev->dcd_w(state); } -WRITE_LINE_MEMBER(it8703f_device::ndsr1_w) +void it8703f_device::ndsr1_w(int state) { pc_serial1_comdev->dsr_w(state); } -WRITE_LINE_MEMBER(it8703f_device::nri1_w) +void it8703f_device::nri1_w(int state) { pc_serial1_comdev->ri_w(state); } -WRITE_LINE_MEMBER(it8703f_device::ncts1_w) +void it8703f_device::ncts1_w(int state) { pc_serial1_comdev->cts_w(state); } -WRITE_LINE_MEMBER(it8703f_device::rxd2_w) +void it8703f_device::rxd2_w(int state) { pc_serial2_comdev->rx_w(state); } -WRITE_LINE_MEMBER(it8703f_device::ndcd2_w) +void it8703f_device::ndcd2_w(int state) { pc_serial2_comdev->dcd_w(state); } -WRITE_LINE_MEMBER(it8703f_device::ndsr2_w) +void it8703f_device::ndsr2_w(int state) { pc_serial2_comdev->dsr_w(state); } -WRITE_LINE_MEMBER(it8703f_device::nri2_w) +void it8703f_device::nri2_w(int state) { pc_serial2_comdev->ri_w(state); } -WRITE_LINE_MEMBER(it8703f_device::ncts2_w) +void it8703f_device::ncts2_w(int state) { pc_serial2_comdev->cts_w(state); } -WRITE_LINE_MEMBER(it8703f_device::irq_keyboard_w) +void it8703f_device::irq_keyboard_w(int state) { if (enabled_logical[LogicalDevice::Keyboard] == false) return; lpchost->set_virtual_line(configuration_registers[LogicalDevice::Keyboard][0x70], state ? ASSERT_LINE : CLEAR_LINE); } -WRITE_LINE_MEMBER(it8703f_device::kbdp21_gp25_gatea20_w) +void it8703f_device::kbdp21_gp25_gatea20_w(int state) { if (enabled_logical[LogicalDevice::Keyboard] == false) return; pin_gatea20_callback(state); } -WRITE_LINE_MEMBER(it8703f_device::kbdp20_gp20_reset_w) +void it8703f_device::kbdp20_gp20_reset_w(int state) { if (enabled_logical[LogicalDevice::Keyboard] == false) return; @@ -1096,7 +1096,7 @@ private: void nforce_map_io(address_map &map); void boot_state_award_w(uint8_t data); IRQ_CALLBACK_MEMBER(irq_callback); - DECLARE_WRITE_LINE_MEMBER(maincpu_interrupt); + void maincpu_interrupt(int state); virtual void machine_start() override; virtual void machine_reset() override; @@ -1145,7 +1145,7 @@ IRQ_CALLBACK_MEMBER(nforcepc_state::irq_callback) return isalpc->acknowledge(); } -WRITE_LINE_MEMBER(nforcepc_state::maincpu_interrupt) +void nforcepc_state::maincpu_interrupt(int state) { m_maincpu->set_input_line(0, state ? HOLD_LINE : CLEAR_LINE); } diff --git a/src/mame/pc/nforcepc.h b/src/mame/pc/nforcepc.h index f923d8051e9..2faec6f050f 100644 --- a/src/mame/pc/nforcepc.h +++ b/src/mame/pc/nforcepc.h @@ -209,35 +209,35 @@ public: void map_keyboard(address_map &map); // floppy disk controller - DECLARE_WRITE_LINE_MEMBER(irq_floppy_w); - DECLARE_WRITE_LINE_MEMBER(drq_floppy_w); + void irq_floppy_w(int state); + void drq_floppy_w(int state); // parallel port - DECLARE_WRITE_LINE_MEMBER(irq_parallel_w); - DECLARE_WRITE_LINE_MEMBER(drq_parallel_w); + void irq_parallel_w(int state); + void drq_parallel_w(int state); // uarts - DECLARE_WRITE_LINE_MEMBER(irq_serial1_w); - DECLARE_WRITE_LINE_MEMBER(txd_serial1_w); - DECLARE_WRITE_LINE_MEMBER(dtr_serial1_w); - DECLARE_WRITE_LINE_MEMBER(rts_serial1_w); - DECLARE_WRITE_LINE_MEMBER(irq_serial2_w); - DECLARE_WRITE_LINE_MEMBER(txd_serial2_w); - DECLARE_WRITE_LINE_MEMBER(dtr_serial2_w); - DECLARE_WRITE_LINE_MEMBER(rts_serial2_w); + void irq_serial1_w(int state); + void txd_serial1_w(int state); + void dtr_serial1_w(int state); + void rts_serial1_w(int state); + void irq_serial2_w(int state); + void txd_serial2_w(int state); + void dtr_serial2_w(int state); + void rts_serial2_w(int state); // uarts - DECLARE_WRITE_LINE_MEMBER(rxd1_w); - DECLARE_WRITE_LINE_MEMBER(ndcd1_w); - DECLARE_WRITE_LINE_MEMBER(ndsr1_w); - DECLARE_WRITE_LINE_MEMBER(nri1_w); - DECLARE_WRITE_LINE_MEMBER(ncts1_w); - DECLARE_WRITE_LINE_MEMBER(rxd2_w); - DECLARE_WRITE_LINE_MEMBER(ndcd2_w); - DECLARE_WRITE_LINE_MEMBER(ndsr2_w); - DECLARE_WRITE_LINE_MEMBER(nri2_w); - DECLARE_WRITE_LINE_MEMBER(ncts2_w); + void rxd1_w(int state); + void ndcd1_w(int state); + void ndsr1_w(int state); + void nri1_w(int state); + void ncts1_w(int state); + void rxd2_w(int state); + void ndcd2_w(int state); + void ndsr2_w(int state); + void nri2_w(int state); + void ncts2_w(int state); // keyboard - DECLARE_WRITE_LINE_MEMBER(irq_keyboard_w); - DECLARE_WRITE_LINE_MEMBER(kbdp21_gp25_gatea20_w); - DECLARE_WRITE_LINE_MEMBER(kbdp20_gp20_reset_w); + void irq_keyboard_w(int state); + void kbdp21_gp25_gatea20_w(int state); + void kbdp20_gp20_reset_w(int state); uint8_t read_it8703f(offs_t offset); void write_it8703f(offs_t offset, uint8_t data); diff --git a/src/mame/pc/pc_t1t.cpp b/src/mame/pc/pc_t1t.cpp index f4785b0ed0b..54654bc5ae8 100644 --- a/src/mame/pc/pc_t1t.cpp +++ b/src/mame/pc/pc_t1t.cpp @@ -987,19 +987,19 @@ uint8_t pc_t1t_device::read(offs_t offset) return data; } -WRITE_LINE_MEMBER( pc_t1t_device::t1000_de_changed ) +void pc_t1t_device::t1000_de_changed(int state) { m_display_enable = state ? 0 : 1; } -WRITE_LINE_MEMBER( pcvideo_pcjr_device::de_changed ) +void pcvideo_pcjr_device::de_changed(int state) { m_display_enable = state ? 1 : 0; } -WRITE_LINE_MEMBER( pcvideo_t1000_device::t1000_vsync_changed ) +void pcvideo_t1000_device::t1000_vsync_changed(int state) { m_vsync = state ? 8 : 0; if ( state ) @@ -1008,7 +1008,7 @@ WRITE_LINE_MEMBER( pcvideo_t1000_device::t1000_vsync_changed ) } } -WRITE_LINE_MEMBER( pcvideo_t1000_device::disable_w ) +void pcvideo_t1000_device::disable_w(int state) { if(state) m_vram->set_bank(8); @@ -1017,7 +1017,7 @@ WRITE_LINE_MEMBER( pcvideo_t1000_device::disable_w ) m_disable = state ? true : false; } -WRITE_LINE_MEMBER( pcvideo_pcjr_device::pcjr_vsync_changed ) +void pcvideo_pcjr_device::pcjr_vsync_changed(int state) { m_vsync = state ? 8 : 0; if ( state ) diff --git a/src/mame/pc/pc_t1t.h b/src/mame/pc/pc_t1t.h index fa9b277f872..1bef1d1b267 100644 --- a/src/mame/pc/pc_t1t.h +++ b/src/mame/pc/pc_t1t.h @@ -17,7 +17,7 @@ class pc_t1t_device : public device_t, public device_video_interface { public: - DECLARE_WRITE_LINE_MEMBER( t1000_de_changed ); + void t1000_de_changed(int state); uint8_t read(offs_t offset); virtual MC6845_UPDATE_ROW( crtc_update_row ); @@ -101,7 +101,7 @@ public: pcvideo_t1000_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); void write(offs_t offset, uint8_t data); - DECLARE_WRITE_LINE_MEMBER( disable_w ); + void disable_w(int state); protected: virtual void device_add_mconfig(machine_config &config) override; @@ -114,7 +114,7 @@ private: void mode_control_w(int data); bool m_disable = false; - DECLARE_WRITE_LINE_MEMBER( t1000_vsync_changed ); + void t1000_vsync_changed(int state); }; DECLARE_DEVICE_TYPE(PCVIDEO_T1000, pcvideo_t1000_device) @@ -127,7 +127,7 @@ public: void write(offs_t offset, uint8_t data); - DECLARE_WRITE_LINE_MEMBER( de_changed ); + void de_changed(int state); MC6845_UPDATE_ROW( pcjx_text_update_row ); MC6845_UPDATE_ROW( pcjr_gfx_2bpp_high_update_row ); @@ -144,7 +144,7 @@ private: void pc_pcjr_bank_w(int data); void pc_pcjx_bank_w(int data); - DECLARE_WRITE_LINE_MEMBER( pcjr_vsync_changed ); + void pcjr_vsync_changed(int state); virtual MC6845_UPDATE_ROW( crtc_update_row ) override; }; diff --git a/src/mame/pc/poisk1.cpp b/src/mame/pc/poisk1.cpp index 5ad7fdf7fde..6094d0e8538 100644 --- a/src/mame/pc/poisk1.cpp +++ b/src/mame/pc/poisk1.cpp @@ -95,7 +95,7 @@ protected: virtual void machine_reset() override; virtual void video_start() override; - DECLARE_WRITE_LINE_MEMBER(vsync_changed); + void vsync_changed(int state); TIMER_DEVICE_CALLBACK_MEMBER(hsync_changed); private: @@ -139,8 +139,8 @@ private: POISK1_UPDATE_ROW(cga_gfx_1bpp_update_row); POISK1_UPDATE_ROW(poisk1_gfx_1bpp_update_row); - DECLARE_WRITE_LINE_MEMBER(p1_pit8253_out2_changed); - DECLARE_WRITE_LINE_MEMBER(p1_speaker_set_spkrdata); + void p1_pit8253_out2_changed(int state); + void p1_speaker_set_spkrdata(int state); uint8_t p1_trap_r(offs_t offset); void p1_trap_w(offs_t offset, uint8_t data); uint8_t p1_cga_r(offs_t offset); @@ -437,7 +437,7 @@ void p1_state::video_start() space.install_ram(0xb8000, 0xbffff, m_video.videoram); } -WRITE_LINE_MEMBER(p1_state::vsync_changed) +void p1_state::vsync_changed(int state) { m_vsync = state ? 9 : 0; } @@ -479,13 +479,13 @@ uint32_t p1_state::screen_update(screen_device &screen, bitmap_rgb32 &bitmap, co // Timer. Poisk-1 uses single XTAL for everything? -- check -WRITE_LINE_MEMBER(p1_state::p1_speaker_set_spkrdata) +void p1_state::p1_speaker_set_spkrdata(int state) { m_p1_spkrdata = state ? 1 : 0; m_speaker->level_w(m_p1_spkrdata & m_p1_input); } -WRITE_LINE_MEMBER(p1_state::p1_pit8253_out2_changed) +void p1_state::p1_pit8253_out2_changed(int state) { m_p1_input = state ? 1 : 0; m_speaker->level_w(m_p1_spkrdata & m_p1_input); diff --git a/src/mame/pce/paranoia.cpp b/src/mame/pce/paranoia.cpp index 7f5e6ec7db2..6ac064f7dde 100644 --- a/src/mame/pce/paranoia.cpp +++ b/src/mame/pce/paranoia.cpp @@ -67,7 +67,7 @@ private: void i8155_a_w(uint8_t data); void i8155_b_w(uint8_t data); void i8155_c_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(i8155_timer_out); + void i8155_timer_out(int state); void paranoia_8085_io_map(address_map &map); void paranoia_8085_map(address_map &map); void paranoia_z80_io_map(address_map &map); @@ -161,7 +161,7 @@ void paranoia_state::i8155_c_w(uint8_t data) //logerror("i8155 Port C: %02X\n", data); } -WRITE_LINE_MEMBER(paranoia_state::i8155_timer_out) +void paranoia_state::i8155_timer_out(int state) { //m_subcpu->set_input_line(I8085_RST55_LINE, state ? CLEAR_LINE : ASSERT_LINE ); //logerror("Timer out %d\n", state); diff --git a/src/mame/pce/tourvis.cpp b/src/mame/pce/tourvis.cpp index 72921e25913..c045efce78b 100644 --- a/src/mame/pce/tourvis.cpp +++ b/src/mame/pce/tourvis.cpp @@ -210,7 +210,7 @@ private: void tourvision_i8155_a_w(uint8_t data); void tourvision_i8155_b_w(uint8_t data); void tourvision_i8155_c_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(tourvision_timer_out); + void tourvision_timer_out(int state); DECLARE_DEVICE_IMAGE_LOAD_MEMBER(cart_load); @@ -385,7 +385,7 @@ void tourvision_state::tourvision_i8155_c_w(uint8_t data) //logerror("i8155 Port C: %02X\n", data); } -WRITE_LINE_MEMBER(tourvision_state::tourvision_timer_out) +void tourvision_state::tourvision_timer_out(int state) { m_subcpu->set_input_line(I8085_RST55_LINE, state ? CLEAR_LINE : ASSERT_LINE ); //logerror("Timer out %d\n", state); diff --git a/src/mame/philips/odyssey2.cpp b/src/mame/philips/odyssey2.cpp index 5a77b9d7d02..0ea05a216c4 100644 --- a/src/mame/philips/odyssey2.cpp +++ b/src/mame/philips/odyssey2.cpp @@ -172,7 +172,7 @@ protected: void p1_write(u8 data); u8 p2_read(); void p2_write(u8 data); - DECLARE_READ_LINE_MEMBER(t1_read); + int t1_read(); void odyssey2_io(address_map &map); void odyssey2_mem(address_map &map); @@ -430,7 +430,7 @@ u8 odyssey2_state::bus_read() return data; } -READ_LINE_MEMBER(odyssey2_state::t1_read) +int odyssey2_state::t1_read() { return m_i8244->vblank() | m_i8244->hblank(); } diff --git a/src/mame/phoenix/phoenix.h b/src/mame/phoenix/phoenix.h index 8ba053ded21..4d960d8324a 100644 --- a/src/mame/phoenix/phoenix.h +++ b/src/mame/phoenix/phoenix.h @@ -24,7 +24,7 @@ public: } DECLARE_CUSTOM_INPUT_MEMBER(player_input_r); - DECLARE_READ_LINE_MEMBER(pleiads_protection_r); + int pleiads_protection_r(); void condor(machine_config &config); void phoenix(machine_config &config); @@ -69,7 +69,7 @@ private: void pleiads_palette(palette_device &palette) const; uint32_t screen_update_phoenix(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint8_t survival_protection_r(); - DECLARE_READ_LINE_MEMBER(survival_sid_callback); + int survival_sid_callback(); void phoenix_memory_map(address_map &map); void pleiads_memory_map(address_map &map); void survival_memory_map(address_map &map); diff --git a/src/mame/phoenix/phoenix_v.cpp b/src/mame/phoenix/phoenix_v.cpp index 11332375d4a..c0774699549 100644 --- a/src/mame/phoenix/phoenix_v.cpp +++ b/src/mame/phoenix/phoenix_v.cpp @@ -302,7 +302,7 @@ CUSTOM_INPUT_MEMBER(phoenix_state::player_input_r) return (ioport("CTRL")->read() & 0x0f) >> 0; } -READ_LINE_MEMBER(phoenix_state::pleiads_protection_r) +int phoenix_state::pleiads_protection_r() { /* handle Pleiads protection */ switch (m_pleiads_protection_question) @@ -424,7 +424,7 @@ uint8_t phoenix_state::survival_protection_r() return m_survival_protection_value; } -READ_LINE_MEMBER(phoenix_state::survival_sid_callback) +int phoenix_state::survival_sid_callback() { return m_survival_sid_value ? ASSERT_LINE : CLEAR_LINE; } diff --git a/src/mame/pinball/by17.cpp b/src/mame/pinball/by17.cpp index 5a4f3917a2f..8c1029af96f 100644 --- a/src/mame/pinball/by17.cpp +++ b/src/mame/pinball/by17.cpp @@ -78,9 +78,9 @@ public: DECLARE_INPUT_CHANGED_MEMBER(activity_button); DECLARE_INPUT_CHANGED_MEMBER(self_test); - template DECLARE_READ_LINE_MEMBER(outhole_x0); - template DECLARE_READ_LINE_MEMBER(saucer_x3); - template DECLARE_READ_LINE_MEMBER(drop_target_x2); + template int outhole_x0(); + template int saucer_x3(); + template int drop_target_x2(); void by17(machine_config &config); @@ -129,10 +129,10 @@ private: void u11_b_w(uint8_t data); uint8_t nibble_nvram_r(offs_t offset); void nibble_nvram_w(offs_t offset, uint8_t data); - DECLARE_READ_LINE_MEMBER(u10_ca1_r); - DECLARE_WRITE_LINE_MEMBER(u10_ca2_w); - DECLARE_WRITE_LINE_MEMBER(u10_cb2_w); - DECLARE_WRITE_LINE_MEMBER(u11_cb2_w); + int u10_ca1_r(); + void u10_ca2_w(int state); + void u10_cb2_w(int state); + void u11_cb2_w(int state); TIMER_DEVICE_CALLBACK_MEMBER(timer_z_freq); TIMER_DEVICE_CALLBACK_MEMBER(timer_z_pulse); @@ -465,7 +465,7 @@ INPUT_PORTS_END template -READ_LINE_MEMBER( by17_state::outhole_x0 ) +int by17_state::outhole_x0() { int bit_shift = (Param & 0x07); int port = ((Param >> 4) & 0x07); @@ -479,7 +479,7 @@ READ_LINE_MEMBER( by17_state::outhole_x0 ) } template -READ_LINE_MEMBER( by17_state::saucer_x3 ) +int by17_state::saucer_x3() { int bit_shift = (Param & 0x07); int port = ((Param >> 4) & 0x07); @@ -493,7 +493,7 @@ READ_LINE_MEMBER( by17_state::saucer_x3 ) } template -READ_LINE_MEMBER( by17_state::drop_target_x2 ) +int by17_state::drop_target_x2() { /* Here we simulate fallen Drop Targets so the Drop Target Reset Solenoids can release the switches */ @@ -552,12 +552,12 @@ INPUT_CHANGED_MEMBER( by17_state::self_test ) m_pia_u10->ca1_w(newval); } -READ_LINE_MEMBER( by17_state::u10_ca1_r ) +int by17_state::u10_ca1_r() { return m_io_test->read() & 0x01; } -WRITE_LINE_MEMBER( by17_state::u10_ca2_w ) +void by17_state::u10_ca2_w(int state) { #if 0 // Display Blanking - Out of sync with video redraw rate and causes flicker so it's disabled if (state == 0) @@ -576,7 +576,7 @@ WRITE_LINE_MEMBER( by17_state::u10_ca2_w ) m_u10_ca2 = state; } -WRITE_LINE_MEMBER( by17_state::u10_cb2_w ) +void by17_state::u10_cb2_w(int state) { // logerror("New U10 CB2 state %01x, was %01x. PIA=%02x\n", state, m_u10_cb2, m_u10a); @@ -586,7 +586,7 @@ WRITE_LINE_MEMBER( by17_state::u10_cb2_w ) m_u10_cb2 = state; } -WRITE_LINE_MEMBER( by17_state::u11_cb2_w ) +void by17_state::u11_cb2_w(int state) { m_u11_cb2 = state; } diff --git a/src/mame/pinball/by35.cpp b/src/mame/pinball/by35.cpp index de711ec0bbb..5109c261295 100644 --- a/src/mame/pinball/by35.cpp +++ b/src/mame/pinball/by35.cpp @@ -160,9 +160,9 @@ public: DECLARE_INPUT_CHANGED_MEMBER(activity_button); DECLARE_INPUT_CHANGED_MEMBER(self_test); - template DECLARE_READ_LINE_MEMBER(outhole_x0); - template DECLARE_READ_LINE_MEMBER(drop_target_x0); - template DECLARE_READ_LINE_MEMBER(kickback_x3); + template int outhole_x0(); + template int drop_target_x0(); + template int kickback_x3(); void by35(machine_config &config); void nuovo(machine_config &config); @@ -217,10 +217,10 @@ protected: void u11_b_w(uint8_t data); uint8_t nibble_nvram_r(offs_t offset); void nibble_nvram_w(offs_t offset, uint8_t data); - DECLARE_READ_LINE_MEMBER(u10_ca1_r); - DECLARE_WRITE_LINE_MEMBER(u10_ca2_w); - DECLARE_WRITE_LINE_MEMBER(u10_cb2_w); - DECLARE_WRITE_LINE_MEMBER(u11_cb2_w); + int u10_ca1_r(); + void u10_ca2_w(int state); + void u10_cb2_w(int state); + void u11_cb2_w(int state); virtual void machine_start() override; virtual void machine_reset() override; TIMER_DEVICE_CALLBACK_MEMBER(timer_z_freq); @@ -1011,7 +1011,7 @@ INPUT_PORTS_END template -READ_LINE_MEMBER( by35_state::outhole_x0 ) +int by35_state::outhole_x0() { int bit_shift = (Param & 0x07); int port = ((Param >> 4) & 0x07); @@ -1025,7 +1025,7 @@ READ_LINE_MEMBER( by35_state::outhole_x0 ) } template -READ_LINE_MEMBER( by35_state::kickback_x3 ) +int by35_state::kickback_x3() { int bit_shift = (Param & 0x07); int port = ((Param >> 4) & 0x07); @@ -1039,7 +1039,7 @@ READ_LINE_MEMBER( by35_state::kickback_x3 ) } template -READ_LINE_MEMBER( by35_state::drop_target_x0 ) +int by35_state::drop_target_x0() { /* Here we simulate the Drop Target switch states so the Drop Target Reset Solenoid can also release the switches */ @@ -1088,12 +1088,12 @@ INPUT_CHANGED_MEMBER( by35_state::self_test ) m_pia_u10->ca1_w(newval); } -READ_LINE_MEMBER( by35_state::u10_ca1_r ) +int by35_state::u10_ca1_r() { return m_io_test->read() & 0x01; } -WRITE_LINE_MEMBER( by35_state::u10_ca2_w ) +void by35_state::u10_ca2_w(int state) { #if 0 // Display Blanking - Out of sync with video redraw rate and causes flicker so it's disabled if (state == 0) @@ -1112,7 +1112,7 @@ WRITE_LINE_MEMBER( by35_state::u10_ca2_w ) m_u10_ca2 = state; } -WRITE_LINE_MEMBER( by35_state::u10_cb2_w ) +void by35_state::u10_cb2_w(int state) { LOG("New U10 CB2 state %01x, was %01x. PIA=%02x\n", state, m_u10_cb2, m_u10a); @@ -1122,7 +1122,7 @@ WRITE_LINE_MEMBER( by35_state::u10_cb2_w ) m_u10_cb2 = state; } -WRITE_LINE_MEMBER( by35_state::u11_cb2_w ) +void by35_state::u11_cb2_w(int state) { // Handle sound if (!m_sound_int_handler.isnull()) diff --git a/src/mame/pinball/by6803.cpp b/src/mame/pinball/by6803.cpp index 02730b52ab3..872f461c35b 100644 --- a/src/mame/pinball/by6803.cpp +++ b/src/mame/pinball/by6803.cpp @@ -122,10 +122,10 @@ private: void pia1b_w(u8 data); void pia0a_g1w(u8 data); void pia1a_g1w(u8 data); - DECLARE_WRITE_LINE_MEMBER(pia0_ca2_g1w); - DECLARE_WRITE_LINE_MEMBER(pia0_ca2_w); - DECLARE_WRITE_LINE_MEMBER(pia0_cb2_w); - DECLARE_WRITE_LINE_MEMBER(pia1_cb2_w); + void pia0_ca2_g1w(int state); + void pia0_ca2_w(int state); + void pia0_cb2_w(int state); + void pia1_cb2_w(int state); TIMER_DEVICE_CALLBACK_MEMBER(pia0_timer); void by6803_map(address_map &map); @@ -265,7 +265,7 @@ void by6803_state::port2_w(u8 data) } // display latch strobes; display blanking -WRITE_LINE_MEMBER( by6803_state::pia0_ca2_w ) +void by6803_state::pia0_ca2_w(int state) { if (state) { @@ -278,13 +278,13 @@ WRITE_LINE_MEMBER( by6803_state::pia0_ca2_w ) } // lamp strobe 1 when high -WRITE_LINE_MEMBER( by6803_state::pia0_cb2_w ) +void by6803_state::pia0_cb2_w(int state) { //printf("CB02=%X,m_pia0_a=%X ",state,m_pia0_a); } // sol bank select (0 to enable sol selection) -WRITE_LINE_MEMBER( by6803_state::pia1_cb2_w ) +void by6803_state::pia1_cb2_w(int state) { //printf("CB12=%X ",state); } @@ -417,7 +417,7 @@ void by6803_state::pia1a_g1w(u8 data) m_segment[4] = BIT(m_pia0_a, 4, 4); } -WRITE_LINE_MEMBER( by6803_state::pia0_ca2_g1w ) +void by6803_state::pia0_ca2_g1w(int state) { static const u8 patterns[16] = { 0x3f,0x06,0xdb,0xcf,0xe6,0xed,0xfd,0x07,0xff,0xef,0,0,0,0,0,0 }; // MC14543 if (state) diff --git a/src/mame/pinball/byvid.cpp b/src/mame/pinball/byvid.cpp index 0c4e6295bb2..7c683d59074 100644 --- a/src/mame/pinball/byvid.cpp +++ b/src/mame/pinball/byvid.cpp @@ -157,12 +157,12 @@ private: void u11_a_w(u8 data); u8 u11_b_r(); void u11_b_w(u8 data); - DECLARE_WRITE_LINE_MEMBER(u7_ca2_w); - DECLARE_WRITE_LINE_MEMBER(u10_ca2_w); - DECLARE_WRITE_LINE_MEMBER(u11_ca2_w); - DECLARE_WRITE_LINE_MEMBER(u7_cb2_w); - DECLARE_WRITE_LINE_MEMBER(u10_cb2_w); - DECLARE_WRITE_LINE_MEMBER(u11_cb2_w); + void u7_ca2_w(int state); + void u10_ca2_w(int state); + void u11_ca2_w(int state); + void u7_cb2_w(int state); + void u10_cb2_w(int state); + void u11_cb2_w(int state); TIMER_DEVICE_CALLBACK_MEMBER(u10_timer); TIMER_DEVICE_CALLBACK_MEMBER(u11_timer); void granny_crtc_w(offs_t offset, u8 data); @@ -558,22 +558,22 @@ void by133_state::sound_data_w(u8 data) m_vid_to_mpu = data; } -WRITE_LINE_MEMBER( by133_state::u7_ca2_w ) +void by133_state::u7_ca2_w(int state) { // comms out } -WRITE_LINE_MEMBER( by133_state::u10_ca2_w ) +void by133_state::u10_ca2_w(int state) { // enable digital display } -WRITE_LINE_MEMBER( by133_state::u11_ca2_w ) +void by133_state::u11_ca2_w(int state) { // green led } -WRITE_LINE_MEMBER( by133_state::u7_cb2_w ) +void by133_state::u7_cb2_w(int state) { // red led m_beep->set_clock(950); @@ -581,13 +581,13 @@ WRITE_LINE_MEMBER( by133_state::u7_cb2_w ) m_sound_int_handler(state); } -WRITE_LINE_MEMBER( by133_state::u10_cb2_w ) +void by133_state::u10_cb2_w(int state) { // lamp strobe #1 m_u10_cb2 = state; } -WRITE_LINE_MEMBER( by133_state::u11_cb2_w ) +void by133_state::u11_cb2_w(int state) { // solenoid-sound selector diff --git a/src/mame/pinball/de_2.cpp b/src/mame/pinball/de_2.cpp index b42b1ea6321..f214151c65c 100644 --- a/src/mame/pinball/de_2.cpp +++ b/src/mame/pinball/de_2.cpp @@ -104,8 +104,8 @@ private: void alpha3_dig1_w(uint8_t data); void lamp0_w(uint8_t data) { } void lamp1_w(uint8_t data) { } - DECLARE_WRITE_LINE_MEMBER(ym2151_irq_w); - DECLARE_WRITE_LINE_MEMBER(msm5205_irq_w); + void ym2151_irq_w(int state); + void msm5205_irq_w(int state); void sound_w(uint8_t data); uint8_t sound_latch_r(); @@ -264,12 +264,12 @@ void de_2_state::machine_start() m_sample_bank->set_entry(0); } -WRITE_LINE_MEMBER(de_2_state::ym2151_irq_w) +void de_2_state::ym2151_irq_w(int state) { m_audiocpu->set_input_line(M6809_IRQ_LINE,state); } -WRITE_LINE_MEMBER(de_2_state::msm5205_irq_w) +void de_2_state::msm5205_irq_w(int state) { m_msm5205->data_w(m_sample_data >> 4); if(m_more_data) diff --git a/src/mame/pinball/de_3.cpp b/src/mame/pinball/de_3.cpp index 85d1d184b3b..d916c233999 100644 --- a/src/mame/pinball/de_3.cpp +++ b/src/mame/pinball/de_3.cpp @@ -103,8 +103,8 @@ protected: private: void de_bg_audio(machine_config &config); void audio_map(address_map &map); - DECLARE_WRITE_LINE_MEMBER(ym2151_irq_w); - DECLARE_WRITE_LINE_MEMBER(msm5205_irq_w); + void ym2151_irq_w(int state); + void msm5205_irq_w(int state); uint8_t sound_latch_r(); void sample_bank_w(uint8_t data); void sample_w(uint8_t data); @@ -419,12 +419,12 @@ void de_3_state::lamps_w(offs_t offset, uint8_t data) } } -WRITE_LINE_MEMBER(de_3_state::ym2151_irq_w) +void de_3_state::ym2151_irq_w(int state) { m_audiocpu->set_input_line(M6809_IRQ_LINE,state); } -WRITE_LINE_MEMBER(de_3_state::msm5205_irq_w) +void de_3_state::msm5205_irq_w(int state) { m_msm5205->data_w(m_sample_data >> 4); if(m_more_data) diff --git a/src/mame/pinball/decodmd1.cpp b/src/mame/pinball/decodmd1.cpp index 8e325355c75..b8f53993026 100644 --- a/src/mame/pinball/decodmd1.cpp +++ b/src/mame/pinball/decodmd1.cpp @@ -100,31 +100,31 @@ void decodmd_type1_device::dmd_port_w(offs_t offset, uint8_t data) } } -WRITE_LINE_MEMBER(decodmd_type1_device::blank_w) +void decodmd_type1_device::blank_w(int state) { m_blank = state; if (state) output_data(); } -WRITE_LINE_MEMBER(decodmd_type1_device::status_w) +void decodmd_type1_device::status_w(int state) { m_status = state; } -WRITE_LINE_MEMBER(decodmd_type1_device::rowdata_w) +void decodmd_type1_device::rowdata_w(int state) { m_rowdata = state; } -WRITE_LINE_MEMBER(decodmd_type1_device::rowclock_w) +void decodmd_type1_device::rowclock_w(int state) { if (!state && m_rowclock) // on negative edge m_rowselect = (m_rowselect << 1) | m_rowdata; m_rowclock = state; } -WRITE_LINE_MEMBER(decodmd_type1_device::test_w) +void decodmd_type1_device::test_w(int state) { set_busy(B_SET, state); } diff --git a/src/mame/pinball/decodmd1.h b/src/mame/pinball/decodmd1.h index 32c13571e01..6224cd65059 100644 --- a/src/mame/pinball/decodmd1.h +++ b/src/mame/pinball/decodmd1.h @@ -36,11 +36,11 @@ public: uint8_t dmd_port_r(offs_t offset); void dmd_port_w(offs_t offset, uint8_t data); - DECLARE_WRITE_LINE_MEMBER(blank_w); - DECLARE_WRITE_LINE_MEMBER(status_w); - DECLARE_WRITE_LINE_MEMBER(rowdata_w); - DECLARE_WRITE_LINE_MEMBER(rowclock_w); - DECLARE_WRITE_LINE_MEMBER(test_w); + void blank_w(int state); + void status_w(int state); + void rowdata_w(int state); + void rowclock_w(int state); + void test_w(int state); template void set_gfxregion(T &&tag) { m_rom.set_tag(std::forward(tag)); } diff --git a/src/mame/pinball/decopincpu.cpp b/src/mame/pinball/decopincpu.cpp index ee86912bc33..5a018f684a6 100644 --- a/src/mame/pinball/decopincpu.cpp +++ b/src/mame/pinball/decopincpu.cpp @@ -83,7 +83,7 @@ INPUT_CHANGED_MEMBER( decocpu_type1_device::main_nmi ) m_cpu->pulse_input_line(INPUT_LINE_NMI, attotime::zero); } -WRITE_LINE_MEMBER(decocpu_type1_device::cpu_pia_irq) +void decocpu_type1_device::cpu_pia_irq(int state) { if (state == CLEAR_LINE) { diff --git a/src/mame/pinball/decopincpu.h b/src/mame/pinball/decopincpu.h index 28a665a6155..5c1d9aed3cb 100644 --- a/src/mame/pinball/decopincpu.h +++ b/src/mame/pinball/decopincpu.h @@ -91,14 +91,14 @@ private: devcb_write8 m_write_solenoid; output_finder<86> m_io_outputs; // 22 solenoids + 64 lamps - DECLARE_WRITE_LINE_MEMBER(cpu_pia_irq); - DECLARE_WRITE_LINE_MEMBER(pia21_cb2_w) { } // flipper enable - DECLARE_WRITE_LINE_MEMBER(pia24_ca2_w) { m_io_outputs[18] = state; } - DECLARE_WRITE_LINE_MEMBER(pia24_cb2_w) { m_io_outputs[20] = state; } - DECLARE_WRITE_LINE_MEMBER(pia2c_ca2_w) { m_io_outputs[21] = state; } - DECLARE_WRITE_LINE_MEMBER(pia2c_cb2_w) { m_io_outputs[17] = state; } - DECLARE_WRITE_LINE_MEMBER(pia30_ca2_w) { m_io_outputs[19] = state; } - DECLARE_WRITE_LINE_MEMBER(pia30_cb2_w) { m_io_outputs[16] = state; } + void cpu_pia_irq(int state); + void pia21_cb2_w(int state) { } // flipper enable + void pia24_ca2_w(int state) { m_io_outputs[18] = state; } + void pia24_cb2_w(int state) { m_io_outputs[20] = state; } + void pia2c_ca2_w(int state) { m_io_outputs[21] = state; } + void pia2c_cb2_w(int state) { m_io_outputs[17] = state; } + void pia30_ca2_w(int state) { m_io_outputs[19] = state; } + void pia30_cb2_w(int state) { m_io_outputs[16] = state; } void lamp0_w(u8 data); void lamp1_w(u8 data); u8 display_strobe_r(); diff --git a/src/mame/pinball/flicker.cpp b/src/mame/pinball/flicker.cpp index 9659c406267..9665416ffdf 100644 --- a/src/mame/pinball/flicker.cpp +++ b/src/mame/pinball/flicker.cpp @@ -75,8 +75,8 @@ private: void rom1_out(u8 data) { m_rom1_output = data; } u8 rom2_in(); - DECLARE_WRITE_LINE_MEMBER(cm_ram1_w); - DECLARE_WRITE_LINE_MEMBER(cm_ram2_w); + void cm_ram1_w(int state); + void cm_ram2_w(int state); void flicker_memory(address_map &map); void flicker_ram_ports(address_map &map); @@ -288,7 +288,7 @@ u8 flicker_state::rom2_in() } -WRITE_LINE_MEMBER(flicker_state::cm_ram1_w) +void flicker_state::cm_ram1_w(int state) { static constexpr u8 led_digits[16] = { 0x3f, 0x06, 0x5b, 0x4f, 0x66, 0x6d, 0x7d, 0x07, 0x7f, 0x6f, 0, 0, 0, 0, 0, 0 }; static constexpr char const *const lamp_matrix[][4] = { @@ -332,7 +332,7 @@ WRITE_LINE_MEMBER(flicker_state::cm_ram1_w) } -WRITE_LINE_MEMBER(flicker_state::cm_ram2_w) +void flicker_state::cm_ram2_w(int state) { if (!m_cm_ram2 && !state && (m_relay_drive != m_ram0_output)) { diff --git a/src/mame/pinball/gts3.cpp b/src/mame/pinball/gts3.cpp index e37fdcc61e2..bd68d39f788 100644 --- a/src/mame/pinball/gts3.cpp +++ b/src/mame/pinball/gts3.cpp @@ -101,7 +101,7 @@ private: void solenoid_w(offs_t, u8); void u4b_w(u8 data); void u5a_w(u8 data); - DECLARE_WRITE_LINE_MEMBER(nmi_w); + void nmi_w(int state); void mem_map(address_map &map); bool m_dispclk = false; bool m_lampclk = false; @@ -239,7 +239,7 @@ INPUT_CHANGED_MEMBER( gts3_state::test_inp ) } // This trampoline needed; WRITELINE("maincpu", m65c02_device, nmi_line) does not work -WRITE_LINE_MEMBER( gts3_state::nmi_w ) +void gts3_state::nmi_w(int state) { m_maincpu->set_input_line(INPUT_LINE_NMI, (state) ? CLEAR_LINE : HOLD_LINE); } diff --git a/src/mame/pinball/gts3a.cpp b/src/mame/pinball/gts3a.cpp index 224bec81a13..7cd5dcc2cde 100644 --- a/src/mame/pinball/gts3a.cpp +++ b/src/mame/pinball/gts3a.cpp @@ -97,8 +97,8 @@ private: void u5a_w(u8 data); u8 dmd_r(); void dmd_w(u8 data); - DECLARE_WRITE_LINE_MEMBER(nmi_w); - DECLARE_WRITE_LINE_MEMBER(crtc_vs); + void nmi_w(int state); + void crtc_vs(int state); MC6845_UPDATE_ROW(crtc_update_row); void palette_init(palette_device &palette); required_device m_palette; @@ -284,7 +284,7 @@ INPUT_CHANGED_MEMBER( gts3a_state::test_inp ) } // This trampoline needed; WRITELINE("maincpu", m65c02_device, nmi_line) does not work -WRITE_LINE_MEMBER( gts3a_state::nmi_w ) +void gts3a_state::nmi_w(int state) { m_maincpu->set_input_line(INPUT_LINE_NMI, (state) ? CLEAR_LINE : HOLD_LINE); } @@ -401,7 +401,7 @@ MC6845_UPDATE_ROW( gts3a_state::crtc_update_row ) } } -WRITE_LINE_MEMBER( gts3a_state::crtc_vs ) +void gts3a_state::crtc_vs(int state) { if (state) //m_dmdcpu->set_input_line(INPUT_LINE_NMI, HOLD_LINE); diff --git a/src/mame/pinball/hankin.cpp b/src/mame/pinball/hankin.cpp index dcb68d89718..8394754ad14 100644 --- a/src/mame/pinball/hankin.cpp +++ b/src/mame/pinball/hankin.cpp @@ -60,13 +60,13 @@ protected: virtual void machine_reset() override; private: - DECLARE_WRITE_LINE_MEMBER(ic10_ca2_w); - DECLARE_WRITE_LINE_MEMBER(ic10_cb2_w); - DECLARE_WRITE_LINE_MEMBER(ic11_ca2_w); - DECLARE_WRITE_LINE_MEMBER(ic11_cb2_w); - DECLARE_WRITE_LINE_MEMBER(ic2_ca2_w); - DECLARE_WRITE_LINE_MEMBER(ic2_cb2_w); - DECLARE_WRITE_LINE_MEMBER(clock_w); + void ic10_ca2_w(int state); + void ic10_cb2_w(int state); + void ic11_ca2_w(int state); + void ic11_cb2_w(int state); + void ic2_ca2_w(int state); + void ic2_cb2_w(int state); + void clock_w(int state); void ic10_a_w(u8 data); void ic10_b_w(u8 data); void ic11_a_w(u8 data); @@ -325,14 +325,14 @@ void hankin_state::ic10_b_w(u8 data) // also sound data } -WRITE_LINE_MEMBER( hankin_state::ic10_ca2_w ) +void hankin_state::ic10_ca2_w(int state) { m_io_leds[0] = state ? 0 : 1; // also sound strobe m_ic2->ca1_w(state); } -WRITE_LINE_MEMBER( hankin_state::ic10_cb2_w ) +void hankin_state::ic10_cb2_w(int state) { // solenoid strobe m_ic10_cb2 = state; @@ -376,7 +376,7 @@ u8 hankin_state::ic11_b_r() return data; } -WRITE_LINE_MEMBER( hankin_state::ic11_ca2_w ) +void hankin_state::ic11_ca2_w(int state) { m_ic11_ca2 = state; if (!state) @@ -384,7 +384,7 @@ WRITE_LINE_MEMBER( hankin_state::ic11_ca2_w ) } // lamp strobe -WRITE_LINE_MEMBER( hankin_state::ic11_cb2_w ) +void hankin_state::ic11_cb2_w(int state) { m_ic11_cb2 = state; // Todo: no lamps are ever activated at this moment, to fix @@ -398,7 +398,7 @@ WRITE_LINE_MEMBER( hankin_state::ic11_cb2_w ) } // zero-cross detection -WRITE_LINE_MEMBER( hankin_state::clock_w ) +void hankin_state::clock_w(int state) { m_ic11->cb1_w(state); } @@ -505,13 +505,13 @@ void hankin_state::ic2_b_w(u8 data) } // low to divide 555 by 2 -WRITE_LINE_MEMBER( hankin_state::ic2_ca2_w ) +void hankin_state::ic2_ca2_w(int state) { m_ic2_ca2 = state; } // low to enable 7493 dividers -WRITE_LINE_MEMBER( hankin_state::ic2_cb2_w ) +void hankin_state::ic2_cb2_w(int state) { m_ic2_cb2 = state; } diff --git a/src/mame/pinball/idsa.cpp b/src/mame/pinball/idsa.cpp index 675a23c30db..331e00ae0a0 100644 --- a/src/mame/pinball/idsa.cpp +++ b/src/mame/pinball/idsa.cpp @@ -59,7 +59,7 @@ public: void idsa(machine_config &config); private: - DECLARE_WRITE_LINE_MEMBER(clock_w); + void clock_w(int state); uint8_t portb0_r(offs_t offset); void port80_w(uint8_t data); void port90_w(uint8_t data); @@ -320,7 +320,7 @@ void idsa_state::ay2_b_w(uint8_t data) //logerror("%s: AY2 port B = %02X\n", machine().describe_context(), data); } -WRITE_LINE_MEMBER( idsa_state::clock_w ) +void idsa_state::clock_w(int state) { if (state) { diff --git a/src/mame/pinball/inder.cpp b/src/mame/pinball/inder.cpp index 3d92e2dbe58..f9f674788a0 100644 --- a/src/mame/pinball/inder.cpp +++ b/src/mame/pinball/inder.cpp @@ -107,9 +107,9 @@ private: void sndcmd_lapbylap_w(u8 data); void lamp_w(offs_t offset, u8 data) { for (u8 i = 0; i < 8; i++) m_io_outputs[8U+offset*8+i] = BIT(data, i); } void disp_w(offs_t offset, u8 data); - DECLARE_WRITE_LINE_MEMBER(qc7a_w); - DECLARE_WRITE_LINE_MEMBER(q9a_w); - DECLARE_WRITE_LINE_MEMBER(qc9b_w); + void qc7a_w(int state); + void q9a_w(int state); + void qc9b_w(int state); void update_mus(); void brvteam_map(address_map &map); void canasta_map(address_map &map); @@ -1280,19 +1280,19 @@ void inder_state::update_mus() m_13->ba_w(0); } -WRITE_LINE_MEMBER( inder_state::qc7a_w ) +void inder_state::qc7a_w(int state) { m_msm->reset_w(state); m_9a->clear_w(!state); m_9b->clear_w(!state); } -WRITE_LINE_MEMBER( inder_state::q9a_w ) +void inder_state::q9a_w(int state) { m_pc0 = state; } -WRITE_LINE_MEMBER( inder_state::qc9b_w ) +void inder_state::qc9b_w(int state) { m_9a->d_w(state); m_9b->d_w(state); diff --git a/src/mame/pinball/inderp.cpp b/src/mame/pinball/inderp.cpp index cb2238360d1..7ad05b7fbe9 100644 --- a/src/mame/pinball/inderp.cpp +++ b/src/mame/pinball/inderp.cpp @@ -54,7 +54,7 @@ public: void init_1player(); private: - DECLARE_WRITE_LINE_MEMBER(clock_tick); + void clock_tick(int state); u8 m_key_row = 0U; u16 m_t_c = 0U; u8 m_segment[5]{}; @@ -297,7 +297,7 @@ u16 inderp_state::seg8to14(u16 data) return bitswap<10>(data,7,7,6,6,5,4,3,2,1,0); } -WRITE_LINE_MEMBER( inderp_state::clock_tick ) +void inderp_state::clock_tick(int state) { m_t_c++; if (m_t_c == 0x173) diff --git a/src/mame/pinball/jeutel.cpp b/src/mame/pinball/jeutel.cpp index de7894fdfc8..459851393f6 100644 --- a/src/mame/pinball/jeutel.cpp +++ b/src/mame/pinball/jeutel.cpp @@ -78,7 +78,7 @@ private: void tmaddr_w(u8 data); void tminc_w(u8); u8 tmdata_r(); - DECLARE_WRITE_LINE_MEMBER(clock_w); + void clock_w(int state); void cpu2_map(address_map &map); void audio_main_map(address_map &map); void audio_io_map(address_map &map); @@ -430,7 +430,7 @@ void jeutel_state::machine_reset() m_tmbit = 0U; } -WRITE_LINE_MEMBER( jeutel_state::clock_w ) +void jeutel_state::clock_w(int state) { m_cpu2->set_input_line(0, (state) ? ASSERT_LINE : CLEAR_LINE); if (m_cpu2->state_int(Z80_HALT)) diff --git a/src/mame/pinball/joctronic.cpp b/src/mame/pinball/joctronic.cpp index 7e21064daf6..eaf11880fa3 100644 --- a/src/mame/pinball/joctronic.cpp +++ b/src/mame/pinball/joctronic.cpp @@ -74,7 +74,7 @@ private: u8 soundlatch_nmi_r(); void resint_w(u8 data); void slalom03_oki_bank_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(vck_w); + void vck_w(int state); virtual void machine_start() override; virtual void machine_reset() override; @@ -272,7 +272,7 @@ void joctronic_state::slalom03_oki_bank_w(uint8_t data) m_oki->reset_w(BIT(data, 0)); } -WRITE_LINE_MEMBER(joctronic_state::vck_w) +void joctronic_state::vck_w(int state) { if (state) { diff --git a/src/mame/pinball/jp.cpp b/src/mame/pinball/jp.cpp index 75ba745abe8..95bf1416ce0 100644 --- a/src/mame/pinball/jp.cpp +++ b/src/mame/pinball/jp.cpp @@ -85,13 +85,13 @@ private: u8 portb_r(); void out1_w(offs_t offset, u8 data); void out2_w(offs_t offset, u8 data); - DECLARE_WRITE_LINE_MEMBER(disp_data_w); - DECLARE_WRITE_LINE_MEMBER(disp_clock_w); - DECLARE_WRITE_LINE_MEMBER(disp_strobe_w); - DECLARE_WRITE_LINE_MEMBER(row_w); + void disp_data_w(int state); + void disp_clock_w(int state); + void disp_strobe_w(int state); + void row_w(int state); void sample_bank_w(u8 data); void adpcm_reset_w(u8 data); - DECLARE_WRITE_LINE_MEMBER(vck_w); + void vck_w(int state); IRQ_CALLBACK_MEMBER(sound_int_cb); void main_map(address_map &map); @@ -273,15 +273,15 @@ void jp_state::out2_w(offs_t offset, u8 data) } } -WRITE_LINE_MEMBER(jp_state::row_w) +void jp_state::row_w(int state) { } -WRITE_LINE_MEMBER(jp_state::disp_data_w) +void jp_state::disp_data_w(int state) { } -WRITE_LINE_MEMBER(jp_state::disp_clock_w) +void jp_state::disp_clock_w(int state) { if (state) { @@ -292,7 +292,7 @@ WRITE_LINE_MEMBER(jp_state::disp_clock_w) update_display(); } -WRITE_LINE_MEMBER(jp_state::disp_strobe_w) +void jp_state::disp_strobe_w(int state) { if (state) update_display(); @@ -461,7 +461,7 @@ void jp_state::adpcm_reset_w(u8 data) m_msm->reset_w(BIT(data, 0)); } -WRITE_LINE_MEMBER(jp_state::vck_w) +void jp_state::vck_w(int state) { if (state) { diff --git a/src/mame/pinball/ltd.cpp b/src/mame/pinball/ltd.cpp index 004ba3f13f6..b220bb55123 100644 --- a/src/mame/pinball/ltd.cpp +++ b/src/mame/pinball/ltd.cpp @@ -109,7 +109,7 @@ private: u8 ram_r(offs_t); void ram_w(offs_t, u8); u8 sw_r(offs_t offset); - DECLARE_WRITE_LINE_MEMBER(irq_w); + void irq_w(int state); void ltd3_map(address_map &map); u8 m_game = 0; u8 m_ram[0x80]{}; @@ -532,7 +532,7 @@ void ltd4_state::machine_reset() mr_common(); } -WRITE_LINE_MEMBER( ltd3_state::irq_w ) +void ltd3_state::irq_w(int state) { // Using /Q output m_maincpu->set_input_line(M6802_IRQ_LINE, !state ? CLEAR_LINE : ASSERT_LINE); diff --git a/src/mame/pinball/macp.cpp b/src/mame/pinball/macp.cpp index 696aea46ed6..233076b02aa 100644 --- a/src/mame/pinball/macp.cpp +++ b/src/mame/pinball/macp.cpp @@ -58,8 +58,8 @@ public: void io32k_map(address_map &map); private: - DECLARE_WRITE_LINE_MEMBER(clock_tick); - DECLARE_WRITE_LINE_MEMBER(irq_w); + void clock_tick(int state); + void irq_w(int state); void scanlines_w(u8); void digit_w(u8); void ay0_a_w(u8); @@ -298,12 +298,12 @@ u8 macp_state::ay1_b_r() return 0x7f | (m_relay_ctrl ? 0 : 0x80); // Temporary for testing } -WRITE_LINE_MEMBER( macp_state::irq_w ) +void macp_state::irq_w(int state) { m_maincpu->set_input_line(INPUT_LINE_IRQ0, state ? ASSERT_LINE : CLEAR_LINE); } -WRITE_LINE_MEMBER( macp_state::clock_tick ) +void macp_state::clock_tick(int state) { if (state) { diff --git a/src/mame/pinball/micropin.cpp b/src/mame/pinball/micropin.cpp index a14b38208b8..3987d2ac6cc 100644 --- a/src/mame/pinball/micropin.cpp +++ b/src/mame/pinball/micropin.cpp @@ -82,8 +82,8 @@ private: void pia51_w(offs_t offset, u8 data); u8 p51b_r(); void sol_w(u8 data); - DECLARE_WRITE_LINE_MEMBER(p50ca2_w); - DECLARE_WRITE_LINE_MEMBER(p51ca2_w); + void p50ca2_w(int state); + void p51ca2_w(int state); void sw_w(u8 data); void lamp_w(u8 data); void p50a_w(u8 data); @@ -112,7 +112,7 @@ public: void pent8085(machine_config &config); private: - DECLARE_WRITE_LINE_MEMBER(clock_w); + void clock_w(int state); void disp_w(offs_t, u8); void io_map(address_map &map); void mem_map(address_map &map); @@ -366,7 +366,7 @@ void pent6800_state::p50b_w(u8 data) } // round LEDs on score panel -WRITE_LINE_MEMBER( pent6800_state::p50ca2_w ) +void pent6800_state::p50ca2_w(int state) { if ((!state) && (m_row < 8)) { @@ -387,7 +387,7 @@ void pent6800_state::p51a_w(u8 data) } // Sound on/off -WRITE_LINE_MEMBER( pent6800_state::p51ca2_w ) +void pent6800_state::p51ca2_w(int state) { m_beep->set_state(state); } @@ -421,7 +421,7 @@ void pent8085_state::disp_w(offs_t offset, u8 data) m_digits[offset+20] = patterns[BIT(~data, 4, 4)]; } -WRITE_LINE_MEMBER( pent8085_state::clock_w ) +void pent8085_state::clock_w(int state) { if (state) m_v2cpu->set_input_line(I8085_RST55_LINE, HOLD_LINE); diff --git a/src/mame/pinball/mrgame.cpp b/src/mame/pinball/mrgame.cpp index 7dd4db6dd1c..aff5a7c0200 100644 --- a/src/mame/pinball/mrgame.cpp +++ b/src/mame/pinball/mrgame.cpp @@ -113,17 +113,17 @@ private: void video_w(u8 data); void videoram_w(offs_t offset, u8 data); void videoattr_w(offs_t offset, u8 data); - template DECLARE_WRITE_LINE_MEMBER(video_bank_w); - DECLARE_WRITE_LINE_MEMBER(intst_w); - DECLARE_WRITE_LINE_MEMBER(nmi_intst_w); - DECLARE_WRITE_LINE_MEMBER(flip_w); + template void video_bank_w(int state); + void intst_w(int state); + void nmi_intst_w(int state); + void flip_w(int state); u8 col_r(); u8 sound_r(); u8 porta_r(); u8 portc_r(); u8 rsw_r(); - DECLARE_WRITE_LINE_MEMBER(vblank_int_w); - DECLARE_WRITE_LINE_MEMBER(vblank_nmi_w); + void vblank_int_w(int state); + void vblank_nmi_w(int state); TIMER_DEVICE_CALLBACK_MEMBER(irq_timer); TILE_GET_INFO_MEMBER(get_tile_info); uint32_t screen_update_mrgame(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); @@ -432,28 +432,28 @@ void mrgame_state::videoattr_w(offs_t offset, u8 data) } template -WRITE_LINE_MEMBER(mrgame_state::video_bank_w) +void mrgame_state::video_bank_w(int state) { m_gfx_bank &= 0x0f & ~(u8(1) << Bit); m_gfx_bank |= u8(state ? 1 : 0) << Bit; m_tilemap->mark_all_dirty(); } -WRITE_LINE_MEMBER(mrgame_state::intst_w) +void mrgame_state::intst_w(int state) { m_intst = state; if (!state) m_videocpu->set_input_line(INPUT_LINE_IRQ0, CLEAR_LINE); } -WRITE_LINE_MEMBER(mrgame_state::nmi_intst_w) +void mrgame_state::nmi_intst_w(int state) { m_intst = state; if (!state) m_videocpu->set_input_line(INPUT_LINE_NMI, CLEAR_LINE); } -WRITE_LINE_MEMBER(mrgame_state::flip_w) +void mrgame_state::flip_w(int state) { m_flip = state; m_tilemap->mark_all_dirty(); @@ -530,13 +530,13 @@ void mrgame_state::machine_reset() m_row = 0; } -WRITE_LINE_MEMBER(mrgame_state::vblank_int_w) +void mrgame_state::vblank_int_w(int state) { if (state && m_intst) m_videocpu->set_input_line(INPUT_LINE_IRQ0, ASSERT_LINE); } -WRITE_LINE_MEMBER(mrgame_state::vblank_nmi_w) +void mrgame_state::vblank_nmi_w(int state) { if (state && m_intst) m_videocpu->set_input_line(INPUT_LINE_NMI, ASSERT_LINE); diff --git a/src/mame/pinball/pinsnd88.cpp b/src/mame/pinball/pinsnd88.cpp index c556353844c..55db48109c3 100644 --- a/src/mame/pinball/pinsnd88.cpp +++ b/src/mame/pinball/pinsnd88.cpp @@ -179,7 +179,7 @@ void pinsnd88_device::sync_w(uint8_t data) machine().scheduler().synchronize(timer_expired_delegate(FUNC(pinsnd88_device::deferred_sync_w),this), 0); } -WRITE_LINE_MEMBER(pinsnd88_device::strobe_w) +void pinsnd88_device::strobe_w(int state) { m_inputlatch->write(m_data_in); } @@ -189,7 +189,7 @@ void pinsnd88_device::data_w(uint8_t data) m_data_in = data; } -WRITE_LINE_MEMBER(pinsnd88_device::resetq_w) +void pinsnd88_device::resetq_w(int state) { if ((m_old_resetq_state != CLEAR_LINE) && (state == CLEAR_LINE)) { diff --git a/src/mame/pinball/pinsnd88.h b/src/mame/pinball/pinsnd88.h index 3afd7681bb1..4825831d26c 100644 --- a/src/mame/pinball/pinsnd88.h +++ b/src/mame/pinball/pinsnd88.h @@ -27,9 +27,9 @@ public: // note to keep synchronization working, the host machine should have synchronization timer expired delegates // if possible, before writing to the following things: - DECLARE_WRITE_LINE_MEMBER(strobe_w); // external write to board (J1 pin 13) + void strobe_w(int state); // external write to board (J1 pin 13) void data_w(uint8_t data); // external write to board data bus (J1 pins 3 thru 10 for D0-D7) - DECLARE_WRITE_LINE_MEMBER(resetq_w); // external write to board /RESET (J1 pin 18) + void resetq_w(int state); // external write to board /RESET (J1 pin 18) // callbacks auto syncq_cb() { return m_syncq_cb.bind(); } diff --git a/src/mame/pinball/play_1.cpp b/src/mame/pinball/play_1.cpp index 542a0754c48..f79f88b9ef9 100644 --- a/src/mame/pinball/play_1.cpp +++ b/src/mame/pinball/play_1.cpp @@ -63,12 +63,12 @@ private: void port04_w(u8 data); void port05_w(u8 data); void port06_w(u8 data); - DECLARE_READ_LINE_MEMBER(clear_r); - DECLARE_READ_LINE_MEMBER(wait_r); - DECLARE_READ_LINE_MEMBER(ef2_r); - DECLARE_READ_LINE_MEMBER(ef3_r); - DECLARE_READ_LINE_MEMBER(ef4_r); - DECLARE_WRITE_LINE_MEMBER(clock_w); + int clear_r(); + int wait_r(); + int ef2_r(); + int ef3_r(); + int ef4_r(); + void clock_w(int state); void chance_map(address_map &map); void io_map(address_map &map); @@ -507,7 +507,7 @@ void play_1_state::port06_w(u8 data) m_io_outputs[t+i] = BIT(m_segment, i); } -READ_LINE_MEMBER( play_1_state::clear_r ) +int play_1_state::clear_r() { // A hack to make the machine reset itself on boot if (m_resetcnt < 0xff) @@ -515,7 +515,7 @@ READ_LINE_MEMBER( play_1_state::clear_r ) return (m_resetcnt < 0xf0) ? 0 : 1; } -READ_LINE_MEMBER( play_1_state::wait_r ) +int play_1_state::wait_r() { // Any OUT instruction forces a 60-100msec wait if (m_waitcnt < 0x180) @@ -527,22 +527,22 @@ READ_LINE_MEMBER( play_1_state::wait_r ) return 1; } -READ_LINE_MEMBER( play_1_state::ef2_r ) +int play_1_state::ef2_r() { return !BIT(m_io_keyboard[0]->read(), 0); // 1 or 3 games dip (1=1 game) inverted } -READ_LINE_MEMBER( play_1_state::ef3_r ) +int play_1_state::ef3_r() { return !BIT(m_io_keyboard[0]->read(), 1); // 3 or 5 balls dip (1=5 balls) inverted } -READ_LINE_MEMBER( play_1_state::ef4_r ) +int play_1_state::ef4_r() { return !BIT(m_io_keyboard[0]->read(), 2); // extra ball or game dip (1=extra ball) inverted } -WRITE_LINE_MEMBER( play_1_state::clock_w ) +void play_1_state::clock_w(int state) { if (state) { diff --git a/src/mame/pinball/play_2.cpp b/src/mame/pinball/play_2.cpp index 9fd443f25ed..0ecf6b3e0fa 100644 --- a/src/mame/pinball/play_2.cpp +++ b/src/mame/pinball/play_2.cpp @@ -83,11 +83,11 @@ protected: u8 port05_r(); void port06_w(u8 data); void port07_w(u8 data); - DECLARE_READ_LINE_MEMBER(clear_r); - DECLARE_READ_LINE_MEMBER(ef1_r); - DECLARE_READ_LINE_MEMBER(ef4_r); + int clear_r(); + int ef1_r(); + int ef4_r(); void clockcnt_w(u16 data); - DECLARE_WRITE_LINE_MEMBER(clock2_w); + void clock2_w(int state); TIMER_DEVICE_CALLBACK_MEMBER(snd_off_callback) { m_1863->set_output_gain(0, 0.00); } void play_2_io(address_map &map); @@ -360,7 +360,7 @@ void play_2_state::port07_w(u8 data) m_io_outputs[8+i*3+j] = (BIT(t, j) && (data == i)) ? 1 : 0; } -READ_LINE_MEMBER( play_2_state::clear_r ) +int play_2_state::clear_r() { // A hack to make the machine reset itself on boot if (m_resetcnt < 0xff) @@ -368,12 +368,12 @@ READ_LINE_MEMBER( play_2_state::clear_r ) return (m_resetcnt < 0xf0) ? 0 : 1; } -READ_LINE_MEMBER( play_2_state::ef1_r ) +int play_2_state::ef1_r() { return (!BIT(m_4020->count(), 10)); // inverted } -READ_LINE_MEMBER( play_2_state::ef4_r ) +int play_2_state::ef4_r() { return BIT(m_io_keyboard[7]->read(), 0); // inverted test button - doesn't seem to do anything } @@ -384,7 +384,7 @@ void play_2_state::clockcnt_w(u16 data) m_4013b->preset_w(!BIT(data, 10)); // Q10 output } -WRITE_LINE_MEMBER( play_2_state::clock2_w ) +void play_2_state::clock2_w(int state) { m_4013b->clock_w(state); m_maincpu->ef3_w(state); // inverted diff --git a/src/mame/pinball/play_3.cpp b/src/mame/pinball/play_3.cpp index e2f3537fad9..0c410f805ad 100644 --- a/src/mame/pinball/play_3.cpp +++ b/src/mame/pinball/play_3.cpp @@ -110,15 +110,15 @@ private: void port06_w(u8 data); void flashman_port06_w(u8 data); void port07_w(u8 data); - DECLARE_READ_LINE_MEMBER(clear_r); - DECLARE_READ_LINE_MEMBER(ef1_r); - DECLARE_READ_LINE_MEMBER(ef4_r); + int clear_r(); + int ef1_r(); + int ef4_r(); void clockcnt_w(u16 data); - DECLARE_WRITE_LINE_MEMBER(clock_w); - DECLARE_WRITE_LINE_MEMBER(clock2_w); + void clock_w(int state); + void clock2_w(int state); void port01_a_w(u8 data); u8 port02_a_r(); - DECLARE_READ_LINE_MEMBER(clear_a_r); + int clear_a_r(); void terrlake_io(address_map &map); void audio_io_map(address_map &map); @@ -467,7 +467,7 @@ u8 play_3_state::port02_a_r() return m_soundlatch; } -READ_LINE_MEMBER( play_3_state::clear_r ) +int play_3_state::clear_r() { // A hack to make the machine reset itself on boot if (m_resetcnt < 0xff) @@ -475,7 +475,7 @@ READ_LINE_MEMBER( play_3_state::clear_r ) return (m_resetcnt < 0xf0) ? 0 : 1; } -READ_LINE_MEMBER( play_3_state::clear_a_r ) +int play_3_state::clear_a_r() { // A hack to make the machine reset itself on boot if (m_resetcnt_a < 0xff) @@ -483,12 +483,12 @@ READ_LINE_MEMBER( play_3_state::clear_a_r ) return (m_resetcnt_a < 0xf0) ? 0 : 1; } -READ_LINE_MEMBER( play_3_state::ef1_r ) +int play_3_state::ef1_r() { return (!BIT(m_4020->count(), 10)); // inverted } -READ_LINE_MEMBER( play_3_state::ef4_r ) +int play_3_state::ef4_r() { return BIT(m_io_keyboard[9]->read(), 0); // inverted test/reset button - doesn't seem to do anything } @@ -512,7 +512,7 @@ void play_3_state::clockcnt_w(u16 data) } } -WRITE_LINE_MEMBER( play_3_state::clock2_w ) +void play_3_state::clock2_w(int state) { m_4013b->clock_w(state); m_maincpu->ef3_w(state); // inverted diff --git a/src/mame/pinball/s11.cpp b/src/mame/pinball/s11.cpp index 8cb18decb89..6d7ef812bff 100644 --- a/src/mame/pinball/s11.cpp +++ b/src/mame/pinball/s11.cpp @@ -202,13 +202,13 @@ INPUT_CHANGED_MEMBER( s11_state::audio_nmi ) m_audiocpu->pulse_input_line(INPUT_LINE_NMI, attotime::zero); } -WRITE_LINE_MEMBER( s11_state::pia_irq ) +void s11_state::pia_irq(int state) { m_pia_irq_active = state; m_mainirq->in_w<1>(state); } -WRITE_LINE_MEMBER( s11_state::main_irq ) +void s11_state::main_irq(int state) { // handle the fact that the Advance and Up/Down switches are gated by the combined timer/pia irq signal if(state == CLEAR_LINE) @@ -229,7 +229,7 @@ void s11_state::sound_w(u8 data) m_sound_data = data; } -WRITE_LINE_MEMBER( s11_state::pia21_ca2_w ) +void s11_state::pia21_ca2_w(int state) { // sound ns if(m_pias) @@ -353,7 +353,7 @@ void s11_state::pia34_pb_w(u8 data) m_ps88->data_w(data); } -WRITE_LINE_MEMBER( s11_state::pia34_cb2_w ) +void s11_state::pia34_cb2_w(int state) { if(m_bg) m_bg->ctrl_w(state); // MCB2 through CPU interface @@ -367,14 +367,14 @@ void s11_state::bank_w(u8 data) membank("bank1")->set_entry(BIT(data, 0)); } -WRITE_LINE_MEMBER( s11_state::pias_ca2_w ) +void s11_state::pias_ca2_w(int state) { // speech clock if(m_hc55516) m_hc55516->clock_w(state); } -WRITE_LINE_MEMBER( s11_state::pias_cb2_w ) +void s11_state::pias_cb2_w(int state) { // speech data if(m_hc55516) diff --git a/src/mame/pinball/s11.h b/src/mame/pinball/s11.h index 5ffcdaf9bbe..7742bf8b524 100644 --- a/src/mame/pinball/s11.h +++ b/src/mame/pinball/s11.h @@ -96,22 +96,22 @@ protected: void pia2c_pb_w(u8 data); void pia34_pa_w(u8 data); void pia34_pb_w(u8 data); - DECLARE_WRITE_LINE_MEMBER(pia34_cb2_w); - - DECLARE_WRITE_LINE_MEMBER(pias_ca2_w); - DECLARE_WRITE_LINE_MEMBER(pias_cb2_w); - DECLARE_WRITE_LINE_MEMBER(pia21_ca2_w); - DECLARE_WRITE_LINE_MEMBER(pia21_cb2_w) { } // enable solenoids - DECLARE_WRITE_LINE_MEMBER(pia24_ca2_w) { m_io_outputs[20] = state; } // E - DECLARE_WRITE_LINE_MEMBER(pia24_cb2_w) { m_io_outputs[21] = state; } // F - DECLARE_WRITE_LINE_MEMBER(pia28_ca2_w) { } // comma3&4 (not used) - DECLARE_WRITE_LINE_MEMBER(pia28_cb2_w) { } // comma1&2 (not used) - DECLARE_WRITE_LINE_MEMBER(pia2c_ca2_w) { m_io_outputs[17] = state; } // B - DECLARE_WRITE_LINE_MEMBER(pia2c_cb2_w) { m_io_outputs[18] = state; } // C - DECLARE_WRITE_LINE_MEMBER(pia30_ca2_w) { m_io_outputs[16] = state; } // D - DECLARE_WRITE_LINE_MEMBER(pia30_cb2_w) { m_io_outputs[19] = state; } // A - DECLARE_WRITE_LINE_MEMBER(pia_irq); - DECLARE_WRITE_LINE_MEMBER(main_irq); + void pia34_cb2_w(int state); + + void pias_ca2_w(int state); + void pias_cb2_w(int state); + void pia21_ca2_w(int state); + void pia21_cb2_w(int state) { } // enable solenoids + void pia24_ca2_w(int state) { m_io_outputs[20] = state; } // E + void pia24_cb2_w(int state) { m_io_outputs[21] = state; } // F + void pia28_ca2_w(int state) { } // comma3&4 (not used) + void pia28_cb2_w(int state) { } // comma1&2 (not used) + void pia2c_ca2_w(int state) { m_io_outputs[17] = state; } // B + void pia2c_cb2_w(int state) { m_io_outputs[18] = state; } // C + void pia30_ca2_w(int state) { m_io_outputs[16] = state; } // D + void pia30_cb2_w(int state) { m_io_outputs[19] = state; } // A + void pia_irq(int state); + void main_irq(int state); u8 switch_r(); void switch_w(u8 data); diff --git a/src/mame/pinball/s3.cpp b/src/mame/pinball/s3.cpp index d6f766f704f..5cbc77d43ba 100644 --- a/src/mame/pinball/s3.cpp +++ b/src/mame/pinball/s3.cpp @@ -103,14 +103,14 @@ protected: u8 m_lamp_data = 0; u8 m_game = 0; bool m_disco = false; - DECLARE_WRITE_LINE_MEMBER(pia22_ca2_w) { m_io_outputs[20] = state; } //ST5 - DECLARE_WRITE_LINE_MEMBER(pia22_cb2_w) { } //ST-solenoids enable - DECLARE_WRITE_LINE_MEMBER(pia24_ca2_w) { m_io_outputs[17] = state; } //ST2 - DECLARE_WRITE_LINE_MEMBER(pia24_cb2_w) { m_io_outputs[16] = state; } //ST1 - DECLARE_WRITE_LINE_MEMBER(pia28_ca2_w) { } //diag leds enable - DECLARE_WRITE_LINE_MEMBER(pia28_cb2_w) { m_io_outputs[21] = state; } //ST6 - DECLARE_WRITE_LINE_MEMBER(pia30_ca2_w) { m_io_outputs[19] = state; } //ST4 - DECLARE_WRITE_LINE_MEMBER(pia30_cb2_w) { m_io_outputs[18] = state; } //ST3 + void pia22_ca2_w(int state) { m_io_outputs[20] = state; } //ST5 + void pia22_cb2_w(int state) { } //ST-solenoids enable + void pia24_ca2_w(int state) { m_io_outputs[17] = state; } //ST2 + void pia24_cb2_w(int state) { m_io_outputs[16] = state; } //ST1 + void pia28_ca2_w(int state) { } //diag leds enable + void pia28_cb2_w(int state) { m_io_outputs[21] = state; } //ST6 + void pia30_ca2_w(int state) { m_io_outputs[19] = state; } //ST4 + void pia30_cb2_w(int state) { m_io_outputs[18] = state; } //ST3 TIMER_DEVICE_CALLBACK_MEMBER(irq); void main_map(address_map &map); diff --git a/src/mame/pinball/s4.cpp b/src/mame/pinball/s4.cpp index 1c94132ae43..62bbdbb222c 100644 --- a/src/mame/pinball/s4.cpp +++ b/src/mame/pinball/s4.cpp @@ -93,15 +93,15 @@ private: bool m_data_ok = false; u8 m_lamp_data = 0; bool m_irq_in_progress = false; - DECLARE_WRITE_LINE_MEMBER(pia22_ca2_w) { m_io_outputs[20] = state; } //ST5 - DECLARE_WRITE_LINE_MEMBER(pia22_cb2_w) { } //ST-solenoids enable - DECLARE_WRITE_LINE_MEMBER(pia24_ca2_w) { m_io_outputs[17] = state; } //ST2 - DECLARE_WRITE_LINE_MEMBER(pia24_cb2_w) { m_io_outputs[16] = state; } //ST1 - DECLARE_WRITE_LINE_MEMBER(pia28_ca2_w) { } //diag leds enable - DECLARE_WRITE_LINE_MEMBER(pia28_cb2_w) { m_io_outputs[21] = state; } //ST6 - DECLARE_WRITE_LINE_MEMBER(pia30_ca2_w) { m_io_outputs[19] = state; } //ST4 - DECLARE_WRITE_LINE_MEMBER(pia30_cb2_w) { m_io_outputs[18] = state; } //ST3 - DECLARE_WRITE_LINE_MEMBER(irq_w); + void pia22_ca2_w(int state) { m_io_outputs[20] = state; } //ST5 + void pia22_cb2_w(int state) { } //ST-solenoids enable + void pia24_ca2_w(int state) { m_io_outputs[17] = state; } //ST2 + void pia24_cb2_w(int state) { m_io_outputs[16] = state; } //ST1 + void pia28_ca2_w(int state) { } //diag leds enable + void pia28_cb2_w(int state) { m_io_outputs[21] = state; } //ST6 + void pia30_ca2_w(int state) { m_io_outputs[19] = state; } //ST4 + void pia30_cb2_w(int state) { m_io_outputs[18] = state; } //ST3 + void irq_w(int state); void main_map(address_map &map); required_device m_maincpu; @@ -419,7 +419,7 @@ void s4_state::switch_w(u8 data) m_row = data; } -WRITE_LINE_MEMBER( s4_state::irq_w ) +void s4_state::irq_w(int state) { m_irq_in_progress = state; m_maincpu->set_input_line(M6802_IRQ_LINE, state ? ASSERT_LINE : CLEAR_LINE); diff --git a/src/mame/pinball/s6.cpp b/src/mame/pinball/s6.cpp index 441e3c31972..1a61023459d 100644 --- a/src/mame/pinball/s6.cpp +++ b/src/mame/pinball/s6.cpp @@ -109,15 +109,15 @@ private: u8 dips_r(); u8 switch_r(); void switch_w(u8 data); - DECLARE_WRITE_LINE_MEMBER(pia22_ca2_w) { m_io_outputs[20] = state; } //ST5 - DECLARE_WRITE_LINE_MEMBER(pia22_cb2_w) { } //ST-solenoids enable - DECLARE_WRITE_LINE_MEMBER(pia24_ca2_w) { m_io_outputs[17] = state; } //ST2 - DECLARE_WRITE_LINE_MEMBER(pia24_cb2_w) { m_io_outputs[16] = state; } //ST1 - DECLARE_WRITE_LINE_MEMBER(pia28_ca2_w) { } //diag leds enable - DECLARE_WRITE_LINE_MEMBER(pia28_cb2_w) { m_io_outputs[21] = state; } //ST6 - DECLARE_WRITE_LINE_MEMBER(pia30_ca2_w) { m_io_outputs[19] = state; } //ST4 - DECLARE_WRITE_LINE_MEMBER(pia30_cb2_w) { m_io_outputs[18] = state; } //ST3 - DECLARE_WRITE_LINE_MEMBER(pia_irq); + void pia22_ca2_w(int state) { m_io_outputs[20] = state; } //ST5 + void pia22_cb2_w(int state) { } //ST-solenoids enable + void pia24_ca2_w(int state) { m_io_outputs[17] = state; } //ST2 + void pia24_cb2_w(int state) { m_io_outputs[16] = state; } //ST1 + void pia28_ca2_w(int state) { } //diag leds enable + void pia28_cb2_w(int state) { m_io_outputs[21] = state; } //ST6 + void pia30_ca2_w(int state) { m_io_outputs[19] = state; } //ST4 + void pia30_cb2_w(int state) { m_io_outputs[18] = state; } //ST3 + void pia_irq(int state); void main_map(address_map &map); @@ -415,7 +415,7 @@ void s6_state::switch_w(u8 data) m_row = data; } -WRITE_LINE_MEMBER( s6_state::pia_irq ) +void s6_state::pia_irq(int state) { if(state == CLEAR_LINE) { diff --git a/src/mame/pinball/s7.cpp b/src/mame/pinball/s7.cpp index 7e8148f3e07..02ea1ef558e 100644 --- a/src/mame/pinball/s7.cpp +++ b/src/mame/pinball/s7.cpp @@ -133,17 +133,17 @@ private: void switch_w(u8 data); u8 nvram_r(offs_t offset); void nvram_w(offs_t offset, u8 data); - DECLARE_WRITE_LINE_MEMBER(pia21_ca2_w) { } - DECLARE_WRITE_LINE_MEMBER(pia21_cb2_w) { } // enable solenoids - DECLARE_WRITE_LINE_MEMBER(pia22_ca2_w) { m_io_outputs[20] = state; } //ST5 - DECLARE_WRITE_LINE_MEMBER(pia22_cb2_w) { } //ST-solenoids enable - DECLARE_WRITE_LINE_MEMBER(pia24_ca2_w) { m_io_outputs[17] = state; } //ST2 - DECLARE_WRITE_LINE_MEMBER(pia24_cb2_w) { m_io_outputs[16] = state; } //ST1 - DECLARE_WRITE_LINE_MEMBER(pia28_ca2_w) { } //diag leds enable - DECLARE_WRITE_LINE_MEMBER(pia28_cb2_w) { m_io_outputs[21] = state; } //ST6 - DECLARE_WRITE_LINE_MEMBER(pia30_ca2_w) { m_io_outputs[19] = state; } //ST4 - DECLARE_WRITE_LINE_MEMBER(pia30_cb2_w) { m_io_outputs[18] = state; } //ST3 - DECLARE_WRITE_LINE_MEMBER(pia_irq); + void pia21_ca2_w(int state) { } + void pia21_cb2_w(int state) { } // enable solenoids + void pia22_ca2_w(int state) { m_io_outputs[20] = state; } //ST5 + void pia22_cb2_w(int state) { } //ST-solenoids enable + void pia24_ca2_w(int state) { m_io_outputs[17] = state; } //ST2 + void pia24_cb2_w(int state) { m_io_outputs[16] = state; } //ST1 + void pia28_ca2_w(int state) { } //diag leds enable + void pia28_cb2_w(int state) { m_io_outputs[21] = state; } //ST6 + void pia30_ca2_w(int state) { m_io_outputs[19] = state; } //ST4 + void pia30_cb2_w(int state) { m_io_outputs[18] = state; } //ST3 + void pia_irq(int state); void main_map(address_map &map); u8 m_strobe = 0U; @@ -611,7 +611,7 @@ void s7_state::nvram_w(offs_t offset, u8 data) m_nvram[offset] = data; } -WRITE_LINE_MEMBER( s7_state::pia_irq ) +void s7_state::pia_irq(int state) { if(state == CLEAR_LINE) { diff --git a/src/mame/pinball/s8.cpp b/src/mame/pinball/s8.cpp index bade50e2bf8..c505956d57d 100644 --- a/src/mame/pinball/s8.cpp +++ b/src/mame/pinball/s8.cpp @@ -172,12 +172,12 @@ private: void sound_w(u8 data); u8 switch_r(); void switch_w(u8 data); - DECLARE_WRITE_LINE_MEMBER(pia21_ca2_w); - DECLARE_WRITE_LINE_MEMBER(pia21_cb2_w) { } // enable solenoids - DECLARE_WRITE_LINE_MEMBER(pia24_cb2_w) { m_io_outputs[16] = state; } // dummy to stop error log filling up - DECLARE_WRITE_LINE_MEMBER(pia28_ca2_w) { m_comma34 = state; } // comma3&4 - DECLARE_WRITE_LINE_MEMBER(pia28_cb2_w) { m_comma12 = state; } // comma1&2 - DECLARE_WRITE_LINE_MEMBER(pia_irq); + void pia21_ca2_w(int state); + void pia21_cb2_w(int state) { } // enable solenoids + void pia24_cb2_w(int state) { m_io_outputs[16] = state; } // dummy to stop error log filling up + void pia28_ca2_w(int state) { m_comma34 = state; } // comma3&4 + void pia28_cb2_w(int state) { m_comma12 = state; } // comma1&2 + void pia_irq(int state); void audio_map(address_map &map); void main_map(address_map &map); @@ -425,7 +425,7 @@ void s8_state::sound_w(u8 data) m_sound_data = data; } -WRITE_LINE_MEMBER( s8_state::pia21_ca2_w ) +void s8_state::pia21_ca2_w(int state) { // sound ns if (m_pias) @@ -506,7 +506,7 @@ u8 s8_state::sound_r() return m_sound_data; } -WRITE_LINE_MEMBER( s8_state::pia_irq ) +void s8_state::pia_irq(int state) { if(state == CLEAR_LINE) { diff --git a/src/mame/pinball/s9.cpp b/src/mame/pinball/s9.cpp index 0da72ce3c1f..2e7923aa299 100644 --- a/src/mame/pinball/s9.cpp +++ b/src/mame/pinball/s9.cpp @@ -84,11 +84,11 @@ private: void sol3_w(u8 data) { for (u8 i = 0; i < 8; i++) m_io_outputs[i] = BIT(data, i); }; // solenoids 0-7 u8 switch_r(); void switch_w(u8 data); - DECLARE_WRITE_LINE_MEMBER(pia21_cb2_w) { } // enable solenoids - DECLARE_WRITE_LINE_MEMBER(pia24_cb2_w) { } // dummy to stop error log filling up - DECLARE_WRITE_LINE_MEMBER(pia28_ca2_w) { m_comma34 = state; } // comma3&4 - DECLARE_WRITE_LINE_MEMBER(pia28_cb2_w) { m_comma12 = state; } // comma1&2 - DECLARE_WRITE_LINE_MEMBER(pia_irq); + void pia21_cb2_w(int state) { } // enable solenoids + void pia24_cb2_w(int state) { } // dummy to stop error log filling up + void pia28_ca2_w(int state) { m_comma34 = state; } // comma3&4 + void pia28_cb2_w(int state) { m_comma12 = state; } // comma1&2 + void pia_irq(int state); void main_map(address_map &map); @@ -295,7 +295,7 @@ void s9_state::switch_w(u8 data) m_row = data; } -WRITE_LINE_MEMBER( s9_state::pia_irq ) +void s9_state::pia_irq(int state) { if(state == CLEAR_LINE) { diff --git a/src/mame/pinball/spinb.cpp b/src/mame/pinball/spinb.cpp index ed7df7e4eb3..9215c150054 100644 --- a/src/mame/pinball/spinb.cpp +++ b/src/mame/pinball/spinb.cpp @@ -151,8 +151,8 @@ private: void disp_w(offs_t, u8 data); void update_sound_a(); void update_sound_m(); - DECLARE_WRITE_LINE_MEMBER(ic5a_w); - DECLARE_WRITE_LINE_MEMBER(ic5m_w); + void ic5a_w(int state); + void ic5m_w(int state); void spinb_palette(palette_device &palette) const; u32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); @@ -800,14 +800,14 @@ void spinb_state::update_sound_m() m_ic14m->ba_w(0); } -WRITE_LINE_MEMBER( spinb_state::ic5a_w ) +void spinb_state::ic5a_w(int state) { m_pc0a = state; m_ic5a->d_w(state); m_ic14a->select_w(state); } -WRITE_LINE_MEMBER( spinb_state::ic5m_w ) +void spinb_state::ic5m_w(int state) { m_pc0m = state; m_ic5m->d_w(state); diff --git a/src/mame/pinball/st_mp100.cpp b/src/mame/pinball/st_mp100.cpp index 203f5fb1a74..ec844c6a244 100644 --- a/src/mame/pinball/st_mp100.cpp +++ b/src/mame/pinball/st_mp100.cpp @@ -69,10 +69,10 @@ private: u8 u11_a_r(); void u11_a_w(u8 data); void u11_b_w(u8 data); - DECLARE_WRITE_LINE_MEMBER(u10_ca2_w); - DECLARE_WRITE_LINE_MEMBER(u10_cb2_w); - DECLARE_WRITE_LINE_MEMBER(u11_ca2_w); - DECLARE_WRITE_LINE_MEMBER(u11_cb2_w); + void u10_ca2_w(int state); + void u10_cb2_w(int state); + void u11_ca2_w(int state); + void u11_cb2_w(int state); void mem_map(address_map &map); u8 m_u10a = 0U; @@ -516,26 +516,26 @@ INPUT_CHANGED_MEMBER( st_mp100_state::self_test ) m_pia_u10->ca1_w(newval); } -WRITE_LINE_MEMBER( st_mp100_state::u10_ca2_w ) +void st_mp100_state::u10_ca2_w(int state) { m_u10_ca2 = state; if (!state) m_counter = 0; } -WRITE_LINE_MEMBER( st_mp100_state::u10_cb2_w ) +void st_mp100_state::u10_cb2_w(int state) { m_u10_cb2 = state; if (state) m_stored_lamp = m_u10a; } -WRITE_LINE_MEMBER( st_mp100_state::u11_ca2_w ) +void st_mp100_state::u11_ca2_w(int state) { m_io_leds[0] = state ? 0 : 1; } -WRITE_LINE_MEMBER( st_mp100_state::u11_cb2_w ) +void st_mp100_state::u11_cb2_w(int state) { m_u11_cb2 = state; } diff --git a/src/mame/pinball/st_mp200.cpp b/src/mame/pinball/st_mp200.cpp index 822e3f75320..3b5a6ea3958 100644 --- a/src/mame/pinball/st_mp200.cpp +++ b/src/mame/pinball/st_mp200.cpp @@ -117,10 +117,10 @@ private: void u11_a_w(u8 data); void u11_b_w(u8 data); u8 speech_r(offs_t offset); - DECLARE_WRITE_LINE_MEMBER(u10_ca2_w); - DECLARE_WRITE_LINE_MEMBER(u10_cb2_w); - DECLARE_WRITE_LINE_MEMBER(u11_ca2_w); - DECLARE_WRITE_LINE_MEMBER(u11_cb2_w); + void u10_ca2_w(int state); + void u10_cb2_w(int state); + void u11_ca2_w(int state); + void u11_cb2_w(int state); void mem_map(address_map &map); void sam4_map(address_map &map); @@ -390,14 +390,14 @@ INPUT_CHANGED_MEMBER( st_mp200_state::self_test ) m_pia_u10->ca1_w(newval); } -WRITE_LINE_MEMBER( st_mp200_state::u10_ca2_w ) +void st_mp200_state::u10_ca2_w(int state) { m_u10_ca2 = state; if (!state) m_counter = 0; } -WRITE_LINE_MEMBER( st_mp200_state::u10_cb2_w ) +void st_mp200_state::u10_cb2_w(int state) { m_u10_cb2 = state; if (state) @@ -412,7 +412,7 @@ WRITE_LINE_MEMBER( st_mp200_state::u10_cb2_w ) } } -WRITE_LINE_MEMBER( st_mp200_state::u11_ca2_w ) +void st_mp200_state::u11_ca2_w(int state) { m_io_leds[0] = state ? 0 : 1; @@ -436,7 +436,7 @@ WRITE_LINE_MEMBER( st_mp200_state::u11_ca2_w ) } } -WRITE_LINE_MEMBER( st_mp200_state::u11_cb2_w ) +void st_mp200_state::u11_cb2_w(int state) { m_u11_cb2 = state; } diff --git a/src/mame/pinball/stargame.cpp b/src/mame/pinball/stargame.cpp index 36fcf62f4cb..cff8bd51a45 100644 --- a/src/mame/pinball/stargame.cpp +++ b/src/mame/pinball/stargame.cpp @@ -56,7 +56,7 @@ public: void init_1() { m_game = 1; } private: - DECLARE_WRITE_LINE_MEMBER(reset2_w) { m_audiocpu->reset(); } + void reset2_w(int state) { m_audiocpu->reset(); } void ckdis_w(u8); void cdig_w(u8); void cdriv_w(offs_t, u8); diff --git a/src/mame/pinball/supstarf.cpp b/src/mame/pinball/supstarf.cpp index b9d291af5b2..b07a8703118 100644 --- a/src/mame/pinball/supstarf.cpp +++ b/src/mame/pinball/supstarf.cpp @@ -45,10 +45,10 @@ private: void psg_latch_w(offs_t offset, u8 data); void port1_w(u8 data); void port2_w(u8 data); - DECLARE_READ_LINE_MEMBER(contacts_r); - DECLARE_WRITE_LINE_MEMBER(displays_w); + int contacts_r(); + void displays_w(int state); void driver_clk_w(offs_t offset, u8 data); - DECLARE_READ_LINE_MEMBER(phase_detect_r); + int phase_detect_r(); void lights_a_w(u8 data); void lights_b_w(u8 data); @@ -147,12 +147,12 @@ void supstarf_state::port2_w(u8 data) m_latch_select = !BIT(data, 7); } -READ_LINE_MEMBER(supstarf_state::contacts_r) +int supstarf_state::contacts_r() { return 1; } -WRITE_LINE_MEMBER(supstarf_state::displays_w) +void supstarf_state::displays_w(int state) { } @@ -160,7 +160,7 @@ void supstarf_state::driver_clk_w(offs_t offset, u8 data) { } -READ_LINE_MEMBER(supstarf_state::phase_detect_r) +int supstarf_state::phase_detect_r() { return 0; } diff --git a/src/mame/pinball/taito.cpp b/src/mame/pinball/taito.cpp index 52db046497c..e6320d751ec 100644 --- a/src/mame/pinball/taito.cpp +++ b/src/mame/pinball/taito.cpp @@ -108,8 +108,8 @@ private: u8 io_r(offs_t offset); void io_w(offs_t offset, u8 data); void pia_pb_w(u8 data); - DECLARE_WRITE_LINE_MEMBER(pia_cb2_w); - DECLARE_WRITE_LINE_MEMBER(votrax_request); + void pia_cb2_w(int state); + void votrax_request(int state); void shock_main_map(address_map &map); void shock_audio_map(address_map &map); void main_map(address_map &map); @@ -383,7 +383,7 @@ void taito_8080::io_w(offs_t offset, u8 data) m_samples->start(0, 5); // outhole } -WRITE_LINE_MEMBER( taito_8080::pia_cb2_w ) +void taito_8080::pia_cb2_w(int state) { if (state) { @@ -405,7 +405,7 @@ void taito_8080::pia_pb_w(u8 data) m_votrax_cmd = 0x3e; // stop the rattling } -WRITE_LINE_MEMBER( taito_8080::votrax_request ) +void taito_8080::votrax_request(int state) { m_pia->ca1_w(state); } diff --git a/src/mame/pinball/wms_shuffle.cpp b/src/mame/pinball/wms_shuffle.cpp index 0f34c2ec4f5..20f3374105c 100644 --- a/src/mame/pinball/wms_shuffle.cpp +++ b/src/mame/pinball/wms_shuffle.cpp @@ -116,16 +116,16 @@ private: bool m_data_ok = false; u8 m_lamp_data = 0; bool m_irq_in_progress = false; - DECLARE_WRITE_LINE_MEMBER(pia21_cb2_w) { } // enable solenoids - DECLARE_WRITE_LINE_MEMBER(pia22_ca2_w) { } //ST5 - DECLARE_WRITE_LINE_MEMBER(pia22_cb2_w) { } //ST-solenoids enable - DECLARE_WRITE_LINE_MEMBER(pia24_ca2_w) { } //ST2 - DECLARE_WRITE_LINE_MEMBER(pia24_cb2_w) { } //ST1 - DECLARE_WRITE_LINE_MEMBER(pia28_ca2_w) { } //diag leds enable - DECLARE_WRITE_LINE_MEMBER(pia28_cb2_w) { } //ST6 - DECLARE_WRITE_LINE_MEMBER(pia30_ca2_w) { } //ST4 - DECLARE_WRITE_LINE_MEMBER(pia30_cb2_w) { } //ST3 - DECLARE_WRITE_LINE_MEMBER(irq_w); + void pia21_cb2_w(int state) { } // enable solenoids + void pia22_ca2_w(int state) { } //ST5 + void pia22_cb2_w(int state) { } //ST-solenoids enable + void pia24_ca2_w(int state) { } //ST2 + void pia24_cb2_w(int state) { } //ST1 + void pia28_ca2_w(int state) { } //diag leds enable + void pia28_cb2_w(int state) { } //ST6 + void pia30_ca2_w(int state) { } //ST4 + void pia30_cb2_w(int state) { } //ST3 + void irq_w(int state); void s4_map(address_map &map); void s9_map(address_map &map); void s11_map(address_map &map); @@ -426,7 +426,7 @@ void shuffle_state::switch_w(u8 data) m_row = data; } -WRITE_LINE_MEMBER( shuffle_state::irq_w ) +void shuffle_state::irq_w(int state) { m_irq_in_progress = state; m_maincpu->set_input_line(M6802_IRQ_LINE, state ? ASSERT_LINE : CLEAR_LINE); diff --git a/src/mame/pinball/wpc_95.cpp b/src/mame/pinball/wpc_95.cpp index b6c5598821a..12b78239077 100644 --- a/src/mame/pinball/wpc_95.cpp +++ b/src/mame/pinball/wpc_95.cpp @@ -102,7 +102,7 @@ private: void dcs_reset_w(uint8_t data); uint8_t rtc_r(offs_t offset); - DECLARE_WRITE_LINE_MEMBER(scanline_irq); + void scanline_irq(int state); TIMER_DEVICE_CALLBACK_MEMBER(zc_timer); void wpc_95_map(address_map &map); @@ -268,7 +268,7 @@ void wpc_95_state::watchdog_w(uint8_t data) { } -WRITE_LINE_MEMBER(wpc_95_state::scanline_irq) +void wpc_95_state::scanline_irq(int state) { m_firq_src = 0x00; m_maincpu->set_input_line(1, state); diff --git a/src/mame/pinball/wpc_an.cpp b/src/mame/pinball/wpc_an.cpp index 0124831202d..137bbb74d4a 100644 --- a/src/mame/pinball/wpc_an.cpp +++ b/src/mame/pinball/wpc_an.cpp @@ -135,9 +135,9 @@ private: uint8_t ram_r(offs_t offset); void ram_w(offs_t offset, uint8_t data); - DECLARE_WRITE_LINE_MEMBER(snd_reply_w); - DECLARE_WRITE_LINE_MEMBER(irq_w); - DECLARE_WRITE_LINE_MEMBER(firq_w); + void snd_reply_w(int state); + void irq_w(int state); + void firq_w(int state); uint8_t sound_ctrl_r(); void sound_ctrl_w(uint8_t data); uint8_t sound_data_r(); @@ -310,18 +310,18 @@ void wpc_an_state::rombank_w(uint8_t data) m_cpubank->set_entry(data & m_bankmask); } -WRITE_LINE_MEMBER(wpc_an_state::snd_reply_w) +void wpc_an_state::snd_reply_w(int state) { if(state) m_maincpu->set_input_line(M6809_FIRQ_LINE,ASSERT_LINE); } -WRITE_LINE_MEMBER(wpc_an_state::irq_w) +void wpc_an_state::irq_w(int state) { m_maincpu->set_input_line(M6809_IRQ_LINE,CLEAR_LINE); } -WRITE_LINE_MEMBER(wpc_an_state::firq_w) +void wpc_an_state::firq_w(int state) { m_maincpu->set_input_line(M6809_FIRQ_LINE,CLEAR_LINE); } diff --git a/src/mame/pinball/wpc_dcs.cpp b/src/mame/pinball/wpc_dcs.cpp index cf2a326ac55..af7960be00c 100644 --- a/src/mame/pinball/wpc_dcs.cpp +++ b/src/mame/pinball/wpc_dcs.cpp @@ -78,7 +78,7 @@ private: uint8_t switches_r(); void switches_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(scanline_irq); + void scanline_irq(int state); TIMER_DEVICE_CALLBACK_MEMBER(zc_timer); void wpc_dcs_map(address_map &map); @@ -224,7 +224,7 @@ void wpc_dcs_state::watchdog_w(uint8_t data) m_maincpu->set_input_line(0, CLEAR_LINE); } -WRITE_LINE_MEMBER(wpc_dcs_state::scanline_irq) +void wpc_dcs_state::scanline_irq(int state) { m_firq_src = 0x00; m_maincpu->set_input_line(1, state); diff --git a/src/mame/pinball/wpc_dot.cpp b/src/mame/pinball/wpc_dot.cpp index 35747e3284d..74ab9a86150 100644 --- a/src/mame/pinball/wpc_dot.cpp +++ b/src/mame/pinball/wpc_dot.cpp @@ -271,7 +271,7 @@ void wpc_dot_state::dmdbank_w(offs_t offset, uint8_t data) } } -WRITE_LINE_MEMBER(wpc_dot_state::snd_reply_w) +void wpc_dot_state::snd_reply_w(int state) { if(state) { @@ -280,12 +280,12 @@ WRITE_LINE_MEMBER(wpc_dot_state::snd_reply_w) } } -WRITE_LINE_MEMBER(wpc_dot_state::irq_w) +void wpc_dot_state::irq_w(int state) { m_maincpu->set_input_line(M6809_IRQ_LINE,CLEAR_LINE); } -WRITE_LINE_MEMBER(wpc_dot_state::firq_w) +void wpc_dot_state::firq_w(int state) { m_maincpu->set_input_line(M6809_FIRQ_LINE,CLEAR_LINE); } diff --git a/src/mame/pinball/wpc_dot.h b/src/mame/pinball/wpc_dot.h index 91b832d7a5e..e491bf2b89f 100644 --- a/src/mame/pinball/wpc_dot.h +++ b/src/mame/pinball/wpc_dot.h @@ -46,9 +46,9 @@ protected: uint8_t ram_r(offs_t offset); void ram_w(offs_t offset, uint8_t data); - DECLARE_WRITE_LINE_MEMBER(snd_reply_w); - DECLARE_WRITE_LINE_MEMBER(irq_w); - DECLARE_WRITE_LINE_MEMBER(firq_w); + void snd_reply_w(int state); + void irq_w(int state); + void firq_w(int state); void rombank_w(uint8_t data); void dmdbank_w(offs_t offset, uint8_t data); diff --git a/src/mame/pinball/wpc_s.cpp b/src/mame/pinball/wpc_s.cpp index 36b7221e0d7..670cfdaf473 100644 --- a/src/mame/pinball/wpc_s.cpp +++ b/src/mame/pinball/wpc_s.cpp @@ -100,7 +100,7 @@ private: void dcs_reset_w(uint8_t data); uint8_t rtc_r(offs_t offset); - DECLARE_WRITE_LINE_MEMBER(scanline_irq); + void scanline_irq(int state); TIMER_DEVICE_CALLBACK_MEMBER(zc_timer); void wpc_s_map(address_map &map); @@ -254,7 +254,7 @@ void wpc_s_state::watchdog_w(uint8_t data) m_maincpu->set_input_line(0, CLEAR_LINE); } -WRITE_LINE_MEMBER(wpc_s_state::scanline_irq) +void wpc_s_state::scanline_irq(int state) { m_firq_src = 0x00; m_maincpu->set_input_line(1, state); diff --git a/src/mame/pinball/wpcsnd.cpp b/src/mame/pinball/wpcsnd.cpp index d8fee1b5138..ce92abd415f 100644 --- a/src/mame/pinball/wpcsnd.cpp +++ b/src/mame/pinball/wpcsnd.cpp @@ -141,7 +141,7 @@ void wpcsnd_device::device_reset() m_reply_available = false; } -WRITE_LINE_MEMBER( wpcsnd_device::ym2151_irq_w) +void wpcsnd_device::ym2151_irq_w(int state) { m_cpu->set_input_line(M6809_FIRQ_LINE,state ? ASSERT_LINE : CLEAR_LINE); } diff --git a/src/mame/pinball/wpcsnd.h b/src/mame/pinball/wpcsnd.h index 3ae1033c4b3..5d34b09093a 100644 --- a/src/mame/pinball/wpcsnd.h +++ b/src/mame/pinball/wpcsnd.h @@ -54,7 +54,7 @@ private: // callback devcb_write_line m_reply_cb; - DECLARE_WRITE_LINE_MEMBER(ym2151_irq_w); + void ym2151_irq_w(int state); void bg_cvsd_clock_set_w(uint8_t data); void bg_cvsd_digit_clock_clear_w(uint8_t data); diff --git a/src/mame/pinball/zac_1.cpp b/src/mame/pinball/zac_1.cpp index a85457e2c79..811c52f6f99 100644 --- a/src/mame/pinball/zac_1.cpp +++ b/src/mame/pinball/zac_1.cpp @@ -115,11 +115,11 @@ public: private: u8 ctrl_r(); void ctrl_w(u8 data); - DECLARE_READ_LINE_MEMBER(audio_t1_r); - DECLARE_READ_LINE_MEMBER(serial_r); - DECLARE_WRITE_LINE_MEMBER(serial_w); - DECLARE_WRITE_LINE_MEMBER(noise_w); - DECLARE_WRITE_LINE_MEMBER(clock_w); + int audio_t1_r(); + int serial_r(); + void serial_w(int state); + void noise_w(int state); + void clock_w(int state); u8 reset_int_r(); void reset_int_w(u8 data); TIMER_DEVICE_CALLBACK_MEMBER(zac_1_inttimer); @@ -441,13 +441,13 @@ void zac_1_state::audio_command_w(u8 data) } // Locomotion: The noise and tone represent a steam whistle -WRITE_LINE_MEMBER( zac_1_state::noise_w ) +void zac_1_state::noise_w(int state) { m_noise_state = state; m_speaker->level_w((m_clock_state && m_noise_state) ? 1 : 0); } -WRITE_LINE_MEMBER( zac_1_state::clock_w ) +void zac_1_state::clock_w(int state) { m_clock_state = state; m_speaker->level_w((m_clock_state && m_noise_state) ? 1 : 0); @@ -458,7 +458,7 @@ u8 zac_1_state::audio_command_r() return m_soundlatch->read() | (ioport("DSW2")->read() & 0x30); } -READ_LINE_MEMBER(zac_1_state::audio_t1_r) +int zac_1_state::audio_t1_r() { return (m_soundlatch->read() == 0); } @@ -497,13 +497,13 @@ void zac_1_state::reset_int_w(u8 data) m_maincpu->set_input_line(INPUT_LINE_IRQ0, CLEAR_LINE); } -READ_LINE_MEMBER( zac_1_state::serial_r ) +int zac_1_state::serial_r() { // from printer return 0; } -WRITE_LINE_MEMBER( zac_1_state::serial_w ) +void zac_1_state::serial_w(int state) { // to printer } diff --git a/src/mame/pinball/zac_2.cpp b/src/mame/pinball/zac_2.cpp index 367333e1c89..3b47eeef517 100644 --- a/src/mame/pinball/zac_2.cpp +++ b/src/mame/pinball/zac_2.cpp @@ -76,8 +76,8 @@ private: u8 data_r(); void ctrl_w(u8 data); void data_w(u8 data); - DECLARE_READ_LINE_MEMBER(serial_r); - DECLARE_WRITE_LINE_MEMBER(serial_w); + int serial_r(); + void serial_w(int state); TIMER_DEVICE_CALLBACK_MEMBER(zac_2_inttimer); TIMER_DEVICE_CALLBACK_MEMBER(zac_2_outtimer); void zac_2_data(address_map &map); @@ -236,13 +236,13 @@ void zac_2_state::data_w(u8 data) // writes to sound card } -READ_LINE_MEMBER( zac_2_state::serial_r ) +int zac_2_state::serial_r() { // from printer return 0; } -WRITE_LINE_MEMBER( zac_2_state::serial_w ) +void zac_2_state::serial_w(int state) { // to printer } diff --git a/src/mame/pinball/zac_proto.cpp b/src/mame/pinball/zac_proto.cpp index 173fbe62ea2..de4914c792c 100644 --- a/src/mame/pinball/zac_proto.cpp +++ b/src/mame/pinball/zac_proto.cpp @@ -56,8 +56,8 @@ private: void out1_w(offs_t offset, uint8_t data); void digit_w(offs_t offset, uint8_t data); void sound_w(offs_t offset, uint8_t data); - DECLARE_WRITE_LINE_MEMBER(audio_clock); - DECLARE_READ_LINE_MEMBER(slam_r); + void audio_clock(int state); + int slam_r(); void zac_proto_map(address_map &map); u8 m_u36 = 0x80U; // preset divider for u44/u45 u8 m_u37 = 0U; // selector for u48 @@ -227,7 +227,7 @@ static INPUT_PORTS_START( zac_proto ) PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYPAD ) PORT_NAME("Slam Tilt") PORT_CODE(KEYCODE_0) INPUT_PORTS_END -READ_LINE_MEMBER( zac_proto_state::slam_r ) +int zac_proto_state::slam_r() { return BIT(ioport("X8")->read(), 0); } @@ -293,7 +293,7 @@ void zac_proto_state::sound_w(offs_t offset, uint8_t data) } } -WRITE_LINE_MEMBER(zac_proto_state::audio_clock) +void zac_proto_state::audio_clock(int state) { if (state) { diff --git a/src/mame/pinball/zpinball.cpp b/src/mame/pinball/zpinball.cpp index fc2e6c3104a..9f30756441f 100644 --- a/src/mame/pinball/zpinball.cpp +++ b/src/mame/pinball/zpinball.cpp @@ -54,8 +54,8 @@ private: void pal_w(u8 data); void shift_load_w(u8 data); - DECLARE_WRITE_LINE_MEMBER(shift_toggle_w); - DECLARE_WRITE_LINE_MEMBER(clock_off_w); + void shift_toggle_w(int state); + void clock_off_w(int state); u8 in1_r(); u8 in2_r(); @@ -132,7 +132,7 @@ void zpinball_state::shift_load_w(u8 data) m_zpuctc->subdevice("ch0")->set_unscaled_clock(8_MHz_XTAL / 4); } -WRITE_LINE_MEMBER(zpinball_state::shift_toggle_w) +void zpinball_state::shift_toggle_w(int state) { if (state && m_shift_enabled) { @@ -142,7 +142,7 @@ WRITE_LINE_MEMBER(zpinball_state::shift_toggle_w) } } -WRITE_LINE_MEMBER(zpinball_state::clock_off_w) +void zpinball_state::clock_off_w(int state) { if (state) { diff --git a/src/mame/poly88/poly88.h b/src/mame/poly88/poly88.h index e6073b9a085..431c1ea26d2 100644 --- a/src/mame/poly88/poly88.h +++ b/src/mame/poly88/poly88.h @@ -52,11 +52,11 @@ private: void intr_w(uint8_t data); TIMER_DEVICE_CALLBACK_MEMBER(kansas_r); - DECLARE_WRITE_LINE_MEMBER(cassette_clock_w); + void cassette_clock_w(int state); TIMER_DEVICE_CALLBACK_MEMBER(rtc_tick); - DECLARE_WRITE_LINE_MEMBER(vi2_w); - DECLARE_WRITE_LINE_MEMBER(vi5_w); - DECLARE_WRITE_LINE_MEMBER(usart_ready_w); + void vi2_w(int state); + void vi5_w(int state); + void usart_ready_w(int state); IRQ_CALLBACK_MEMBER(poly88_irq_callback); DECLARE_SNAPSHOT_LOAD_MEMBER(snapshot_cb); diff --git a/src/mame/poly88/poly88_m.cpp b/src/mame/poly88/poly88_m.cpp index b09d739b10a..a08d1eea181 100644 --- a/src/mame/poly88/poly88_m.cpp +++ b/src/mame/poly88/poly88_m.cpp @@ -129,7 +129,7 @@ TIMER_DEVICE_CALLBACK_MEMBER( poly88_state::kansas_r ) } } -WRITE_LINE_MEMBER(poly88_state::cassette_clock_w) +void poly88_state::cassette_clock_w(int state) { // incoming @4800Hz (bit), 2400Hz (polyphase) if (BIT(m_linec->read(), 7)) @@ -205,7 +205,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(poly88_state::rtc_tick) m_maincpu->set_input_line(0, HOLD_LINE); } -WRITE_LINE_MEMBER(poly88_state::vi2_w) +void poly88_state::vi2_w(int state) { if (state == ASSERT_LINE) { @@ -214,7 +214,7 @@ WRITE_LINE_MEMBER(poly88_state::vi2_w) } } -WRITE_LINE_MEMBER(poly88_state::vi5_w) +void poly88_state::vi5_w(int state) { if (state == ASSERT_LINE) { @@ -223,7 +223,7 @@ WRITE_LINE_MEMBER(poly88_state::vi5_w) } } -WRITE_LINE_MEMBER(poly88_state::usart_ready_w) +void poly88_state::usart_ready_w(int state) { if (state) { diff --git a/src/mame/promat/gstream.cpp b/src/mame/promat/gstream.cpp index ef58dd53c0f..e485c626022 100644 --- a/src/mame/promat/gstream.cpp +++ b/src/mame/promat/gstream.cpp @@ -164,9 +164,9 @@ public: void init_gstream(); void init_x2222(); - DECLARE_READ_LINE_MEMBER(mirror_service_r); + int mirror_service_r(); DECLARE_CUSTOM_INPUT_MEMBER(gstream_mirror_r); - DECLARE_READ_LINE_MEMBER(x2222_toggle_r); + int x2222_toggle_r(); private: /* devices */ @@ -215,14 +215,14 @@ private: void x2222_io(address_map &map); }; -READ_LINE_MEMBER(gstream_state::x2222_toggle_r) // or the game hangs when starting, might be a status flag for the sound? +int gstream_state::x2222_toggle_r() // or the game hangs when starting, might be a status flag for the sound? { m_toggle ^= 0xffff; return m_toggle; } -READ_LINE_MEMBER(gstream_state::mirror_service_r) +int gstream_state::mirror_service_r() { int result; diff --git a/src/mame/psikyo/psikyo.cpp b/src/mame/psikyo/psikyo.cpp index 87405a9b4e1..efc85217bc7 100644 --- a/src/mame/psikyo/psikyo.cpp +++ b/src/mame/psikyo/psikyo.cpp @@ -90,7 +90,7 @@ This was pointed out by Bart Puype Strikers 1945 / Tengai MCU ***************************************************************************/ -READ_LINE_MEMBER(psikyo_state::mcu_status_r) +int psikyo_state::mcu_status_r() { int ret = 0x00; @@ -431,7 +431,7 @@ void psikyo_state::s1945_sound_io_map(address_map &map) ***************************************************************************/ -READ_LINE_MEMBER(psikyo_state::z80_nmi_r) +int psikyo_state::z80_nmi_r() { int ret = 0x00; diff --git a/src/mame/psikyo/psikyo.h b/src/mame/psikyo/psikyo.h index e0df0a5637a..e4b67347867 100644 --- a/src/mame/psikyo/psikyo.h +++ b/src/mame/psikyo/psikyo.h @@ -61,8 +61,8 @@ public: void init_tengai(); void init_gunbird(); - DECLARE_READ_LINE_MEMBER(z80_nmi_r); - DECLARE_READ_LINE_MEMBER(mcu_status_r); + int z80_nmi_r(); + int mcu_status_r(); private: /* memory pointers */ @@ -135,8 +135,8 @@ private: DECLARE_VIDEO_START(psikyo); u32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); u32 screen_update_bootleg(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(screen_vblank); - DECLARE_WRITE_LINE_MEMBER(screen_vblank_bootleg); + void screen_vblank(int state); + void screen_vblank_bootleg(int state); void switch_bgbanks(u8 tmap, u8 bank); void draw_sprites(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); void get_sprites(); diff --git a/src/mame/psikyo/psikyo_v.cpp b/src/mame/psikyo/psikyo_v.cpp index 5ecdd6ed044..5e1956dc7c0 100644 --- a/src/mame/psikyo/psikyo_v.cpp +++ b/src/mame/psikyo/psikyo_v.cpp @@ -662,7 +662,7 @@ u32 psikyo_state::screen_update_bootleg(screen_device &screen, bitmap_rgb32 &bit } -WRITE_LINE_MEMBER(psikyo_state::screen_vblank) +void psikyo_state::screen_vblank(int state) { // rising edge if (state) @@ -672,7 +672,7 @@ WRITE_LINE_MEMBER(psikyo_state::screen_vblank) } } -WRITE_LINE_MEMBER(psikyo_state::screen_vblank_bootleg) +void psikyo_state::screen_vblank_bootleg(int state) { // rising edge if (state) diff --git a/src/mame/psikyo/psikyosh.h b/src/mame/psikyo/psikyosh.h index e592744d026..afa44509e52 100644 --- a/src/mame/psikyo/psikyosh.h +++ b/src/mame/psikyo/psikyosh.h @@ -110,7 +110,7 @@ private: u32 mjgtaste_input_r(); void eeprom_w(u8 data); u32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(screen_vblank); + void screen_vblank(int state); INTERRUPT_GEN_MEMBER(interrupt); void draw_scanline32_alpha(bitmap_rgb32 &bitmap, s32 destx, s32 desty, s32 length, const u32 *srcptr, int alpha); void draw_scanline32_argb(bitmap_rgb32 &bitmap, s32 destx, s32 desty, s32 length, const u32 *srcptr); diff --git a/src/mame/psikyo/psikyosh_v.cpp b/src/mame/psikyo/psikyosh_v.cpp index c05ab84e289..6be30b7facb 100644 --- a/src/mame/psikyo/psikyosh_v.cpp +++ b/src/mame/psikyo/psikyosh_v.cpp @@ -1135,7 +1135,7 @@ popmessage ("%08x %08x %08x %08x\n%08x %08x %08x %08x", return 0; } -WRITE_LINE_MEMBER(psikyosh_state::screen_vblank) +void psikyosh_state::screen_vblank(int state) { if (state) { diff --git a/src/mame/psion/etna.cpp b/src/mame/psion/etna.cpp index 5d60ef941fd..bd7ef27307d 100644 --- a/src/mame/psion/etna.cpp +++ b/src/mame/psion/etna.cpp @@ -210,7 +210,7 @@ uint8_t etna_device::regs_r(offs_t offset) return data; } -WRITE_LINE_MEMBER(etna_device::eeprom_cs_in) +void etna_device::eeprom_cs_in(int state) { bool old = m_prom_cs; m_prom_cs = state; @@ -222,7 +222,7 @@ WRITE_LINE_MEMBER(etna_device::eeprom_cs_in) } } -WRITE_LINE_MEMBER(etna_device::eeprom_clk_in) +void etna_device::eeprom_clk_in(int state) { bool old = m_prom_clk; m_prom_clk = state; @@ -252,6 +252,6 @@ WRITE_LINE_MEMBER(etna_device::eeprom_clk_in) } } -WRITE_LINE_MEMBER(etna_device::eeprom_data_in) +void etna_device::eeprom_data_in(int state) { } diff --git a/src/mame/psion/etna.h b/src/mame/psion/etna.h index 9b9c24a891e..e020c25dcf5 100644 --- a/src/mame/psion/etna.h +++ b/src/mame/psion/etna.h @@ -23,9 +23,9 @@ public: void regs_w(offs_t offset, uint8_t data); uint8_t regs_r(offs_t offset); - DECLARE_WRITE_LINE_MEMBER(eeprom_cs_in); - DECLARE_WRITE_LINE_MEMBER(eeprom_clk_in); - DECLARE_WRITE_LINE_MEMBER(eeprom_data_in); + void eeprom_cs_in(int state); + void eeprom_clk_in(int state); + void eeprom_data_in(int state); auto eeprom_data_out() { return m_eeprom_data_out.bind(); } diff --git a/src/mame/quantel/dpb7000.cpp b/src/mame/quantel/dpb7000.cpp index a4ba16ecc6d..750b17af3b3 100644 --- a/src/mame/quantel/dpb7000.cpp +++ b/src/mame/quantel/dpb7000.cpp @@ -180,7 +180,7 @@ private: void fddcpu_p1_w(uint8_t data); uint8_t fddcpu_p2_r(); void fddcpu_p2_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(fddcpu_debug_rx); + void fddcpu_debug_rx(int state); bool handle_command(uint16_t data); void store_address_w(uint8_t card, uint16_t data); @@ -369,8 +369,8 @@ private: uint8_t keyboard_p2_r(); void keyboard_p1_w(uint8_t data); void keyboard_p2_w(uint8_t data); - DECLARE_READ_LINE_MEMBER(keyboard_t0_r); - DECLARE_READ_LINE_MEMBER(keyboard_t1_r); + int keyboard_t0_r(); + int keyboard_t1_r(); uint8_t m_keybc_latched_bit; uint8_t m_keybc_p1_data; uint8_t m_keybc_tx; @@ -398,7 +398,7 @@ private: void tds_convert_w(uint8_t data); uint8_t tds_adc_r(); uint8_t tds_pen_switches_r(); - DECLARE_WRITE_LINE_MEMBER(duart_b_w); + void duart_b_w(int state); TIMER_CALLBACK_MEMBER(tablet_tx_tick); TIMER_CALLBACK_MEMBER(tds_adc_tick); TIMER_CALLBACK_MEMBER(tds_press_tick); @@ -3044,7 +3044,7 @@ uint8_t dpb7000_state::fdd_cmd_r() return m_diskseq_cmd_to_ctrl; } -WRITE_LINE_MEMBER(dpb7000_state::fddcpu_debug_rx) +void dpb7000_state::fddcpu_debug_rx(int state) { if (m_fdd_debug_rx_bit_count < 10) { @@ -3093,13 +3093,13 @@ void dpb7000_state::keyboard_p2_w(uint8_t data) m_keybc_tx = BIT(~data, 7); } -READ_LINE_MEMBER(dpb7000_state::keyboard_t0_r) +int dpb7000_state::keyboard_t0_r() { LOGMASKED(LOG_KEYBC, "%s: T0 read\n", machine().describe_context()); return 0; } -READ_LINE_MEMBER(dpb7000_state::keyboard_t1_r) +int dpb7000_state::keyboard_t1_r() { uint8_t data = m_keybc_latched_bit; //m_keybc_latched_bit = 0; @@ -3200,7 +3200,7 @@ TIMER_CALLBACK_MEMBER(dpb7000_state::tablet_tx_tick) } } -WRITE_LINE_MEMBER(dpb7000_state::duart_b_w) +void dpb7000_state::duart_b_w(int state) { //printf("B%d ", state); } diff --git a/src/mame/qume/qvt102.cpp b/src/mame/qume/qvt102.cpp index c477d54e5ee..ac7a919220b 100644 --- a/src/mame/qume/qvt102.cpp +++ b/src/mame/qume/qvt102.cpp @@ -106,18 +106,18 @@ private: MC6845_UPDATE_ROW(crtc_update_row); uint8_t vsync_ack_r(); - DECLARE_WRITE_LINE_MEMBER(vsync_w); + void vsync_w(int state); uint8_t kbd_r(); void latch_w(uint8_t data); uint8_t ctc_r(); void ctc_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(acia_txd_w); - DECLARE_WRITE_LINE_MEMBER(acia_rts_w); - DECLARE_WRITE_LINE_MEMBER(dsr_w); - DECLARE_WRITE_LINE_MEMBER(host_rxd_w); - DECLARE_WRITE_LINE_MEMBER(host_dcd_w); + void acia_txd_w(int state); + void acia_rts_w(int state); + void dsr_w(int state); + void host_rxd_w(int state); + void host_dcd_w(int state); uint8_t m_latch; int m_kbd_data; @@ -125,8 +125,8 @@ private: // keyboard mcu uint8_t mcu_bus_r(); void mcu_bus_w(uint8_t data); - DECLARE_READ_LINE_MEMBER(mcu_t0_r); - DECLARE_READ_LINE_MEMBER(mcu_t1_r); + int mcu_t0_r(); + int mcu_t1_r(); void mcu_p1_w(uint8_t data); void mcu_p2_w(uint8_t data); @@ -367,7 +367,7 @@ void qvt102_state::mcu_bus_w(uint8_t data) m_kbd_bus = data; } -READ_LINE_MEMBER(qvt102_state::mcu_t0_r) +int qvt102_state::mcu_t0_r() { int state = 1; @@ -383,7 +383,7 @@ READ_LINE_MEMBER(qvt102_state::mcu_t0_r) return state; } -READ_LINE_MEMBER(qvt102_state::mcu_t1_r) +int qvt102_state::mcu_t1_r() { int state = 1; @@ -439,7 +439,7 @@ uint8_t qvt102_state::vsync_ack_r() return 0; } -WRITE_LINE_MEMBER(qvt102_state::vsync_w) +void qvt102_state::vsync_w(int state) { if (state) m_irqs->in_w<0>(ASSERT_LINE); @@ -563,7 +563,7 @@ void qvt102_state::ctc_w(uint8_t data) m_ctc->write(BIT(m_latch, 5), data); } -WRITE_LINE_MEMBER(qvt102_state::acia_txd_w) +void qvt102_state::acia_txd_w(int state) { if (BIT(m_latch, 6) == 0) { @@ -580,7 +580,7 @@ WRITE_LINE_MEMBER(qvt102_state::acia_txd_w) } } -WRITE_LINE_MEMBER(qvt102_state::acia_rts_w) +void qvt102_state::acia_rts_w(int state) { m_host->write_rts(state); @@ -590,14 +590,14 @@ WRITE_LINE_MEMBER(qvt102_state::acia_rts_w) m_host->write_dtr(state); } -WRITE_LINE_MEMBER(qvt102_state::dsr_w) +void qvt102_state::dsr_w(int state) { if (machine().phase() != machine_phase::INIT) if (BIT(m_jumper->read(), 0)) m_acia->write_dcd(state); } -WRITE_LINE_MEMBER(qvt102_state::host_rxd_w) +void qvt102_state::host_rxd_w(int state) { m_acia->write_rxd(state); @@ -606,7 +606,7 @@ WRITE_LINE_MEMBER(qvt102_state::host_rxd_w) m_aux->write_txd(state); } -WRITE_LINE_MEMBER(qvt102_state::host_dcd_w) +void qvt102_state::host_dcd_w(int state) { if (machine().phase() != machine_phase::INIT) if (BIT(m_jumper->read(), 1)) diff --git a/src/mame/rare/btoads.cpp b/src/mame/rare/btoads.cpp index 3d0cc667ecc..ded9bd1620e 100644 --- a/src/mame/rare/btoads.cpp +++ b/src/mame/rare/btoads.cpp @@ -93,13 +93,13 @@ uint16_t btoads_state::main_sound_r() } -READ_LINE_MEMBER( btoads_state::main_to_sound_r ) +int btoads_state::main_to_sound_r() { return m_main_to_sound_ready; } -READ_LINE_MEMBER( btoads_state::sound_to_main_r ) +int btoads_state::sound_to_main_r() { return m_sound_to_main_ready; } diff --git a/src/mame/rare/btoads.h b/src/mame/rare/btoads.h index 7c507b2bbf0..68ec317f6f6 100644 --- a/src/mame/rare/btoads.h +++ b/src/mame/rare/btoads.h @@ -34,8 +34,8 @@ public: m_tlc34076(*this, "tlc34076"), m_screen(*this, "screen") { } - DECLARE_READ_LINE_MEMBER( main_to_sound_r ); - DECLARE_READ_LINE_MEMBER( sound_to_main_r ); + int main_to_sound_r(); + int sound_to_main_r(); void btoads(machine_config &config); diff --git a/src/mame/rare/xtheball.cpp b/src/mame/rare/xtheball.cpp index 1d748045bf0..ba6f064e960 100644 --- a/src/mame/rare/xtheball.cpp +++ b/src/mame/rare/xtheball.cpp @@ -52,7 +52,7 @@ private: required_ioport m_analog_x; required_ioport m_analog_y; - DECLARE_WRITE_LINE_MEMBER(foreground_mode_w); + void foreground_mode_w(int state); uint16_t analogx_r(); uint16_t analogy_watchdog_r(); @@ -153,7 +153,7 @@ TMS340X0_FROM_SHIFTREG_CB_MEMBER(xtheball_state::from_shiftreg) * *************************************/ -WRITE_LINE_MEMBER(xtheball_state::foreground_mode_w) +void xtheball_state::foreground_mode_w(int state) { m_foreground_mode = state; } diff --git a/src/mame/rca/microkit.cpp b/src/mame/rca/microkit.cpp index faeffff5103..8fd767c089e 100644 --- a/src/mame/rca/microkit.cpp +++ b/src/mame/rca/microkit.cpp @@ -47,7 +47,7 @@ public: DECLARE_INPUT_CHANGED_MEMBER(runu_button); private: - DECLARE_READ_LINE_MEMBER(clear_r); + int clear_r(); void ram_w(offs_t offset, uint8_t data); uint8_t ram_r(offs_t offset); @@ -106,7 +106,7 @@ INPUT_CHANGED_MEMBER(microkit_state::runu_button) m_maincpu->set_input_line(INPUT_LINE_RESET, newval ? ASSERT_LINE : CLEAR_LINE); } -READ_LINE_MEMBER( microkit_state::clear_r ) +int microkit_state::clear_r() { if (m_resetcnt < 0x20) m_resetcnt++; diff --git a/src/mame/rca/studio2.cpp b/src/mame/rca/studio2.cpp index da8eb0b9638..0a66079b7ae 100644 --- a/src/mame/rca/studio2.cpp +++ b/src/mame/rca/studio2.cpp @@ -270,10 +270,10 @@ protected: uint8_t dispon_r(); void keylatch_w(uint8_t data); void dispon_w(uint8_t data); - DECLARE_READ_LINE_MEMBER( clear_r ); - DECLARE_READ_LINE_MEMBER( ef3_r ); - DECLARE_READ_LINE_MEMBER( ef4_r ); - DECLARE_WRITE_LINE_MEMBER( q_w ); + int clear_r(); + int ef3_r(); + int ef4_r(); + void q_w(int state); DECLARE_DEVICE_IMAGE_LOAD_MEMBER( cart_load ); /* keyboard state */ @@ -325,9 +325,9 @@ private: virtual void machine_reset() override; void dma_w(offs_t offset, uint8_t data); - DECLARE_READ_LINE_MEMBER( rdata_r ); - DECLARE_READ_LINE_MEMBER( bdata_r ); - DECLARE_READ_LINE_MEMBER( gdata_r ); + int rdata_r(); + int bdata_r(); + int gdata_r(); /* video state */ required_shared_ptr m_color_ram; @@ -471,39 +471,39 @@ uint32_t visicom_state::screen_update(screen_device &screen, bitmap_rgb32 &bitma return 0; } -READ_LINE_MEMBER( mpt02_state::rdata_r ) +int mpt02_state::rdata_r() { return BIT(m_color, 0); } -READ_LINE_MEMBER( mpt02_state::bdata_r ) +int mpt02_state::bdata_r() { return BIT(m_color, 1); } -READ_LINE_MEMBER( mpt02_state::gdata_r ) +int mpt02_state::gdata_r() { return BIT(m_color, 2); } /* CDP1802 Configuration */ -READ_LINE_MEMBER( studio2_state::clear_r ) +int studio2_state::clear_r() { return BIT(m_clear->read(), 0); } -READ_LINE_MEMBER( studio2_state::ef3_r ) +int studio2_state::ef3_r() { return BIT(m_a->read(), m_keylatch); } -READ_LINE_MEMBER( studio2_state::ef4_r ) +int studio2_state::ef4_r() { return BIT(m_b->read(), m_keylatch); } -WRITE_LINE_MEMBER( studio2_state::q_w ) +void studio2_state::q_w(int state) { m_beeper->set_state(state); } diff --git a/src/mame/rca/vip.cpp b/src/mame/rca/vip.cpp index e1569b82289..fc4dc9a1d3d 100644 --- a/src/mame/rca/vip.cpp +++ b/src/mame/rca/vip.cpp @@ -468,34 +468,34 @@ INPUT_PORTS_END // COSMAC_INTERFACE( cosmac_intf ) //------------------------------------------------- -READ_LINE_MEMBER(vip_state::clear_r) +int vip_state::clear_r() { return BIT(m_run->read(), 0); } -READ_LINE_MEMBER(vip_state::ef1_r) +int vip_state::ef1_r() { return m_vdc_ef1 || m_exp->ef1_r(); } -READ_LINE_MEMBER(vip_state::ef2_r) +int vip_state::ef2_r() { m_leds[LED_TAPE] = m_cassette->input() > 0 ? 1 : 0; return (m_cassette->input() < 0) ? ASSERT_LINE : CLEAR_LINE; } -READ_LINE_MEMBER(vip_state::ef3_r) +int vip_state::ef3_r() { return !BIT(m_keypad->read(), m_keylatch) || m_byteio_ef3 || m_exp_ef3; } -READ_LINE_MEMBER(vip_state::ef4_r) +int vip_state::ef4_r() { return m_byteio_ef4 || m_exp_ef4; } -WRITE_LINE_MEMBER(vip_state::q_w) +void vip_state::q_w(int state) { // sound output m_beeper->write(NODE_01, state); @@ -515,21 +515,21 @@ WRITE_LINE_MEMBER(vip_state::q_w) // CDP1861_INTERFACE( vdc_intf ) //------------------------------------------------- -WRITE_LINE_MEMBER(vip_state::vdc_int_w) +void vip_state::vdc_int_w(int state) { m_vdc_int = state; update_interrupts(); } -WRITE_LINE_MEMBER(vip_state::vdc_dma_out_w) +void vip_state::vdc_dma_out_w(int state) { m_vdc_dma_out = state; update_interrupts(); } -WRITE_LINE_MEMBER(vip_state::vdc_ef1_w) +void vip_state::vdc_ef1_w(int state) { m_vdc_ef1 = state; } @@ -566,7 +566,7 @@ DISCRETE_SOUND_END // VIP_BYTEIO_PORT_INTERFACE( byteio_intf ) //------------------------------------------------- -WRITE_LINE_MEMBER(vip_state::byteio_inst_w) +void vip_state::byteio_inst_w(int state) { if (!state) { @@ -579,21 +579,21 @@ WRITE_LINE_MEMBER(vip_state::byteio_inst_w) // VIP_EXPANSION_INTERFACE( expansion_intf ) //------------------------------------------------- -WRITE_LINE_MEMBER(vip_state::exp_int_w) +void vip_state::exp_int_w(int state) { m_exp_int = state; update_interrupts(); } -WRITE_LINE_MEMBER(vip_state::exp_dma_out_w) +void vip_state::exp_dma_out_w(int state) { m_exp_dma_out = state; update_interrupts(); } -WRITE_LINE_MEMBER(vip_state::exp_dma_in_w) +void vip_state::exp_dma_in_w(int state) { m_exp_dma_in = state; diff --git a/src/mame/rca/vip.h b/src/mame/rca/vip.h index 0d2fe4ccc09..9bc76a509f3 100644 --- a/src/mame/rca/vip.h +++ b/src/mame/rca/vip.h @@ -69,22 +69,22 @@ private: uint8_t io_r(offs_t offset); void io_w(offs_t offset, uint8_t data); - DECLARE_READ_LINE_MEMBER(clear_r); - DECLARE_READ_LINE_MEMBER(ef1_r); - DECLARE_READ_LINE_MEMBER(ef2_r); - DECLARE_READ_LINE_MEMBER(ef3_r); - DECLARE_READ_LINE_MEMBER(ef4_r); - DECLARE_WRITE_LINE_MEMBER(q_w); - - DECLARE_WRITE_LINE_MEMBER(vdc_int_w); - DECLARE_WRITE_LINE_MEMBER(vdc_dma_out_w); - DECLARE_WRITE_LINE_MEMBER(vdc_ef1_w); - - DECLARE_WRITE_LINE_MEMBER(byteio_inst_w); - - DECLARE_WRITE_LINE_MEMBER(exp_int_w ); - DECLARE_WRITE_LINE_MEMBER(exp_dma_out_w); - DECLARE_WRITE_LINE_MEMBER(exp_dma_in_w); + int clear_r(); + int ef1_r(); + int ef2_r(); + int ef3_r(); + int ef4_r(); + void q_w(int state); + + void vdc_int_w(int state); + void vdc_dma_out_w(int state); + void vdc_ef1_w(int state); + + void byteio_inst_w(int state); + + void exp_int_w(int state); + void exp_dma_out_w(int state); + void exp_dma_in_w(int state); DECLARE_QUICKLOAD_LOAD_MEMBER(quickload_cb); diff --git a/src/mame/regnecentralen/rc702.cpp b/src/mame/regnecentralen/rc702.cpp index 7542810fadb..f2a9a189c34 100644 --- a/src/mame/regnecentralen/rc702.cpp +++ b/src/mame/regnecentralen/rc702.cpp @@ -75,13 +75,13 @@ private: void memory_write_byte(offs_t offset, uint8_t data); void port14_w(uint8_t data); void port1c_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(crtc_drq_w); - DECLARE_WRITE_LINE_MEMBER(hreq_w); - DECLARE_WRITE_LINE_MEMBER(clock_w); - DECLARE_WRITE_LINE_MEMBER(eop_w); - DECLARE_WRITE_LINE_MEMBER(q_w); - DECLARE_WRITE_LINE_MEMBER(qbar_w); - DECLARE_WRITE_LINE_MEMBER(dack1_w); + void crtc_drq_w(int state); + void hreq_w(int state); + void clock_w(int state); + void eop_w(int state); + void q_w(int state); + void qbar_w(int state); + void dack1_w(int state); I8275_DRAW_CHARACTER_MEMBER(display_pixels); void rc702_palette(palette_device &palette) const; void kbd_put(u8 data); @@ -185,7 +185,7 @@ void rc702_state::machine_start() save_item(NAME(m_dack1)); } -WRITE_LINE_MEMBER( rc702_state::q_w ) +void rc702_state::q_w(int state) { m_q_state = state; @@ -195,7 +195,7 @@ WRITE_LINE_MEMBER( rc702_state::q_w ) m_dma->dreq3_w(0); } -WRITE_LINE_MEMBER( rc702_state::qbar_w ) +void rc702_state::qbar_w(int state) { m_qbar_state = state; @@ -205,7 +205,7 @@ WRITE_LINE_MEMBER( rc702_state::qbar_w ) m_dma->dreq2_w(0); } -WRITE_LINE_MEMBER( rc702_state::crtc_drq_w ) +void rc702_state::crtc_drq_w(int state) { m_drq_state = state; @@ -220,7 +220,7 @@ WRITE_LINE_MEMBER( rc702_state::crtc_drq_w ) m_dma->dreq2_w(0); } -WRITE_LINE_MEMBER( rc702_state::eop_w ) +void rc702_state::eop_w(int state) { if (state == m_eop) return; @@ -233,7 +233,7 @@ WRITE_LINE_MEMBER( rc702_state::eop_w ) m_fdc->tc_w(0); } -WRITE_LINE_MEMBER( rc702_state::dack1_w ) +void rc702_state::dack1_w(int state) { if (state == m_dack1) return; @@ -293,7 +293,7 @@ I8275_DRAW_CHARACTER_MEMBER( rc702_state::display_pixels ) } // Baud rate generator. All inputs are 0.614MHz. -WRITE_LINE_MEMBER( rc702_state::clock_w ) +void rc702_state::clock_w(int state) { m_ctc1->trg0(state); m_ctc1->trg1(state); @@ -303,7 +303,7 @@ WRITE_LINE_MEMBER( rc702_state::clock_w ) m_beepcnt--; } -WRITE_LINE_MEMBER( rc702_state::hreq_w ) +void rc702_state::hreq_w(int state) { m_maincpu->set_input_line(INPUT_LINE_HALT, state ? ASSERT_LINE : CLEAR_LINE); m_dma->hack_w(state); // tell dma that bus has been granted diff --git a/src/mame/regnecentralen/rc759.cpp b/src/mame/regnecentralen/rc759.cpp index 44de63834be..af3ffed5184 100644 --- a/src/mame/regnecentralen/rc759.cpp +++ b/src/mame/regnecentralen/rc759.cpp @@ -109,11 +109,11 @@ private: uint8_t ppi_portb_r(); void ppi_portc_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(centronics_busy_w); - DECLARE_WRITE_LINE_MEMBER(centronics_ack_w); - DECLARE_WRITE_LINE_MEMBER(centronics_fault_w); - DECLARE_WRITE_LINE_MEMBER(centronics_perror_w); - DECLARE_WRITE_LINE_MEMBER(centronics_select_w); + void centronics_busy_w(int state); + void centronics_ack_w(int state); + void centronics_fault_w(int state); + void centronics_perror_w(int state); + void centronics_select_w(int state); uint8_t centronics_data_r(); void centronics_data_w(uint8_t data); @@ -126,8 +126,8 @@ private: uint8_t palette_r(offs_t offset); void palette_w(offs_t offset, uint8_t data); - DECLARE_WRITE_LINE_MEMBER(i186_timer0_w); - DECLARE_WRITE_LINE_MEMBER(i186_timer1_w); + void i186_timer0_w(int state); + void i186_timer1_w(int state); void nvram_init(nvram_device &nvram, void *data, size_t size); uint8_t nvram_r(offs_t offset); @@ -402,28 +402,28 @@ void rc759_state::ppi_portc_w(uint8_t data) m_cas_enabled = BIT(data, 0); } -WRITE_LINE_MEMBER( rc759_state::centronics_busy_w ) +void rc759_state::centronics_busy_w(int state) { m_centronics_busy = state; m_pic->ir6_w(state); } -WRITE_LINE_MEMBER( rc759_state::centronics_ack_w ) +void rc759_state::centronics_ack_w(int state) { m_centronics_ack = state; } -WRITE_LINE_MEMBER( rc759_state::centronics_fault_w ) +void rc759_state::centronics_fault_w(int state) { m_centronics_fault = state; } -WRITE_LINE_MEMBER( rc759_state::centronics_perror_w ) +void rc759_state::centronics_perror_w(int state) { m_centronics_perror = state; } -WRITE_LINE_MEMBER( rc759_state::centronics_select_w ) +void rc759_state::centronics_select_w(int state) { m_centronics_select = state; } @@ -513,7 +513,7 @@ void rc759_state::rtc_addr_w(uint8_t data) // MACHINE EMULATION //************************************************************************** -WRITE_LINE_MEMBER( rc759_state::i186_timer0_w ) +void rc759_state::i186_timer0_w(int state) { m_cas_data = 1; @@ -523,7 +523,7 @@ WRITE_LINE_MEMBER( rc759_state::i186_timer0_w ) m_cas->output(m_cas_data ? -1.0 : 1.0); } -WRITE_LINE_MEMBER( rc759_state::i186_timer1_w ) +void rc759_state::i186_timer1_w(int state) { m_speaker->level_w(state); } diff --git a/src/mame/rm/rmnimbus.h b/src/mame/rm/rmnimbus.h index d9f4f1b880c..531683e4412 100644 --- a/src/mame/rm/rmnimbus.h +++ b/src/mame/rm/rmnimbus.h @@ -159,19 +159,19 @@ private: virtual void video_start() override; virtual void video_reset() override; uint32_t screen_update_nimbus(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(sio_interrupt); - DECLARE_WRITE_LINE_MEMBER(nimbus_fdc_intrq_w); - DECLARE_WRITE_LINE_MEMBER(nimbus_fdc_drq_w); - DECLARE_READ_LINE_MEMBER(nimbus_fdc_enmf_r); + void sio_interrupt(int state); + void nimbus_fdc_intrq_w(int state); + void nimbus_fdc_drq_w(int state); + int nimbus_fdc_enmf_r(); void nimbus_via_write_portb(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(write_scsi_bsy); - DECLARE_WRITE_LINE_MEMBER(write_scsi_cd); - DECLARE_WRITE_LINE_MEMBER(write_scsi_io); - DECLARE_WRITE_LINE_MEMBER(write_scsi_msg); - DECLARE_WRITE_LINE_MEMBER(write_scsi_req); - DECLARE_WRITE_LINE_MEMBER(nimbus_msm5205_vck); - DECLARE_WRITE_LINE_MEMBER(write_scsi_iena); + void write_scsi_bsy(int state); + void write_scsi_cd(int state); + void write_scsi_io(int state); + void write_scsi_msg(int state); + void write_scsi_req(int state); + void nimbus_msm5205_vck(int state); + void write_scsi_iena(int state); uint8_t get_pixel(uint16_t x, uint16_t y); uint16_t read_pixel_line(uint16_t x, uint16_t y, uint8_t pixels, uint8_t bpp); diff --git a/src/mame/rm/rmnimbus_m.cpp b/src/mame/rm/rmnimbus_m.cpp index 272726914ab..203da2724d6 100644 --- a/src/mame/rm/rmnimbus_m.cpp +++ b/src/mame/rm/rmnimbus_m.cpp @@ -408,7 +408,7 @@ Z80SIO, used for the keyboard interface /* Z80 SIO/2 */ -WRITE_LINE_MEMBER(rmnimbus_state::sio_interrupt) +void rmnimbus_state::sio_interrupt(int state) { LOGMASKED(LOG_SIO, "SIO Interrupt state=%02X\n",state); @@ -423,7 +423,7 @@ void rmnimbus_state::fdc_reset() m_scsi_ctrl_out->write(0); } -WRITE_LINE_MEMBER(rmnimbus_state::nimbus_fdc_intrq_w) +void rmnimbus_state::nimbus_fdc_intrq_w(int state) { LOGMASKED(LOG_DISK, "nimbus_drives_intrq = %d\n",state); @@ -433,14 +433,14 @@ WRITE_LINE_MEMBER(rmnimbus_state::nimbus_fdc_intrq_w) } } -WRITE_LINE_MEMBER(rmnimbus_state::nimbus_fdc_drq_w) +void rmnimbus_state::nimbus_fdc_drq_w(int state) { LOGMASKED(LOG_DISK, "nimbus_drives_drq_w(%d)\n", state); m_maincpu->drq1_w(state && FDC_DRQ_ENABLED()); } -READ_LINE_MEMBER(rmnimbus_state::nimbus_fdc_enmf_r) +int rmnimbus_state::nimbus_fdc_enmf_r() { return false; } @@ -600,7 +600,7 @@ void rmnimbus_state::check_scsi_irq() nimbus_fdc_intrq_w(m_scsi_io && m_scsi_cd && m_scsi_req && m_scsi_iena); } -WRITE_LINE_MEMBER(rmnimbus_state::write_scsi_iena) +void rmnimbus_state::write_scsi_iena(int state) { m_scsi_iena = state; check_scsi_irq(); @@ -634,12 +634,12 @@ void rmnimbus_state::hdc_drq(bool state) m_maincpu->drq1_w(HDC_DRQ_ENABLED() && !m_scsi_cd && state); } -WRITE_LINE_MEMBER( rmnimbus_state::write_scsi_bsy ) +void rmnimbus_state::write_scsi_bsy(int state) { m_scsi_bsy = state; } -WRITE_LINE_MEMBER( rmnimbus_state::write_scsi_cd ) +void rmnimbus_state::write_scsi_cd(int state) { m_scsi_cd = state; @@ -649,7 +649,7 @@ WRITE_LINE_MEMBER( rmnimbus_state::write_scsi_cd ) check_scsi_irq(); } -WRITE_LINE_MEMBER( rmnimbus_state::write_scsi_io ) +void rmnimbus_state::write_scsi_io(int state) { m_scsi_io = state; @@ -660,12 +660,12 @@ WRITE_LINE_MEMBER( rmnimbus_state::write_scsi_io ) check_scsi_irq(); } -WRITE_LINE_MEMBER( rmnimbus_state::write_scsi_msg ) +void rmnimbus_state::write_scsi_msg(int state) { m_scsi_msg = !state; } -WRITE_LINE_MEMBER( rmnimbus_state::write_scsi_req ) +void rmnimbus_state::write_scsi_req(int state) { // Detect rising edge on req, IC11b, clock int rising = ((m_scsi_req == 0) && (state == 1)); @@ -964,7 +964,7 @@ void rmnimbus_state::nimbus_sound_ay8910_portb_w(uint8_t data) m_ay8910_b=data; } -WRITE_LINE_MEMBER(rmnimbus_state::nimbus_msm5205_vck) +void rmnimbus_state::nimbus_msm5205_vck(int state) { if(m_iou_reg092 & MSM5205_INT_ENABLE) external_int(EXTERNAL_INT_MSM5205,state); diff --git a/src/mame/robotron/rt1715.cpp b/src/mame/robotron/rt1715.cpp index b9b773e8a61..fe9bbf908ef 100644 --- a/src/mame/robotron/rt1715.cpp +++ b/src/mame/robotron/rt1715.cpp @@ -80,8 +80,8 @@ private: void memory_write_byte(offs_t offset, uint8_t data); uint8_t io_read_byte(offs_t offset); void io_write_byte(offs_t offset, uint8_t data); - DECLARE_WRITE_LINE_MEMBER(busreq_w); - DECLARE_WRITE_LINE_MEMBER(tc_w); + void busreq_w(int state); + void tc_w(int state); void rt1715_floppy_enable(uint8_t data); uint8_t k7658_led1_r(); uint8_t k7658_led2_r(); @@ -93,7 +93,7 @@ private: void rt1715w_krfd_w(uint8_t data); void rt1715_palette(palette_device &palette) const; I8275_DRAW_CHARACTER_MEMBER(crtc_display_pixels); - DECLARE_WRITE_LINE_MEMBER(crtc_drq_w); + void crtc_drq_w(int state); void k7658_io(address_map &map); void k7658_mem(address_map &map); @@ -156,7 +156,7 @@ void rt1715_state::rt1715w_krfd_w(uint8_t data) m_krfd = data; } -WRITE_LINE_MEMBER(rt1715_state::tc_w) +void rt1715_state::tc_w(int state) { m_fdc->tc_w(state & BIT(m_krfd, 7)); } @@ -401,7 +401,7 @@ void rt1715_state::io_write_byte(offs_t offset, uint8_t data) prog_space.write_byte(offset, data); } -WRITE_LINE_MEMBER(rt1715_state::busreq_w) +void rt1715_state::busreq_w(int state) { // since our Z80 has no support for BUSACK, we assume it is granted immediately m_maincpu->set_input_line(INPUT_LINE_HALT, state); @@ -412,7 +412,7 @@ WRITE_LINE_MEMBER(rt1715_state::busreq_w) VIDEO EMULATION ***************************************************************************/ -WRITE_LINE_MEMBER(rt1715_state::crtc_drq_w) +void rt1715_state::crtc_drq_w(int state) { if (state) { diff --git a/src/mame/robotron/z9001.cpp b/src/mame/robotron/z9001.cpp index 382b750684e..99532785021 100644 --- a/src/mame/robotron/z9001.cpp +++ b/src/mame/robotron/z9001.cpp @@ -74,7 +74,7 @@ public: private: void kbd_put(u8 data); void port88_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(cass_w); + void cass_w(int state); TIMER_DEVICE_CALLBACK_MEMBER(timer_callback); uint32_t screen_update_z9001(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); @@ -133,7 +133,7 @@ void z9001_state::port88_w(uint8_t data) m_beeper->set_state(BIT(data, 7)); } -WRITE_LINE_MEMBER( z9001_state::cass_w ) +void z9001_state::cass_w(int state) { if (state) { diff --git a/src/mame/roland/bu3905.cpp b/src/mame/roland/bu3905.cpp index 2f893fad8bc..c72ab9445f7 100644 --- a/src/mame/roland/bu3905.cpp +++ b/src/mame/roland/bu3905.cpp @@ -30,6 +30,6 @@ void bu3905_device::write(offs_t offset, u8 data) logerror("%s: Writing %02X to offset %X\n", machine().describe_context(), data, offset & 0xf); } -WRITE_LINE_MEMBER(bu3905_device::axi_w) +void bu3905_device::axi_w(int state) { } diff --git a/src/mame/roland/bu3905.h b/src/mame/roland/bu3905.h index 64d1645d772..4781832f7ff 100644 --- a/src/mame/roland/bu3905.h +++ b/src/mame/roland/bu3905.h @@ -45,7 +45,7 @@ public: // construction/destruction void write(offs_t offset, u8 data); - DECLARE_WRITE_LINE_MEMBER(axi_w); + void axi_w(int state); protected: // device-level overrides diff --git a/src/mame/roland/mb87013.cpp b/src/mame/roland/mb87013.cpp index 2ba29e35fe3..28f12926beb 100644 --- a/src/mame/roland/mb87013.cpp +++ b/src/mame/roland/mb87013.cpp @@ -125,7 +125,7 @@ void mb87013_device::write(offs_t offset, u8 data) // MFM modulator //------------------------------------------------- -WRITE_LINE_MEMBER(mb87013_device::dtr_w) +void mb87013_device::dtr_w(int state) { } @@ -135,7 +135,7 @@ WRITE_LINE_MEMBER(mb87013_device::dtr_w) // modulated by QDC //------------------------------------------------- -WRITE_LINE_MEMBER(mb87013_device::txd_w) +void mb87013_device::txd_w(int state) { } @@ -145,6 +145,6 @@ WRITE_LINE_MEMBER(mb87013_device::txd_w) // data through RxC and RxD //------------------------------------------------- -WRITE_LINE_MEMBER(mb87013_device::rts_w) +void mb87013_device::rts_w(int state) { } diff --git a/src/mame/roland/mb87013.h b/src/mame/roland/mb87013.h index f6feae8cce2..1afd7af7658 100644 --- a/src/mame/roland/mb87013.h +++ b/src/mame/roland/mb87013.h @@ -62,9 +62,9 @@ public: void write(offs_t offset, u8 data); // line write handlers - DECLARE_WRITE_LINE_MEMBER(dtr_w); - DECLARE_WRITE_LINE_MEMBER(txd_w); - DECLARE_WRITE_LINE_MEMBER(rts_w); + void dtr_w(int state); + void txd_w(int state); + void rts_w(int state); protected: // device-specific overrides diff --git a/src/mame/sage/sage2.cpp b/src/mame/sage/sage2.cpp index f3c5cd285b0..654aae99981 100644 --- a/src/mame/sage/sage2.cpp +++ b/src/mame/sage/sage2.cpp @@ -211,7 +211,7 @@ void sage2_state::ppi0_pc_w(uint8_t data) // I8255A INTERFACE( ppi1_intf ) //------------------------------------------------- -WRITE_LINE_MEMBER(sage2_state::write_centronics_ack) +void sage2_state::write_centronics_ack(int state) { if (!state) { @@ -219,22 +219,22 @@ WRITE_LINE_MEMBER(sage2_state::write_centronics_ack) } } -WRITE_LINE_MEMBER(sage2_state::write_centronics_busy) +void sage2_state::write_centronics_busy(int state) { m_centronics_busy = state; } -WRITE_LINE_MEMBER(sage2_state::write_centronics_perror) +void sage2_state::write_centronics_perror(int state) { m_centronics_perror = state; } -WRITE_LINE_MEMBER(sage2_state::write_centronics_select) +void sage2_state::write_centronics_select(int state) { m_centronics_select = state; } -WRITE_LINE_MEMBER(sage2_state::write_centronics_fault) +void sage2_state::write_centronics_fault(int state) { m_centronics_fault = state; } @@ -323,13 +323,13 @@ void sage2_state::ppi1_pc_w(uint8_t data) } } -WRITE_LINE_MEMBER( sage2_state::br1_w ) +void sage2_state::br1_w(int state) { m_usart0->write_txc(state); m_usart0->write_rxc(state); } -WRITE_LINE_MEMBER( sage2_state::br2_w ) +void sage2_state::br2_w(int state) { m_usart1->write_txc(state); m_usart1->write_rxc(state); @@ -349,7 +349,7 @@ void sage2_state::update_fdc_int() m_maincpu->set_input_line(M68K_IRQ_6, m_fdie && m_fdc_int); } -WRITE_LINE_MEMBER( sage2_state::fdc_irq ) +void sage2_state::fdc_irq(int state) { m_fdc_int = state; update_fdc_int(); diff --git a/src/mame/sage/sage2.h b/src/mame/sage/sage2.h index ccdb97f1ecd..eec8621c560 100644 --- a/src/mame/sage/sage2.h +++ b/src/mame/sage/sage2.h @@ -56,19 +56,19 @@ private: void update_fdc_int(); uint16_t rom_r(offs_t offset); - DECLARE_WRITE_LINE_MEMBER( br1_w ); - DECLARE_WRITE_LINE_MEMBER( br2_w ); + void br1_w(int state); + void br2_w(int state); void ppi0_pc_w(uint8_t data); uint8_t ppi1_pb_r(); void ppi1_pc_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER( fdc_irq ); + void fdc_irq(int state); - DECLARE_WRITE_LINE_MEMBER(write_centronics_ack); - DECLARE_WRITE_LINE_MEMBER(write_centronics_busy); - DECLARE_WRITE_LINE_MEMBER(write_centronics_perror); - DECLARE_WRITE_LINE_MEMBER(write_centronics_select); - DECLARE_WRITE_LINE_MEMBER(write_centronics_fault); + void write_centronics_ack(int state); + void write_centronics_busy(int state); + void write_centronics_perror(int state); + void write_centronics_select(int state); + void write_centronics_fault(int state); void sage2_mem(address_map &map); diff --git a/src/mame/samsung/spc1000.cpp b/src/mame/samsung/spc1000.cpp index 2db77c1a67a..ecb8f48fbb1 100644 --- a/src/mame/samsung/spc1000.cpp +++ b/src/mame/samsung/spc1000.cpp @@ -164,11 +164,11 @@ public: private: void iplk_w(uint8_t data); uint8_t iplk_r(); - DECLARE_WRITE_LINE_MEMBER(irq_w); + void irq_w(int state); void gmode_w(uint8_t data); uint8_t gmode_r(); uint8_t porta_r(); - DECLARE_WRITE_LINE_MEMBER( centronics_busy_w ) { m_centronics_busy = state; } + void centronics_busy_w(int state) { m_centronics_busy = state; } uint8_t mc6847_videoram_r(offs_t offset); void cass_w(uint8_t data); uint8_t keyboard_r(offs_t offset); @@ -459,7 +459,7 @@ uint8_t spc1000_state::porta_r() } // irq is inverted in emulation, so we need this trampoline -WRITE_LINE_MEMBER( spc1000_state::irq_w ) +void spc1000_state::irq_w(int state) { m_maincpu->set_input_line(0, state ? CLEAR_LINE : HOLD_LINE); } diff --git a/src/mame/samsung/spc1500.cpp b/src/mame/samsung/spc1500.cpp index 4c52b8116b7..52cca33a03d 100644 --- a/src/mame/samsung/spc1500.cpp +++ b/src/mame/samsung/spc1500.cpp @@ -276,7 +276,7 @@ protected: private: uint8_t psga_r(); uint8_t porta_r(); - DECLARE_WRITE_LINE_MEMBER( centronics_busy_w ) { m_centronics_busy = state; } + void centronics_busy_w(int state) { m_centronics_busy = state; } uint8_t mc6845_videoram_r(offs_t offset); uint8_t keyboard_r(offs_t offset); void palet_w(offs_t offset, uint8_t data); diff --git a/src/mame/sanritsu/appoooh.cpp b/src/mame/sanritsu/appoooh.cpp index fb584be033b..7cd04472704 100644 --- a/src/mame/sanritsu/appoooh.cpp +++ b/src/mame/sanritsu/appoooh.cpp @@ -235,7 +235,7 @@ protected: INTERRUPT_GEN_MEMBER(vblank_irq); void draw_sprites(bitmap_ind16 &dest_bmp, const rectangle &cliprect, gfx_element *gfx, uint8_t *sprite); uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(adpcm_int); + void adpcm_int(int state); void common(machine_config &config); void main_map(address_map &map); @@ -498,7 +498,7 @@ uint32_t base_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, * *************************************/ -WRITE_LINE_MEMBER(base_state::adpcm_int) +void base_state::adpcm_int(int state) { if (!m_adpcm_playing || !state) return; diff --git a/src/mame/sanritsu/chinsan.cpp b/src/mame/sanritsu/chinsan.cpp index 1b27dae2e5f..a61ee27430c 100644 --- a/src/mame/sanritsu/chinsan.cpp +++ b/src/mame/sanritsu/chinsan.cpp @@ -66,7 +66,7 @@ public: TILE_GET_INFO_MEMBER(tile_info); void adpcm_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(adpcm_int_w); + void adpcm_int_w(int state); INTERRUPT_GEN_MEMBER(vblank_int); void ctrl_w(uint8_t data); @@ -411,7 +411,7 @@ void chinsan_state::adpcm_w(uint8_t data) m_adpcm->reset_w(0); } -WRITE_LINE_MEMBER( chinsan_state::adpcm_int_w ) +void chinsan_state::adpcm_int_w(int state) { if (m_adpcm_pos >= 0x10000 || m_adpcm_idle) { diff --git a/src/mame/sanritsu/drmicro.cpp b/src/mame/sanritsu/drmicro.cpp index 6d8ba64f67a..5eade08eb14 100644 --- a/src/mame/sanritsu/drmicro.cpp +++ b/src/mame/sanritsu/drmicro.cpp @@ -72,7 +72,7 @@ private: template void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(interrupt); - DECLARE_WRITE_LINE_MEMBER(pcm_w); + void pcm_w(int state); void prg_map(address_map &map); void io_map(address_map &map); }; @@ -231,7 +231,7 @@ void drmicro_state::nmi_enable_w(uint8_t data) } -WRITE_LINE_MEMBER(drmicro_state::pcm_w) +void drmicro_state::pcm_w(int state) { int data = m_adpcm_rom[m_pcm_adr / 2]; diff --git a/src/mame/sanritsu/jantotsu.cpp b/src/mame/sanritsu/jantotsu.cpp index 314452a5ec6..f567e8c9d50 100644 --- a/src/mame/sanritsu/jantotsu.cpp +++ b/src/mame/sanritsu/jantotsu.cpp @@ -157,7 +157,7 @@ private: void adpcm_w(offs_t offset, uint8_t data); void palette(palette_device &palette) const; uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(adpcm_int); + void adpcm_int(int state); void io_map(address_map &map); void prg_map(address_map &map); }; @@ -295,7 +295,7 @@ void jantotsu_state::adpcm_w(offs_t offset, uint8_t data) } } -WRITE_LINE_MEMBER(jantotsu_state::adpcm_int) +void jantotsu_state::adpcm_int(int state) { if (m_adpcm_pos >= 0x10000 || m_adpcm_idle) { diff --git a/src/mame/sanritsu/mermaid.cpp b/src/mame/sanritsu/mermaid.cpp index 756a2254bc2..94463add812 100644 --- a/src/mame/sanritsu/mermaid.cpp +++ b/src/mame/sanritsu/mermaid.cpp @@ -139,17 +139,17 @@ void mermaid_state::mermaid_ay8910_control_port_w(uint8_t data) } -WRITE_LINE_MEMBER(mermaid_state::ay1_enable_w) +void mermaid_state::ay1_enable_w(int state) { m_ay8910_enable[0] = state; } -WRITE_LINE_MEMBER(mermaid_state::ay2_enable_w) +void mermaid_state::ay2_enable_w(int state) { m_ay8910_enable[1] = state; } -WRITE_LINE_MEMBER(mermaid_state::nmi_mask_w) +void mermaid_state::nmi_mask_w(int state) { m_nmi_mask = state; if (!m_nmi_mask) @@ -179,19 +179,19 @@ void mermaid_state::mermaid_map(address_map &map) map(0xf807, 0xf807).w(FUNC(mermaid_state::mermaid_ay8910_control_port_w)); } -WRITE_LINE_MEMBER(mermaid_state::rougien_sample_rom_lo_w) +void mermaid_state::rougien_sample_rom_lo_w(int state) { m_adpcm_rom_sel = state | (m_adpcm_rom_sel & 2); m_adpcm_counter->set_rom_bank(m_adpcm_rom_sel); } -WRITE_LINE_MEMBER(mermaid_state::rougien_sample_rom_hi_w) +void mermaid_state::rougien_sample_rom_hi_w(int state) { m_adpcm_rom_sel = (state <<1) | (m_adpcm_rom_sel & 1); m_adpcm_counter->set_rom_bank(m_adpcm_rom_sel); } -WRITE_LINE_MEMBER(mermaid_state::rougien_sample_playback_w) +void mermaid_state::rougien_sample_playback_w(int state) { if (state) { @@ -408,7 +408,7 @@ void mermaid_state::adpcm_data_w(uint8_t data) m_adpcm->data_w(m_adpcm_trigger ? (data & 0x0f) : (data & 0xf0) >> 4); } -WRITE_LINE_MEMBER(mermaid_state::rougien_adpcm_int) +void mermaid_state::rougien_adpcm_int(int state) { if (!state) return; diff --git a/src/mame/sanritsu/mermaid.h b/src/mame/sanritsu/mermaid.h index db00111acb2..eb0b0abd83d 100644 --- a/src/mame/sanritsu/mermaid.h +++ b/src/mame/sanritsu/mermaid.h @@ -90,24 +90,24 @@ private: uint8_t m_nmi_mask = 0; void mermaid_ay8910_write_port_w(uint8_t data); void mermaid_ay8910_control_port_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(ay1_enable_w); - DECLARE_WRITE_LINE_MEMBER(ay2_enable_w); - DECLARE_WRITE_LINE_MEMBER(nmi_mask_w); - DECLARE_WRITE_LINE_MEMBER(rougien_sample_rom_lo_w); - DECLARE_WRITE_LINE_MEMBER(rougien_sample_rom_hi_w); - DECLARE_WRITE_LINE_MEMBER(rougien_sample_playback_w); + void ay1_enable_w(int state); + void ay2_enable_w(int state); + void nmi_mask_w(int state); + void rougien_sample_rom_lo_w(int state); + void rougien_sample_rom_hi_w(int state); + void rougien_sample_playback_w(int state); void adpcm_data_w(uint8_t data); void mermaid_videoram2_w(offs_t offset, uint8_t data); void mermaid_videoram_w(offs_t offset, uint8_t data); void mermaid_colorram_w(offs_t offset, uint8_t data); - DECLARE_WRITE_LINE_MEMBER(flip_screen_x_w); - DECLARE_WRITE_LINE_MEMBER(flip_screen_y_w); + void flip_screen_x_w(int state); + void flip_screen_y_w(int state); void mermaid_bg_scroll_w(offs_t offset, uint8_t data); void mermaid_fg_scroll_w(offs_t offset, uint8_t data); - DECLARE_WRITE_LINE_MEMBER(bg_mask_w); - DECLARE_WRITE_LINE_MEMBER(bg_bank_w); - DECLARE_WRITE_LINE_MEMBER(rougien_gfxbankswitch1_w); - DECLARE_WRITE_LINE_MEMBER(rougien_gfxbankswitch2_w); + void bg_mask_w(int state); + void bg_bank_w(int state); + void rougien_gfxbankswitch1_w(int state); + void rougien_gfxbankswitch2_w(int state); uint8_t mermaid_collision_r(); TILE_GET_INFO_MEMBER(get_bg_tile_info); TILE_GET_INFO_MEMBER(get_fg_tile_info); @@ -118,11 +118,11 @@ private: void mermaid_palette(palette_device &palette) const; void rougien_palette(palette_device &palette) const; uint32_t screen_update_mermaid(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(screen_vblank_mermaid); + void screen_vblank_mermaid(int state); void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); uint8_t collision_check( rectangle& rect ); void collision_update(); - DECLARE_WRITE_LINE_MEMBER(rougien_adpcm_int); + void rougien_adpcm_int(int state); void mermaid_map(address_map &map); }; diff --git a/src/mame/sanritsu/mermaid_v.cpp b/src/mame/sanritsu/mermaid_v.cpp index bec0e084745..c5fcd29d44f 100644 --- a/src/mame/sanritsu/mermaid_v.cpp +++ b/src/mame/sanritsu/mermaid_v.cpp @@ -72,12 +72,12 @@ void mermaid_state::mermaid_colorram_w(offs_t offset, uint8_t data) m_fg_tilemap->mark_tile_dirty(offset); } -WRITE_LINE_MEMBER(mermaid_state::flip_screen_x_w) +void mermaid_state::flip_screen_x_w(int state) { flip_screen_x_set(state); } -WRITE_LINE_MEMBER(mermaid_state::flip_screen_y_w) +void mermaid_state::flip_screen_y_w(int state) { flip_screen_y_set(state); } @@ -94,25 +94,25 @@ void mermaid_state::mermaid_fg_scroll_w(offs_t offset, uint8_t data) m_fg_tilemap->set_scrolly(offset, data); } -WRITE_LINE_MEMBER(mermaid_state::bg_mask_w) +void mermaid_state::bg_mask_w(int state) { m_bg_mask = state; logerror("mask %d\n", state); } -WRITE_LINE_MEMBER(mermaid_state::bg_bank_w) +void mermaid_state::bg_bank_w(int state) { m_bg_bank = state ? 0x100 : 0; m_bg_tilemap->mark_all_dirty(); logerror("bank %d\n", state); } -WRITE_LINE_MEMBER(mermaid_state::rougien_gfxbankswitch1_w) +void mermaid_state::rougien_gfxbankswitch1_w(int state) { m_rougien_gfxbank1 = state; } -WRITE_LINE_MEMBER(mermaid_state::rougien_gfxbankswitch2_w) +void mermaid_state::rougien_gfxbankswitch2_w(int state) { m_rougien_gfxbank2 = state; } @@ -574,7 +574,7 @@ void mermaid_state::collision_update() } } -WRITE_LINE_MEMBER(mermaid_state::screen_vblank_mermaid) +void mermaid_state::screen_vblank_mermaid(int state) { // rising edge if (state) diff --git a/src/mame/sanritsu/mjkjidai.cpp b/src/mame/sanritsu/mjkjidai.cpp index 26def0d109c..1c61d289240 100644 --- a/src/mame/sanritsu/mjkjidai.cpp +++ b/src/mame/sanritsu/mjkjidai.cpp @@ -99,10 +99,10 @@ private: void videoram_w(offs_t offset, uint8_t data); void ctrl_w(uint8_t data); void adpcm_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(adpcm_int); + void adpcm_int(int state); TILE_GET_INFO_MEMBER(get_tile_info); uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(vblank_irq); + void vblank_irq(int state); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); void io_map(address_map &map); void prg_map(address_map &map); @@ -244,7 +244,7 @@ void mjkjidai_state::adpcm_w(uint8_t data) m_msm->reset_w(0); } -WRITE_LINE_MEMBER(mjkjidai_state::adpcm_int) +void mjkjidai_state::adpcm_int(int state) { if (m_adpcm_pos >= m_adpcm_end) { @@ -478,7 +478,7 @@ static GFXDECODE_START( gfx_mjkjidai ) GFXDECODE_ENTRY( "gfx", 0, spritelayout, 0, 16 ) GFXDECODE_END -WRITE_LINE_MEMBER(mjkjidai_state::vblank_irq) +void mjkjidai_state::vblank_irq(int state) { if (state && m_nmi_enable) m_maincpu->set_input_line(INPUT_LINE_NMI, ASSERT_LINE); diff --git a/src/mame/sanritsu/ron.cpp b/src/mame/sanritsu/ron.cpp index b7a3d2d4931..da30b4efb0c 100644 --- a/src/mame/sanritsu/ron.cpp +++ b/src/mame/sanritsu/ron.cpp @@ -60,7 +60,7 @@ private: // screen updates uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void ron_palette(palette_device &palette) const; - DECLARE_WRITE_LINE_MEMBER(vblank_irq); + void vblank_irq(int state); void output_w(uint8_t data); uint8_t p1_mux_r(offs_t offset); @@ -70,7 +70,7 @@ private: uint8_t audio_cmd_r(); void audio_p1_w(uint8_t data); void audio_p2_w(uint8_t data); - DECLARE_READ_LINE_MEMBER(audio_t1_r); + int audio_t1_r(); void ay_pa_w(uint8_t data); void ron_audio_io(address_map &map); @@ -424,7 +424,7 @@ void ron_state::ron_palette(palette_device &palette) const } -WRITE_LINE_MEMBER(ron_state::vblank_irq) +void ron_state::vblank_irq(int state) { if (state && m_nmi_enable) m_maincpu->set_input_line(INPUT_LINE_NMI, ASSERT_LINE); @@ -468,7 +468,7 @@ void ron_state::audio_p2_w(uint8_t data) // machine().debug_break(); } -READ_LINE_MEMBER(ron_state::audio_t1_r) +int ron_state::audio_t1_r() { // TODO: what controls this? return !BIT(m_sound_command, 6); diff --git a/src/mame/sanyo/mbc55x.cpp b/src/mame/sanyo/mbc55x.cpp index 731a7c1136c..b5d743b9751 100644 --- a/src/mame/sanyo/mbc55x.cpp +++ b/src/mame/sanyo/mbc55x.cpp @@ -152,17 +152,17 @@ void mbc55x_state::disk_select_w(uint8_t data) m_printer->write_strobe(!BIT(data, 3)); } -WRITE_LINE_MEMBER(mbc55x_state::printer_busy_w) +void mbc55x_state::printer_busy_w(int state) { m_printer_status = (m_printer_status & 0xef) | (state ? 0x10 : 0x00); } -WRITE_LINE_MEMBER(mbc55x_state::printer_paper_end_w) +void mbc55x_state::printer_paper_end_w(int state) { m_printer_status = (m_printer_status & 0xdf) | (state ? 0x20 : 0x00); } -WRITE_LINE_MEMBER(mbc55x_state::printer_select_w) +void mbc55x_state::printer_select_w(int state) { m_printer_status = (m_printer_status & 0xbf) | (state ? 0x40 : 0x00); } diff --git a/src/mame/sanyo/mbc55x.h b/src/mame/sanyo/mbc55x.h index f08ced15d46..f9b9238168f 100644 --- a/src/mame/sanyo/mbc55x.h +++ b/src/mame/sanyo/mbc55x.h @@ -109,12 +109,12 @@ private: uint8_t printer_status_r(); void printer_data_w(uint8_t data); void disk_select_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(printer_busy_w); - DECLARE_WRITE_LINE_MEMBER(printer_paper_end_w); - DECLARE_WRITE_LINE_MEMBER(printer_select_w); + void printer_busy_w(int state); + void printer_paper_end_w(int state); + void printer_select_w(int state); - DECLARE_WRITE_LINE_MEMBER(vid_hsync_changed); - DECLARE_WRITE_LINE_MEMBER(vid_vsync_changed); + void vid_hsync_changed(int state); + void vid_vsync_changed(int state); MC6845_UPDATE_ROW(crtc_update_row); void mbc55x_palette(palette_device &palette) const; diff --git a/src/mame/sanyo/mbc55x_v.cpp b/src/mame/sanyo/mbc55x_v.cpp index 7cf4edd6ae2..7b85e9050c5 100644 --- a/src/mame/sanyo/mbc55x_v.cpp +++ b/src/mame/sanyo/mbc55x_v.cpp @@ -119,11 +119,11 @@ MC6845_UPDATE_ROW( mbc55x_state::crtc_update_row ) } } -WRITE_LINE_MEMBER( mbc55x_state::vid_hsync_changed ) +void mbc55x_state::vid_hsync_changed(int state) { } -WRITE_LINE_MEMBER( mbc55x_state::vid_vsync_changed ) +void mbc55x_state::vid_vsync_changed(int state) { } diff --git a/src/mame/sanyo/phc25.cpp b/src/mame/sanyo/phc25.cpp index 1fa46b65554..b6d8ac9cbfb 100644 --- a/src/mame/sanyo/phc25.cpp +++ b/src/mame/sanyo/phc25.cpp @@ -117,7 +117,7 @@ void phc25_state::port40_w(uint8_t data) m_port40 = data; } -WRITE_LINE_MEMBER( phc25_state::write_centronics_busy ) +void phc25_state::write_centronics_busy(int state) { m_centronics_busy = state; } @@ -294,7 +294,7 @@ MC6847_GET_CHARROM_MEMBER(phc25_state::pal_char_rom_r) } // irq is inverted in emulation, so we need this trampoline -WRITE_LINE_MEMBER( phc25_state::irq_w ) +void phc25_state::irq_w(int state) { m_maincpu->set_input_line(0, state ? CLEAR_LINE : ASSERT_LINE); } diff --git a/src/mame/sanyo/phc25.h b/src/mame/sanyo/phc25.h index a9cb1053cdf..8a123cfe9f8 100644 --- a/src/mame/sanyo/phc25.h +++ b/src/mame/sanyo/phc25.h @@ -41,10 +41,10 @@ public: private: void io_map(address_map &map); void mem_map(address_map &map); - DECLARE_WRITE_LINE_MEMBER( write_centronics_busy ); + void write_centronics_busy(int state); uint8_t port40_r(); void port40_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(irq_w); + void irq_w(int state); uint8_t video_ram_r(offs_t offset); MC6847_GET_CHARROM_MEMBER(ntsc_char_rom_r); MC6847_GET_CHARROM_MEMBER(pal_char_rom_r); diff --git a/src/mame/sega/blockade.cpp b/src/mame/sega/blockade.cpp index 6a1dfb6d325..193ef81ea16 100644 --- a/src/mame/sega/blockade.cpp +++ b/src/mame/sega/blockade.cpp @@ -47,7 +47,7 @@ public: { } DECLARE_INPUT_CHANGED_MEMBER(coin_inserted); - DECLARE_READ_LINE_MEMBER(coin_r); + int coin_r(); void coin_latch_w(uint8_t data); void videoram_w(offs_t offset, uint8_t data); @@ -335,7 +335,7 @@ INPUT_CHANGED_MEMBER( blockade_state::coin_inserted ) m_maincpu->pulse_input_line(INPUT_LINE_RESET, attotime::zero); } -READ_LINE_MEMBER( blockade_state::coin_r ) +int blockade_state::coin_r() { return m_coin_latch; } diff --git a/src/mame/sega/calcune.cpp b/src/mame/sega/calcune.cpp index e9e1002eb8c..b6d93f5e9cb 100644 --- a/src/mame/sega/calcune.cpp +++ b/src/mame/sega/calcune.cpp @@ -51,9 +51,9 @@ private: int m_vdp_state = 0; - WRITE_LINE_MEMBER(vdp_sndirqline_callback_genesis_z80); - WRITE_LINE_MEMBER(vdp_lv6irqline_callback_genesis_68k); - WRITE_LINE_MEMBER(vdp_lv4irqline_callback_genesis_68k); + void vdp_sndirqline_callback_genesis_z80(int state); + void vdp_lv6irqline_callback_genesis_68k(int state); + void vdp_lv4irqline_callback_genesis_68k(int state); IRQ_CALLBACK_MEMBER(genesis_int_callback); @@ -222,11 +222,11 @@ IRQ_CALLBACK_MEMBER(calcune_state::genesis_int_callback) return (0x60+irqline*4)/4; // vector address } -WRITE_LINE_MEMBER(calcune_state::vdp_sndirqline_callback_genesis_z80) +void calcune_state::vdp_sndirqline_callback_genesis_z80(int state) { } -WRITE_LINE_MEMBER(calcune_state::vdp_lv6irqline_callback_genesis_68k) +void calcune_state::vdp_lv6irqline_callback_genesis_68k(int state) { // this looks odd but is the logic the Genesis code requires if (state == ASSERT_LINE) @@ -235,7 +235,7 @@ WRITE_LINE_MEMBER(calcune_state::vdp_lv6irqline_callback_genesis_68k) m_maincpu->set_input_line(6, CLEAR_LINE); } -WRITE_LINE_MEMBER(calcune_state::vdp_lv4irqline_callback_genesis_68k) +void calcune_state::vdp_lv4irqline_callback_genesis_68k(int state) { // this looks odd but is the logic the Genesis code requires if (state == ASSERT_LINE) diff --git a/src/mame/sega/coolridr.cpp b/src/mame/sega/coolridr.cpp index b9157707d4a..a393076a53e 100644 --- a/src/mame/sega/coolridr.cpp +++ b/src/mame/sega/coolridr.cpp @@ -394,8 +394,8 @@ public: template uint16_t soundram_r(offs_t offset); template void soundram_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); void lamps_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(scsp1_to_sh1_irq); - DECLARE_WRITE_LINE_MEMBER(scsp2_to_sh1_irq); + void scsp1_to_sh1_irq(int state); + void scsp2_to_sh1_irq(int state); void sound_to_sh1_w(uint8_t data); void init_coolridr(); void init_aquastge(); @@ -3206,7 +3206,7 @@ void coolridr_state::scsp_irq(offs_t offset, uint8_t data) m_soundcpu->set_input_line(offset, data); } -WRITE_LINE_MEMBER(coolridr_state::scsp1_to_sh1_irq) +void coolridr_state::scsp1_to_sh1_irq(int state) { m_subcpu->set_input_line(0xe, (state) ? ASSERT_LINE : CLEAR_LINE); if(state) @@ -3215,7 +3215,7 @@ WRITE_LINE_MEMBER(coolridr_state::scsp1_to_sh1_irq) m_sound_data &= ~0x10; } -WRITE_LINE_MEMBER(coolridr_state::scsp2_to_sh1_irq) +void coolridr_state::scsp2_to_sh1_irq(int state) { m_subcpu->set_input_line(0xe, (state) ? ASSERT_LINE : CLEAR_LINE); if(state) diff --git a/src/mame/sega/dc.cpp b/src/mame/sega/dc.cpp index 9e97c847294..7b4675f9d50 100644 --- a/src/mame/sega/dc.cpp +++ b/src/mame/sega/dc.cpp @@ -622,12 +622,12 @@ void dc_state::soundram_w(offs_t offset, uint16_t data, uint16_t mem_mask) COMBINE_DATA(&dc_sound_ram[offset]); } -WRITE_LINE_MEMBER(dc_state::aica_irq) +void dc_state::aica_irq(int state) { m_soundcpu->set_input_line(ARM7_FIRQ_LINE, state ? ASSERT_LINE : CLEAR_LINE); } -WRITE_LINE_MEMBER(dc_state::sh4_aica_irq) +void dc_state::sh4_aica_irq(int state) { if(state) dc_sysctrl_regs[SB_ISTEXT] |= IST_EXT_AICA; @@ -637,7 +637,7 @@ WRITE_LINE_MEMBER(dc_state::sh4_aica_irq) dc_update_interrupt_status(); } -WRITE_LINE_MEMBER(dc_state::external_irq) +void dc_state::external_irq(int state) { if (state) dc_sysctrl_regs[SB_ISTEXT] |= IST_EXT_EXTERNAL; diff --git a/src/mame/sega/dc.h b/src/mame/sega/dc.h index bedea554910..43532309195 100644 --- a/src/mame/sega/dc.h +++ b/src/mame/sega/dc.h @@ -72,9 +72,9 @@ public: void maple_irq(uint8_t data); uint16_t soundram_r(offs_t offset); void soundram_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); - DECLARE_WRITE_LINE_MEMBER(aica_irq); - DECLARE_WRITE_LINE_MEMBER(sh4_aica_irq); - DECLARE_WRITE_LINE_MEMBER(external_irq); + void aica_irq(int state); + void sh4_aica_irq(int state); + void external_irq(int state); required_device m_maincpu; diff --git a/src/mame/sega/dccons.h b/src/mame/sega/dccons.h index 27bc4639fd5..29de14fd65f 100644 --- a/src/mame/sega/dccons.h +++ b/src/mame/sega/dccons.h @@ -29,9 +29,9 @@ public: uint64_t dc_pdtra_r(); void dc_pdtra_w(uint64_t data); - DECLARE_WRITE_LINE_MEMBER(aica_irq); - DECLARE_WRITE_LINE_MEMBER(sh4_aica_irq); - DECLARE_WRITE_LINE_MEMBER(ata_interrupt); + void aica_irq(int state); + void sh4_aica_irq(int state); + void ata_interrupt(int state); TIMER_CALLBACK_MEMBER( atapi_xfer_end ); diff --git a/src/mame/sega/dccons_m.cpp b/src/mame/sega/dccons_m.cpp index c085f6a4320..426f49f0c69 100644 --- a/src/mame/sega/dccons_m.cpp +++ b/src/mame/sega/dccons_m.cpp @@ -45,7 +45,7 @@ #define LOGWARN(...) LOGMASKED(LOG_WARN, __VA_ARGS__) #define LOGXFER(...) LOGMASKED(LOG_XFER, __VA_ARGS__) -WRITE_LINE_MEMBER(dc_cons_state::ata_interrupt) +void dc_cons_state::ata_interrupt(int state) { if (state) dc_sysctrl_regs[SB_ISTEXT] |= IST_EXT_GDROM; diff --git a/src/mame/sega/dsbz80.cpp b/src/mame/sega/dsbz80.cpp index 85c4e8ce2cc..0be589234ae 100644 --- a/src/mame/sega/dsbz80.cpp +++ b/src/mame/sega/dsbz80.cpp @@ -102,12 +102,12 @@ void dsbz80_device::device_reset() m_uart->write_cts(0); } -WRITE_LINE_MEMBER(dsbz80_device::write_txd) +void dsbz80_device::write_txd(int state) { m_uart->write_rxd(state); } -WRITE_LINE_MEMBER(dsbz80_device::output_txd) +void dsbz80_device::output_txd(int state) { // not used by swa m_rxd_handler(state); diff --git a/src/mame/sega/dsbz80.h b/src/mame/sega/dsbz80.h index af690365024..edec1040591 100644 --- a/src/mame/sega/dsbz80.h +++ b/src/mame/sega/dsbz80.h @@ -27,7 +27,7 @@ public: required_device m_ourcpu; required_device m_uart; - DECLARE_WRITE_LINE_MEMBER(write_txd); + void write_txd(int state); void dsbz80_map(address_map &map); void dsbz80io_map(address_map &map); @@ -47,7 +47,7 @@ private: devcb_write_line m_rxd_handler; - DECLARE_WRITE_LINE_MEMBER(output_txd); + void output_txd(int state); void mpeg_trigger_w(uint8_t data); void mpeg_start_w(offs_t offset, uint8_t data); diff --git a/src/mame/sega/eshockey.cpp b/src/mame/sega/eshockey.cpp index bf5afc57907..f168d2bde27 100644 --- a/src/mame/sega/eshockey.cpp +++ b/src/mame/sega/eshockey.cpp @@ -46,9 +46,9 @@ public: private: required_device m_maincpu; - DECLARE_WRITE_LINE_MEMBER(pit_out0); - DECLARE_WRITE_LINE_MEMBER(pit_out1); - DECLARE_WRITE_LINE_MEMBER(pit_out2); + void pit_out0(int state); + void pit_out1(int state); + void pit_out2(int state); void prg_map(address_map &map); void io_map(address_map &map); @@ -61,19 +61,19 @@ private: ***************************************************************************/ -WRITE_LINE_MEMBER(eshockey_state::pit_out0) +void eshockey_state::pit_out0(int state) { // ? } -WRITE_LINE_MEMBER(eshockey_state::pit_out1) +void eshockey_state::pit_out1(int state) { // NMI? if (state) m_maincpu->pulse_input_line(INPUT_LINE_NMI, attotime::zero); } -WRITE_LINE_MEMBER(eshockey_state::pit_out2) +void eshockey_state::pit_out2(int state) { // ? } diff --git a/src/mame/sega/fd1094.cpp b/src/mame/sega/fd1094.cpp index ea4c5018eba..d8cb3cc8f0f 100644 --- a/src/mame/sega/fd1094.cpp +++ b/src/mame/sega/fd1094.cpp @@ -937,7 +937,7 @@ IRQ_CALLBACK_MEMBER( fd1094_device::irq_callback ) // is encountered //------------------------------------------------- -WRITE_LINE_MEMBER(fd1094_device::rte_callback) +void fd1094_device::rte_callback(int state) { change_state(STATE_RTE); } diff --git a/src/mame/sega/fd1094.h b/src/mame/sega/fd1094.h index cde9415d79d..1508c474f24 100644 --- a/src/mame/sega/fd1094.h +++ b/src/mame/sega/fd1094.h @@ -103,7 +103,7 @@ protected: // static helpers void cmp_callback(offs_t offset, uint32_t data); - DECLARE_WRITE_LINE_MEMBER(rte_callback); + void rte_callback(int state); // internal state uint8_t m_state; diff --git a/src/mame/sega/jvs13551.cpp b/src/mame/sega/jvs13551.cpp index e76875b499d..66e77862787 100644 --- a/src/mame/sega/jvs13551.cpp +++ b/src/mame/sega/jvs13551.cpp @@ -7,13 +7,13 @@ DEFINE_DEVICE_TYPE(SEGA_837_13551, sega_837_13551_device, "jvs13551", "Sega 837-13551 I/O Board") -WRITE_LINE_MEMBER(sega_837_13551_device::jvs13551_coin_1_w) +void sega_837_13551_device::jvs13551_coin_1_w(int state) { if(state) inc_coin(0); } -WRITE_LINE_MEMBER(sega_837_13551_device::jvs13551_coin_2_w) +void sega_837_13551_device::jvs13551_coin_2_w(int state) { if(state) inc_coin(1); diff --git a/src/mame/sega/jvs13551.h b/src/mame/sega/jvs13551.h index abfe5c2dae4..b3aee16ea41 100644 --- a/src/mame/sega/jvs13551.h +++ b/src/mame/sega/jvs13551.h @@ -33,8 +33,8 @@ public: virtual const tiny_rom_entry *device_rom_region() const override; - DECLARE_WRITE_LINE_MEMBER(jvs13551_coin_1_w); - DECLARE_WRITE_LINE_MEMBER(jvs13551_coin_2_w); + void jvs13551_coin_1_w(int state); + void jvs13551_coin_2_w(int state); void inc_coin(int coin); protected: diff --git a/src/mame/sega/m1comm.cpp b/src/mame/sega/m1comm.cpp index 6771229dc92..0b690e8d3e8 100644 --- a/src/mame/sega/m1comm.cpp +++ b/src/mame/sega/m1comm.cpp @@ -192,7 +192,7 @@ void m1comm_device::device_reset_after_children() m_dlc->set_input_line(INPUT_LINE_RESET, ASSERT_LINE); } -WRITE_LINE_MEMBER(m1comm_device::dma_hreq_w) +void m1comm_device::dma_hreq_w(int state) { m_cpu->set_input_line(INPUT_LINE_HALT, state ? ASSERT_LINE : CLEAR_LINE); m_dma->hack_w(state); @@ -208,7 +208,7 @@ void m1comm_device::dma_mem_w(offs_t offset, uint8_t data) m_cpu->space(AS_PROGRAM).write_byte(offset, data); } -WRITE_LINE_MEMBER(m1comm_device::dlc_int7_w) +void m1comm_device::dlc_int7_w(int state) { m_cpu->set_input_line_and_vector(0, state ? ASSERT_LINE : CLEAR_LINE, 0xff); // Z80 } diff --git a/src/mame/sega/m1comm.h b/src/mame/sega/m1comm.h index 22bd24a0f92..939d0375598 100644 --- a/src/mame/sega/m1comm.h +++ b/src/mame/sega/m1comm.h @@ -60,10 +60,10 @@ private: required_device m_dlc; // MB89374 handler - DECLARE_WRITE_LINE_MEMBER(dlc_int7_w); + void dlc_int7_w(int state); // MB89237A handler - DECLARE_WRITE_LINE_MEMBER(dma_hreq_w); + void dma_hreq_w(int state); uint8_t dma_mem_r(offs_t offset); void dma_mem_w(offs_t offset, uint8_t data); diff --git a/src/mame/sega/mdconsole.cpp b/src/mame/sega/mdconsole.cpp index 7cb150ee65a..40a9bf81189 100644 --- a/src/mame/sega/mdconsole.cpp +++ b/src/mame/sega/mdconsole.cpp @@ -173,7 +173,7 @@ void md_cons_cd_state::machine_start() } // same as screen_eof_megadriv but with addition of 32x and SegaCD/MegaCD pieces -WRITE_LINE_MEMBER(md_cons_state::screen_vblank_console) +void md_cons_state::screen_vblank_console(int state) { if (m_io_reset.read_safe(0) & 0x01) m_maincpu->pulse_input_line(INPUT_LINE_RESET, attotime::zero); diff --git a/src/mame/sega/mdconsole.h b/src/mame/sega/mdconsole.h index 3359ba9260f..c6f74d59cee 100644 --- a/src/mame/sega/mdconsole.h +++ b/src/mame/sega/mdconsole.h @@ -41,7 +41,7 @@ protected: virtual void machine_start() override; virtual void machine_reset() override; - DECLARE_WRITE_LINE_MEMBER(screen_vblank_console); + void screen_vblank_console(int state); DECLARE_DEVICE_IMAGE_LOAD_MEMBER( _32x_cart ); diff --git a/src/mame/sega/mdioport.cpp b/src/mame/sega/mdioport.cpp index d281cb1dad9..f7439d93669 100644 --- a/src/mame/sega/mdioport.cpp +++ b/src/mame/sega/mdioport.cpp @@ -316,7 +316,7 @@ megadrive_io_port_device::megadrive_io_port_device( } -WRITE_LINE_MEMBER(megadrive_io_port_device::th_w) +void megadrive_io_port_device::th_w(int state) { u8 const th = state ? DATA_TH_MASK : 0x00; if (th != m_th_in) @@ -420,7 +420,7 @@ gamegear_io_port_device::gamegear_io_port_device( } -WRITE_LINE_MEMBER(gamegear_io_port_device::th_w) +void gamegear_io_port_device::th_w(int state) { u8 const th = state ? DATA_TH_MASK : 0x00; if (th != m_th_in) diff --git a/src/mame/sega/mdioport.h b/src/mame/sega/mdioport.h index 806bdcefbe5..a5fb2608279 100644 --- a/src/mame/sega/mdioport.h +++ b/src/mame/sega/mdioport.h @@ -149,7 +149,7 @@ public: u32 clock) ATTR_COLD; // external signal inputs - DECLARE_WRITE_LINE_MEMBER(th_w); + void th_w(int state); // host read registers u8 ctrl_r() { return m_ctrl; } @@ -179,7 +179,7 @@ public: u32 clock) ATTR_COLD; // external signal inputs - DECLARE_WRITE_LINE_MEMBER(th_w); + void th_w(int state); // host read registers u8 ctrl_r() { return ~m_ctrl; } diff --git a/src/mame/sega/megadriv.cpp b/src/mame/sega/megadriv.cpp index 43307db952b..4f12b40f6db 100644 --- a/src/mame/sega/megadriv.cpp +++ b/src/mame/sega/megadriv.cpp @@ -725,7 +725,7 @@ void md_base_state::megadriv_stop_scanline_timer() // this comes from the VDP on lines 240 (on) 241 (off) and is connected to the z80 irq 0 -WRITE_LINE_MEMBER(md_base_state::vdp_sndirqline_callback_genesis_z80) +void md_base_state::vdp_sndirqline_callback_genesis_z80(int state) { if (state == ASSERT_LINE) { @@ -739,7 +739,7 @@ WRITE_LINE_MEMBER(md_base_state::vdp_sndirqline_callback_genesis_z80) } // this comes from the vdp, and is connected to 68k irq level 6 (main vbl interrupt) -WRITE_LINE_MEMBER(md_core_state::vdp_lv6irqline_callback_genesis_68k) +void md_core_state::vdp_lv6irqline_callback_genesis_68k(int state) { if (state == ASSERT_LINE) m_maincpu->set_input_line(6, HOLD_LINE); @@ -748,7 +748,7 @@ WRITE_LINE_MEMBER(md_core_state::vdp_lv6irqline_callback_genesis_68k) } // this comes from the vdp, and is connected to 68k irq level 4 (raster interrupt) -WRITE_LINE_MEMBER(md_core_state::vdp_lv4irqline_callback_genesis_68k) +void md_core_state::vdp_lv4irqline_callback_genesis_68k(int state) { if (state == ASSERT_LINE) m_maincpu->set_input_line(4, HOLD_LINE); @@ -1003,7 +1003,7 @@ void md_base_state::init_megadrie() m_version_hi_nibble = 0xe0; // Export PAL no-SCD } -WRITE_LINE_MEMBER(md_core_state::screen_vblank_megadriv) +void md_core_state::screen_vblank_megadriv(int state) { if (m_io_reset.read_safe(0) & 0x01) m_maincpu->pulse_input_line(INPUT_LINE_RESET, attotime::zero); diff --git a/src/mame/sega/megadriv.h b/src/mame/sega/megadriv.h index 24ba5ffc6f5..aed465004a4 100644 --- a/src/mame/sega/megadriv.h +++ b/src/mame/sega/megadriv.h @@ -44,7 +44,7 @@ protected: void megadriv_tas_callback(offs_t offset, uint8_t data); uint32_t screen_update_megadriv(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(screen_vblank_megadriv); + void screen_vblank_megadriv(int state); required_device m_maincpu; required_device m_scan_timer; @@ -56,8 +56,8 @@ protected: private: IRQ_CALLBACK_MEMBER(genesis_int_callback); - WRITE_LINE_MEMBER(vdp_lv6irqline_callback_genesis_68k); - WRITE_LINE_MEMBER(vdp_lv4irqline_callback_genesis_68k); + void vdp_lv6irqline_callback_genesis_68k(int state); + void vdp_lv4irqline_callback_genesis_68k(int state); void megadriv_timers(machine_config &config); }; @@ -108,7 +108,7 @@ protected: uint8_t megadriv_z80_unmapped_read(); TIMER_CALLBACK_MEMBER(megadriv_z80_run_state); - WRITE_LINE_MEMBER(vdp_sndirqline_callback_genesis_z80); + void vdp_sndirqline_callback_genesis_z80(int state); void megadriv_stop_scanline_timer(); diff --git a/src/mame/sega/megadriv_sunplus_hybrid.cpp b/src/mame/sega/megadriv_sunplus_hybrid.cpp index 9c6ce401577..76bc0a7c527 100644 --- a/src/mame/sega/megadriv_sunplus_hybrid.cpp +++ b/src/mame/sega/megadriv_sunplus_hybrid.cpp @@ -47,7 +47,7 @@ private: required_region_ptr m_rom; uint32_t screen_update_hybrid(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(screen_vblank_hybrid); + void screen_vblank_hybrid(int state); void megadriv_sunplus_map(address_map &map); }; @@ -113,7 +113,7 @@ uint32_t megadriv_sunplus_state::screen_update_hybrid(screen_device &screen, bit return 0; } -WRITE_LINE_MEMBER(megadriv_sunplus_state::screen_vblank_hybrid) +void megadriv_sunplus_state::screen_vblank_hybrid(int state) { if (m_md_is_running) { diff --git a/src/mame/sega/megadriv_vt_hybrid.cpp b/src/mame/sega/megadriv_vt_hybrid.cpp index f80845911aa..10d26772f6c 100644 --- a/src/mame/sega/megadriv_vt_hybrid.cpp +++ b/src/mame/sega/megadriv_vt_hybrid.cpp @@ -44,7 +44,7 @@ private: required_region_ptr m_rom; uint32_t screen_update_hybrid(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(screen_vblank_hybrid); + void screen_vblank_hybrid(int state); void megadriv_vt0203_map(address_map &map); }; @@ -116,7 +116,7 @@ uint32_t megadriv_vt0203_state::screen_update_hybrid(screen_device &screen, bitm return 0; } -WRITE_LINE_MEMBER(megadriv_vt0203_state::screen_vblank_hybrid) +void megadriv_vt0203_state::screen_vblank_hybrid(int state) { if (m_md_is_running) { diff --git a/src/mame/sega/megaplay.cpp b/src/mame/sega/megaplay.cpp index 4c6b29b7b01..695f29f3511 100644 --- a/src/mame/sega/megaplay.cpp +++ b/src/mame/sega/megaplay.cpp @@ -59,8 +59,8 @@ public: void init_megaplay(); - DECLARE_READ_LINE_MEMBER(start1_r); - DECLARE_READ_LINE_MEMBER(start2_r); + int start1_r(); + int start2_r(); protected: virtual void machine_reset() override; @@ -396,12 +396,12 @@ INPUT_PORTS_END // MEGAPLAY specific -READ_LINE_MEMBER(mplay_state::start1_r) +int mplay_state::start1_r() { return BIT(m_bios_bank, 4); } -READ_LINE_MEMBER(mplay_state::start2_r) +int mplay_state::start2_r() { return BIT(m_bios_bank, 5); } diff --git a/src/mame/sega/megatech.cpp b/src/mame/sega/megatech.cpp index ca7961048ad..eeb2d959a9a 100644 --- a/src/mame/sega/megatech.cpp +++ b/src/mame/sega/megatech.cpp @@ -158,7 +158,7 @@ private: uint32_t screen_update_main(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); uint32_t screen_update_menu(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(screen_vblank_main); + void screen_vblank_main(int state); void megatech_bios_map(address_map &map); void megatech_bios_portmap(address_map &map); @@ -644,7 +644,7 @@ uint32_t mtech_state::screen_update_main(screen_device &screen, bitmap_rgb32 &bi return 0; } -WRITE_LINE_MEMBER(mtech_state::screen_vblank_main) +void mtech_state::screen_vblank_main(int state) { if (!m_current_machine_is_sms) screen_vblank_megadriv(state); diff --git a/src/mame/sega/model1.h b/src/mame/sega/model1.h index 538b2735bc3..4ca82eb36b5 100644 --- a/src/mame/sega/model1.h +++ b/src/mame/sega/model1.h @@ -148,7 +148,7 @@ private: void model1_listctl_w(offs_t offset, u16 data, u16 mem_mask = ~0); uint32_t screen_update_model1(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(screen_vblank_model1); + void screen_vblank_model1(int state); struct lightparam_t { diff --git a/src/mame/sega/model1_v.cpp b/src/mame/sega/model1_v.cpp index 90e231627c6..dcc1c21bdb8 100644 --- a/src/mame/sega/model1_v.cpp +++ b/src/mame/sega/model1_v.cpp @@ -1664,7 +1664,7 @@ uint32_t model1_state::screen_update_model1(screen_device &screen, bitmap_rgb32 return 0; } -WRITE_LINE_MEMBER(model1_state::screen_vblank_model1) +void model1_state::screen_vblank_model1(int state) { // on rising edge if (state) diff --git a/src/mame/sega/model2.cpp b/src/mame/sega/model2.cpp index 870805385df..ec16822c8fc 100644 --- a/src/mame/sega/model2.cpp +++ b/src/mame/sega/model2.cpp @@ -2363,7 +2363,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(model2_state::model2_interrupt) } #ifdef UNUSED_FUNCTION -WRITE_LINE_MEMBER(model2_state::sound_ready_w) +void model2_state::sound_ready_w(int state) { if(state) { diff --git a/src/mame/sega/model2.h b/src/mame/sega/model2.h index 73437e023e1..d48ede4793d 100644 --- a/src/mame/sega/model2.h +++ b/src/mame/sega/model2.h @@ -222,8 +222,8 @@ protected: DECLARE_VIDEO_START(model2); void reset_model2_scsp(); u32 screen_update_model2(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); -// DECLARE_WRITE_LINE_MEMBER(screen_vblank_model2); -// DECLARE_WRITE_LINE_MEMBER(sound_ready_w); +// void screen_vblank_model2(int state); +// void sound_ready_w(int state); template TIMER_DEVICE_CALLBACK_MEMBER(model2_timer_cb); void scsp_irq(offs_t offset, u8 data); diff --git a/src/mame/sega/naomi.cpp b/src/mame/sega/naomi.cpp index ebf96379fd6..aee6fc905ec 100644 --- a/src/mame/sega/naomi.cpp +++ b/src/mame/sega/naomi.cpp @@ -2387,7 +2387,7 @@ MACHINE_RESET_MEMBER(naomi_state,naomi) naomi_state::machine_reset(); } -WRITE_LINE_MEMBER(naomi_state::external_reset) +void naomi_state::external_reset(int state) { // routine called by the dimm board to reboot the naomi mainboard logerror("Received reset fromm dimm board !\n"); diff --git a/src/mame/sega/naomi.h b/src/mame/sega/naomi.h index 09660f0cb59..e1aa4381f2e 100644 --- a/src/mame/sega/naomi.h +++ b/src/mame/sega/naomi.h @@ -73,7 +73,7 @@ protected: optional_ioport_array<5> m_p2_kb; DECLARE_MACHINE_RESET(naomi); - DECLARE_WRITE_LINE_MEMBER(external_reset); + void external_reset(int state); uint16_t naomi_g2bus_r(offs_t offset); uint64_t eeprom_93c46a_r(); diff --git a/src/mame/sega/naomigd.cpp b/src/mame/sega/naomigd.cpp index 374f3fe6d5b..d510fb3c066 100644 --- a/src/mame/sega/naomigd.cpp +++ b/src/mame/sega/naomigd.cpp @@ -438,7 +438,7 @@ static void gdrom_devices(device_slot_interface &device) } -WRITE_LINE_MEMBER(idegdrom_device::ide_irq) +void idegdrom_device::ide_irq(int state) { irq_cb(state); } diff --git a/src/mame/sega/naomigd.h b/src/mame/sega/naomigd.h index e2e4a585481..8919401fe35 100644 --- a/src/mame/sega/naomigd.h +++ b/src/mame/sega/naomigd.h @@ -31,7 +31,7 @@ public: uint32_t ide_cs1_r(offs_t offset, uint32_t mem_mask = ~0); void ide_cs0_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0); void ide_cs1_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0); - DECLARE_WRITE_LINE_MEMBER(ide_irq); + void ide_irq(int state); protected: virtual void device_start() override; diff --git a/src/mame/sega/saturn.h b/src/mame/sega/saturn.h index efceec16768..89f9760d216 100644 --- a/src/mame/sega/saturn.h +++ b/src/mame/sega/saturn.h @@ -47,15 +47,15 @@ public: void scsp_irq(offs_t offset, uint8_t data); // SMPC HLE delegates - DECLARE_WRITE_LINE_MEMBER(master_sh2_reset_w); - DECLARE_WRITE_LINE_MEMBER(master_sh2_nmi_w); - DECLARE_WRITE_LINE_MEMBER(slave_sh2_reset_w); - DECLARE_WRITE_LINE_MEMBER(sound_68k_reset_w); - DECLARE_WRITE_LINE_MEMBER(system_reset_w); - DECLARE_WRITE_LINE_MEMBER(system_halt_w); - DECLARE_WRITE_LINE_MEMBER(dot_select_w); + void master_sh2_reset_w(int state); + void master_sh2_nmi_w(int state); + void slave_sh2_reset_w(int state); + void sound_68k_reset_w(int state); + void system_reset_w(int state); + void system_halt_w(int state); + void dot_select_w(int state); - DECLARE_WRITE_LINE_MEMBER(m68k_reset_callback); + void m68k_reset_callback(int state); protected: required_region_ptr m_rom; @@ -436,7 +436,7 @@ protected: } stv_rbg_cache_data; -// DECLARE_WRITE_LINE_MEMBER(scudsp_end_w); +// void scudsp_end_w(int state); // uint16_t scudsp_dma_r(offs_t offset); // void scudsp_dma_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); }; diff --git a/src/mame/sega/saturn_m.cpp b/src/mame/sega/saturn_m.cpp index 5d54781b4f1..7ea5d31230b 100644 --- a/src/mame/sega/saturn_m.cpp +++ b/src/mame/sega/saturn_m.cpp @@ -146,7 +146,7 @@ void saturn_state::saturn_backupram_w(offs_t offset, uint8_t data) } -WRITE_LINE_MEMBER(saturn_state::m68k_reset_callback) +void saturn_state::m68k_reset_callback(int state) { logerror("m68k RESET opcode triggered\n"); m_smpc_hle->m68k_reset_trigger(); @@ -320,30 +320,30 @@ GFXDECODE_START( gfx_stv ) GFXDECODE_END -WRITE_LINE_MEMBER( saturn_state::master_sh2_reset_w ) +void saturn_state::master_sh2_reset_w(int state) { m_maincpu->set_input_line(INPUT_LINE_RESET, state ? ASSERT_LINE : CLEAR_LINE); } -WRITE_LINE_MEMBER(saturn_state::master_sh2_nmi_w) +void saturn_state::master_sh2_nmi_w(int state) { m_maincpu->set_input_line(INPUT_LINE_NMI, state ? ASSERT_LINE : CLEAR_LINE); } -WRITE_LINE_MEMBER( saturn_state::slave_sh2_reset_w ) +void saturn_state::slave_sh2_reset_w(int state) { m_slave->set_input_line(INPUT_LINE_RESET, state ? ASSERT_LINE : CLEAR_LINE); // m_smpc.slave_on = state; } -WRITE_LINE_MEMBER( saturn_state::sound_68k_reset_w ) +void saturn_state::sound_68k_reset_w(int state) { m_audiocpu->set_input_line(INPUT_LINE_RESET, state ? ASSERT_LINE : CLEAR_LINE); m_en_68k = state ^ 1; } // TODO: edge triggered? -WRITE_LINE_MEMBER( saturn_state::system_reset_w ) +void saturn_state::system_reset_w(int state) { if(!state) return; @@ -361,14 +361,14 @@ WRITE_LINE_MEMBER( saturn_state::system_reset_w ) //A-Bus } -WRITE_LINE_MEMBER(saturn_state::system_halt_w) +void saturn_state::system_halt_w(int state) { m_maincpu->set_input_line(INPUT_LINE_HALT, state ? ASSERT_LINE : CLEAR_LINE); m_slave->set_input_line(INPUT_LINE_HALT, state ? ASSERT_LINE : CLEAR_LINE); m_audiocpu->set_input_line(INPUT_LINE_HALT, state ? ASSERT_LINE : CLEAR_LINE); } -WRITE_LINE_MEMBER(saturn_state::dot_select_w) +void saturn_state::dot_select_w(int state) { const XTAL &xtal = state ? MASTER_CLOCK_320 : MASTER_CLOCK_352; diff --git a/src/mame/sega/segac2.cpp b/src/mame/sega/segac2.cpp index 49562428e47..e1553ca4954 100644 --- a/src/mame/sega/segac2.cpp +++ b/src/mame/sega/segac2.cpp @@ -186,9 +186,9 @@ protected: int m_segac2_sp_pal_lookup[4]; void recompute_palette_tables(); - DECLARE_WRITE_LINE_MEMBER(vdp_sndirqline_callback_c2); - DECLARE_WRITE_LINE_MEMBER(vdp_lv6irqline_callback_c2); - DECLARE_WRITE_LINE_MEMBER(vdp_lv4irqline_callback_c2); + void vdp_sndirqline_callback_c2(int state); + void vdp_lv6irqline_callback_c2(int state); + void vdp_lv4irqline_callback_c2(int state); IRQ_CALLBACK_MEMBER(int_callback); uint8_t io_portc_r(); @@ -203,7 +203,7 @@ protected: void prot_w(uint8_t data); void counter_timer_w(uint8_t data); uint16_t ichirjbl_prot_r(); - DECLARE_WRITE_LINE_MEMBER(segac2_irq2_interrupt); + void segac2_irq2_interrupt(int state); int prot_func_dummy(int in); int prot_func_columns(int in); @@ -1719,27 +1719,27 @@ uint32_t segac2_state::screen_update_segac2_new(screen_device &screen, bitmap_rg Interrupt handling ******************************************************************************/ -WRITE_LINE_MEMBER(segac2_state::segac2_irq2_interrupt) +void segac2_state::segac2_irq2_interrupt(int state) { //printf("sound irq %d\n", state); m_maincpu->set_input_line(2, state ? ASSERT_LINE : CLEAR_LINE); } // the main interrupt on C2 comes from the vdp line used to drive the z80 interrupt on a regular genesis(!) -WRITE_LINE_MEMBER(segac2_state::vdp_sndirqline_callback_c2) +void segac2_state::vdp_sndirqline_callback_c2(int state) { if (state == ASSERT_LINE) m_maincpu->set_input_line(6, HOLD_LINE); } // the line usually used to drive irq6 is not connected -WRITE_LINE_MEMBER(segac2_state::vdp_lv6irqline_callback_c2) +void segac2_state::vdp_lv6irqline_callback_c2(int state) { // } // the scanline interrupt seems connected as usual -WRITE_LINE_MEMBER(segac2_state::vdp_lv4irqline_callback_c2) +void segac2_state::vdp_lv4irqline_callback_c2(int state) { if (state == ASSERT_LINE) m_maincpu->set_input_line(4, HOLD_LINE); diff --git a/src/mame/sega/segag80v.cpp b/src/mame/sega/segag80v.cpp index a611333b976..9bff154a11d 100644 --- a/src/mame/sega/segag80v.cpp +++ b/src/mame/sega/segag80v.cpp @@ -156,7 +156,7 @@ static constexpr int WAIT_STATES = 2; * *************************************/ -WRITE_LINE_MEMBER(segag80v_state::service_switch_w) +void segag80v_state::service_switch_w(int state) { // pressing the service switch sends an NMI if (state) @@ -322,7 +322,7 @@ u8 segag80v_state::spinner_input_r() * *************************************/ -READ_LINE_MEMBER(segag80v_state::elim4_joint_coin_r) +int segag80v_state::elim4_joint_coin_r() { return (m_coins->read() & 0xf) != 0xf; } @@ -400,7 +400,7 @@ void segag80v_state::unknown_w(u8 data) osd_printf_debug("%04X:unknown_w = %02X\n", m_maincpu->pc(), data); } -READ_LINE_MEMBER(segag80v_state::draw_r) +int segag80v_state::draw_r() { return (machine().scheduler().time() < m_draw_end_time); } @@ -444,7 +444,7 @@ void segag80v_state::update_int() m_coin_ff_state &= ~0x04; } -WRITE_LINE_MEMBER(segag80v_state::irq_ack_w) +void segag80v_state::irq_ack_w(int state) { if (state) { diff --git a/src/mame/sega/segag80v.h b/src/mame/sega/segag80v.h index 6f7b916136d..65c139e9723 100644 --- a/src/mame/sega/segag80v.h +++ b/src/mame/sega/segag80v.h @@ -81,13 +81,13 @@ public: void init_spacfury(); void init_spacfurybl(); - DECLARE_READ_LINE_MEMBER(elim4_joint_coin_r); - DECLARE_READ_LINE_MEMBER(draw_r); - DECLARE_WRITE_LINE_MEMBER(service_switch_w); - DECLARE_WRITE_LINE_MEMBER(irq_ack_w); + int elim4_joint_coin_r(); + int draw_r(); + void service_switch_w(int state); + void irq_ack_w(int state); template - DECLARE_WRITE_LINE_MEMBER( coin_w ) + void coin_w(int state) { const u8 mask = 1 << Index; diff --git a/src/mame/sega/segaic16_m.cpp b/src/mame/sega/segaic16_m.cpp index 6ace39b45a6..63b3c89db97 100644 --- a/src/mame/sega/segaic16_m.cpp +++ b/src/mame/sega/segaic16_m.cpp @@ -262,7 +262,7 @@ sega_315_5250_compare_timer_device::sega_315_5250_compare_timer_device(const mac // exck_w - clock the timer //------------------------------------------------- -WRITE_LINE_MEMBER(sega_315_5250_compare_timer_device::exck_w) +void sega_315_5250_compare_timer_device::exck_w(int state) { if (m_exck == bool(state)) return; diff --git a/src/mame/sega/segaic16_m.h b/src/mame/sega/segaic16_m.h index 6ef7e799dd3..f7f84c65938 100644 --- a/src/mame/sega/segaic16_m.h +++ b/src/mame/sega/segaic16_m.h @@ -79,7 +79,7 @@ public: auto zint_callback() { return m_zint_callback.bind(); } // public interface - DECLARE_WRITE_LINE_MEMBER(exck_w); + void exck_w(int state); u16 read(offs_t offset); void write(offs_t offset, u16 data, u16 mem_mask = ~0); u8 zread(); diff --git a/src/mame/sega/segajw.cpp b/src/mame/sega/segajw.cpp index ab5a8964de3..8f8036f20c8 100644 --- a/src/mame/sega/segajw.cpp +++ b/src/mame/sega/segajw.cpp @@ -59,7 +59,7 @@ public: DECLARE_INPUT_CHANGED_MEMBER(coin_drop_start); DECLARE_CUSTOM_INPUT_MEMBER(coin_sensors_r); - DECLARE_READ_LINE_MEMBER(hopper_sensors_r); + int hopper_sensors_r(); protected: // driver_device overrides @@ -134,7 +134,7 @@ INPUT_CHANGED_MEMBER( segajw_state::coin_drop_start ) m_coin_start_cycles = m_maincpu->total_cycles(); } -READ_LINE_MEMBER( segajw_state::hopper_sensors_r ) +int segajw_state::hopper_sensors_r() { uint8_t data = 0; diff --git a/src/mame/sega/segaorun.cpp b/src/mame/sega/segaorun.cpp index 214d5b8fa50..fda65210005 100644 --- a/src/mame/sega/segaorun.cpp +++ b/src/mame/sega/segaorun.cpp @@ -831,7 +831,7 @@ void segaorun_state::update_main_irqs() // main 68000 is reset //------------------------------------------------- -WRITE_LINE_MEMBER(segaorun_state::m68k_reset_callback) +void segaorun_state::m68k_reset_callback(int state) { m_subcpu->pulse_input_line(INPUT_LINE_RESET, attotime::zero); } diff --git a/src/mame/sega/segaorun.h b/src/mame/sega/segaorun.h index 7f63c3d0054..163b574a2bf 100644 --- a/src/mame/sega/segaorun.h +++ b/src/mame/sega/segaorun.h @@ -118,7 +118,7 @@ protected: // internal helpers void update_main_irqs(); - DECLARE_WRITE_LINE_MEMBER(m68k_reset_callback); + void m68k_reset_callback(int state); // custom I/O uint16_t outrun_custom_io_r(address_space &space, offs_t offset); diff --git a/src/mame/sega/segapico.cpp b/src/mame/sega/segapico.cpp index bceb8f682ee..ff4cfc767d7 100644 --- a/src/mame/sega/segapico.cpp +++ b/src/mame/sega/segapico.cpp @@ -163,7 +163,7 @@ protected: uint16_t pico_read_penpos(int pen); uint16_t pico_68k_io_read(offs_t offset); void pico_68k_io_write(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); - DECLARE_WRITE_LINE_MEMBER(sound_cause_irq); + void sound_cause_irq(int state); void pico_mem(address_map &map); }; @@ -299,7 +299,7 @@ uint16_t pico_base_state::pico_68k_io_read(offs_t offset) } -WRITE_LINE_MEMBER(pico_base_state::sound_cause_irq) +void pico_base_state::sound_cause_irq(int state) { // printf("sound irq\n"); /* sega_315_5641_pcm callback */ diff --git a/src/mame/sega/segas16a.cpp b/src/mame/sega/segas16a.cpp index 0e3d6be97d0..a759f9c175e 100644 --- a/src/mame/sega/segas16a.cpp +++ b/src/mame/sega/segas16a.cpp @@ -582,7 +582,7 @@ uint8_t segas16a_state::mcu_io_r(address_space &space, offs_t offset) // handler, we hook this to execute it //------------------------------------------------- -WRITE_LINE_MEMBER(segas16a_state::i8751_main_cpu_vblank_w) +void segas16a_state::i8751_main_cpu_vblank_w(int state) { // if we have a fake 8751 handler, call it on VBLANK if (state && !m_i8751_vblank_hook.isnull()) diff --git a/src/mame/sega/segas16a.h b/src/mame/sega/segas16a.h index e644e9ecadf..15fba62538c 100644 --- a/src/mame/sega/segas16a.h +++ b/src/mame/sega/segas16a.h @@ -110,7 +110,7 @@ private: uint8_t mcu_io_r(address_space &space, offs_t offset); // I8751-related VBLANK interrupt handlers - DECLARE_WRITE_LINE_MEMBER(i8751_main_cpu_vblank_w); + void i8751_main_cpu_vblank_w(int state); // video updates uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); diff --git a/src/mame/sega/segas16b.cpp b/src/mame/sega/segas16b.cpp index 5fb1652444a..093d02d3796 100644 --- a/src/mame/sega/segas16b.cpp +++ b/src/mame/sega/segas16b.cpp @@ -1238,7 +1238,7 @@ uint8_t segas16b_state::upd7759_status_r() // NMI to the sound CPU //------------------------------------------------- -WRITE_LINE_MEMBER(segas16b_state::upd7759_generate_nmi) +void segas16b_state::upd7759_generate_nmi(int state) { if (state) m_soundcpu->pulse_input_line(INPUT_LINE_NMI, attotime::zero); diff --git a/src/mame/sega/segas16b.h b/src/mame/sega/segas16b.h index 8e73b3c474a..a234fc10065 100644 --- a/src/mame/sega/segas16b.h +++ b/src/mame/sega/segas16b.h @@ -155,7 +155,7 @@ protected: void sound_w16(uint16_t data); // other callbacks - DECLARE_WRITE_LINE_MEMBER(upd7759_generate_nmi); + void upd7759_generate_nmi(int state); INTERRUPT_GEN_MEMBER( i8751_main_cpu_vblank ); void spin_68k_w(uint8_t data); diff --git a/src/mame/sega/segas18.cpp b/src/mame/sega/segas18.cpp index 3e6fc50a502..d6f00b80ff9 100644 --- a/src/mame/sega/segas18.cpp +++ b/src/mame/sega/segas18.cpp @@ -1333,15 +1333,15 @@ GFXDECODE_END // are any of the VDP interrupt lines hooked up to anything? -WRITE_LINE_MEMBER(segas18_state::vdp_sndirqline_callback_s18) +void segas18_state::vdp_sndirqline_callback_s18(int state) { } -WRITE_LINE_MEMBER(segas18_state::vdp_lv6irqline_callback_s18) +void segas18_state::vdp_lv6irqline_callback_s18(int state) { } -WRITE_LINE_MEMBER(segas18_state::vdp_lv4irqline_callback_s18) +void segas18_state::vdp_lv4irqline_callback_s18(int state) { } diff --git a/src/mame/sega/segas18.h b/src/mame/sega/segas18.h index 6b0183396df..d9c5798e55c 100644 --- a/src/mame/sega/segas18.h +++ b/src/mame/sega/segas18.h @@ -101,17 +101,17 @@ private: // video rendering uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(vdp_sndirqline_callback_s18); - DECLARE_WRITE_LINE_MEMBER(vdp_lv6irqline_callback_s18); - DECLARE_WRITE_LINE_MEMBER(vdp_lv4irqline_callback_s18); + void vdp_sndirqline_callback_s18(int state); + void vdp_lv6irqline_callback_s18(int state); + void vdp_lv4irqline_callback_s18(int state); uint16_t genesis_vdp_r(address_space &space, offs_t offset, uint16_t mem_mask = ~0) { return m_vdp->vdp_r(offset, mem_mask); } void genesis_vdp_w(address_space &space, offs_t offset, uint16_t data, uint16_t mem_mask = ~0) { m_vdp->vdp_w(offset, data, mem_mask); } void tileram_w(address_space &space, offs_t offset, uint16_t data, uint16_t mem_mask = ~0) { m_segaic16vid->tileram_w(offset, data, mem_mask); } void textram_w(address_space &space, offs_t offset, uint16_t data, uint16_t mem_mask = ~0) { m_segaic16vid->textram_w(offset, data, mem_mask); } - DECLARE_WRITE_LINE_MEMBER(set_grayscale); - DECLARE_WRITE_LINE_MEMBER(set_vdp_enable); + void set_grayscale(int state); + void set_vdp_enable(int state); void decrypted_opcodes_map(address_map &map); void mcu_io_map(address_map &map); diff --git a/src/mame/sega/segas18_v.cpp b/src/mame/sega/segas18_v.cpp index 4f58f5605fb..d7ffa3a7ede 100644 --- a/src/mame/sega/segas18_v.cpp +++ b/src/mame/sega/segas18_v.cpp @@ -50,7 +50,7 @@ void segas18_state::video_start() * *************************************/ -WRITE_LINE_MEMBER(segas18_state::set_grayscale) +void segas18_state::set_grayscale(int state) { if (state != m_grayscale_enable) { @@ -61,7 +61,7 @@ WRITE_LINE_MEMBER(segas18_state::set_grayscale) } -WRITE_LINE_MEMBER(segas18_state::set_vdp_enable) +void segas18_state::set_vdp_enable(int state) { if (state != m_vdp_enable) { diff --git a/src/mame/sega/segas24.cpp b/src/mame/sega/segas24.cpp index 38b96f8111b..06adcb2205b 100644 --- a/src/mame/sega/segas24.cpp +++ b/src/mame/sega/segas24.cpp @@ -648,7 +648,7 @@ TIMER_CALLBACK_MEMBER(segas24_state::gground_hack_timer_callback) // Cpu #1 reset control -WRITE_LINE_MEMBER(segas24_state::cnt1) +void segas24_state::cnt1(int state) { if (bool(state) != m_cnt1) { @@ -974,7 +974,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(segas24_state::irq_vbl) m_irq_vsynctime = machine().time(); } -WRITE_LINE_MEMBER(segas24_state::irq_ym) +void segas24_state::irq_ym(int state) { m_irq_yms = state; m_maincpu->set_input_line(IRQ_YM2151+1, m_irq_yms && (m_irq_allow0 & (1 << IRQ_YM2151)) ? ASSERT_LINE : CLEAR_LINE); diff --git a/src/mame/sega/segas24.h b/src/mame/sega/segas24.h index 4c91044aba3..c35e1d346d6 100644 --- a/src/mame/sega/segas24.h +++ b/src/mame/sega/segas24.h @@ -132,7 +132,7 @@ private: required_device m_vsprite; required_device m_vmixer; - DECLARE_WRITE_LINE_MEMBER(irq_ym); + void irq_ym(int state); uint16_t paletteram_r(offs_t offset); void paletteram_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); uint16_t irq_r(offs_t offset); @@ -166,7 +166,7 @@ private: void irq_init(); void irq_timer_sync(); void irq_timer_start(int old_tmode); - WRITE_LINE_MEMBER(cnt1); + void cnt1(int state); virtual void machine_start() override; virtual void machine_reset() override; uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); diff --git a/src/mame/sega/segas32.cpp b/src/mame/sega/segas32.cpp index 68b69fd1baf..f473030f2a4 100644 --- a/src/mame/sega/segas32.cpp +++ b/src/mame/sega/segas32.cpp @@ -859,7 +859,7 @@ void segas32_state::tilebank_external_w(uint8_t data) } template -WRITE_LINE_MEMBER(segas32_state::display_enable_w) +void segas32_state::display_enable_w(int state) { m_system32_displayenable[Which] = state; } @@ -967,7 +967,7 @@ void segas32_state::sound_int_control_hi_w(offs_t offset, uint8_t data) } -WRITE_LINE_MEMBER(segas32_state::ym3438_irq_handler) +void segas32_state::ym3438_irq_handler(int state) { if (state) signal_sound_irq(SOUND_IRQ_YM3438); @@ -2497,13 +2497,13 @@ void segas32_cd_state::lamps2_w(uint8_t data) m_lamps[8 + i] = BIT(data, i); } -WRITE_LINE_MEMBER(segas32_cd_state::scsi_irq_w) +void segas32_cd_state::scsi_irq_w(int state) { //printf("%02x IRQ\n",state); // TODO: sent! } -WRITE_LINE_MEMBER(segas32_cd_state::scsi_drq_w) +void segas32_cd_state::scsi_drq_w(int state) { //printf("%02x DRQ\n",state); } diff --git a/src/mame/sega/segas32.h b/src/mame/sega/segas32.h index 51209be29cd..21f7194a741 100644 --- a/src/mame/sega/segas32.h +++ b/src/mame/sega/segas32.h @@ -56,7 +56,7 @@ public: uint32_t screen_update_multi32_left(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); uint32_t screen_update_multi32_right(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(ym3438_irq_handler); + void ym3438_irq_handler(int state); TIMER_DEVICE_CALLBACK_MEMBER(signal_v60_irq_callback); INTERRUPT_GEN_MEMBER(start_of_vblank_int); @@ -64,7 +64,7 @@ public: void misc_output_1_w(uint8_t data); void sw2_output_0_w(uint8_t data); void sw2_output_1_w(uint8_t data); - template DECLARE_WRITE_LINE_MEMBER(display_enable_w); + template void display_enable_w(int state); void tilebank_external_w(uint8_t data); protected: @@ -341,8 +341,8 @@ public: void lamps1_w(uint8_t data); void lamps2_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(scsi_irq_w); - DECLARE_WRITE_LINE_MEMBER(scsi_drq_w); + void scsi_irq_w(int state); + void scsi_drq_w(int state); static void cdrom_config(device_t *device); protected: diff --git a/src/mame/sega/segaspeech.cpp b/src/mame/sega/segaspeech.cpp index 48b49b8c796..ef1225faf1c 100644 --- a/src/mame/sega/segaspeech.cpp +++ b/src/mame/sega/segaspeech.cpp @@ -68,12 +68,12 @@ void sega_speech_device::device_start() * *************************************/ -READ_LINE_MEMBER( sega_speech_device::t0_r ) +int sega_speech_device::t0_r() { return m_t0; } -READ_LINE_MEMBER( sega_speech_device::t1_r ) +int sega_speech_device::t1_r() { //printf("%s: t1_r=%d\n", machine().scheduler().time().as_string(), m_drq); return m_drq; @@ -108,7 +108,7 @@ void sega_speech_device::p2_w(uint8_t data) * *************************************/ -WRITE_LINE_MEMBER(sega_speech_device::drq_w) +void sega_speech_device::drq_w(int state) { //printf("%s: DRQ=%d\n", machine().scheduler().time().as_string(), state); m_drq = (state == ASSERT_LINE); diff --git a/src/mame/sega/segaspeech.h b/src/mame/sega/segaspeech.h index 9956fc00a32..524f3d91d7d 100644 --- a/src/mame/sega/segaspeech.h +++ b/src/mame/sega/segaspeech.h @@ -29,14 +29,14 @@ protected: virtual void device_add_mconfig(machine_config &config) override; virtual void device_start() override; - DECLARE_READ_LINE_MEMBER( t0_r ); - DECLARE_READ_LINE_MEMBER( t1_r ); + int t0_r(); + int t1_r(); uint8_t p1_r(); uint8_t rom_r(offs_t offset); void p1_w(uint8_t data); void p2_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(drq_w); + void drq_w(int state); private: void speech_map(address_map &map); diff --git a/src/mame/sega/segaufo.cpp b/src/mame/sega/segaufo.cpp index 2248a9e5b07..a7624d95ff6 100644 --- a/src/mame/sega/segaufo.cpp +++ b/src/mame/sega/segaufo.cpp @@ -98,9 +98,9 @@ public: private: void motor_tick(int p, int m); - DECLARE_WRITE_LINE_MEMBER(pit_out0); - DECLARE_WRITE_LINE_MEMBER(pit_out1); - DECLARE_WRITE_LINE_MEMBER(pit_out2); + void pit_out0(int state); + void pit_out1(int state); + void pit_out2(int state); uint8_t crane_limits_r(offs_t offset); void stepper_w(uint8_t data); void cp_lamps_w(uint8_t data); @@ -207,19 +207,19 @@ TIMER_DEVICE_CALLBACK_MEMBER(ufo_state::update_info) ***************************************************************************/ -WRITE_LINE_MEMBER(ufo_state::pit_out0) +void ufo_state::pit_out0(int state) { // ? } -WRITE_LINE_MEMBER(ufo_state::pit_out1) +void ufo_state::pit_out1(int state) { // NMI? if (state) m_maincpu->pulse_input_line(INPUT_LINE_NMI, attotime::zero); } -WRITE_LINE_MEMBER(ufo_state::pit_out2) +void ufo_state::pit_out2(int state) { // ? } diff --git a/src/mame/sega/segausb.cpp b/src/mame/sega/segausb.cpp index 07d1729e200..e8e45d4cd79 100644 --- a/src/mame/sega/segausb.cpp +++ b/src/mame/sega/segausb.cpp @@ -299,7 +299,7 @@ void usb_sound_device::p2_w(u8 data) } -READ_LINE_MEMBER( usb_sound_device::t1_r ) +int usb_sound_device::t1_r() { // T1 returns 1 based on the value of the T1 clock; the exact // pattern is determined by one or more jumpers on the board. diff --git a/src/mame/sega/segausb.h b/src/mame/sega/segausb.h index c0688d8d08c..19a2cfcb1f5 100644 --- a/src/mame/sega/segausb.h +++ b/src/mame/sega/segausb.h @@ -165,7 +165,7 @@ private: uint8_t p1_r(); void p1_w(uint8_t data); void p2_w(uint8_t data); - DECLARE_READ_LINE_MEMBER( t1_r ); + int t1_r(); }; DECLARE_DEVICE_TYPE(SEGAUSB, usb_sound_device) diff --git a/src/mame/sega/segaxbd.cpp b/src/mame/sega/segaxbd.cpp index eb8b283ec6d..6e8f9dbdfce 100644 --- a/src/mame/sega/segaxbd.cpp +++ b/src/mame/sega/segaxbd.cpp @@ -454,7 +454,7 @@ const auto SOUND_CLOCK = XTAL(16'000'000); // the timer chip //------------------------------------------------- -WRITE_LINE_MEMBER(segaxbd_state::timer_irq_w) +void segaxbd_state::timer_irq_w(int state) { // set/clear the timer IRQ m_timer_irq_state = (state == ASSERT_LINE); @@ -813,7 +813,7 @@ void segaxbd_state::update_main_irqs() // main 68000 is reset //------------------------------------------------- -WRITE_LINE_MEMBER(segaxbd_state::m68k_reset_callback) +void segaxbd_state::m68k_reset_callback(int state) { m_subcpu->pulse_input_line(INPUT_LINE_RESET, attotime::zero); machine().scheduler().perfect_quantum(attotime::from_usec(100)); diff --git a/src/mame/sega/segaxbd.h b/src/mame/sega/segaxbd.h index 8cc6f6aa719..768983ead96 100644 --- a/src/mame/sega/segaxbd.h +++ b/src/mame/sega/segaxbd.h @@ -91,11 +91,11 @@ protected: // internal helpers void update_main_irqs(); - DECLARE_WRITE_LINE_MEMBER(m68k_reset_callback); + void m68k_reset_callback(int state); void generic_iochip0_lamps_w(uint8_t data); // compare/timer chip callbacks - DECLARE_WRITE_LINE_MEMBER(timer_irq_w); + void timer_irq_w(int state); void pc_0_w(uint8_t data); void pd_0_w(uint8_t data); diff --git a/src/mame/sega/segaybd.cpp b/src/mame/sega/segaybd.cpp index 81c1dcfe044..6839586eca6 100644 --- a/src/mame/sega/segaybd.cpp +++ b/src/mame/sega/segaybd.cpp @@ -789,13 +789,13 @@ void segaybd_state::sound_portmap(address_map &map) // LINK BOARD //************************************************************************** -WRITE_LINE_MEMBER(segaybd_state::mb8421_intl) +void segaybd_state::mb8421_intl(int state) { // shared ram interrupt request from linkcpu side // unused? } -WRITE_LINE_MEMBER(segaybd_state::mb8421_intr) +void segaybd_state::mb8421_intr(int state) { // shared ram interrupt request from maincpu side m_linkcpu->set_input_line_and_vector(0, state ? ASSERT_LINE : CLEAR_LINE, 0xef); // Z80 - RST $28 diff --git a/src/mame/sega/segaybd.h b/src/mame/sega/segaybd.h index bab61e4c631..66b0415bc87 100644 --- a/src/mame/sega/segaybd.h +++ b/src/mame/sega/segaybd.h @@ -59,8 +59,8 @@ private: void output2_w(uint8_t data); // linked cabinet specific handlers - DECLARE_WRITE_LINE_MEMBER(mb8421_intl); - DECLARE_WRITE_LINE_MEMBER(mb8421_intr); + void mb8421_intl(int state); + void mb8421_intr(int state); uint16_t link_r(); uint16_t link2_r(); void link2_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); diff --git a/src/mame/sega/sg1000.cpp b/src/mame/sega/sg1000.cpp index 5b561b342cf..b26f32fbdb2 100644 --- a/src/mame/sega/sg1000.cpp +++ b/src/mame/sega/sg1000.cpp @@ -219,7 +219,7 @@ private: virtual void machine_start() override; virtual void machine_reset() override; - DECLARE_WRITE_LINE_MEMBER( write_centronics_busy ); + void write_centronics_busy(int state); uint8_t ppi_pa_r(); void ppi_pc_w(uint8_t data); @@ -507,7 +507,7 @@ INPUT_PORTS_END I8255 INTERFACE -------------------------------------------------*/ -WRITE_LINE_MEMBER( sf7000_state::write_centronics_busy ) +void sf7000_state::write_centronics_busy(int state) { m_centronics_busy = state; } diff --git a/src/mame/sega/shtzone.cpp b/src/mame/sega/shtzone.cpp index 973b36d8611..8318d5ef9e9 100644 --- a/src/mame/sega/shtzone.cpp +++ b/src/mame/sega/shtzone.cpp @@ -103,7 +103,7 @@ private: void select_cart(uint8_t data); void control_w(uint8_t data); uint8_t cart_r(offs_t offset); - DECLARE_WRITE_LINE_MEMBER(int_callback); + void int_callback(int state); void prg_map(address_map &map); }; @@ -168,7 +168,7 @@ void shtzone_state::control_w(uint8_t data) m_control = data; } -WRITE_LINE_MEMBER(shtzone_state::int_callback) +void shtzone_state::int_callback(int state) { if (BIT(m_control, 0)) m_timercpu->set_input_line(0, state); diff --git a/src/mame/sega/sms.h b/src/mame/sega/sms.h index e3775d7e599..373faef3c2c 100644 --- a/src/mame/sega/sms.h +++ b/src/mame/sega/sms.h @@ -93,9 +93,9 @@ protected: void smsj_ym2413_register_port_w(uint8_t data); void smsj_ym2413_data_port_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(rapid_n_csync_callback); - DECLARE_WRITE_LINE_MEMBER(sms_ctrl1_th_input); - DECLARE_WRITE_LINE_MEMBER(sms_ctrl2_th_input); + void rapid_n_csync_callback(int state); + void sms_ctrl1_th_input(int state); + void sms_ctrl2_th_input(int state); void sms_io(address_map &map); void sms_mem(address_map &map); @@ -210,7 +210,7 @@ private: uint8_t sscope_r(offs_t offset); void sscope_w(offs_t offset, uint8_t data); - DECLARE_WRITE_LINE_MEMBER(sscope_vblank); + void sscope_vblank(int state); uint32_t screen_update_left(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); uint32_t screen_update_right(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); @@ -256,7 +256,7 @@ private: uint8_t store_cart_peek(offs_t offset); - DECLARE_WRITE_LINE_MEMBER(sms_store_int_callback); + void sms_store_int_callback(int state); void sms_store_mem(address_map &map); required_device m_control_cpu; @@ -319,9 +319,9 @@ private: uint8_t gg_input_port_dd_r(); void gg_io_control_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(gg_pause_callback); - DECLARE_WRITE_LINE_MEMBER(gg_ext_th_input); - DECLARE_WRITE_LINE_MEMBER(gg_nmi); + void gg_pause_callback(int state); + void gg_ext_th_input(int state); + void gg_nmi(int state); uint32_t screen_update_gamegear(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); void screen_gg_sms_mode_scaling(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); diff --git a/src/mame/sega/sms_m.cpp b/src/mame/sega/sms_m.cpp index 293c4a66ed2..406b455e2fb 100644 --- a/src/mame/sega/sms_m.cpp +++ b/src/mame/sega/sms_m.cpp @@ -28,7 +28,7 @@ void sms_state::lphaser_hcount_latch() } -WRITE_LINE_MEMBER(sms_state::sms_ctrl1_th_input) +void sms_state::sms_ctrl1_th_input(int state) { // Check if TH of controller port 1 is set to input (1) if (m_io_ctrl_reg & 0x02) @@ -48,7 +48,7 @@ WRITE_LINE_MEMBER(sms_state::sms_ctrl1_th_input) } -WRITE_LINE_MEMBER(sms_state::sms_ctrl2_th_input) +void sms_state::sms_ctrl2_th_input(int state) { // Check if TH of controller port 2 is set to input (1) if (m_io_ctrl_reg & 0x08) @@ -68,7 +68,7 @@ WRITE_LINE_MEMBER(sms_state::sms_ctrl2_th_input) } -WRITE_LINE_MEMBER(gamegear_state::gg_ext_th_input) +void gamegear_state::gg_ext_th_input(int state) { m_gg_ioport->th_w(state); @@ -78,7 +78,7 @@ WRITE_LINE_MEMBER(gamegear_state::gg_ext_th_input) } -WRITE_LINE_MEMBER(gamegear_state::gg_nmi) +void gamegear_state::gg_nmi(int state) { if (!(m_cartslot->exists() && m_cartslot->get_sms_mode())) m_maincpu->set_input_line(INPUT_LINE_NMI, state); @@ -148,7 +148,7 @@ uint8_t sms_state::sms_count_r(offs_t offset) /* If the gamegear is in sms mode, the start button performs the pause function. */ -WRITE_LINE_MEMBER(gamegear_state::gg_pause_callback) +void gamegear_state::gg_pause_callback(int state) { if (!state) { @@ -178,7 +178,7 @@ WRITE_LINE_MEMBER(gamegear_state::gg_pause_callback) } -WRITE_LINE_MEMBER(sms_state::rapid_n_csync_callback) +void sms_state::rapid_n_csync_callback(int state) { if (m_port_rapid.found()) { @@ -1114,7 +1114,7 @@ void smssdisp_state::sms_store_control_w(uint8_t data) m_store_control = data; } -WRITE_LINE_MEMBER(smssdisp_state::sms_store_int_callback) +void smssdisp_state::sms_store_int_callback(int state) { if ( m_store_control & 0x01 ) { @@ -1158,7 +1158,7 @@ void sms1_state::video_reset() } -WRITE_LINE_MEMBER(sms1_state::sscope_vblank) +void sms1_state::sscope_vblank(int state) { // on falling edge if (!state) diff --git a/src/mame/sega/stactics.cpp b/src/mame/sega/stactics.cpp index 5081d78dd58..27b1ab58b24 100644 --- a/src/mame/sega/stactics.cpp +++ b/src/mame/sega/stactics.cpp @@ -85,10 +85,10 @@ public: void stactics(machine_config &config); - DECLARE_READ_LINE_MEMBER(frame_count_d3_r); - DECLARE_READ_LINE_MEMBER(shot_standby_r); - DECLARE_READ_LINE_MEMBER(not_shot_arrive_r); - DECLARE_READ_LINE_MEMBER(motor_not_ready_r); + int frame_count_d3_r(); + int shot_standby_r(); + int not_shot_arrive_r(); + int motor_not_ready_r(); DECLARE_CUSTOM_INPUT_MEMBER(get_rng); protected: @@ -98,19 +98,19 @@ protected: private: uint8_t vert_pos_r(); uint8_t horiz_pos_r(); - template DECLARE_WRITE_LINE_MEMBER(coin_lockout_w); - DECLARE_WRITE_LINE_MEMBER(palette_bank_w); + template void coin_lockout_w(int state); + void palette_bank_w(int state); void scroll_ram_w(offs_t offset, uint8_t data); void speed_latch_w(uint8_t data); void shot_trigger_w(uint8_t data); void shot_flag_clear_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(motor_w); + void motor_w(int state); INTERRUPT_GEN_MEMBER(interrupt); - DECLARE_WRITE_LINE_MEMBER(barrier_lamp_w); - DECLARE_WRITE_LINE_MEMBER(start_lamp_w); - template DECLARE_WRITE_LINE_MEMBER(base_lamp_w) { m_base_lamps[N] = state; } + void barrier_lamp_w(int state); + void start_lamp_w(int state); + template void base_lamp_w(int state) { m_base_lamps[N] = state; } void palette(palette_device &palette) const; @@ -244,7 +244,7 @@ void stactics_state::palette(palette_device &palette) const } -WRITE_LINE_MEMBER(stactics_state::palette_bank_w) +void stactics_state::palette_bank_w(int state) { m_palette_bank = m_outlatch->q6_r() | (m_outlatch->q7_r() << 1); } @@ -278,7 +278,7 @@ void stactics_state::scroll_ram_w(offs_t offset, uint8_t data) * *************************************/ -READ_LINE_MEMBER(stactics_state::frame_count_d3_r) +int stactics_state::frame_count_d3_r() { return (m_frame_count >> 3) & 0x01; } @@ -327,13 +327,13 @@ void stactics_state::shot_flag_clear_w(uint8_t data) } -READ_LINE_MEMBER(stactics_state::shot_standby_r) +int stactics_state::shot_standby_r() { return m_shot_standby; } -READ_LINE_MEMBER(stactics_state::not_shot_arrive_r) +int stactics_state::not_shot_arrive_r() { return !m_shot_arrive; } @@ -454,14 +454,14 @@ template void stactics_state::set_indicator_leds(unsigned offset, o } -WRITE_LINE_MEMBER(stactics_state::barrier_lamp_w) +void stactics_state::barrier_lamp_w(int state) { // this needs to flash on/off, not implemented m_barrier_lamp = state; } -WRITE_LINE_MEMBER(stactics_state::start_lamp_w) +void stactics_state::start_lamp_w(int state) { m_start_lamp = state; } @@ -576,13 +576,13 @@ uint32_t stactics_state::screen_update(screen_device &screen, bitmap_ind16 &bitm * *************************************/ -WRITE_LINE_MEMBER(stactics_state::motor_w) +void stactics_state::motor_w(int state) { m_motor_on = state; } -READ_LINE_MEMBER(stactics_state::motor_not_ready_r) +int stactics_state::motor_not_ready_r() { // if the motor is self-centering, but not centered yet return (!m_motor_on && (m_horiz_pos != 0 || m_vert_pos != 0)); @@ -664,7 +664,7 @@ CUSTOM_INPUT_MEMBER(stactics_state::get_rng) *************************************/ template -WRITE_LINE_MEMBER(stactics_state::coin_lockout_w) +void stactics_state::coin_lockout_w(int state) { machine().bookkeeping().coin_lockout_w(Which, !state); } diff --git a/src/mame/sega/system16.cpp b/src/mame/sega/system16.cpp index 95765f93278..b5fd2de5543 100644 --- a/src/mame/sega/system16.cpp +++ b/src/mame/sega/system16.cpp @@ -394,7 +394,7 @@ void segas1x_bootleg_state::tturfbl_msm5205_data_w(uint8_t data) m_sample_buffer = data; } -WRITE_LINE_MEMBER(segas1x_bootleg_state::tturfbl_msm5205_callback) +void segas1x_bootleg_state::tturfbl_msm5205_callback(int state) { m_msm->data_w((m_sample_buffer >> 4) & 0x0f); @@ -474,7 +474,7 @@ void segas1x_bootleg_state::shinobi_datsu_sound_map(address_map &map) map(0xf800, 0xffff).ram(); } -WRITE_LINE_MEMBER(segas1x_bootleg_state::datsu_msm5205_callback) +void segas1x_bootleg_state::datsu_msm5205_callback(int state) { if (!state) return; @@ -1209,7 +1209,7 @@ void segas1x_bootleg_state::shdancbl_msm5205_data_w(uint8_t data) m_sample_buffer = data; } -WRITE_LINE_MEMBER(segas1x_bootleg_state::shdancbl_msm5205_callback) +void segas1x_bootleg_state::shdancbl_msm5205_callback(int state) { m_msm->data_w(m_sample_buffer & 0x0f); @@ -2084,7 +2084,7 @@ void segas1x_bootleg_state::z80_ym2151(machine_config &config) YM2151(config, "ymsnd", 4000000).add_route(0, "lspeaker", 0.32).add_route(1, "rspeaker", 0.32); } -WRITE_LINE_MEMBER(segas1x_bootleg_state::sound_cause_nmi) +void segas1x_bootleg_state::sound_cause_nmi(int state) { if (state) m_soundcpu->pulse_input_line(INPUT_LINE_NMI, attotime::zero); diff --git a/src/mame/sega/system16.h b/src/mame/sega/system16.h index 301147fa9af..cc0c7ce966f 100644 --- a/src/mame/sega/system16.h +++ b/src/mame/sega/system16.h @@ -169,10 +169,10 @@ private: void set_fg_page( int data ); void set_bg_page( int data ); void datsu_set_pages( ); - DECLARE_WRITE_LINE_MEMBER(tturfbl_msm5205_callback); - DECLARE_WRITE_LINE_MEMBER(datsu_msm5205_callback); - DECLARE_WRITE_LINE_MEMBER(shdancbl_msm5205_callback); - DECLARE_WRITE_LINE_MEMBER(sound_cause_nmi); + void tturfbl_msm5205_callback(int state); + void datsu_msm5205_callback(int state); + void shdancbl_msm5205_callback(int state); + void sound_cause_nmi(int state); void bayrouteb1_map(address_map &map); void bayrouteb2_map(address_map &map); diff --git a/src/mame/sega/turbo.cpp b/src/mame/sega/turbo.cpp index 8ecd54096bf..6f4135ff382 100644 --- a/src/mame/sega/turbo.cpp +++ b/src/mame/sega/turbo.cpp @@ -480,19 +480,19 @@ void turbo_state::analog_reset_w(uint8_t data) } -WRITE_LINE_MEMBER(turbo_state::coin_meter_1_w) +void turbo_state::coin_meter_1_w(int state) { machine().bookkeeping().coin_counter_w(0, state); } -WRITE_LINE_MEMBER(turbo_state::coin_meter_2_w) +void turbo_state::coin_meter_2_w(int state) { machine().bookkeeping().coin_counter_w(1, state); } -WRITE_LINE_MEMBER(turbo_state::start_lamp_w) +void turbo_state::start_lamp_w(int state) { m_lamp = state ? 1 : 0; } diff --git a/src/mame/sega/turbo.h b/src/mame/sega/turbo.h index 57174acaf10..b96c4109742 100644 --- a/src/mame/sega/turbo.h +++ b/src/mame/sega/turbo.h @@ -250,9 +250,9 @@ private: uint8_t collision_r(); void collision_clear_w(uint8_t data); void analog_reset_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(coin_meter_1_w); - DECLARE_WRITE_LINE_MEMBER(coin_meter_2_w); - DECLARE_WRITE_LINE_MEMBER(start_lamp_w); + void coin_meter_1_w(int state); + void coin_meter_2_w(int state); + void start_lamp_w(int state); void ppi0a_w(uint8_t data); void ppi0b_w(uint8_t data); void ppi0c_w(uint8_t data); diff --git a/src/mame/sega/vicdual.cpp b/src/mame/sega/vicdual.cpp index 04a43e13099..139017adde4 100644 --- a/src/mame/sega/vicdual.cpp +++ b/src/mame/sega/vicdual.cpp @@ -243,7 +243,7 @@ void carnival_state::mboard_map(address_map &map) map(0x0000, 0x03ff).rom(); } -READ_LINE_MEMBER( carnival_state::carnival_music_port_t1_r ) +int carnival_state::carnival_music_port_t1_r() { // T1: comms from audio port 2 d3 return ~m_port2State >> 3 & 1; @@ -728,7 +728,7 @@ void vicdual_state::assert_coin_status() m_coin_status = 1; } -READ_LINE_MEMBER(vicdual_state::coin_status_r) +int vicdual_state::coin_status_r() { return m_coin_status; } @@ -803,25 +803,25 @@ int vicdual_state::get_vcounter() } -READ_LINE_MEMBER(vicdual_state::get_64v) +int vicdual_state::get_64v() { return (get_vcounter() >> 6) & 0x01; } -READ_LINE_MEMBER(vicdual_state::vblank_comp_r) +int vicdual_state::vblank_comp_r() { return (get_vcounter() < VICDUAL_VBSTART); } -READ_LINE_MEMBER(vicdual_state::cblank_comp_r) +int vicdual_state::cblank_comp_r() { return (vblank_comp_r() && !m_screen->hblank()); } -READ_LINE_MEMBER(vicdual_state::timer_value_r) +int vicdual_state::timer_value_r() { /* return the state of the timer (old code claims "4MHz square wave", but it was toggled once every 2msec, or 500Hz) */ return machine().time().as_ticks(500) & 1; @@ -2182,7 +2182,7 @@ void vicdual_state::headonn_io_map(address_map &map) /* several of the games' lives DIPs are spread across two input ports */ template -READ_LINE_MEMBER(vicdual_state::fake_lives_r) +int vicdual_state::fake_lives_r() { // FIXME: there should be two template parameters, but that makes port macros confused // use the low byte for the bitmask @@ -3142,7 +3142,7 @@ void vicdual_state::samurai_protection_w(uint8_t data) template -READ_LINE_MEMBER(vicdual_state::samurai_protection_r) +int vicdual_state::samurai_protection_r() { uint32_t answer = 0; diff --git a/src/mame/sega/vicdual.h b/src/mame/sega/vicdual.h index c2c7eac8e2c..1293f1b669a 100644 --- a/src/mame/sega/vicdual.h +++ b/src/mame/sega/vicdual.h @@ -69,13 +69,13 @@ public: void carhntds(machine_config &config); void alphaho(machine_config &config); - DECLARE_READ_LINE_MEMBER(coin_status_r); - DECLARE_READ_LINE_MEMBER(get_64v); - DECLARE_READ_LINE_MEMBER(vblank_comp_r); - DECLARE_READ_LINE_MEMBER(cblank_comp_r); - DECLARE_READ_LINE_MEMBER(timer_value_r); - template DECLARE_READ_LINE_MEMBER(fake_lives_r); - template DECLARE_READ_LINE_MEMBER(samurai_protection_r); + int coin_status_r(); + int get_64v(); + int vblank_comp_r(); + int cblank_comp_r(); + int timer_value_r(); + template int fake_lives_r(); + template int samurai_protection_r(); DECLARE_INPUT_CHANGED_MEMBER(coin_changed); protected: @@ -297,7 +297,7 @@ protected: /*----------- defined in audio/carnival.cpp -----------*/ void carnival_audio_1_w(uint8_t data); void carnival_audio_2_w(uint8_t data); - DECLARE_READ_LINE_MEMBER( carnival_music_port_t1_r ); + int carnival_music_port_t1_r(); void carnivala_music_port_1_w(uint8_t data); void carnivala_music_port_2_w(uint8_t data); void carnival_psg_latch(); diff --git a/src/mame/sega/zaxxon.cpp b/src/mame/sega/zaxxon.cpp index fd1ad7164ad..bb74a1b54dd 100644 --- a/src/mame/sega/zaxxon.cpp +++ b/src/mame/sega/zaxxon.cpp @@ -303,14 +303,14 @@ INPUT_CHANGED_MEMBER(zaxxon_state::service_switch) } -WRITE_LINE_MEMBER(zaxxon_state::vblank_int) +void zaxxon_state::vblank_int(int state) { if (state && m_int_enabled) m_maincpu->set_input_line(0, ASSERT_LINE); } -WRITE_LINE_MEMBER(zaxxon_state::int_enable_w) +void zaxxon_state::int_enable_w(int state) { m_int_enabled = state; if (!m_int_enabled) @@ -391,13 +391,13 @@ void zaxxon_state::zaxxon_control_w(offs_t offset, uint8_t data) } -WRITE_LINE_MEMBER(zaxxon_state::coin_counter_a_w) +void zaxxon_state::coin_counter_a_w(int state) { machine().bookkeeping().coin_counter_w(0, state); } -WRITE_LINE_MEMBER(zaxxon_state::coin_counter_b_w) +void zaxxon_state::coin_counter_b_w(int state) { machine().bookkeeping().coin_counter_w(1, state); } @@ -407,7 +407,7 @@ WRITE_LINE_MEMBER(zaxxon_state::coin_counter_b_w) // each coin input, which then needs to be explicitly cleared by the game. // Each coin input first passes through a debounce circuit consisting of a // LS175 quad flip-flop and LS10 3-input NAND gate, which is not emulated. -WRITE_LINE_MEMBER(zaxxon_state::coin_enable_w) +void zaxxon_state::coin_enable_w(int state) { for (int n = 0; n < 3; n++) if (!BIT(m_mainlatch[0]->output_state(), n)) @@ -423,7 +423,7 @@ INPUT_CHANGED_MEMBER(zaxxon_state::zaxxon_coin_inserted) template -READ_LINE_MEMBER(zaxxon_state::zaxxon_coin_r) +int zaxxon_state::zaxxon_coin_r() { return m_coin_status[Num]; } diff --git a/src/mame/sega/zaxxon.h b/src/mame/sega/zaxxon.h index 8f70a2e12f2..3beff1af871 100644 --- a/src/mame/sega/zaxxon.h +++ b/src/mame/sega/zaxxon.h @@ -49,7 +49,7 @@ public: void init_zaxxonj(); template DECLARE_CUSTOM_INPUT_MEMBER(razmataz_dial_r); - template DECLARE_READ_LINE_MEMBER(zaxxon_coin_r); + template int zaxxon_coin_r(); DECLARE_INPUT_CHANGED_MEMBER(service_switch); DECLARE_INPUT_CHANGED_MEMBER(zaxxon_coin_inserted); @@ -88,19 +88,19 @@ private: const uint8_t *m_color_codes; tilemap_t *m_fg_tilemap = nullptr; tilemap_t *m_bg_tilemap = nullptr; - DECLARE_WRITE_LINE_MEMBER(int_enable_w); + void int_enable_w(int state); uint8_t razmataz_counter_r(); void zaxxon_control_w(offs_t offset, uint8_t data); - DECLARE_WRITE_LINE_MEMBER(coin_counter_a_w); - DECLARE_WRITE_LINE_MEMBER(coin_counter_b_w); - DECLARE_WRITE_LINE_MEMBER(coin_enable_w); - DECLARE_WRITE_LINE_MEMBER(flipscreen_w); - DECLARE_WRITE_LINE_MEMBER(fg_color_w); + void coin_counter_a_w(int state); + void coin_counter_b_w(int state); + void coin_enable_w(int state); + void flipscreen_w(int state); + void fg_color_w(int state); void bg_position_w(offs_t offset, uint8_t data); - DECLARE_WRITE_LINE_MEMBER(bg_color_w); - DECLARE_WRITE_LINE_MEMBER(bg_enable_w); - DECLARE_WRITE_LINE_MEMBER(congo_fg_bank_w); - DECLARE_WRITE_LINE_MEMBER(congo_color_bank_w); + void bg_color_w(int state); + void bg_enable_w(int state); + void congo_fg_bank_w(int state); + void congo_color_bank_w(int state); void zaxxon_videoram_w(offs_t offset, uint8_t data); void congo_colorram_w(offs_t offset, uint8_t data); void congo_sprite_custom_w(address_space &space, offs_t offset, uint8_t data); @@ -119,7 +119,7 @@ private: uint32_t screen_update_razmataz(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_ixion(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_congo(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(vblank_int); + void vblank_int(int state); void zaxxon_sound_a_w(uint8_t data); void zaxxon_sound_b_w(uint8_t data); void zaxxon_sound_c_w(uint8_t data); diff --git a/src/mame/sega/zaxxon_v.cpp b/src/mame/sega/zaxxon_v.cpp index 9b7696b4650..3754ee2792b 100644 --- a/src/mame/sega/zaxxon_v.cpp +++ b/src/mame/sega/zaxxon_v.cpp @@ -172,7 +172,7 @@ VIDEO_START_MEMBER(zaxxon_state,congo) * *************************************/ -WRITE_LINE_MEMBER(zaxxon_state::flipscreen_w) +void zaxxon_state::flipscreen_w(int state) { /* low bit controls flip; background and sprite flip are handled at render time */ m_flip_screen = !state; @@ -180,7 +180,7 @@ WRITE_LINE_MEMBER(zaxxon_state::flipscreen_w) } -WRITE_LINE_MEMBER(zaxxon_state::fg_color_w) +void zaxxon_state::fg_color_w(int state) { /* low bit selects high color palette index */ m_fg_color = state * 0x80; @@ -198,21 +198,21 @@ void zaxxon_state::bg_position_w(offs_t offset, uint8_t data) } -WRITE_LINE_MEMBER(zaxxon_state::bg_color_w) +void zaxxon_state::bg_color_w(int state) { /* low bit selects high color palette index */ m_bg_color = state * 0x80; } -WRITE_LINE_MEMBER(zaxxon_state::bg_enable_w) +void zaxxon_state::bg_enable_w(int state) { /* low bit enables/disables the background layer */ m_bg_enable = state; } -WRITE_LINE_MEMBER(zaxxon_state::congo_fg_bank_w) +void zaxxon_state::congo_fg_bank_w(int state) { /* low bit controls the topmost character bit */ m_congo_fg_bank = state; @@ -220,7 +220,7 @@ WRITE_LINE_MEMBER(zaxxon_state::congo_fg_bank_w) } -WRITE_LINE_MEMBER(zaxxon_state::congo_color_bank_w) +void zaxxon_state::congo_color_bank_w(int state) { /* low bit controls the topmost bit into the color PROM */ m_congo_color_bank = state; diff --git a/src/mame/seibu/bloodbro.cpp b/src/mame/seibu/bloodbro.cpp index ce18d256f3e..22a3ae308d9 100644 --- a/src/mame/seibu/bloodbro.cpp +++ b/src/mame/seibu/bloodbro.cpp @@ -212,7 +212,7 @@ void bloodbro_state::weststry_map(address_map &map) map(0x128000, 0x1287ff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); } -WRITE_LINE_MEMBER(bloodbro_state::weststry_opl_irq_w) +void bloodbro_state::weststry_opl_irq_w(int state) { m_weststry_opl_irq = state; weststry_soundnmi_update(); diff --git a/src/mame/seibu/bloodbro.h b/src/mame/seibu/bloodbro.h index 3a9d4b4cb81..6347130671c 100644 --- a/src/mame/seibu/bloodbro.h +++ b/src/mame/seibu/bloodbro.h @@ -71,7 +71,7 @@ private: void layer_scroll_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); void weststry_layer_scroll_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); void weststry_soundlatch_w(offs_t offset, u8 data); - DECLARE_WRITE_LINE_MEMBER(weststry_opl_irq_w); + void weststry_opl_irq_w(int state); void weststry_opl_w(offs_t offset, uint8_t data); void weststry_soundnmi_ack_w(uint8_t data); void weststry_soundnmi_update(); diff --git a/src/mame/seibu/dynduke.cpp b/src/mame/seibu/dynduke.cpp index 078ef5a5cfb..059e8491423 100644 --- a/src/mame/seibu/dynduke.cpp +++ b/src/mame/seibu/dynduke.cpp @@ -303,7 +303,7 @@ GFXDECODE_END /* Interrupt Generator */ -WRITE_LINE_MEMBER(dynduke_state::vblank_irq) +void dynduke_state::vblank_irq(int state) { if (state) { diff --git a/src/mame/seibu/dynduke.h b/src/mame/seibu/dynduke.h index bd35e6a975d..e0cd9535a02 100644 --- a/src/mame/seibu/dynduke.h +++ b/src/mame/seibu/dynduke.h @@ -74,7 +74,7 @@ private: void draw_sprites(bitmap_ind16 &bitmap,const rectangle &cliprect,int pri); void draw_background(bitmap_ind16 &bitmap, const rectangle &cliprect, int pri ); - DECLARE_WRITE_LINE_MEMBER(vblank_irq); + void vblank_irq(int state); void master_map(address_map &map); void masterj_map(address_map &map); void sei80bu_encrypted_full_map(address_map &map); diff --git a/src/mame/seibu/feversoc.cpp b/src/mame/seibu/feversoc.cpp index da8240f7183..6159d52b530 100644 --- a/src/mame/seibu/feversoc.cpp +++ b/src/mame/seibu/feversoc.cpp @@ -115,7 +115,7 @@ private: void output2_w(uint16_t data); void feversoc_map(address_map &map); uint32_t screen_update_feversoc(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(feversoc_irq); + void feversoc_irq(int state); void feversoc_irq_ack(uint16_t data); virtual void machine_start() override; @@ -278,7 +278,7 @@ static INPUT_PORTS_START( feversoc ) PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNUSED ) INPUT_PORTS_END -WRITE_LINE_MEMBER(feversoc_state::feversoc_irq) +void feversoc_state::feversoc_irq(int state) { if (state) m_maincpu->set_input_line(8, ASSERT_LINE); diff --git a/src/mame/seibu/goal92.cpp b/src/mame/seibu/goal92.cpp index 29b33c5e85d..1f2ead5418d 100644 --- a/src/mame/seibu/goal92.cpp +++ b/src/mame/seibu/goal92.cpp @@ -95,8 +95,8 @@ private: TILE_GET_INFO_MEMBER(get_fore_tile_info); uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect, int pri); - DECLARE_WRITE_LINE_MEMBER(irqhandler); - DECLARE_WRITE_LINE_MEMBER(adpcm_int); + void irqhandler(int state); + void adpcm_int(int state); void main_map(address_map &map); void sound_map(address_map &map); }; @@ -459,13 +459,13 @@ static INPUT_PORTS_START( goal92 ) INPUT_PORTS_END // handler called by the 2203 emulator when the internal timers cause an IRQ -WRITE_LINE_MEMBER(goal92_state::irqhandler) +void goal92_state::irqhandler(int state) { // NMI writes to MSM ports *only*! -AS //m_audiocpu->set_input_line(INPUT_LINE_NMI, state ? ASSERT_LINE : CLEAR_LINE); } -WRITE_LINE_MEMBER(goal92_state::adpcm_int) +void goal92_state::adpcm_int(int state) { m_msm->data_w(m_msm5205next); m_msm5205next >>= 4; diff --git a/src/mame/seibu/goodejan.cpp b/src/mame/seibu/goodejan.cpp index 2c0c50421f3..002f527a6bd 100644 --- a/src/mame/seibu/goodejan.cpp +++ b/src/mame/seibu/goodejan.cpp @@ -150,7 +150,7 @@ private: TILE_GET_INFO_MEMBER(seibucrtc_sc2_tile_info); TILE_GET_INFO_MEMBER(seibucrtc_sc3_tile_info); - DECLARE_WRITE_LINE_MEMBER(vblank_irq); + void vblank_irq(int state); void seibucrtc_sc0bank_w(uint16_t data); void draw_sprites(bitmap_ind16 &bitmap,const rectangle &cliprect,int pri); @@ -588,7 +588,7 @@ static GFXDECODE_START( gfx_goodejan ) GFXDECODE_ENTRY( "tx_gfx", 0, charlayout, 0x100, 0x10 ) /* Text */ GFXDECODE_END -WRITE_LINE_MEMBER(goodejan_state::vblank_irq) +void goodejan_state::vblank_irq(int state) { if (state) m_maincpu->set_input_line_and_vector(0, HOLD_LINE, 0x208/4); // V30 diff --git a/src/mame/seibu/raiden.cpp b/src/mame/seibu/raiden.cpp index 1380b231c8b..7ff1c0530fa 100644 --- a/src/mame/seibu/raiden.cpp +++ b/src/mame/seibu/raiden.cpp @@ -335,7 +335,7 @@ GFXDECODE_END /******************************************************************************/ -WRITE_LINE_MEMBER(raiden_state::vblank_irq) +void raiden_state::vblank_irq(int state) { if (state) { diff --git a/src/mame/seibu/raiden.h b/src/mame/seibu/raiden.h index 9a5245545ad..cc657b6ae67 100644 --- a/src/mame/seibu/raiden.h +++ b/src/mame/seibu/raiden.h @@ -85,7 +85,7 @@ protected: u32 screen_update_raiden(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(vblank_irq); + void vblank_irq(int state); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect, bitmap_ind8 &primap); void common_decrypt(); diff --git a/src/mame/seibu/raiden_ms.cpp b/src/mame/seibu/raiden_ms.cpp index c85fe0f25cd..f27084faa0a 100644 --- a/src/mame/seibu/raiden_ms.cpp +++ b/src/mame/seibu/raiden_ms.cpp @@ -275,14 +275,14 @@ private: void adpcm_w(u8 data); void ym_w(offs_t offset, u8 data); void audio_map(address_map& map); - DECLARE_WRITE_LINE_MEMBER(adpcm_int); + void adpcm_int(int state); bool m_audio_select; u8 m_adpcm_data; void unk_snd_dffx_w(offs_t offset, u8 data); void soundlatch_w(u8 data); - DECLARE_WRITE_LINE_MEMBER(vblank_irq); + void vblank_irq(int state); void descramble_16x16tiles(uint8_t* src, int len); @@ -401,7 +401,7 @@ void raiden_ms_state::audio_map(address_map &map) map(0xe00a, 0xe00b).r(m_ym2, FUNC(ym2203_device::read)); } -WRITE_LINE_MEMBER(raiden_ms_state::adpcm_int) +void raiden_ms_state::adpcm_int(int state) { m_msm->data_w(m_adpcm_data); m_audiocpu->set_input_line(0, HOLD_LINE); @@ -642,7 +642,7 @@ static GFXDECODE_START( gfx_raiden_ms ) GFXDECODE_ENTRY( "gfx3", 0, tiles8x8x4_layout, 0x000, 16 ) GFXDECODE_END -WRITE_LINE_MEMBER(raiden_ms_state::vblank_irq) +void raiden_ms_state::vblank_irq(int state) { if (state) { diff --git a/src/mame/seibu/seibuspi.cpp b/src/mame/seibu/seibuspi.cpp index 98f7d2259dc..27fcb92eaf4 100644 --- a/src/mame/seibu/seibuspi.cpp +++ b/src/mame/seibu/seibuspi.cpp @@ -1196,7 +1196,7 @@ void seibuspi_state::spi_ymf271_map(address_map &map) /*****************************************************************************/ -WRITE_LINE_MEMBER(seibuspi_state::ymf_irqhandler) +void seibuspi_state::ymf_irqhandler(int state) { if (state) m_audiocpu->set_input_line_and_vector(0, ASSERT_LINE, 0xd7); // Z80 - IRQ is RST10 diff --git a/src/mame/seibu/seibuspi.h b/src/mame/seibu/seibuspi.h index ebdfdeaf723..839b015c2ad 100644 --- a/src/mame/seibu/seibuspi.h +++ b/src/mame/seibu/seibuspi.h @@ -150,7 +150,7 @@ protected: u32 rf2_speedup_r(); u32 rfjet_speedup_r(); - DECLARE_WRITE_LINE_MEMBER(ymf_irqhandler); + void ymf_irqhandler(int state); void set_layer_offsets(); void drawgfx_blend(bitmap_rgb32 &bitmap, const rectangle &cliprect, gfx_element *gfx, u32 code, u32 color, bool flipx, bool flipy, int sx, int sy, bitmap_ind8 &primap, u8 primask); diff --git a/src/mame/seibu/sengokmj.cpp b/src/mame/seibu/sengokmj.cpp index 6f8ba6a4721..f955cd5e0f2 100644 --- a/src/mame/seibu/sengokmj.cpp +++ b/src/mame/seibu/sengokmj.cpp @@ -128,7 +128,7 @@ private: TILE_GET_INFO_MEMBER(seibucrtc_sc2_tile_info); TILE_GET_INFO_MEMBER(seibucrtc_sc3_tile_info); - DECLARE_WRITE_LINE_MEMBER(vblank_irq); + void vblank_irq(int state); void draw_sprites(bitmap_ind16 &bitmap,const rectangle &cliprect,int pri); uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); @@ -565,7 +565,7 @@ static GFXDECODE_START( gfx_sengokmj ) GFXDECODE_ENTRY( "tx_gfx", 0, charlayout, 0x700, 0x10 ) /* Text */ GFXDECODE_END -WRITE_LINE_MEMBER(sengokmj_state::vblank_irq) +void sengokmj_state::vblank_irq(int state) { if (state) m_maincpu->set_input_line_and_vector(0, HOLD_LINE, 0xc8/4); // V30 diff --git a/src/mame/seibu/stfight.h b/src/mame/seibu/stfight.h index 89c2ad366f4..08d28e4d728 100644 --- a/src/mame/seibu/stfight.h +++ b/src/mame/seibu/stfight.h @@ -50,7 +50,7 @@ protected: TIMER_CALLBACK_MEMBER(rst08_tick); private: - DECLARE_WRITE_LINE_MEMBER(stfight_adpcm_int); + void stfight_adpcm_int(int state); void stfight_io_w(uint8_t data); uint8_t stfight_coin_r(); diff --git a/src/mame/seibu/stfight_m.cpp b/src/mame/seibu/stfight_m.cpp index 3ab2a9b7178..ab701c738ff 100644 --- a/src/mame/seibu/stfight_m.cpp +++ b/src/mame/seibu/stfight_m.cpp @@ -151,7 +151,7 @@ void stfight_state::stfight_coin_w(uint8_t data) * Machine hardware for MSM5205 ADPCM sound control */ -WRITE_LINE_MEMBER(stfight_state::stfight_adpcm_int) +void stfight_state::stfight_adpcm_int(int state) { if (!state) return; diff --git a/src/mame/seibu/t5182.cpp b/src/mame/seibu/t5182.cpp index 4debad2a609..f243a801a4f 100644 --- a/src/mame/seibu/t5182.cpp +++ b/src/mame/seibu/t5182.cpp @@ -234,7 +234,7 @@ void t5182_device::cpu_irq_ack_w(uint8_t data) machine().scheduler().synchronize(timer_expired_delegate(FUNC(t5182_device::setirq_callback), this), CPU_CLEAR); } -WRITE_LINE_MEMBER(t5182_device::ym2151_irq_handler) +void t5182_device::ym2151_irq_handler(int state) { if (state) machine().scheduler().synchronize(timer_expired_delegate(FUNC(t5182_device::setirq_callback), this), YM2151_ASSERT); diff --git a/src/mame/seibu/t5182.h b/src/mame/seibu/t5182.h index 6af170605af..28180b8e612 100644 --- a/src/mame/seibu/t5182.h +++ b/src/mame/seibu/t5182.h @@ -30,7 +30,7 @@ public: void sharedram_semaphore_main_release_w(uint8_t data); uint8_t sharedram_r(offs_t offset); void sharedram_w(offs_t offset, uint8_t data); - DECLARE_WRITE_LINE_MEMBER(ym2151_irq_handler); + void ym2151_irq_handler(int state); void t5182_io(address_map &map); void t5182_map(address_map &map); diff --git a/src/mame/seibu/toki.cpp b/src/mame/seibu/toki.cpp index f4514713fb7..47b9d77b2c8 100644 --- a/src/mame/seibu/toki.cpp +++ b/src/mame/seibu/toki.cpp @@ -116,7 +116,7 @@ uint16_t toki_state::pip_r() -WRITE_LINE_MEMBER(toki_state::tokib_adpcm_int) +void toki_state::tokib_adpcm_int(int state) { m_msm->data_w(m_msm5205next); m_msm5205next >>= 4; diff --git a/src/mame/seibu/toki.h b/src/mame/seibu/toki.h index 7776d6d40e5..6d4ca80540f 100644 --- a/src/mame/seibu/toki.h +++ b/src/mame/seibu/toki.h @@ -77,7 +77,7 @@ private: void background2_videoram_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); void tokib_adpcm_control_w(uint8_t data); void tokib_adpcm_data_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(tokib_adpcm_int); + void tokib_adpcm_int(int state); uint8_t jujuba_z80_data_decrypt(offs_t offset); diff --git a/src/mame/seibu/toki_ms.cpp b/src/mame/seibu/toki_ms.cpp index 33859e85da8..e9d8a0f2945 100644 --- a/src/mame/seibu/toki_ms.cpp +++ b/src/mame/seibu/toki_ms.cpp @@ -334,7 +334,7 @@ private: u8 sound_status_r(); void sound_command_w(u8 data); void adpcm_w(u8 data); - DECLARE_WRITE_LINE_MEMBER(adpcm_int); + void adpcm_int(int state); u8 m_adpcm_data = 0; void descramble_16x16tiles(uint8_t* src, int len); @@ -680,7 +680,7 @@ void toki_ms_state::machine_start() membank("sound_bank")->configure_entries(0, 2, memregion("audiocpu")->base() + 0x8000, 0x4000); } -WRITE_LINE_MEMBER(toki_ms_state::adpcm_int) +void toki_ms_state::adpcm_int(int state) { m_msm->data_w(m_adpcm_data); m_audiocpu->set_input_line(0, HOLD_LINE); diff --git a/src/mame/sequential/prophet600.cpp b/src/mame/sequential/prophet600.cpp index c5bd3f37258..077c4a6a323 100644 --- a/src/mame/sequential/prophet600.cpp +++ b/src/mame/sequential/prophet600.cpp @@ -94,10 +94,10 @@ public: private: virtual void machine_start() override; - DECLARE_WRITE_LINE_MEMBER( pit_ch0_tick_w ); - DECLARE_WRITE_LINE_MEMBER( pit_ch2_tick_w ); - DECLARE_WRITE_LINE_MEMBER( acia_irq_w ); - DECLARE_WRITE_LINE_MEMBER( acia_clock_w ); + void pit_ch0_tick_w(int state); + void pit_ch2_tick_w(int state); + void acia_irq_w(int state); + void acia_clock_w(int state); void dac_w(offs_t offset, uint8_t data); void scanrow_w(uint8_t data); @@ -130,18 +130,18 @@ private: uint16_t m_CVs[CV_MAX]{}; }; -WRITE_LINE_MEMBER( prophet600_state::pit_ch0_tick_w ) +void prophet600_state::pit_ch0_tick_w(int state) { m_maincpu->set_input_line(INPUT_LINE_IRQ0, state); } -WRITE_LINE_MEMBER( prophet600_state::pit_ch2_tick_w ) +void prophet600_state::pit_ch2_tick_w(int state) { m_comparitor &= ~0x04; m_comparitor |= (state == ASSERT_LINE) ? 0x04 : 0x00; } -WRITE_LINE_MEMBER( prophet600_state::acia_irq_w ) +void prophet600_state::acia_irq_w(int state) { if (!m_nmi_gate) { @@ -149,7 +149,7 @@ WRITE_LINE_MEMBER( prophet600_state::acia_irq_w ) } } -WRITE_LINE_MEMBER( prophet600_state::acia_clock_w ) +void prophet600_state::acia_clock_w(int state) { m_acia->write_txc(state); m_acia->write_rxc(state); diff --git a/src/mame/seta/kiwame.cpp b/src/mame/seta/kiwame.cpp index f801f4ade50..91983ecbaf8 100644 --- a/src/mame/seta/kiwame.cpp +++ b/src/mame/seta/kiwame.cpp @@ -37,7 +37,7 @@ protected: private: void row_select_w(u16 data); u16 input_r(offs_t offset); - DECLARE_WRITE_LINE_MEMBER(kiwame_vblank); + void kiwame_vblank(int state); u32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); diff --git a/src/mame/seta/seta.cpp b/src/mame/seta/seta.cpp index 8fb2a1aba19..a271336a8a9 100644 --- a/src/mame/seta/seta.cpp +++ b/src/mame/seta/seta.cpp @@ -1595,7 +1595,7 @@ void seta_state::timer_regs_w(offs_t offset, u16 data) */ -WRITE_LINE_MEMBER(seta_state::pit_out0) +void seta_state::pit_out0(int state) { if (state) m_maincpu->set_input_line(4, ASSERT_LINE); @@ -1680,7 +1680,7 @@ u8 downtown_state::dsw2_r() Sprites Buffering */ -WRITE_LINE_MEMBER(seta_state::screen_vblank_seta_buffer_sprites) +void seta_state::screen_vblank_seta_buffer_sprites(int state) { // rising edge if (state) diff --git a/src/mame/seta/seta.h b/src/mame/seta/seta.h index 4453f42de68..c9cc83f5703 100644 --- a/src/mame/seta/seta.h +++ b/src/mame/seta/seta.h @@ -157,7 +157,7 @@ protected: u32 screen_update_seta_no_layers(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); u32 screen_update_seta(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(screen_vblank_seta_buffer_sprites); + void screen_vblank_seta_buffer_sprites(int state); u16 ipl0_ack_r(); void ipl0_ack_w(u16 data); u16 ipl1_ack_r(); @@ -174,7 +174,7 @@ protected: void set_pens(); void seta_layers_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int sprite_bank_size); void uPD71054_timer_init(); - DECLARE_WRITE_LINE_MEMBER(pit_out0); + void pit_out0(int state); void atehate_map(address_map &map); void blandia_map(address_map &map); @@ -465,7 +465,7 @@ public: DECLARE_CUSTOM_INPUT_MEMBER(coin_sensors_r); DECLARE_CUSTOM_INPUT_MEMBER(hopper_sensors_r); - DECLARE_WRITE_LINE_MEMBER(screen_vblank); + void screen_vblank(int state); protected: virtual void machine_start() override; diff --git a/src/mame/seta/seta2.h b/src/mame/seta/seta2.h index ce08c40d56f..0c8f190282e 100644 --- a/src/mame/seta/seta2.h +++ b/src/mame/seta/seta2.h @@ -95,7 +95,7 @@ protected: void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(screen_vblank); + void screen_vblank(int state); void sound_bank_w(offs_t offset, uint8_t data); diff --git a/src/mame/seta/seta2_v.cpp b/src/mame/seta/seta2_v.cpp index 60683671ef3..ba167becb3f 100644 --- a/src/mame/seta/seta2_v.cpp +++ b/src/mame/seta/seta2_v.cpp @@ -905,7 +905,7 @@ uint32_t seta2_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, return 0; } -WRITE_LINE_MEMBER(seta2_state::screen_vblank) +void seta2_state::screen_vblank(int state) { //popmessage("yoffset: %04x%04x yzoom: %04x%04x | xoffset: %04x%04x xzoom: %04x%04x \n", m_vregs[0x1a/2], m_vregs[0x18/2], m_vregs[0x1e/2], m_vregs[0x1c/2] , m_vregs[0x12/2], m_vregs[0x10/2], m_vregs[0x16/2], m_vregs[0x14/2]); } diff --git a/src/mame/seta/seta_v.cpp b/src/mame/seta/seta_v.cpp index 2154dc0932f..d95894052e9 100644 --- a/src/mame/seta/seta_v.cpp +++ b/src/mame/seta/seta_v.cpp @@ -604,7 +604,7 @@ u32 setaroul_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, c return 0; } -WRITE_LINE_MEMBER(setaroul_state::screen_vblank) +void setaroul_state::screen_vblank(int state) { // rising edge if (state) diff --git a/src/mame/seta/srmp2.cpp b/src/mame/seta/srmp2.cpp index f6e53ea1870..b9a4c4f2048 100644 --- a/src/mame/seta/srmp2.cpp +++ b/src/mame/seta/srmp2.cpp @@ -226,7 +226,7 @@ void srmp2_state::adpcm_code_w(uint8_t data) } -WRITE_LINE_MEMBER(srmp2_state::adpcm_int) +void srmp2_state::adpcm_int(int state) { if (m_adpcm_sptr) { diff --git a/src/mame/seta/srmp2.h b/src/mame/seta/srmp2.h index 1a68df6838b..0a551b916a5 100644 --- a/src/mame/seta/srmp2.h +++ b/src/mame/seta/srmp2.h @@ -59,7 +59,7 @@ private: uint8_t iox_status_r(); void iox_command_w(uint8_t data); void iox_data_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(adpcm_int); + void adpcm_int(int state); // mjuugi void mjyuugi_flags_w(uint16_t data); diff --git a/src/mame/seta/ssv.cpp b/src/mame/seta/ssv.cpp index fe1bb3aee60..0c959c49216 100644 --- a/src/mame/seta/ssv.cpp +++ b/src/mame/seta/ssv.cpp @@ -260,7 +260,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(ssv_state::interrupt) } } -WRITE_LINE_MEMBER(gdfs_state::adc_int_w) +void gdfs_state::adc_int_w(int state) { if (state) { diff --git a/src/mame/seta/ssv.h b/src/mame/seta/ssv.h index a4ee9f948c6..082b6b8d5ed 100644 --- a/src/mame/seta/ssv.h +++ b/src/mame/seta/ssv.h @@ -180,7 +180,7 @@ protected: virtual void video_start() override; private: - DECLARE_WRITE_LINE_MEMBER(adc_int_w); + void adc_int_w(int state); uint16_t eeprom_r(); void eeprom_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); diff --git a/src/mame/seta/thedealr.cpp b/src/mame/seta/thedealr.cpp index 1600cad48f0..2845b2a5724 100644 --- a/src/mame/seta/thedealr.cpp +++ b/src/mame/seta/thedealr.cpp @@ -76,7 +76,7 @@ private: // video void thedealr_palette(palette_device &palette) const; uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(screen_vblank); + void screen_vblank(int state); void thedealr_main(address_map &map); void thedealr_sub(address_map &map); @@ -118,7 +118,7 @@ uint32_t thedealr_state::screen_update(screen_device &screen, bitmap_ind16 &bitm return 0; } -WRITE_LINE_MEMBER(thedealr_state::screen_vblank) +void thedealr_state::screen_vblank(int state) { // rising edge if (state) diff --git a/src/mame/sfrj/lola8a.cpp b/src/mame/sfrj/lola8a.cpp index dfffd5a51ba..add2e8e5f72 100644 --- a/src/mame/sfrj/lola8a.cpp +++ b/src/mame/sfrj/lola8a.cpp @@ -89,9 +89,9 @@ private: void machine_start() override; u8 lola8a_port_a_r(); void lola8a_port_b_w(u8 data); - DECLARE_WRITE_LINE_MEMBER(crtc_vsync); - DECLARE_READ_LINE_MEMBER(cass_r); - DECLARE_WRITE_LINE_MEMBER(cass_w); + void crtc_vsync(int state); + int cass_r(); + void cass_w(int state); u8 keyboard_r(); MC6845_UPDATE_ROW(crtc_update_row); @@ -270,12 +270,12 @@ void lola8a_state::lola8a_port_b_w(u8 data) m_portb = data; } -READ_LINE_MEMBER( lola8a_state::cass_r ) +int lola8a_state::cass_r() { return (m_cass->input() < 0.03); } -WRITE_LINE_MEMBER( lola8a_state::cass_w ) +void lola8a_state::cass_w(int state) { m_cass->output(state ? -1.0 : +1.0); } @@ -317,7 +317,7 @@ void lola8a_state::machine_start() save_item(NAME(m_portb)); } -WRITE_LINE_MEMBER(lola8a_state::crtc_vsync) +void lola8a_state::crtc_vsync(int state) { m_maincpu->set_input_line(I8085_RST75_LINE, state? ASSERT_LINE : CLEAR_LINE); } diff --git a/src/mame/sfrj/pecom.cpp b/src/mame/sfrj/pecom.cpp index 7356c8b4179..cf9aeada2b2 100644 --- a/src/mame/sfrj/pecom.cpp +++ b/src/mame/sfrj/pecom.cpp @@ -60,11 +60,11 @@ private: uint8_t keyboard_r(); void cdp1869_w(offs_t offset, uint8_t data); TIMER_CALLBACK_MEMBER(reset_tick); - DECLARE_READ_LINE_MEMBER(clear_r); - DECLARE_READ_LINE_MEMBER(ef2_r); - DECLARE_WRITE_LINE_MEMBER(q_w); + int clear_r(); + int ef2_r(); + void q_w(int state); void sc_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(prd_w); + void prd_w(int state); CDP1869_CHAR_RAM_READ_MEMBER(char_ram_r); CDP1869_CHAR_RAM_WRITE_MEMBER(char_ram_w); CDP1869_PCB_READ_MEMBER(pcb_r); @@ -153,12 +153,12 @@ uint8_t pecom_state::keyboard_r() /* CDP1802 Interface */ -READ_LINE_MEMBER(pecom_state::clear_r) +int pecom_state::clear_r() { return m_reset; } -READ_LINE_MEMBER(pecom_state::ef2_r) +int pecom_state::ef2_r() { bool shift = BIT(m_io_cnt->read(), 1); double cas = false;//m_cassette->input(); @@ -166,7 +166,7 @@ READ_LINE_MEMBER(pecom_state::ef2_r) return (cas < -0.02) | shift; // touching shift kills cassette load } -WRITE_LINE_MEMBER(pecom_state::q_w) +void pecom_state::q_w(int state) { m_cassette->output(state ? -1.0 : +1.0); } @@ -234,7 +234,7 @@ CDP1869_PCB_READ_MEMBER(pecom_state::pcb_r ) return BIT(pmd, 7); } -WRITE_LINE_MEMBER(pecom_state::prd_w) +void pecom_state::prd_w(int state) { // every other PRD triggers a DMAOUT request if (m_dma) diff --git a/src/mame/sfrj/tim100.cpp b/src/mame/sfrj/tim100.cpp index bdbf6b86d13..e24640d08d9 100644 --- a/src/mame/sfrj/tim100.cpp +++ b/src/mame/sfrj/tim100.cpp @@ -47,7 +47,7 @@ protected: private: u8 dma_r(offs_t offset); - DECLARE_WRITE_LINE_MEMBER(sod_w); + void sod_w(int state); I8275_DRAW_CHARACTER_MEMBER( crtc_display_pixels ); void mem_map(address_map &map); @@ -161,7 +161,7 @@ I8275_DRAW_CHARACTER_MEMBER( tim100_state::crtc_display_pixels ) } } -WRITE_LINE_MEMBER( tim100_state::sod_w ) +void tim100_state::sod_w(int state) { if (state) m_dma_view.select(0); diff --git a/src/mame/sgi/hpc1.cpp b/src/mame/sgi/hpc1.cpp index b2bddb1e49b..537bb9096da 100644 --- a/src/mame/sgi/hpc1.cpp +++ b/src/mame/sgi/hpc1.cpp @@ -547,7 +547,7 @@ void hpc1_device::decrement_chain() } } -WRITE_LINE_MEMBER(hpc1_device::scsi_drq) +void hpc1_device::scsi_drq(int state) { m_scsi_dma.m_drq = state; @@ -592,21 +592,21 @@ void hpc1_device::set_timer_int_clear(uint32_t data) } } -WRITE_LINE_MEMBER(hpc1_device::timer0_int) +void hpc1_device::timer0_int(int state) { LOGMASKED(LOG_PIT, "Timer0 Interrupt: %d\n", state); if (state) m_maincpu->set_input_line(MIPS3_IRQ2, ASSERT_LINE); } -WRITE_LINE_MEMBER(hpc1_device::timer1_int) +void hpc1_device::timer1_int(int state) { LOGMASKED(LOG_PIT, "Timer2 Interrupt: %d\n", state); if (state) m_maincpu->set_input_line(MIPS3_IRQ3, ASSERT_LINE); } -WRITE_LINE_MEMBER(hpc1_device::timer2_int) +void hpc1_device::timer2_int(int state) { LOGMASKED(LOG_PIT, "Timer2 Interrupt (Disabled): %d\n", state); } @@ -615,9 +615,9 @@ WRITE_LINE_MEMBER(hpc1_device::timer2_int) // SERIAL DUARTS //************************************************************************** -WRITE_LINE_MEMBER(hpc1_device::duart0_int_w) { duart_int_w(0, state); } -WRITE_LINE_MEMBER(hpc1_device::duart1_int_w) { duart_int_w(1, state); } -WRITE_LINE_MEMBER(hpc1_device::duart2_int_w) { duart_int_w(2, state); } +void hpc1_device::duart0_int_w(int state) { duart_int_w(0, state); } +void hpc1_device::duart1_int_w(int state) { duart_int_w(1, state); } +void hpc1_device::duart2_int_w(int state) { duart_int_w(2, state); } void hpc1_device::duart_int_w(int channel, int state) { @@ -665,7 +665,7 @@ void hpc1_device::update_irq(int channel) } } -WRITE_LINE_MEMBER(hpc1_device::scsi_irq) +void hpc1_device::scsi_irq(int state) { if (state) { diff --git a/src/mame/sgi/hpc1.h b/src/mame/sgi/hpc1.h index 5c333110ca7..b2b2a17c023 100644 --- a/src/mame/sgi/hpc1.h +++ b/src/mame/sgi/hpc1.h @@ -38,16 +38,16 @@ protected: virtual void device_reset() override; virtual void device_add_mconfig(machine_config &config) override; - DECLARE_WRITE_LINE_MEMBER(scsi_irq); - DECLARE_WRITE_LINE_MEMBER(scsi_drq); + void scsi_irq(int state); + void scsi_drq(int state); void set_timer_int_clear(uint32_t data); - DECLARE_WRITE_LINE_MEMBER(timer0_int); - DECLARE_WRITE_LINE_MEMBER(timer1_int); - DECLARE_WRITE_LINE_MEMBER(timer2_int); - DECLARE_WRITE_LINE_MEMBER(duart0_int_w); - DECLARE_WRITE_LINE_MEMBER(duart1_int_w); - DECLARE_WRITE_LINE_MEMBER(duart2_int_w); + void timer0_int(int state); + void timer1_int(int state); + void timer2_int(int state); + void duart0_int_w(int state); + void duart1_int_w(int state); + void duart2_int_w(int state); void duart_int_w(int channel, int status); void raise_local_irq(int channel, uint8_t source_mask); diff --git a/src/mame/sgi/hpc3.cpp b/src/mame/sgi/hpc3.cpp index ca734852f33..868b7a6f378 100644 --- a/src/mame/sgi/hpc3.cpp +++ b/src/mame/sgi/hpc3.cpp @@ -1044,12 +1044,12 @@ void hpc3_device::do_scsi_dma(int channel) } } -WRITE_LINE_MEMBER(hpc3_device::scsi0_drq) +void hpc3_device::scsi0_drq(int state) { scsi_drq(state, 0); } -WRITE_LINE_MEMBER(hpc3_device::scsi1_drq) +void hpc3_device::scsi1_drq(int state) { scsi_drq(state, 1); } diff --git a/src/mame/sgi/hpc3.h b/src/mame/sgi/hpc3.h index 44fa64ae74c..5c37109357b 100644 --- a/src/mame/sgi/hpc3.h +++ b/src/mame/sgi/hpc3.h @@ -64,8 +64,8 @@ public: void enet_rxrdy_w(int state); void enet_intr_in_w(int state); - DECLARE_WRITE_LINE_MEMBER(scsi0_drq); - DECLARE_WRITE_LINE_MEMBER(scsi1_drq); + void scsi0_drq(int state); + void scsi1_drq(int state); protected: virtual void device_resolve_objects() override; diff --git a/src/mame/sgi/ioc2.cpp b/src/mame/sgi/ioc2.cpp index 31056762a65..c5eb674bf5f 100644 --- a/src/mame/sgi/ioc2.cpp +++ b/src/mame/sgi/ioc2.cpp @@ -207,7 +207,7 @@ void ioc2_device::lower_local_irq(int channel, uint8_t mask) m_maincpu->set_input_line(channel, (m_int3_local_mask_reg[channel] & m_int3_local_status_reg[channel]) ? ASSERT_LINE : CLEAR_LINE); } -WRITE_LINE_MEMBER(ioc2_device::timer0_int) +void ioc2_device::timer0_int(int state) { if (state) { @@ -216,7 +216,7 @@ WRITE_LINE_MEMBER(ioc2_device::timer0_int) } } -WRITE_LINE_MEMBER(ioc2_device::timer1_int) +void ioc2_device::timer1_int(int state) { if (state) { @@ -225,18 +225,18 @@ WRITE_LINE_MEMBER(ioc2_device::timer1_int) } } -WRITE_LINE_MEMBER(ioc2_device::pit_clock2_out) +void ioc2_device::pit_clock2_out(int state) { m_pit->write_clk0(state); m_pit->write_clk1(state); } -WRITE_LINE_MEMBER(ioc2_device::kbdc_int_w) +void ioc2_device::kbdc_int_w(int state) { set_mappable_int(0x10, state); } -WRITE_LINE_MEMBER(ioc2_device::duart_int_w) +void ioc2_device::duart_int_w(int state) { set_mappable_int(0x20, state); } @@ -687,7 +687,7 @@ INPUT_CHANGED_MEMBER( ioc2_device::volume_down ) raise_local_irq(1, INT3_LOCAL1_PANEL); } -WRITE_LINE_MEMBER(ioc2_device::gio_int0_w) +void ioc2_device::gio_int0_w(int state) { if (state == ASSERT_LINE) raise_local_irq(0, ioc2_device::INT3_LOCAL0_FIFO); @@ -695,7 +695,7 @@ WRITE_LINE_MEMBER(ioc2_device::gio_int0_w) lower_local_irq(0, ioc2_device::INT3_LOCAL0_FIFO); } -WRITE_LINE_MEMBER(ioc2_device::gio_int1_w) +void ioc2_device::gio_int1_w(int state) { if (state == ASSERT_LINE) raise_local_irq(0, ioc2_device::INT3_LOCAL0_GRAPHICS); @@ -703,7 +703,7 @@ WRITE_LINE_MEMBER(ioc2_device::gio_int1_w) lower_local_irq(0, ioc2_device::INT3_LOCAL0_GRAPHICS); } -WRITE_LINE_MEMBER(ioc2_device::gio_int2_w) +void ioc2_device::gio_int2_w(int state) { if (state == ASSERT_LINE) raise_local_irq(1, ioc2_device::INT3_LOCAL1_RETRACE); @@ -711,7 +711,7 @@ WRITE_LINE_MEMBER(ioc2_device::gio_int2_w) lower_local_irq(1, ioc2_device::INT3_LOCAL1_RETRACE); } -WRITE_LINE_MEMBER(ioc2_device::hpc_dma_done_w) +void ioc2_device::hpc_dma_done_w(int state) { if (state) raise_local_irq(1, ioc2_device::INT3_LOCAL1_HPC_DMA); @@ -719,7 +719,7 @@ WRITE_LINE_MEMBER(ioc2_device::hpc_dma_done_w) lower_local_irq(1, ioc2_device::INT3_LOCAL1_HPC_DMA); } -WRITE_LINE_MEMBER(ioc2_device::mc_dma_done_w) +void ioc2_device::mc_dma_done_w(int state) { if (state == ASSERT_LINE) raise_local_irq(0, ioc2_device::INT3_LOCAL0_MC_DMA); @@ -727,7 +727,7 @@ WRITE_LINE_MEMBER(ioc2_device::mc_dma_done_w) lower_local_irq(0, ioc2_device::INT3_LOCAL0_MC_DMA); } -WRITE_LINE_MEMBER(ioc2_device::scsi0_int_w) +void ioc2_device::scsi0_int_w(int state) { if (state) raise_local_irq(0, ioc2_device::INT3_LOCAL0_SCSI0); @@ -735,7 +735,7 @@ WRITE_LINE_MEMBER(ioc2_device::scsi0_int_w) lower_local_irq(0, ioc2_device::INT3_LOCAL0_SCSI0); } -WRITE_LINE_MEMBER(ioc2_device::scsi1_int_w) +void ioc2_device::scsi1_int_w(int state) { if (state) raise_local_irq(0, ioc2_device::INT3_LOCAL0_SCSI1); @@ -743,7 +743,7 @@ WRITE_LINE_MEMBER(ioc2_device::scsi1_int_w) lower_local_irq(0, ioc2_device::INT3_LOCAL0_SCSI1); } -WRITE_LINE_MEMBER(ioc2_device::enet_int_w) +void ioc2_device::enet_int_w(int state) { if (state) raise_local_irq(0, ioc2_device::INT3_LOCAL0_ETHERNET); @@ -751,7 +751,7 @@ WRITE_LINE_MEMBER(ioc2_device::enet_int_w) lower_local_irq(0, ioc2_device::INT3_LOCAL0_ETHERNET); } -WRITE_LINE_MEMBER(ioc2_device::video_int_w) +void ioc2_device::video_int_w(int state) { if (state) raise_local_irq(1, ioc2_device::INT3_LOCAL1_VIDEO); diff --git a/src/mame/sgi/ioc2.h b/src/mame/sgi/ioc2.h index 02224e24e66..dde872257bc 100644 --- a/src/mame/sgi/ioc2.h +++ b/src/mame/sgi/ioc2.h @@ -24,19 +24,19 @@ class ioc2_device : public device_t public: template void set_cpu_tag(T &&tag) { m_maincpu.set_tag(std::forward(tag)); } - DECLARE_INPUT_CHANGED_MEMBER( power_button ); - DECLARE_INPUT_CHANGED_MEMBER( volume_down ); - DECLARE_INPUT_CHANGED_MEMBER( volume_up ); - - DECLARE_WRITE_LINE_MEMBER(gio_int0_w); - DECLARE_WRITE_LINE_MEMBER(gio_int1_w); - DECLARE_WRITE_LINE_MEMBER(gio_int2_w); - DECLARE_WRITE_LINE_MEMBER(hpc_dma_done_w); - DECLARE_WRITE_LINE_MEMBER(mc_dma_done_w); - DECLARE_WRITE_LINE_MEMBER(scsi0_int_w); - DECLARE_WRITE_LINE_MEMBER(scsi1_int_w); - DECLARE_WRITE_LINE_MEMBER(enet_int_w); - DECLARE_WRITE_LINE_MEMBER(video_int_w); + DECLARE_INPUT_CHANGED_MEMBER(power_button); + DECLARE_INPUT_CHANGED_MEMBER(volume_down); + DECLARE_INPUT_CHANGED_MEMBER(volume_up); + + void gio_int0_w(int state); + void gio_int1_w(int state); + void gio_int2_w(int state); + void hpc_dma_done_w(int state); + void mc_dma_done_w(int state); + void scsi0_int_w(int state); + void scsi1_int_w(int state); + void enet_int_w(int state); + void video_int_w(int state); void raise_local_irq(int channel, uint8_t mask); void lower_local_irq(int channel, uint8_t mask); @@ -78,11 +78,11 @@ protected: virtual void device_add_mconfig(machine_config &config) override; virtual ioport_constructor device_input_ports() const override; - DECLARE_WRITE_LINE_MEMBER(timer0_int); - DECLARE_WRITE_LINE_MEMBER(timer1_int); - DECLARE_WRITE_LINE_MEMBER(pit_clock2_out); - DECLARE_WRITE_LINE_MEMBER(kbdc_int_w); - DECLARE_WRITE_LINE_MEMBER(duart_int_w); + void timer0_int(int state); + void timer1_int(int state); + void pit_clock2_out(int state); + void kbdc_int_w(int state); + void duart_int_w(int state); void check_mappable_interrupt(int channel); diff --git a/src/mame/sgi/iris3130.cpp b/src/mame/sgi/iris3130.cpp index 0030914a2ff..ca1e7156578 100644 --- a/src/mame/sgi/iris3130.cpp +++ b/src/mame/sgi/iris3130.cpp @@ -131,8 +131,8 @@ private: void stack_limit_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); uint8_t romboard_r(offs_t offset); [[maybe_unused]] void romboard_w(offs_t offset, uint8_t data); - DECLARE_WRITE_LINE_MEMBER(duarta_irq_handler); - DECLARE_WRITE_LINE_MEMBER(duartb_irq_handler); + void duarta_irq_handler(int state); + void duartb_irq_handler(int state); void mem_map(address_map &map); void storager_map(address_map& map); @@ -599,12 +599,12 @@ void iris3000_state::storager_map(address_map& map) MACHINE DRIVERS ***************************************************************************/ -WRITE_LINE_MEMBER(iris3000_state::duarta_irq_handler) +void iris3000_state::duarta_irq_handler(int state) { m_maincpu->set_input_line(M68K_IRQ_6, state); } -WRITE_LINE_MEMBER(iris3000_state::duartb_irq_handler) +void iris3000_state::duartb_irq_handler(int state) { m_maincpu->set_input_line(M68K_IRQ_6, state); } diff --git a/src/mame/sgi/kbd.cpp b/src/mame/sgi/kbd.cpp index fdf150c9908..7be81740fd7 100644 --- a/src/mame/sgi/kbd.cpp +++ b/src/mame/sgi/kbd.cpp @@ -73,7 +73,7 @@ void sgi_kbd_port_device::device_start() m_rxd_handler(1); } -WRITE_LINE_MEMBER(sgi_kbd_port_device::write_txd) +void sgi_kbd_port_device::write_txd(int state) { if (m_kbd) m_kbd->write_txd(state); diff --git a/src/mame/sgi/kbd.h b/src/mame/sgi/kbd.h index a94bde185dd..917d4527a0b 100644 --- a/src/mame/sgi/kbd.h +++ b/src/mame/sgi/kbd.h @@ -30,7 +30,7 @@ public: virtual ~sgi_kbd_port_device(); auto rxd_handler() { return m_rxd_handler.bind(); } - DECLARE_WRITE_LINE_MEMBER(write_txd); + void write_txd(int state); protected: virtual void device_config_complete() override; @@ -46,13 +46,13 @@ class device_sgi_kbd_port_interface : public device_interface { public: - virtual DECLARE_WRITE_LINE_MEMBER(write_txd) = 0; + virtual void write_txd(int state) = 0; protected: device_sgi_kbd_port_interface(machine_config const &mconfig, device_t &device); virtual ~device_sgi_kbd_port_interface() override; - DECLARE_WRITE_LINE_MEMBER(write_rxd) { m_port->m_rxd_handler(state); } + void write_rxd(int state) { m_port->m_rxd_handler(state); } private: sgi_kbd_port_device *m_port; @@ -65,7 +65,7 @@ class sgi_kbd_device public: sgi_kbd_device(machine_config const &mconfig, char const *tag, device_t *owner, uint32_t clock); - virtual DECLARE_WRITE_LINE_MEMBER(write_txd) override; + virtual void write_txd(int state) override; protected: virtual void device_add_mconfig(machine_config &config) override; diff --git a/src/mame/shared/ballysound.cpp b/src/mame/shared/ballysound.cpp index e937f922e04..a88bd87dd1b 100644 --- a/src/mame/shared/ballysound.cpp +++ b/src/mame/shared/ballysound.cpp @@ -104,7 +104,7 @@ TIMER_CALLBACK_MEMBER(bally_as2888_device::sound_select_sync) // sound_int - handle an external sound interrupt to the board //------------------------------------------------- -WRITE_LINE_MEMBER(bally_as2888_device::sound_int) +void bally_as2888_device::sound_int(int state) { machine().scheduler().synchronize(timer_expired_delegate(FUNC(bally_as2888_device::sound_int_sync), this), state); } @@ -211,7 +211,7 @@ TIMER_CALLBACK_MEMBER(bally_as3022_device::sound_select_sync) // sound_int - handle an external sound interrupt to the board //------------------------------------------------- -WRITE_LINE_MEMBER(bally_as3022_device::sound_int) +void bally_as3022_device::sound_int(int state) { machine().scheduler().synchronize(timer_expired_delegate(FUNC(bally_as3022_device::sound_int_sync), this), state); } @@ -225,7 +225,7 @@ TIMER_CALLBACK_MEMBER(bally_as3022_device::sound_int_sync) // pia_irq_w - IRQ line state changes //------------------------------------------------- -WRITE_LINE_MEMBER(bally_as3022_device::pia_irq_w) +void bally_as3022_device::pia_irq_w(int state) { int combined_state = m_pia->irq_a_state() | m_pia->irq_b_state(); m_cpu->set_input_line(M6802_IRQ_LINE, combined_state ? ASSERT_LINE : CLEAR_LINE); @@ -342,7 +342,7 @@ void bally_as3022_device::pia_portb_w(uint8_t data) // pia_cb2_w - PIA CB2 writes //------------------------------------------------- -WRITE_LINE_MEMBER(bally_as3022_device::pia_cb2_w) +void bally_as3022_device::pia_cb2_w(int state) { // This pin is hooked up to the amp, and disables sounds when hi if (state) @@ -493,7 +493,7 @@ TIMER_CALLBACK_MEMBER(bally_cheap_squeak_device::sound_select_sync) //------------------------------------------------- // sound_int - handle an external sound interrupt to the board //------------------------------------------------- -WRITE_LINE_MEMBER(bally_cheap_squeak_device::sound_int) +void bally_cheap_squeak_device::sound_int(int state) { machine().scheduler().synchronize(timer_expired_delegate(FUNC(bally_cheap_squeak_device::sound_int_sync), this), state); } @@ -660,7 +660,7 @@ TIMER_CALLBACK_MEMBER(bally_squawk_n_talk_device::sound_select_sync) // sound_int - handle an external sound interrupt to the board //------------------------------------------------- -WRITE_LINE_MEMBER(bally_squawk_n_talk_device::sound_int) +void bally_squawk_n_talk_device::sound_int(int state) { machine().scheduler().synchronize(timer_expired_delegate(FUNC(bally_squawk_n_talk_device::sound_int_sync), this), state); } @@ -756,7 +756,7 @@ uint8_t bally_squawk_n_talk_device::pia2_porta_r() //------------------------------------------------- // pia_irq_w - IRQ line state changes //------------------------------------------------- -WRITE_LINE_MEMBER(bally_squawk_n_talk_device::pia_irq_w) +void bally_squawk_n_talk_device::pia_irq_w(int state) { int combined_state = m_pia1->irq_a_state() | m_pia1->irq_b_state() | m_pia2->irq_a_state() | m_pia2->irq_b_state(); m_cpu->set_input_line(M6802_IRQ_LINE, combined_state ? ASSERT_LINE : CLEAR_LINE); @@ -850,7 +850,7 @@ void bally_squawk_n_talk_ay_device::pia2_portb_w(uint8_t data) //------------------------------------------------- // pia2_cb2_w - PIA 2 CB2 writes //------------------------------------------------- -WRITE_LINE_MEMBER(bally_squawk_n_talk_ay_device::pia2_cb2_w) +void bally_squawk_n_talk_ay_device::pia2_cb2_w(int state) { // This pin is hooked up to the amp, and disables sounds when hi if (state) diff --git a/src/mame/shared/ballysound.h b/src/mame/shared/ballysound.h index 19f7d867b30..da396035a88 100644 --- a/src/mame/shared/ballysound.h +++ b/src/mame/shared/ballysound.h @@ -58,7 +58,7 @@ public: // read/write void sound_select(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(sound_int); + void sound_int(int state); void as2888_map(address_map &map); @@ -115,7 +115,7 @@ public: // read/write DECLARE_INPUT_CHANGED_MEMBER(sw1); void sound_select(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(sound_int); + void sound_int(int state); void as3022_map(address_map &map); @@ -164,8 +164,8 @@ private: TIMER_CALLBACK_MEMBER(sound_int_sync); uint8_t pia_porta_r(); void pia_porta_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(pia_cb2_w); - DECLARE_WRITE_LINE_MEMBER(pia_irq_w); + void pia_cb2_w(int state); + void pia_irq_w(int state); uint8_t ay_io_r(); void update_ay_bus(); @@ -212,7 +212,7 @@ public: // read/write DECLARE_INPUT_CHANGED_MEMBER(sw1); void sound_select(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(sound_int); + void sound_int(int state); void cheap_squeak_map(address_map &map); @@ -267,7 +267,7 @@ public: // read/write DECLARE_INPUT_CHANGED_MEMBER(sw1); void sound_select(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(sound_int); + void sound_int(int state); void squawk_n_talk_map(address_map &map); @@ -302,7 +302,7 @@ private: TIMER_CALLBACK_MEMBER(sound_select_sync); TIMER_CALLBACK_MEMBER(sound_int_sync); void pia1_portb_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(pia_irq_w); + void pia_irq_w(int state); }; @@ -332,7 +332,7 @@ private: void pia2_porta_w(uint8_t data); void pia2_portb_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(pia2_cb2_w); + void pia2_cb2_w(int state); uint8_t ay_io_r(); void update_ay_bus(); diff --git a/src/mame/shared/dcs.cpp b/src/mame/shared/dcs.cpp index b8d9963af76..0bb292a282d 100644 --- a/src/mame/shared/dcs.cpp +++ b/src/mame/shared/dcs.cpp @@ -1805,7 +1805,7 @@ void dcs_audio_device::reset_timer() } -WRITE_LINE_MEMBER(dcs_audio_device::timer_enable_callback) +void dcs_audio_device::timer_enable_callback(int state) { if (state) { diff --git a/src/mame/shared/dcs.h b/src/mame/shared/dcs.h index c648ce48700..789fd09b3fc 100644 --- a/src/mame/shared/dcs.h +++ b/src/mame/shared/dcs.h @@ -85,7 +85,7 @@ public: void update_timer_count(); TIMER_DEVICE_CALLBACK_MEMBER( internal_timer_callback ); void reset_timer(); - DECLARE_WRITE_LINE_MEMBER(timer_enable_callback); + void timer_enable_callback(int state); uint16_t adsp_control_r(offs_t offset); void adsp_control_w(offs_t offset, uint16_t data); TIMER_DEVICE_CALLBACK_MEMBER( dcs_irq ); diff --git a/src/mame/shared/decobsmt.cpp b/src/mame/shared/decobsmt.cpp index d4f3ff2182d..510435b660d 100644 --- a/src/mame/shared/decobsmt.cpp +++ b/src/mame/shared/decobsmt.cpp @@ -132,7 +132,7 @@ void decobsmt_device::bsmt_comms_w(u8 data) m_bsmt_comms = data; } -WRITE_LINE_MEMBER(decobsmt_device::bsmt_reset_line) +void decobsmt_device::bsmt_reset_line(int state) { m_ourcpu->set_input_line(INPUT_LINE_RESET, state); } diff --git a/src/mame/shared/decobsmt.h b/src/mame/shared/decobsmt.h index b494f1bb702..5e63b59076c 100644 --- a/src/mame/shared/decobsmt.h +++ b/src/mame/shared/decobsmt.h @@ -28,7 +28,7 @@ public: u8 bsmt_comms_r(); void bsmt_comms_w(u8 data); - DECLARE_WRITE_LINE_MEMBER(bsmt_reset_line); + void bsmt_reset_line(int state); void bsmt_map(address_map &map); void decobsmt_map(address_map &map); diff --git a/src/mame/shared/efo_zsu.cpp b/src/mame/shared/efo_zsu.cpp index 11b570e6de6..9ca33b42c91 100644 --- a/src/mame/shared/efo_zsu.cpp +++ b/src/mame/shared/efo_zsu.cpp @@ -156,7 +156,7 @@ void efo_zsu_device::ay1_porta_w(u8 data) m_ay1_porta = data; } -WRITE_LINE_MEMBER(efo_zsu_device::ctc0_z0_w) +void efo_zsu_device::ctc0_z0_w(int state) { if (state) { @@ -166,27 +166,27 @@ WRITE_LINE_MEMBER(efo_zsu_device::ctc0_z0_w) } } -WRITE_LINE_MEMBER(efo_zsu_device::ctc0_z1_w) +void efo_zsu_device::ctc0_z1_w(int state) { // printf("USED ctc0_z1_w %d\n", state); } -WRITE_LINE_MEMBER(efo_zsu_device::ctc1_z0_w) +void efo_zsu_device::ctc1_z0_w(int state) { // printf("ctc1_z0_w %d\n", state); } -WRITE_LINE_MEMBER(efo_zsu_device::ctc1_z1_w) +void efo_zsu_device::ctc1_z1_w(int state) { // printf("ctc1_z1_w %d\n", state); } -WRITE_LINE_MEMBER(efo_zsu_device::ctc1_z2_w) +void efo_zsu_device::ctc1_z2_w(int state) { // printf("ctc1_z2_w %d\n", state); } -WRITE_LINE_MEMBER(efo_zsu_device::ctc0_z2_w) +void efo_zsu_device::ctc0_z2_w(int state) { if (state) { @@ -201,7 +201,7 @@ WRITE_LINE_MEMBER(efo_zsu_device::ctc0_z2_w) } } -WRITE_LINE_MEMBER(efo_zsu_device::fifo_dor_w) +void efo_zsu_device::fifo_dor_w(int state) { if (!m_fifo_shift_timer->enabled()) m_ctc[0]->trg3(!state); diff --git a/src/mame/shared/efo_zsu.h b/src/mame/shared/efo_zsu.h index 66fa927a3e8..dc78413a0c3 100644 --- a/src/mame/shared/efo_zsu.h +++ b/src/mame/shared/efo_zsu.h @@ -43,13 +43,13 @@ private: void ay1_porta_w(u8 data); - DECLARE_WRITE_LINE_MEMBER(ctc1_z0_w); - DECLARE_WRITE_LINE_MEMBER(ctc1_z1_w); - DECLARE_WRITE_LINE_MEMBER(ctc1_z2_w); - DECLARE_WRITE_LINE_MEMBER(ctc0_z0_w); - DECLARE_WRITE_LINE_MEMBER(ctc0_z1_w); - DECLARE_WRITE_LINE_MEMBER(ctc0_z2_w); - DECLARE_WRITE_LINE_MEMBER(fifo_dor_w); + void ctc1_z0_w(int state); + void ctc1_z1_w(int state); + void ctc1_z2_w(int state); + void ctc0_z0_w(int state); + void ctc0_z1_w(int state); + void ctc0_z2_w(int state); + void fifo_dor_w(int state); TIMER_CALLBACK_MEMBER(fifo_shift); TIMER_CALLBACK_MEMBER(adpcm_clock); diff --git a/src/mame/shared/exidysound.cpp b/src/mame/shared/exidysound.cpp index be6da0fe504..6a329759d3d 100644 --- a/src/mame/shared/exidysound.cpp +++ b/src/mame/shared/exidysound.cpp @@ -703,13 +703,13 @@ void venture_sound_device::pb_w(uint8_t data) } -WRITE_LINE_MEMBER(venture_sound_device::ca_w) +void venture_sound_device::ca_w(int state) { m_pia->ca1_w(state); } -WRITE_LINE_MEMBER(venture_sound_device::cb_w) +void venture_sound_device::cb_w(int state) { m_pia->cb1_w(state); } @@ -727,13 +727,13 @@ void venture_sound_device::pia_pb_w(uint8_t data) } -WRITE_LINE_MEMBER(venture_sound_device::pia_ca2_w) +void venture_sound_device::pia_ca2_w(int state) { m_ca2_callback(state); } -WRITE_LINE_MEMBER(venture_sound_device::pia_cb2_w) +void venture_sound_device::pia_cb2_w(int state) { m_cb2_callback(state); } @@ -937,7 +937,7 @@ void victory_sound_device::command_w(uint8_t data) } -WRITE_LINE_MEMBER(victory_sound_device::irq_clear_w) +void victory_sound_device::irq_clear_w(int state) { if (VICTORY_LOG_SOUND) logerror("%s:!!!! Sound IRQ clear = %02X\n", machine().describe_context(), state); @@ -949,7 +949,7 @@ WRITE_LINE_MEMBER(victory_sound_device::irq_clear_w) } -WRITE_LINE_MEMBER(victory_sound_device::main_ack_w) +void victory_sound_device::main_ack_w(int state) { if (VICTORY_LOG_SOUND) logerror("%s:!!!! Sound Main ACK W = %02X\n", machine().describe_context(), state); diff --git a/src/mame/shared/exidysound.h b/src/mame/shared/exidysound.h index ce66b0e33fd..00779b0047f 100644 --- a/src/mame/shared/exidysound.h +++ b/src/mame/shared/exidysound.h @@ -144,8 +144,8 @@ public: // external access void pa_w(uint8_t data); void pb_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(ca_w); - DECLARE_WRITE_LINE_MEMBER(cb_w); + void ca_w(int state); + void cb_w(int state); protected: venture_sound_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); @@ -161,8 +161,8 @@ private: void pia_pa_w(uint8_t data); void pia_pb_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(pia_ca2_w); - DECLARE_WRITE_LINE_MEMBER(pia_cb2_w); + void pia_ca2_w(int state); + void pia_cb2_w(int state); void venture_audio(machine_config &config); @@ -214,8 +214,8 @@ protected: virtual void device_add_mconfig(machine_config &config) override; private: - DECLARE_WRITE_LINE_MEMBER(irq_clear_w); - DECLARE_WRITE_LINE_MEMBER(main_ack_w); + void irq_clear_w(int state); + void main_ack_w(int state); void victory_audio_map(address_map &map); diff --git a/src/mame/shared/isbc_215g.cpp b/src/mame/shared/isbc_215g.cpp index 2945b5d1068..d45d00a87fb 100644 --- a/src/mame/shared/isbc_215g.cpp +++ b/src/mame/shared/isbc_215g.cpp @@ -334,22 +334,22 @@ void isbc_215g_device::isbc_215g_io(address_map &map) map(0xc0e0, 0xc0ef).rw("sbx2", FUNC(isbx_slot_device::mcs1_r), FUNC(isbx_slot_device::mcs1_w)).umask16(0x00ff); } -WRITE_LINE_MEMBER(isbc_215g_device::isbx_irq_00_w) +void isbc_215g_device::isbx_irq_00_w(int state) { m_isbx_irq[0] = state ? true : false; } -WRITE_LINE_MEMBER(isbc_215g_device::isbx_irq_01_w) +void isbc_215g_device::isbx_irq_01_w(int state) { m_isbx_irq[1] = state ? true : false; } -WRITE_LINE_MEMBER(isbc_215g_device::isbx_irq_10_w) +void isbc_215g_device::isbx_irq_10_w(int state) { m_isbx_irq[2] = state ? true : false; } -WRITE_LINE_MEMBER(isbc_215g_device::isbx_irq_11_w) +void isbc_215g_device::isbx_irq_11_w(int state) { m_isbx_irq[3] = state ? true : false; } diff --git a/src/mame/shared/isbc_215g.h b/src/mame/shared/isbc_215g.h index 58e1a8b0b46..4f6f703b93d 100644 --- a/src/mame/shared/isbc_215g.h +++ b/src/mame/shared/isbc_215g.h @@ -78,10 +78,10 @@ private: const struct hard_disk_file::info* m_geom[2]; - DECLARE_WRITE_LINE_MEMBER(isbx_irq_00_w); - DECLARE_WRITE_LINE_MEMBER(isbx_irq_01_w); - DECLARE_WRITE_LINE_MEMBER(isbx_irq_10_w); - DECLARE_WRITE_LINE_MEMBER(isbx_irq_11_w); + void isbx_irq_00_w(int state); + void isbx_irq_01_w(int state); + void isbx_irq_10_w(int state); + void isbx_irq_11_w(int state); }; DECLARE_DEVICE_TYPE(ISBC_215G, isbc_215g_device) diff --git a/src/mame/shared/ms7004.cpp b/src/mame/shared/ms7004.cpp index 39e5e3fb28c..33a0249f9e8 100644 --- a/src/mame/shared/ms7004.cpp +++ b/src/mame/shared/ms7004.cpp @@ -381,7 +381,7 @@ void ms7004_device::device_reset() } -WRITE_LINE_MEMBER(ms7004_device::write_rxd) +void ms7004_device::write_rxd(int state) { m_maincpu->set_input_line(MCS48_INPUT_IRQ, state ? CLEAR_LINE : ASSERT_LINE); } @@ -466,7 +466,7 @@ void ms7004_device::i8243_port_w(uint8_t data) // t1_r - //------------------------------------------------- -READ_LINE_MEMBER(ms7004_device::t1_r) +int ms7004_device::t1_r() { if (!BIT(m_p1, 4)) return m_keylatch; diff --git a/src/mame/shared/ms7004.h b/src/mame/shared/ms7004.h index d833ecd1310..251fab4396e 100644 --- a/src/mame/shared/ms7004.h +++ b/src/mame/shared/ms7004.h @@ -27,7 +27,7 @@ public: auto tx_handler() { return m_tx_handler.bind(); } auto rts_handler() { return m_rts_handler.bind(); } - DECLARE_WRITE_LINE_MEMBER( write_rxd ); + void write_rxd(int state); void ms7004_map(address_map &map); protected: @@ -54,7 +54,7 @@ private: void p1_w(uint8_t data); void p2_w(uint8_t data); - DECLARE_READ_LINE_MEMBER( t1_r ); + int t1_r(); template void i8243_port_w(uint8_t data); }; diff --git a/src/mame/shared/namco_c355spr.cpp b/src/mame/shared/namco_c355spr.cpp index 9cc1ff6b4c9..db660cf0db1 100644 --- a/src/mame/shared/namco_c355spr.cpp +++ b/src/mame/shared/namco_c355spr.cpp @@ -464,7 +464,7 @@ u16 namco_c355spr_device::spriteram_r(offs_t offset) return m_spriteram[0][offset]; } -WRITE_LINE_MEMBER(namco_c355spr_device::vblank) +void namco_c355spr_device::vblank(int state) { if (state) { diff --git a/src/mame/shared/namco_c355spr.h b/src/mame/shared/namco_c355spr.h index d38ce774d54..b3cfc9f1307 100644 --- a/src/mame/shared/namco_c355spr.h +++ b/src/mame/shared/namco_c355spr.h @@ -39,7 +39,7 @@ public: void spriteram_w(offs_t offset, u16 data, u16 mem_mask = ~0); u16 position_r(offs_t offset); void position_w(offs_t offset, u16 data, u16 mem_mask = ~0); - DECLARE_WRITE_LINE_MEMBER(vblank); + void vblank(int state); typedef delegate c355_obj_code2tile_delegate; typedef device_delegate c355_obj_entry_attr_delegate; diff --git a/src/mame/shared/pcshare.cpp b/src/mame/shared/pcshare.cpp index c0816c20107..290f1185689 100644 --- a/src/mame/shared/pcshare.cpp +++ b/src/mame/shared/pcshare.cpp @@ -22,7 +22,7 @@ DMA8237 Controller ******************/ -WRITE_LINE_MEMBER( pcat_base_state::pc_dma_hrq_changed ) +void pcat_base_state::pc_dma_hrq_changed(int state) { m_maincpu->set_input_line(INPUT_LINE_HALT, state ? ASSERT_LINE : CLEAR_LINE); @@ -100,10 +100,10 @@ void pcat_base_state::set_dma_channel(int channel, int state) if (!state) m_dma_channel = channel; } -WRITE_LINE_MEMBER( pcat_base_state::pc_dack0_w ) { set_dma_channel(0, state); } -WRITE_LINE_MEMBER( pcat_base_state::pc_dack1_w ) { set_dma_channel(1, state); } -WRITE_LINE_MEMBER( pcat_base_state::pc_dack2_w ) { set_dma_channel(2, state); } -WRITE_LINE_MEMBER( pcat_base_state::pc_dack3_w ) { set_dma_channel(3, state); } +void pcat_base_state::pc_dack0_w(int state) { set_dma_channel(0, state); } +void pcat_base_state::pc_dack1_w(int state) { set_dma_channel(1, state); } +void pcat_base_state::pc_dack2_w(int state) { set_dma_channel(2, state); } +void pcat_base_state::pc_dack3_w(int state) { set_dma_channel(3, state); } /****************** 8259 IRQ controller @@ -117,7 +117,7 @@ uint8_t pcat_base_state::get_slave_ack(offs_t offset) return 0x00; } -WRITE_LINE_MEMBER( pcat_base_state::at_pit8254_out2_changed ) +void pcat_base_state::at_pit8254_out2_changed(int state) { m_pit_out2 = state; //at_speaker_set_input( state ? 1 : 0 ); diff --git a/src/mame/shared/pcshare.h b/src/mame/shared/pcshare.h index 0d618558c41..7daebc02eb7 100644 --- a/src/mame/shared/pcshare.h +++ b/src/mame/shared/pcshare.h @@ -27,18 +27,18 @@ public: { } - DECLARE_WRITE_LINE_MEMBER(pc_dma_hrq_changed); + void pc_dma_hrq_changed(int state); uint8_t pc_dma_read_byte(offs_t offset); void pc_dma_write_byte(offs_t offset, uint8_t data); uint8_t dma_page_select_r(offs_t offset); void dma_page_select_w(offs_t offset, uint8_t data); void set_dma_channel(int channel, int state); - DECLARE_WRITE_LINE_MEMBER( pc_dack0_w ); - DECLARE_WRITE_LINE_MEMBER( pc_dack1_w ); - DECLARE_WRITE_LINE_MEMBER( pc_dack2_w ); - DECLARE_WRITE_LINE_MEMBER( pc_dack3_w ); + void pc_dack0_w(int state); + void pc_dack1_w(int state); + void pc_dack2_w(int state); + void pc_dack3_w(int state); uint8_t get_slave_ack(offs_t offset); - DECLARE_WRITE_LINE_MEMBER( at_pit8254_out2_changed ); + void at_pit8254_out2_changed(int state); protected: void pcat_common(machine_config &config); diff --git a/src/mame/shared/s11c_bg.cpp b/src/mame/shared/s11c_bg.cpp index 27e59b1eeaa..d01bddcea13 100644 --- a/src/mame/shared/s11c_bg.cpp +++ b/src/mame/shared/s11c_bg.cpp @@ -323,7 +323,7 @@ TIMER_CALLBACK_MEMBER(s11c_bg_device::deferred_pb_w) } -WRITE_LINE_MEMBER( s11c_bg_device::pia40_cb2_w) +void s11c_bg_device::pia40_cb2_w(int state) { machine().scheduler().synchronize(timer_expired_delegate(FUNC(s11c_bg_device::deferred_cb2_w),this), state); } @@ -334,12 +334,12 @@ void s11c_bg_device::pia40_pb_w(uint8_t data) } -WRITE_LINE_MEMBER( s11c_bg_device::extra_w ) +void s11c_bg_device::extra_w(int state) { m_pia40->cb2_w(state); } -WRITE_LINE_MEMBER( s11c_bg_device::ctrl_w ) +void s11c_bg_device::ctrl_w(int state) { m_pia40->cb1_w(state); } @@ -349,7 +349,7 @@ void s11c_bg_device::data_w(uint8_t data) m_pia40->portb_w(data); } -WRITE_LINE_MEMBER( s11c_bg_device::resetq_w ) +void s11c_bg_device::resetq_w(int state) { if ((m_old_resetq_state != CLEAR_LINE) && (state == CLEAR_LINE)) { diff --git a/src/mame/shared/s11c_bg.h b/src/mame/shared/s11c_bg.h index 24bc6111e77..64b492646c6 100644 --- a/src/mame/shared/s11c_bg.h +++ b/src/mame/shared/s11c_bg.h @@ -35,11 +35,11 @@ public: // note to keep synchronization working, the host machine should have synchronization timer expired delegates // before writing to the following 3 things: - DECLARE_WRITE_LINE_MEMBER(extra_w); // external write to board CB2 (J4 pin 12), does anything actually do this? - DECLARE_WRITE_LINE_MEMBER(ctrl_w); // external write to board CB1 (J4 pin 13) + void extra_w(int state); // external write to board CB2 (J4 pin 12), does anything actually do this? + void ctrl_w(int state); // external write to board CB1 (J4 pin 13) void data_w(uint8_t data); // external write to board data bus (J4 pins 3 thru 10 for D0-D7) virtual void device_reset() override; // power up reset - DECLARE_WRITE_LINE_MEMBER(resetq_w); // external write to board /RESET (J4 pin 18) + void resetq_w(int state); // external write to board /RESET (J4 pin 18) // callbacks auto cb2_cb() { return m_cb2_cb.bind(); } @@ -76,7 +76,7 @@ private: void common_reset(); // common reset function used by both internal and external reset uint8_t m_old_resetq_state; - DECLARE_WRITE_LINE_MEMBER(pia40_cb2_w); + void pia40_cb2_w(int state); void pia40_pb_w(uint8_t data); void bg_cvsd_clock_set_w(uint8_t data); diff --git a/src/mame/shared/sec.cpp b/src/mame/shared/sec.cpp index 6fbb69c2b1d..e089460b83a 100644 --- a/src/mame/shared/sec.cpp +++ b/src/mame/shared/sec.cpp @@ -50,7 +50,7 @@ void sec_device::device_reset() m_rxpos = 0; } -WRITE_LINE_MEMBER(sec_device::cs_w) +void sec_device::cs_w(int state) { if (state) { @@ -72,7 +72,7 @@ WRITE_LINE_MEMBER(sec_device::cs_w) } } -WRITE_LINE_MEMBER(sec_device::data_w) +void sec_device::data_w(int state) { m_data = (uint8_t)state; } @@ -82,7 +82,7 @@ int sec_device::data_r(void) return m_rxdat; } -WRITE_LINE_MEMBER(sec_device::clk_w) +void sec_device::clk_w(int state) { state = state ? 1 : 0; diff --git a/src/mame/shared/sec.h b/src/mame/shared/sec.h index 46623a30260..c62568e366b 100644 --- a/src/mame/shared/sec.h +++ b/src/mame/shared/sec.h @@ -49,9 +49,9 @@ public: sec_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = 0); /* serial interface */ - DECLARE_WRITE_LINE_MEMBER(clk_w); - DECLARE_WRITE_LINE_MEMBER(data_w); - DECLARE_WRITE_LINE_MEMBER(cs_w); + void clk_w(int state); + void data_w(int state); + void cs_w(int state); int data_r(); diff --git a/src/mame/shared/segam1audio.cpp b/src/mame/shared/segam1audio.cpp index a908997bc5d..cfaa49d9424 100644 --- a/src/mame/shared/segam1audio.cpp +++ b/src/mame/shared/segam1audio.cpp @@ -134,12 +134,12 @@ void segam1audio_device::m1_snd_mpcm_bnk2_w(uint16_t data) m_mpcmbank2->set_entry(data & 3); } -WRITE_LINE_MEMBER(segam1audio_device::write_txd) +void segam1audio_device::write_txd(int state) { m_uart->write_rxd(state); } -WRITE_LINE_MEMBER(segam1audio_device::output_txd) +void segam1audio_device::output_txd(int state) { m_rxd_handler(state); } diff --git a/src/mame/shared/segam1audio.h b/src/mame/shared/segam1audio.h index dcefd84c1f7..0c908efe3b6 100644 --- a/src/mame/shared/segam1audio.h +++ b/src/mame/shared/segam1audio.h @@ -32,7 +32,7 @@ public: void m1_snd_mpcm_bnk1_w(uint16_t data); void m1_snd_mpcm_bnk2_w(uint16_t data); - DECLARE_WRITE_LINE_MEMBER(write_txd); + void write_txd(int state); void mpcm1_map(address_map &map); void mpcm2_map(address_map &map); @@ -58,7 +58,7 @@ private: devcb_write_line m_rxd_handler; - DECLARE_WRITE_LINE_MEMBER(output_txd); + void output_txd(int state); }; diff --git a/src/mame/shared/seibusound.cpp b/src/mame/shared/seibusound.cpp index c22aaac61d6..e0ba1fd770b 100644 --- a/src/mame/shared/seibusound.cpp +++ b/src/mame/shared/seibusound.cpp @@ -219,7 +219,7 @@ void seibu_sound_device::rst18_ack_w(u8) update_irq_lines(RST18_EOI); } -WRITE_LINE_MEMBER( seibu_sound_device::fm_irqhandler ) +void seibu_sound_device::fm_irqhandler(int state) { update_irq_lines(state ? RST10_ASSERT : RST10_CLEAR); } diff --git a/src/mame/shared/seibusound.h b/src/mame/shared/seibusound.h index 4daeb9d0989..9e309779d4d 100644 --- a/src/mame/shared/seibusound.h +++ b/src/mame/shared/seibusound.h @@ -64,7 +64,7 @@ public: void ym_w(offs_t offset, u8 data); void bank_w(u8 data); void coin_w(u8 data); - WRITE_LINE_MEMBER( fm_irqhandler ); + void fm_irqhandler(int state); u8 soundlatch_r(offs_t offset); u8 main_data_pending_r(); void main_data_w(offs_t offset, u8 data); diff --git a/src/mame/shared/taito68705.cpp b/src/mame/shared/taito68705.cpp index ad426357faf..e303928f4f6 100644 --- a/src/mame/shared/taito68705.cpp +++ b/src/mame/shared/taito68705.cpp @@ -74,7 +74,7 @@ void taito68705_mcu_device_base::data_w(u8 data) m_mcu->set_input_line(M68705_IRQ_LINE, m_host_flag ? ASSERT_LINE : CLEAR_LINE); } -WRITE_LINE_MEMBER(taito68705_mcu_device_base::reset_w) +void taito68705_mcu_device_base::reset_w(int state) { m_reset_input = ASSERT_LINE == state; if (CLEAR_LINE != state) diff --git a/src/mame/shared/taito68705.h b/src/mame/shared/taito68705.h index 40ccee6005a..8e4172b4be4 100644 --- a/src/mame/shared/taito68705.h +++ b/src/mame/shared/taito68705.h @@ -20,9 +20,9 @@ public: // host interface u8 data_r(); void data_w(u8 data); - DECLARE_WRITE_LINE_MEMBER(reset_w); - DECLARE_READ_LINE_MEMBER(host_semaphore_r) { return m_host_flag ? 1 : 0; } - DECLARE_READ_LINE_MEMBER(mcu_semaphore_r) { return m_mcu_flag ? 1 : 0; } + void reset_w(int state); + int host_semaphore_r() { return m_host_flag ? 1 : 0; } + int mcu_semaphore_r() { return m_mcu_flag ? 1 : 0; } protected: taito68705_mcu_device_base( diff --git a/src/mame/shared/timeplt_a.cpp b/src/mame/shared/timeplt_a.cpp index d55495efbf4..c9ccca94d71 100644 --- a/src/mame/shared/timeplt_a.cpp +++ b/src/mame/shared/timeplt_a.cpp @@ -131,7 +131,7 @@ void timeplt_audio_device::sound_data_w(uint8_t data) } -WRITE_LINE_MEMBER(timeplt_audio_device::sh_irqtrigger_w) +void timeplt_audio_device::sh_irqtrigger_w(int state) { if (m_last_irq_state == 0 && state) { @@ -143,7 +143,7 @@ WRITE_LINE_MEMBER(timeplt_audio_device::sh_irqtrigger_w) } -WRITE_LINE_MEMBER(timeplt_audio_device::mute_w) +void timeplt_audio_device::mute_w(int state) { // controls pin 6 (DC audio mute) of LA4460 amplifier machine().sound().system_mute(state); diff --git a/src/mame/shared/timeplt_a.h b/src/mame/shared/timeplt_a.h index 0efbd2cf4a6..e98af851ebd 100644 --- a/src/mame/shared/timeplt_a.h +++ b/src/mame/shared/timeplt_a.h @@ -16,8 +16,8 @@ public: timeplt_audio_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = 14'318'181); void sound_data_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(sh_irqtrigger_w); - DECLARE_WRITE_LINE_MEMBER(mute_w); + void sh_irqtrigger_w(int state); + void mute_w(int state); protected: timeplt_audio_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); diff --git a/src/mame/shared/vt100_kbd.cpp b/src/mame/shared/vt100_kbd.cpp index 87bb257da2f..d9a6fc7f59e 100644 --- a/src/mame/shared/vt100_kbd.cpp +++ b/src/mame/shared/vt100_kbd.cpp @@ -266,7 +266,7 @@ void vt100_keyboard_device::device_start() // signal_line_w - handle external serial input //------------------------------------------------- -WRITE_LINE_MEMBER(vt100_keyboard_device::signal_line_w) +void vt100_keyboard_device::signal_line_w(int state) { if (m_signal_line == bool(state)) return; @@ -312,7 +312,7 @@ WRITE_LINE_MEMBER(vt100_keyboard_device::signal_line_w) // signal_out_w - transmit serial keyboard output //------------------------------------------------- -WRITE_LINE_MEMBER(vt100_keyboard_device::signal_out_w) +void vt100_keyboard_device::signal_out_w(int state) { m_signal_out_cb(state); } @@ -534,7 +534,7 @@ void ms7002_device::device_start() // keycode is being transmitted //------------------------------------------------- -WRITE_LINE_MEMBER(ms7002_device::scan_disable_w) +void ms7002_device::scan_disable_w(int state) { if (!state) m_scan_enable = false; diff --git a/src/mame/shared/vt100_kbd.h b/src/mame/shared/vt100_kbd.h index 2680738b01f..22d69afcec1 100644 --- a/src/mame/shared/vt100_kbd.h +++ b/src/mame/shared/vt100_kbd.h @@ -32,7 +32,7 @@ public: // configuration auto signal_out_callback() { return m_signal_out_cb.bind(); } - DECLARE_WRITE_LINE_MEMBER(signal_line_w); + void signal_line_w(int state); protected: vt100_keyboard_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock); @@ -47,8 +47,8 @@ protected: private: // internal helpers - DECLARE_WRITE_LINE_MEMBER(signal_out_w); - DECLARE_WRITE_LINE_MEMBER(scan_disable_w); + void signal_out_w(int state); + void scan_disable_w(int state); void key_scan_w(u8 data); devcb_write_line m_signal_out_cb; @@ -85,7 +85,7 @@ protected: virtual void scan_start() override { m_scan_enable = true; } private: - DECLARE_WRITE_LINE_MEMBER(scan_disable_w); + void scan_disable_w(int state); bool m_scan_enable; }; diff --git a/src/mame/shared/williamssound.cpp b/src/mame/shared/williamssound.cpp index 0944beccb7e..6b15a8b8fae 100644 --- a/src/mame/shared/williamssound.cpp +++ b/src/mame/shared/williamssound.cpp @@ -104,7 +104,7 @@ void williams_cvsd_sound_device::write(u16 data) // reset_write - write to the reset line //------------------------------------------------- -WRITE_LINE_MEMBER(williams_cvsd_sound_device::reset_write) +void williams_cvsd_sound_device::reset_write(int state) { // going high halts the CPU if (state) @@ -314,7 +314,7 @@ void williams_narc_sound_device::write(u16 data) // reset_write - write to the reset line //------------------------------------------------- -WRITE_LINE_MEMBER(williams_narc_sound_device::reset_write) +void williams_narc_sound_device::reset_write(int state) { // going high halts the CPU if (state) @@ -654,7 +654,7 @@ void williams_adpcm_sound_device::write(u16 data) // reset_write - write to the reset line //------------------------------------------------- -WRITE_LINE_MEMBER(williams_adpcm_sound_device::reset_write) +void williams_adpcm_sound_device::reset_write(int state) { // going high halts the CPU if (state) @@ -674,7 +674,7 @@ WRITE_LINE_MEMBER(williams_adpcm_sound_device::reset_write) // irq_read - read the sound IRQ state //------------------------------------------------- -READ_LINE_MEMBER(williams_adpcm_sound_device::irq_read) +int williams_adpcm_sound_device::irq_read() { return m_sound_int_state; } @@ -1101,7 +1101,7 @@ void williams_s9_sound_device::write(u8 data) //------------------------------------------------- // strobe - tell PIA to process the input //------------------------------------------------- -WRITE_LINE_MEMBER(williams_s9_sound_device::strobe) +void williams_s9_sound_device::strobe(int state) { m_pia->ca1_w(state); } @@ -1205,7 +1205,7 @@ void williams_s11_sound_device::write(u8 data) //------------------------------------------------- // strobe - tell PIA to process the input //------------------------------------------------- -WRITE_LINE_MEMBER(williams_s11_sound_device::strobe) +void williams_s11_sound_device::strobe(int state) { m_pia->ca1_w(state); } diff --git a/src/mame/shared/williamssound.h b/src/mame/shared/williamssound.h index 8f499b803d8..5760b69e62b 100644 --- a/src/mame/shared/williamssound.h +++ b/src/mame/shared/williamssound.h @@ -46,7 +46,7 @@ public: // read/write void write(u16 data); - DECLARE_WRITE_LINE_MEMBER(reset_write); + void reset_write(int state); // internal communications void bank_select_w(u8 data); @@ -94,7 +94,7 @@ public: // read/write u16 read(); void write(u16 data); - DECLARE_WRITE_LINE_MEMBER(reset_write); + void reset_write(int state); // internal communications void master_bank_select_w(u8 data); @@ -155,8 +155,8 @@ public: // read/write void write(u16 data); - DECLARE_WRITE_LINE_MEMBER(reset_write); - DECLARE_READ_LINE_MEMBER(irq_read); + void reset_write(int state); + int irq_read(); // internal communications void bank_select_w(u8 data); @@ -264,7 +264,7 @@ public: // read/write void write(u8 data); - DECLARE_WRITE_LINE_MEMBER(strobe); + void strobe(int state); DECLARE_INPUT_CHANGED_MEMBER(audio_nmi); protected: @@ -295,7 +295,7 @@ public: // read/write void write(u8 data); - DECLARE_WRITE_LINE_MEMBER(strobe); + void strobe(int state); DECLARE_INPUT_CHANGED_MEMBER(audio_nmi); protected: diff --git a/src/mame/shared/xbox.cpp b/src/mame/shared/xbox.cpp index c5c36d6131d..f6abb2db59e 100644 --- a/src/mame/shared/xbox.cpp +++ b/src/mame/shared/xbox.cpp @@ -632,7 +632,7 @@ void xbox_base_state::debug_generate_irq(int irq, bool active) mcpxlpc->debug_generate_irq(irq, state); } -WRITE_LINE_MEMBER(xbox_base_state::vblank_callback) +void xbox_base_state::vblank_callback(int state) { nvidia_nv2a->vblank_callback(state); } @@ -646,7 +646,7 @@ uint32_t xbox_base_state::screen_update_callback(screen_device &screen, bitmap_r * PIC & PIT */ -WRITE_LINE_MEMBER(xbox_base_state::maincpu_interrupt) +void xbox_base_state::maincpu_interrupt(int state) { m_maincpu->set_input_line(0, state ? HOLD_LINE : CLEAR_LINE); } diff --git a/src/mame/shared/xbox.h b/src/mame/shared/xbox.h index ddd56a441c2..ecb8d73a01f 100644 --- a/src/mame/shared/xbox.h +++ b/src/mame/shared/xbox.h @@ -131,11 +131,11 @@ protected: virtual void hack_eeprom() {} virtual void hack_usb() {} - DECLARE_WRITE_LINE_MEMBER(vblank_callback); + void vblank_callback(int state); uint32_t screen_update_callback(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); virtual void machine_start() override; - DECLARE_WRITE_LINE_MEMBER(maincpu_interrupt); + void maincpu_interrupt(int state); IRQ_CALLBACK_MEMBER(irq_callback); nv2a_renderer *nvidia_nv2a; diff --git a/src/mame/shared/xbox_nv2a.cpp b/src/mame/shared/xbox_nv2a.cpp index eae15b72090..d555bbce996 100644 --- a/src/mame/shared/xbox_nv2a.cpp +++ b/src/mame/shared/xbox_nv2a.cpp @@ -4763,7 +4763,7 @@ void nv2a_renderer::combiner_compute_alpha_outputs(int id, int stage_number) combiner.work[id].functions.Aop3 = std::clamp((combiner.work[id].functions.Aop3 + bias) * scale, -1.0f, 1.0f); } -WRITE_LINE_MEMBER(nv2a_renderer::vblank_callback) +void nv2a_renderer::vblank_callback(int state) { LOGMASKED(LOG_NV2A_VERBOSE, "vblank_callback\n\r"); if ((state != 0) && (puller_waiting == 1)) { diff --git a/src/mame/shared/xbox_nv2a.h b/src/mame/shared/xbox_nv2a.h index e1804d810cd..f259bc27c0b 100644 --- a/src/mame/shared/xbox_nv2a.h +++ b/src/mame/shared/xbox_nv2a.h @@ -652,7 +652,7 @@ public: running_machine &machine() { return mach; } uint32_t geforce_r(offs_t offset, uint32_t mem_mask = ~0); void geforce_w(address_space &space, offs_t offset, uint32_t data, uint32_t mem_mask = ~0); - DECLARE_WRITE_LINE_MEMBER(vblank_callback); + void vblank_callback(int state); uint32_t screen_update_callback(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); bool update_interrupts(); void set_irq_callbaclk(std::function callback) { irq_callback = callback; } diff --git a/src/mame/shared/xbox_pci.cpp b/src/mame/shared/xbox_pci.cpp index 7584a6f88a0..fb35f27e62e 100644 --- a/src/mame/shared/xbox_pci.cpp +++ b/src/mame/shared/xbox_pci.cpp @@ -359,7 +359,7 @@ void mcpx_isalpc_device::boot_state_w(uint8_t data) m_boot_state_hook((offs_t)0, data); } -WRITE_LINE_MEMBER(mcpx_isalpc_device::interrupt_ouptut_changed) +void mcpx_isalpc_device::interrupt_ouptut_changed(int state) { m_interrupt_output(state); } @@ -371,49 +371,49 @@ uint8_t mcpx_isalpc_device::get_slave_ack(offs_t offset) return 0x00; } -WRITE_LINE_MEMBER(mcpx_isalpc_device::pit8254_out0_changed) +void mcpx_isalpc_device::pit8254_out0_changed(int state) { pic8259_1->ir0_w(state); } -WRITE_LINE_MEMBER(mcpx_isalpc_device::pit8254_out1_changed) +void mcpx_isalpc_device::pit8254_out1_changed(int state) { if (state) m_refresh = !m_refresh; } -WRITE_LINE_MEMBER(mcpx_isalpc_device::pit8254_out2_changed) +void mcpx_isalpc_device::pit8254_out2_changed(int state) { m_pit_out2 = state ? 1 : 0; //xbox_speaker_set_input(m_at_spkrdata & m_pit_out2); } -WRITE_LINE_MEMBER(mcpx_isalpc_device::irq1) +void mcpx_isalpc_device::irq1(int state) { pic8259_1->ir1_w(state); } -WRITE_LINE_MEMBER(mcpx_isalpc_device::irq3) +void mcpx_isalpc_device::irq3(int state) { pic8259_1->ir3_w(state); } -WRITE_LINE_MEMBER(mcpx_isalpc_device::irq10) +void mcpx_isalpc_device::irq10(int state) { pic8259_2->ir2_w(state); } -WRITE_LINE_MEMBER(mcpx_isalpc_device::irq11) +void mcpx_isalpc_device::irq11(int state) { pic8259_2->ir3_w(state); } -WRITE_LINE_MEMBER(mcpx_isalpc_device::irq14) +void mcpx_isalpc_device::irq14(int state) { pic8259_2->ir6_w(state); } -WRITE_LINE_MEMBER(mcpx_isalpc_device::irq15) +void mcpx_isalpc_device::irq15(int state) { pic8259_2->ir7_w(state); } @@ -1520,12 +1520,12 @@ void mcpx_ide_device::sec_write_cs1_w(uint8_t data) m_sec->write_cs1(1, data << 16, 0xff0000); } -WRITE_LINE_MEMBER(mcpx_ide_device::ide_pri_interrupt) +void mcpx_ide_device::ide_pri_interrupt(int state) { m_pri_interrupt_handler(state); } -WRITE_LINE_MEMBER(mcpx_ide_device::ide_sec_interrupt) +void mcpx_ide_device::ide_sec_interrupt(int state) { m_sec_interrupt_handler(state); } diff --git a/src/mame/shared/xbox_pci.h b/src/mame/shared/xbox_pci.h index 6638df3c54d..089a6642e70 100644 --- a/src/mame/shared/xbox_pci.h +++ b/src/mame/shared/xbox_pci.h @@ -153,22 +153,22 @@ public: void dma2_iow2_w(uint8_t data) { send_dma_word(6, (m_dma_high_byte << 8) | data); } void dma2_iow3_w(uint8_t data) { send_dma_word(7, (m_dma_high_byte << 8) | data); } - DECLARE_WRITE_LINE_MEMBER(irq1); - DECLARE_WRITE_LINE_MEMBER(irq3); - DECLARE_WRITE_LINE_MEMBER(irq11); - DECLARE_WRITE_LINE_MEMBER(irq10); - DECLARE_WRITE_LINE_MEMBER(irq14); - DECLARE_WRITE_LINE_MEMBER(irq15); - DECLARE_WRITE_LINE_MEMBER(dma2_hreq_w) { m_dma8237_2->hack_w(state); } - DECLARE_WRITE_LINE_MEMBER(dma1_eop_w) { m_dma_eop = state; if (m_dma_channel != -1) signal_dma_end(m_dma_channel, state & 1); } - DECLARE_WRITE_LINE_MEMBER(dma1_dack0_w) { set_dma_channel(0, state); } - DECLARE_WRITE_LINE_MEMBER(dma1_dack1_w) { set_dma_channel(1, state); } - DECLARE_WRITE_LINE_MEMBER(dma1_dack2_w) { set_dma_channel(2, state); } - DECLARE_WRITE_LINE_MEMBER(dma1_dack3_w) { set_dma_channel(3, state); } - DECLARE_WRITE_LINE_MEMBER(dma2_dack0_w) { m_dma8237_1->hack_w(state ? 0 : 1); } - DECLARE_WRITE_LINE_MEMBER(dma2_dack1_w) { set_dma_channel(5, state); } - DECLARE_WRITE_LINE_MEMBER(dma2_dack2_w) { set_dma_channel(6, state); } - DECLARE_WRITE_LINE_MEMBER(dma2_dack3_w) { set_dma_channel(7, state); } + void irq1(int state); + void irq3(int state); + void irq11(int state); + void irq10(int state); + void irq14(int state); + void irq15(int state); + void dma2_hreq_w(int state) { m_dma8237_2->hack_w(state); } + void dma1_eop_w(int state) { m_dma_eop = state; if (m_dma_channel != -1) signal_dma_end(m_dma_channel, state & 1); } + void dma1_dack0_w(int state) { set_dma_channel(0, state); } + void dma1_dack1_w(int state) { set_dma_channel(1, state); } + void dma1_dack2_w(int state) { set_dma_channel(2, state); } + void dma1_dack3_w(int state) { set_dma_channel(3, state); } + void dma2_dack0_w(int state) { m_dma8237_1->hack_w(state ? 0 : 1); } + void dma2_dack1_w(int state) { set_dma_channel(5, state); } + void dma2_dack2_w(int state) { set_dma_channel(6, state); } + void dma2_dack3_w(int state) { set_dma_channel(7, state); } protected: virtual void device_start() override; @@ -178,10 +178,10 @@ protected: uint64_t io_window_start, uint64_t io_window_end, uint64_t io_offset, address_space *io_space) override; uint8_t get_slave_ack(offs_t offset); - DECLARE_WRITE_LINE_MEMBER(interrupt_ouptut_changed); - DECLARE_WRITE_LINE_MEMBER(pit8254_out0_changed); - DECLARE_WRITE_LINE_MEMBER(pit8254_out1_changed); - DECLARE_WRITE_LINE_MEMBER(pit8254_out2_changed); + void interrupt_ouptut_changed(int state); + void pit8254_out0_changed(int state); + void pit8254_out1_changed(int state); + void pit8254_out2_changed(int state); private: void internal_io_map(address_map &map); @@ -496,8 +496,8 @@ private: void ide_sec_command(address_map &map); void ide_sec_control(address_map &map); void ide_io(address_map &map); - DECLARE_WRITE_LINE_MEMBER(ide_pri_interrupt); - DECLARE_WRITE_LINE_MEMBER(ide_sec_interrupt); + void ide_pri_interrupt(int state); + void ide_sec_interrupt(int state); uint8_t minimum_grant_r() { return 3; } uint8_t maximum_latency_r() { return 1; } }; diff --git a/src/mame/sharp/mz2500.cpp b/src/mame/sharp/mz2500.cpp index 5c2f6fe4189..32acb3e62dd 100644 --- a/src/mame/sharp/mz2500.cpp +++ b/src/mame/sharp/mz2500.cpp @@ -1746,7 +1746,7 @@ void mz2500_state::mz2500_palette(palette_device &palette) const /* PIT8253 Interface */ -WRITE_LINE_MEMBER(mz2500_state::pit8253_clk0_irq) +void mz2500_state::pit8253_clk0_irq(int state) { if(m_irq_mask[1] && state & 1) { @@ -1755,7 +1755,7 @@ WRITE_LINE_MEMBER(mz2500_state::pit8253_clk0_irq) } } -WRITE_LINE_MEMBER(mz2500_state::mz2500_rtc_alarm_irq) +void mz2500_state::mz2500_rtc_alarm_irq(int state) { /* TODO: doesn't work yet */ // if(m_irq_mask[3] && state & 1) diff --git a/src/mame/sharp/mz2500.h b/src/mame/sharp/mz2500.h index 987b78e363d..3cce7a8d0fe 100644 --- a/src/mame/sharp/mz2500.h +++ b/src/mame/sharp/mz2500.h @@ -184,8 +184,8 @@ private: uint8_t mz2500_pio1_porta_r(); uint8_t opn_porta_r(); void opn_porta_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(pit8253_clk0_irq); - DECLARE_WRITE_LINE_MEMBER(mz2500_rtc_alarm_irq); + void pit8253_clk0_irq(int state); + void mz2500_rtc_alarm_irq(int state); IRQ_CALLBACK_MEMBER( mz2500_irq_ack ); void draw_80x25(bitmap_ind16 &bitmap,const rectangle &cliprect,uint16_t map_addr); diff --git a/src/mame/sharp/mz700.h b/src/mame/sharp/mz700.h index 48bb63f15d8..af9113b3fc1 100644 --- a/src/mame/sharp/mz700.h +++ b/src/mame/sharp/mz700.h @@ -66,14 +66,14 @@ protected: uint32_t screen_update_mz700(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); TIMER_DEVICE_CALLBACK_MEMBER(ne556_cursor_callback); TIMER_DEVICE_CALLBACK_MEMBER(ne556_other_callback); - DECLARE_WRITE_LINE_MEMBER(pit_out0_changed); - DECLARE_WRITE_LINE_MEMBER(pit_irq_2); + void pit_out0_changed(int state); + void pit_irq_2(int state); uint8_t pio_port_b_r(); uint8_t pio_port_c_r(); void pio_port_a_w(uint8_t data); void pio_port_c_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(write_centronics_busy); - DECLARE_WRITE_LINE_MEMBER(write_centronics_perror); + void write_centronics_busy(int state); + void write_centronics_perror(int state); void mz700_banke(address_map &map); void mz700_io(address_map &map); diff --git a/src/mame/sharp/mz700_m.cpp b/src/mame/sharp/mz700_m.cpp index ecdf59f5e23..fca07df4bc7 100644 --- a/src/mame/sharp/mz700_m.cpp +++ b/src/mame/sharp/mz700_m.cpp @@ -452,7 +452,7 @@ void mz_state::mz700_bank_6_w(uint8_t data) /* Timer 0 is the clock for the speaker output */ -WRITE_LINE_MEMBER(mz_state::pit_out0_changed) +void mz_state::pit_out0_changed(int state) { if((m_prev_state==0) && (state==1)) { m_speaker_level ^= 1; @@ -462,7 +462,7 @@ WRITE_LINE_MEMBER(mz_state::pit_out0_changed) } /* timer 2 is the AM/PM (12 hour) interrupt */ -WRITE_LINE_MEMBER(mz_state::pit_irq_2) +void mz_state::pit_irq_2(int state) { if (!m_intmsk) m_maincpu->set_input_line(0, state); @@ -582,12 +582,12 @@ void mz_state::pio_port_c_w(uint8_t data) Z80 PIO ***************************************************************************/ -WRITE_LINE_MEMBER(mz_state::write_centronics_busy) +void mz_state::write_centronics_busy(int state) { m_centronics_busy = state; } -WRITE_LINE_MEMBER(mz_state::write_centronics_perror) +void mz_state::write_centronics_perror(int state) { m_centronics_perror = state; } diff --git a/src/mame/sharp/mz80.h b/src/mame/sharp/mz80.h index b0213debdab..33012a48fe5 100644 --- a/src/mame/sharp/mz80.h +++ b/src/mame/sharp/mz80.h @@ -46,8 +46,8 @@ private: uint8_t mz80k_8255_portc_r(); void mz80k_8255_porta_w(uint8_t data); void mz80k_8255_portc_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(pit_out0_changed); - DECLARE_WRITE_LINE_MEMBER(pit_out2_changed); + void pit_out0_changed(int state); + void pit_out2_changed(int state); uint32_t screen_update_mz80k(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_mz80kj(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_mz80a(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); diff --git a/src/mame/sharp/mz80_m.cpp b/src/mame/sharp/mz80_m.cpp index 79cced92253..7f31c9172bc 100644 --- a/src/mame/sharp/mz80_m.cpp +++ b/src/mame/sharp/mz80_m.cpp @@ -59,7 +59,7 @@ void mz80_state::mz80k_8255_portc_w(uint8_t data) } -WRITE_LINE_MEMBER( mz80_state::pit_out0_changed ) +void mz80_state::pit_out0_changed(int state) { if(!m_prev_state && state) m_speaker_level++; @@ -68,7 +68,7 @@ WRITE_LINE_MEMBER( mz80_state::pit_out0_changed ) m_speaker->level_w(BIT(m_speaker_level, 1)); } -WRITE_LINE_MEMBER( mz80_state::pit_out2_changed ) +void mz80_state::pit_out2_changed(int state) { m_maincpu->set_input_line(0, HOLD_LINE); } diff --git a/src/mame/sharp/pc1251.h b/src/mame/sharp/pc1251.h index b7c4d8c9d36..d954eb2b2ad 100644 --- a/src/mame/sharp/pc1251.h +++ b/src/mame/sharp/pc1251.h @@ -44,7 +44,7 @@ protected: void out_b_w(uint8_t data); void out_c_w(uint8_t data); - DECLARE_READ_LINE_MEMBER(reset_r); + int reset_r(); uint8_t in_a_r(); uint8_t in_b_r(); uint8_t lcd_read(offs_t offset); diff --git a/src/mame/sharp/pc1251_m.cpp b/src/mame/sharp/pc1251_m.cpp index ee97a813363..bb9b0cec6b2 100644 --- a/src/mame/sharp/pc1251_m.cpp +++ b/src/mame/sharp/pc1251_m.cpp @@ -53,7 +53,7 @@ uint8_t pc1251_state::in_b_r() return data; } -READ_LINE_MEMBER(pc1251_state::reset_r) +int pc1251_state::reset_r() { return BIT(m_extra->read(), 1); } diff --git a/src/mame/sharp/pc1401.h b/src/mame/sharp/pc1401.h index 862e7b918fe..a044e64ff81 100644 --- a/src/mame/sharp/pc1401.h +++ b/src/mame/sharp/pc1401.h @@ -36,7 +36,7 @@ protected: void pc1401_mem(address_map &map); void pc1402_mem(address_map &map); - DECLARE_READ_LINE_MEMBER(reset_r); + int reset_r(); void out_b_w(uint8_t data); void out_c_w(uint8_t data); uint8_t in_a_r(); diff --git a/src/mame/sharp/pc1401_m.cpp b/src/mame/sharp/pc1401_m.cpp index 5b783687972..bed81806f73 100644 --- a/src/mame/sharp/pc1401_m.cpp +++ b/src/mame/sharp/pc1401_m.cpp @@ -65,7 +65,7 @@ uint8_t pc1401_state::in_b_r() return data; } -READ_LINE_MEMBER(pc1401_state::reset_r) +int pc1401_state::reset_r() { return (m_extra->read() & 0x02); } diff --git a/src/mame/sharp/pc1403.h b/src/mame/sharp/pc1403.h index e0b26fdd2b4..5ee832be6b1 100644 --- a/src/mame/sharp/pc1403.h +++ b/src/mame/sharp/pc1403.h @@ -37,7 +37,7 @@ protected: void pc1421_readmem(address_map &map); void pc1421_writemem(address_map &map); - DECLARE_READ_LINE_MEMBER(reset_r); + int reset_r(); void out_c_w(uint8_t data); uint8_t in_a_r(); diff --git a/src/mame/sharp/pc1403_m.cpp b/src/mame/sharp/pc1403_m.cpp index a3934371261..3f8e8ad5178 100644 --- a/src/mame/sharp/pc1403_m.cpp +++ b/src/mame/sharp/pc1403_m.cpp @@ -85,7 +85,7 @@ void pc1403_state::out_c_w(uint8_t data) m_portc = data; } -READ_LINE_MEMBER(pc1403_state::reset_r) +int pc1403_state::reset_r() { return BIT(m_extra->read(), 1); } diff --git a/src/mame/sharp/pocketc.h b/src/mame/sharp/pocketc.h index a06e3e6a503..4ea843861d2 100644 --- a/src/mame/sharp/pocketc.h +++ b/src/mame/sharp/pocketc.h @@ -44,7 +44,7 @@ protected: void pocketc_draw_special(bitmap_ind16 &bitmap,int x, int y, const char* const *fig, int color); void out_a_w(uint8_t data); - DECLARE_READ_LINE_MEMBER(brk_r); + int brk_r(); required_device m_maincpu; required_device m_gfxdecode; diff --git a/src/mame/sharp/pocketc_m.cpp b/src/mame/sharp/pocketc_m.cpp index 2807bdd3911..094b485810e 100644 --- a/src/mame/sharp/pocketc_m.cpp +++ b/src/mame/sharp/pocketc_m.cpp @@ -9,7 +9,7 @@ void pocketc_state::out_a_w(uint8_t data) m_outa = data; } -READ_LINE_MEMBER(pocketc_state::brk_r) +int pocketc_state::brk_r() { return BIT(m_extra->read(), 0); } diff --git a/src/mame/sharp/x1.cpp b/src/mame/sharp/x1.cpp index 2e6e85b7aea..e30c133dc96 100644 --- a/src/mame/sharp/x1.cpp +++ b/src/mame/sharp/x1.cpp @@ -796,12 +796,12 @@ void x1_state::x1_fdc_w(offs_t offset, uint8_t data) } } -WRITE_LINE_MEMBER(x1_state::fdc_drq_w) +void x1_state::fdc_drq_w(int state) { m_dma->rdy_w(state ^ 1); } -WRITE_LINE_MEMBER(x1_state::hdl_w) +void x1_state::hdl_w(int state) { if (state) m_floppy[m_fdc_ctrl & 0x03]->get_device()->mon_w(CLEAR_LINE); diff --git a/src/mame/sharp/x1.h b/src/mame/sharp/x1.h index 49b2ea6eb87..53b8886cac6 100644 --- a/src/mame/sharp/x1.h +++ b/src/mame/sharp/x1.h @@ -144,8 +144,8 @@ public: TIMER_CALLBACK_MEMBER(x1_rtc_increment); TIMER_DEVICE_CALLBACK_MEMBER(x1_cmt_wind_timer); TIMER_DEVICE_CALLBACK_MEMBER(x1_keyboard_callback); - DECLARE_WRITE_LINE_MEMBER(fdc_drq_w); - DECLARE_WRITE_LINE_MEMBER(hdl_w); + void fdc_drq_w(int state); + void hdl_w(int state); uint8_t memory_read_byte(offs_t offset); void memory_write_byte(offs_t offset, uint8_t data); diff --git a/src/mame/sharp/x68k.cpp b/src/mame/sharp/x68k.cpp index ee17edaaecf..4860dbe990b 100644 --- a/src/mame/sharp/x68k.cpp +++ b/src/mame/sharp/x68k.cpp @@ -441,7 +441,7 @@ uint16_t x68k_state::fdc_r(offs_t offset) return 0xff; } -WRITE_LINE_MEMBER( x68k_state::fdc_irq ) +void x68k_state::fdc_irq(int state) { if((m_ioc.irqstatus & 0x04) && state) { @@ -778,7 +778,7 @@ void x68k_state::exp_w(offs_t offset, uint16_t data, uint16_t mem_mask) set_bus_error((offset << 1) + 0xeafa00, 1, mem_mask); } -WRITE_LINE_MEMBER(x68k_state::dma_irq) +void x68k_state::dma_irq(int state) { m_dmac_int = state != CLEAR_LINE; update_ipl(); @@ -792,7 +792,7 @@ void x68k_state::dma_end(offs_t offset, uint8_t data) } } -WRITE_LINE_MEMBER(x68k_state::fm_irq) +void x68k_state::fm_irq(int state) { if(state == CLEAR_LINE) { @@ -817,7 +817,7 @@ void x68k_state::adpcm_w(offs_t offset, uint8_t data) } } -WRITE_LINE_MEMBER(x68k_state::mfp_irq_callback) +void x68k_state::mfp_irq_callback(int state) { m_mfp_int = state; update_ipl(); @@ -898,7 +898,7 @@ uint8_t x68k_state::iack1() } template -WRITE_LINE_MEMBER(x68k_state::irq2_line) +void x68k_state::irq2_line(int state) { m_exp_irq2[N] = (state != CLEAR_LINE); LOGMASKED(LOG_IRQ, "IRQ2-%d %s\n", N + 1, m_exp_irq2[N] ? "asserted" : "cleared"); @@ -906,7 +906,7 @@ WRITE_LINE_MEMBER(x68k_state::irq2_line) } template -WRITE_LINE_MEMBER(x68k_state::irq4_line) +void x68k_state::irq4_line(int state) { m_exp_irq4[N] = (state != CLEAR_LINE); LOGMASKED(LOG_IRQ, "IRQ4-%d %s\n", N + 1, m_exp_irq4[N] ? "asserted" : "cleared"); @@ -914,7 +914,7 @@ WRITE_LINE_MEMBER(x68k_state::irq4_line) } template -WRITE_LINE_MEMBER(x68k_state::nmi_line) +void x68k_state::nmi_line(int state) { m_exp_nmi[N] = (state != CLEAR_LINE); LOGMASKED(LOG_IRQ, "EXNMI %s on expansion %d\n", m_exp_nmi[N] ? "asserted" : "cleared", N + 1); @@ -967,7 +967,7 @@ void x68k_state::cpu_space_map(address_map &map) map(0xffffff, 0xffffff).lr8(NAME([] () { return m68000_base_device::autovector(7); })); } -WRITE_LINE_MEMBER(x68ksupr_state::scsi_irq) +void x68ksupr_state::scsi_irq(int state) { LOGMASKED(LOG_IRQ, "SCSI IRQ %s\n", state ? "asserted" : "cleared"); diff --git a/src/mame/sharp/x68k.h b/src/mame/sharp/x68k.h index ca38a15e414..006388b33e3 100644 --- a/src/mame/sharp/x68k.h +++ b/src/mame/sharp/x68k.h @@ -224,22 +224,22 @@ protected: uint8_t ppi_port_b_r(); uint8_t ppi_port_c_r(); void ppi_port_c_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(fdc_irq); + void fdc_irq(int state); void ct_w(uint8_t data); void adpcm_w(offs_t offset, uint8_t data); - DECLARE_WRITE_LINE_MEMBER(mfp_irq_callback); + void mfp_irq_callback(int state); //dmac - DECLARE_WRITE_LINE_MEMBER(dma_irq); + void dma_irq(int state); void dma_end(offs_t offset, uint8_t data); int read_mouse(); void set_adpcm(); - DECLARE_WRITE_LINE_MEMBER(fm_irq); - template DECLARE_WRITE_LINE_MEMBER(irq2_line); - template DECLARE_WRITE_LINE_MEMBER(irq4_line); - template DECLARE_WRITE_LINE_MEMBER(nmi_line); + void fm_irq(int state); + template void irq2_line(int state); + template void irq4_line(int state); + template void nmi_line(int state); void scc_w(offs_t offset, uint16_t data); uint16_t scc_r(offs_t offset); @@ -318,7 +318,7 @@ public: virtual void driver_start() override; protected: - DECLARE_WRITE_LINE_MEMBER(scsi_irq); + void scsi_irq(int state); void scsi_unknown_w(uint8_t data); required_device m_scsictrl; diff --git a/src/mame/siemens/pcd.cpp b/src/mame/siemens/pcd.cpp index b32c23901da..7f1615635ef 100644 --- a/src/mame/siemens/pcd.cpp +++ b/src/mame/siemens/pcd.cpp @@ -58,7 +58,7 @@ public: private: uint8_t irq_callback(offs_t offset); TIMER_DEVICE_CALLBACK_MEMBER( timer0_tick ); - DECLARE_WRITE_LINE_MEMBER( i186_timer1_w ); + void i186_timer1_w(int state); uint8_t nmi_io_r(address_space &space, offs_t offset); void nmi_io_w(address_space &space, offs_t offset, uint8_t data); @@ -76,11 +76,11 @@ private: uint16_t mem_r(address_space &space, offs_t offset); void mem_w(address_space &space, offs_t offset, uint16_t data, uint16_t mem_mask = ~0); - DECLARE_WRITE_LINE_MEMBER(write_scsi_bsy); - DECLARE_WRITE_LINE_MEMBER(write_scsi_cd); - DECLARE_WRITE_LINE_MEMBER(write_scsi_io); - DECLARE_WRITE_LINE_MEMBER(write_scsi_msg); - DECLARE_WRITE_LINE_MEMBER(write_scsi_req); + void write_scsi_bsy(int state); + void write_scsi_cd(int state); + void write_scsi_io(int state); + void write_scsi_msg(int state); + void write_scsi_req(int state); void pcd_io(address_map &map); void pcd_map(address_map &map); @@ -150,7 +150,7 @@ TIMER_DEVICE_CALLBACK_MEMBER( pcd_state::timer0_tick ) m_maincpu->tmrin0_w(1); } -WRITE_LINE_MEMBER( pcd_state::i186_timer1_w ) +void pcd_state::i186_timer1_w(int state) { if(m_dskctl & 0x20) m_speaker->level_w(state); @@ -321,29 +321,29 @@ void pcd_state::check_scsi_irq() m_pic1->ir5_w(m_io && m_cd && m_req); } -WRITE_LINE_MEMBER(pcd_state::write_scsi_bsy) +void pcd_state::write_scsi_bsy(int state) { m_bsy = state ? 1 : 0; m_scsi->write_sel(0); } -WRITE_LINE_MEMBER(pcd_state::write_scsi_cd) +void pcd_state::write_scsi_cd(int state) { m_cd = state ? 1 : 0; check_scsi_irq(); } -WRITE_LINE_MEMBER(pcd_state::write_scsi_io) +void pcd_state::write_scsi_io(int state) { m_io = state ? 1 : 0; if(state) m_scsi_data_out->write(0); check_scsi_irq(); } -WRITE_LINE_MEMBER(pcd_state::write_scsi_msg) +void pcd_state::write_scsi_msg(int state) { m_msg = state ? 1 : 0; } -WRITE_LINE_MEMBER(pcd_state::write_scsi_req) +void pcd_state::write_scsi_req(int state) { m_req = state ? 1 : 0; if(state) diff --git a/src/mame/siemens/pcd_kbd.cpp b/src/mame/siemens/pcd_kbd.cpp index 356dfdc26b4..cb1a146147c 100644 --- a/src/mame/siemens/pcd_kbd.cpp +++ b/src/mame/siemens/pcd_kbd.cpp @@ -254,12 +254,12 @@ void pcd_keyboard_device::p1_w(uint8_t data) m_out_tx_handler(BIT(data, 5)); } -READ_LINE_MEMBER( pcd_keyboard_device::t0_r ) +int pcd_keyboard_device::t0_r() { return m_t0; } -WRITE_LINE_MEMBER( pcd_keyboard_device::t0_w ) +void pcd_keyboard_device::t0_w(int state) { m_t0 = state; } diff --git a/src/mame/siemens/pcd_kbd.h b/src/mame/siemens/pcd_kbd.h index 8faf838922e..608d84740f7 100644 --- a/src/mame/siemens/pcd_kbd.h +++ b/src/mame/siemens/pcd_kbd.h @@ -13,7 +13,7 @@ public: auto out_tx_handler() { return m_out_tx_handler.bind(); } - DECLARE_WRITE_LINE_MEMBER( t0_w ); + void t0_w(int state); void pcd_keyboard_map(address_map &map); protected: @@ -32,7 +32,7 @@ private: uint8_t bus_r(); uint8_t p1_r(); void p1_w(uint8_t data); - DECLARE_READ_LINE_MEMBER( t0_r ); + int t0_r(); }; DECLARE_DEVICE_TYPE(PCD_KEYBOARD, pcd_keyboard_device) diff --git a/src/mame/siemens/pg685.cpp b/src/mame/siemens/pg685.cpp index 83079807f16..7091deb7a1b 100644 --- a/src/mame/siemens/pg685.cpp +++ b/src/mame/siemens/pg685.cpp @@ -138,8 +138,8 @@ private: uint8_t f9f78_r(); void f9f78_w(uint8_t data); void f9f79_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(fdc_drq_w); - DECLARE_WRITE_LINE_MEMBER(fdc_intrq_w); + void fdc_drq_w(int state); + void fdc_intrq_w(int state); void pg675_mem(address_map &map); void pg685_mem(address_map &map); diff --git a/src/mame/sigma/nyny.cpp b/src/mame/sigma/nyny.cpp index 964cc9e0964..62159265b7d 100644 --- a/src/mame/sigma/nyny.cpp +++ b/src/mame/sigma/nyny.cpp @@ -146,17 +146,17 @@ private: void audio_2_command_w(uint8_t data); uint8_t nyny_pia_1_2_r(offs_t offset); void nyny_pia_1_2_w(offs_t offset, uint8_t data); - DECLARE_WRITE_LINE_MEMBER(main_cpu_irq); - DECLARE_WRITE_LINE_MEMBER(main_cpu_firq); + void main_cpu_irq(int state); + void main_cpu_firq(int state); void pia_2_port_a_w(uint8_t data); void pia_2_port_b_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(flipscreen_w); - DECLARE_WRITE_LINE_MEMBER(flipchars_w); + void flipscreen_w(int state); + void flipchars_w(int state); void nyny_ay8910_37_port_a_w(uint8_t data); virtual void machine_start() override; virtual void machine_reset() override; INTERRUPT_GEN_MEMBER(update_pia_1); - DECLARE_WRITE_LINE_MEMBER(ic48_1_74123_output_changed); + void ic48_1_74123_output_changed(int state); inline void shift_star_generator( ); MC6845_UPDATE_ROW(crtc_update_row); @@ -173,7 +173,7 @@ private: * *************************************/ -WRITE_LINE_MEMBER(nyny_state::main_cpu_irq) +void nyny_state::main_cpu_irq(int state) { int combined_state = m_pia1->irq_a_state() | m_pia1->irq_b_state() | m_pia2->irq_b_state(); @@ -181,7 +181,7 @@ WRITE_LINE_MEMBER(nyny_state::main_cpu_irq) } -WRITE_LINE_MEMBER(nyny_state::main_cpu_firq) +void nyny_state::main_cpu_firq(int state) { m_maincpu->set_input_line(M6809_FIRQ_LINE, state ? ASSERT_LINE : CLEAR_LINE); } @@ -248,7 +248,7 @@ void nyny_state::pia_2_port_b_w(uint8_t data) * *************************************/ -WRITE_LINE_MEMBER(nyny_state::ic48_1_74123_output_changed) +void nyny_state::ic48_1_74123_output_changed(int state) { m_pia2->ca1_w(state); } @@ -260,13 +260,13 @@ WRITE_LINE_MEMBER(nyny_state::ic48_1_74123_output_changed) *************************************/ -WRITE_LINE_MEMBER(nyny_state::flipscreen_w) +void nyny_state::flipscreen_w(int state) { m_flipscreen = !state; } -WRITE_LINE_MEMBER(nyny_state::flipchars_w) +void nyny_state::flipchars_w(int state) { m_flipchars = state; } diff --git a/src/mame/sigma/r2dtank.cpp b/src/mame/sigma/r2dtank.cpp index 9e8919c1ac3..79eecb98361 100644 --- a/src/mame/sigma/r2dtank.cpp +++ b/src/mame/sigma/r2dtank.cpp @@ -81,7 +81,7 @@ public: void r2dtank(machine_config &config); - DECLARE_READ_LINE_MEMBER(ttl74123_output_r); + int ttl74123_output_r(); protected: virtual void machine_start() override; @@ -107,14 +107,14 @@ private: void audio_command_w(uint8_t data); uint8_t audio_answer_r(); void audio_answer_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(main_cpu_irq); + void main_cpu_irq(int state); void AY8910_select_w(uint8_t data); uint8_t AY8910_port_r(); void AY8910_port_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(flipscreen_w); + void flipscreen_w(int state); void pia_comp_w(offs_t offset, uint8_t data); - DECLARE_WRITE_LINE_MEMBER(ttl74123_output_changed); + void ttl74123_output_changed(int state); MC6845_UPDATE_ROW(crtc_update_row); @@ -129,7 +129,7 @@ private: * *************************************/ -WRITE_LINE_MEMBER(r2dtank_state::main_cpu_irq) +void r2dtank_state::main_cpu_irq(int state) { int combined_state = m_pia_main->irq_a_state() | m_pia_main->irq_b_state() | m_pia_audio->irq_a_state() | m_pia_audio->irq_b_state(); @@ -237,14 +237,14 @@ void r2dtank_state::AY8910_port_w(uint8_t data) * *************************************/ -WRITE_LINE_MEMBER(r2dtank_state::ttl74123_output_changed) +void r2dtank_state::ttl74123_output_changed(int state) { m_pia_main->ca1_w(state); m_ttl74123_output = state; } -READ_LINE_MEMBER(r2dtank_state::ttl74123_output_r) +int r2dtank_state::ttl74123_output_r() { return m_ttl74123_output; } @@ -272,7 +272,7 @@ void r2dtank_state::machine_start() *************************************/ -WRITE_LINE_MEMBER(r2dtank_state::flipscreen_w) +void r2dtank_state::flipscreen_w(int state) { m_flipscreen = !state; } diff --git a/src/mame/sigma/sigmab52.cpp b/src/mame/sigma/sigmab52.cpp index ce3129c7956..70277f2bcb0 100644 --- a/src/mame/sigma/sigmab52.cpp +++ b/src/mame/sigma/sigmab52.cpp @@ -157,7 +157,7 @@ private: void lamps2_w(offs_t offset, uint8_t data); void tower_lamps_w(offs_t offset, uint8_t data); void coin_enable_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(ptm2_irq); + void ptm2_irq(int state); void audiocpu_irq_update(); virtual void machine_start() override; @@ -192,7 +192,7 @@ void sigmab52_state::audiocpu_irq_update() m_audiocpu->set_input_line(M6809_IRQ_LINE, (m_6840ptm_2->irq_state() || m_audiocpu_cmd_irq) ? ASSERT_LINE : CLEAR_LINE); } -WRITE_LINE_MEMBER(sigmab52_state::ptm2_irq) +void sigmab52_state::ptm2_irq(int state) { audiocpu_irq_update(); } diff --git a/src/mame/sigma/sigmab98.cpp b/src/mame/sigma/sigmab98.cpp index c52963cb96e..e7201c09a2e 100644 --- a/src/mame/sigma/sigmab98.cpp +++ b/src/mame/sigma/sigmab98.cpp @@ -164,7 +164,7 @@ protected: void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect, int pri_mask); uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - [[maybe_unused]] DECLARE_WRITE_LINE_MEMBER(screen_vblank_sammymdl); + [[maybe_unused]] void screen_vblank_sammymdl(int state); // Required devices required_device m_screen; @@ -260,7 +260,7 @@ private: required_device_array m_dsw_shifter; int m_dsw_bit; - DECLARE_WRITE_LINE_MEMBER(dsw_w); + void dsw_w(int state); void lufykzku_c4_w(uint8_t data); void lufykzku_c6_w(uint8_t data); @@ -824,7 +824,7 @@ void sigmab98_state::gegege_io_map(address_map &map) Otakara Itadaki Luffy Kaizoku-Dan! ***************************************************************************/ -WRITE_LINE_MEMBER(lufykzku_state::dsw_w) +void lufykzku_state::dsw_w(int state) { m_dsw_bit = state; } @@ -947,7 +947,7 @@ void sigmab98_base_state::vblank_w(uint8_t data) m_vblank = (m_vblank & ~0x03) | (data & 0x03); } -WRITE_LINE_MEMBER(sigmab98_base_state::screen_vblank_sammymdl) +void sigmab98_base_state::screen_vblank_sammymdl(int state) { // rising edge if (state) diff --git a/src/mame/sigma/spiders.cpp b/src/mame/sigma/spiders.cpp index fd6453391fc..5520894d745 100644 --- a/src/mame/sigma/spiders.cpp +++ b/src/mame/sigma/spiders.cpp @@ -243,7 +243,7 @@ INTERRUPT_GEN_MEMBER(spiders_state::update_pia_1) * *************************************/ -WRITE_LINE_MEMBER(spiders_state::ic60_74123_output_changed) +void spiders_state::ic60_74123_output_changed(int state) { m_pia[1]->ca1_w(state); } @@ -273,7 +273,7 @@ void spiders_state::machine_start() *************************************/ -WRITE_LINE_MEMBER(spiders_state::flipscreen_w) +void spiders_state::flipscreen_w(int state) { m_flipscreen = state; } diff --git a/src/mame/sigma/spiders.h b/src/mame/sigma/spiders.h index a742a020e13..8722220a93b 100644 --- a/src/mame/sigma/spiders.h +++ b/src/mame/sigma/spiders.h @@ -31,12 +31,12 @@ public: void spiders(machine_config &config); private: - DECLARE_WRITE_LINE_MEMBER(flipscreen_w); + void flipscreen_w(int state); void gfx_rom_intf_w(uint8_t data); uint8_t gfx_rom_r(); virtual void machine_start() override; INTERRUPT_GEN_MEMBER(update_pia_1); - DECLARE_WRITE_LINE_MEMBER(ic60_74123_output_changed); + void ic60_74123_output_changed(int state); void spiders_audio_command_w(uint8_t data); void spiders_audio_a_w(uint8_t data); void spiders_audio_b_w(uint8_t data); diff --git a/src/mame/sinclair/elwro800.cpp b/src/mame/sinclair/elwro800.cpp index fcf736a8e27..be9d3a944e3 100644 --- a/src/mame/sinclair/elwro800.cpp +++ b/src/mame/sinclair/elwro800.cpp @@ -75,7 +75,7 @@ private: INTERRUPT_GEN_MEMBER(elwro800jr_interrupt); uint8_t i8255_port_c_r(); void i8255_port_c_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(write_centronics_ack); + void write_centronics_ack(int state); void elwro800_bank1(address_map &map); void elwro800_bank2(address_map &map); @@ -202,7 +202,7 @@ void elwro800_state::elwro800jr_mmu_w(uint8_t data) * *************************************/ -WRITE_LINE_MEMBER(elwro800_state::write_centronics_ack) +void elwro800_state::write_centronics_ack(int state) { m_centronics_ack = state; m_i8255->pc2_w(state); diff --git a/src/mame/sinclair/ql.cpp b/src/mame/sinclair/ql.cpp index 86b17abace5..dfb2c9a67c6 100644 --- a/src/mame/sinclair/ql.cpp +++ b/src/mame/sinclair/ql.cpp @@ -174,19 +174,19 @@ private: void ipc_port1_w(uint8_t data); void ipc_port2_w(uint8_t data); uint8_t ipc_port2_r(); - DECLARE_READ_LINE_MEMBER( ipc_t1_r ); + int ipc_t1_r(); uint8_t ipc_bus_r(); - DECLARE_WRITE_LINE_MEMBER( ql_baudx4_w ); - DECLARE_WRITE_LINE_MEMBER( ql_comdata_w ); - DECLARE_WRITE_LINE_MEMBER( zx8302_mdselck_w ); - DECLARE_WRITE_LINE_MEMBER( zx8302_mdrdw_w ); - DECLARE_WRITE_LINE_MEMBER( zx8302_erase_w ); - DECLARE_WRITE_LINE_MEMBER( zx8302_raw1_w ); - DECLARE_READ_LINE_MEMBER( zx8302_raw1_r ); - DECLARE_WRITE_LINE_MEMBER( zx8302_raw2_w ); - DECLARE_READ_LINE_MEMBER( zx8302_raw2_r ); - DECLARE_WRITE_LINE_MEMBER( exp_extintl_w ); - DECLARE_WRITE_LINE_MEMBER( qimi_extintl_w ); + void ql_baudx4_w(int state); + void ql_comdata_w(int state); + void zx8302_mdselck_w(int state); + void zx8302_mdrdw_w(int state); + void zx8302_erase_w(int state); + void zx8302_raw1_w(int state); + int zx8302_raw1_r(); + void zx8302_raw2_w(int state); + int zx8302_raw2_r(); + void exp_extintl_w(int state); + void qimi_extintl_w(int state); void update_interrupt(); @@ -450,7 +450,7 @@ void ql_state::ipc_port2_w(uint8_t data) // ipc_t1_r - //------------------------------------------------- -READ_LINE_MEMBER( ql_state::ipc_t1_r ) +int ql_state::ipc_t1_r() { return m_baudx4; } @@ -798,53 +798,53 @@ INPUT_PORTS_END // ZX8302_INTERFACE( ql_zx8302_intf ) //------------------------------------------------- -WRITE_LINE_MEMBER( ql_state::ql_baudx4_w ) +void ql_state::ql_baudx4_w(int state) { m_baudx4 = state; } // CPU to IPC -WRITE_LINE_MEMBER( ql_state::ql_comdata_w ) +void ql_state::ql_comdata_w(int state) { m_comdata_to_ipc = state; } -WRITE_LINE_MEMBER( ql_state::zx8302_mdselck_w ) +void ql_state::zx8302_mdselck_w(int state) { m_mdv2->clk_w(state); m_mdv1->clk_w(state); } -WRITE_LINE_MEMBER( ql_state::zx8302_mdrdw_w ) +void ql_state::zx8302_mdrdw_w(int state) { m_mdv1->read_write_w(state); m_mdv2->read_write_w(state); } -WRITE_LINE_MEMBER( ql_state::zx8302_erase_w ) +void ql_state::zx8302_erase_w(int state) { m_mdv1->erase_w(state); m_mdv2->erase_w(state); } -WRITE_LINE_MEMBER( ql_state::zx8302_raw1_w ) +void ql_state::zx8302_raw1_w(int state) { m_mdv1->data1_w(state); m_mdv2->data1_w(state); } -READ_LINE_MEMBER( ql_state::zx8302_raw1_r ) +int ql_state::zx8302_raw1_r() { return m_mdv1->data1_r() | m_mdv2->data1_r(); } -WRITE_LINE_MEMBER( ql_state::zx8302_raw2_w ) +void ql_state::zx8302_raw2_w(int state) { m_mdv1->data2_w(state); m_mdv2->data2_w(state); } -READ_LINE_MEMBER( ql_state::zx8302_raw2_r ) +int ql_state::zx8302_raw2_r() { return m_mdv1->data2_r() | m_mdv2->data2_r(); } @@ -854,13 +854,13 @@ void ql_state::update_interrupt() m_zx8302->extint_w(m_extintl || m_qimi_extint); } -WRITE_LINE_MEMBER( ql_state::exp_extintl_w ) +void ql_state::exp_extintl_w(int state) { m_extintl = state; update_interrupt(); } -WRITE_LINE_MEMBER( ql_state::qimi_extintl_w ) +void ql_state::qimi_extintl_w(int state) { if (m_qimi_enabled) { diff --git a/src/mame/sinclair/zx8302.cpp b/src/mame/sinclair/zx8302.cpp index 49e0d9dde94..5758ded3cb3 100644 --- a/src/mame/sinclair/zx8302.cpp +++ b/src/mame/sinclair/zx8302.cpp @@ -529,7 +529,7 @@ void zx8302_device::data_w(uint8_t data) // vsync_w - vertical sync //------------------------------------------------- -WRITE_LINE_MEMBER( zx8302_device::vsync_w ) +void zx8302_device::vsync_w(int state) { if (state) { @@ -544,7 +544,7 @@ WRITE_LINE_MEMBER( zx8302_device::vsync_w ) // comctl_w - IPC COMCTL //------------------------------------------------- -WRITE_LINE_MEMBER( zx8302_device::comctl_w ) +void zx8302_device::comctl_w(int state) { if (LOG) logerror("ZX8302 '%s' COMCTL: %x\n", tag(), state); @@ -562,7 +562,7 @@ WRITE_LINE_MEMBER( zx8302_device::comctl_w ) // IPC writing comdata to CPU // -WRITE_LINE_MEMBER( zx8302_device::comdata_w ) +void zx8302_device::comdata_w(int state) { if (LOG) logerror("ZX8302 '%s' COMDATA->CPU(pending): %x\n", tag(), state); @@ -574,7 +574,7 @@ WRITE_LINE_MEMBER( zx8302_device::comdata_w ) // extint_w - external interrupt //------------------------------------------------- -WRITE_LINE_MEMBER( zx8302_device::extint_w ) +void zx8302_device::extint_w(int state) { if (LOG) logerror("ZX8302 '%s' EXTINT: %x\n", tag(), state); @@ -584,18 +584,18 @@ WRITE_LINE_MEMBER( zx8302_device::extint_w ) } } -WRITE_LINE_MEMBER( zx8302_device::write_netin ) +void zx8302_device::write_netin(int state) { m_rs232_rx = state; device_serial_interface::rx_w(state); } -WRITE_LINE_MEMBER( zx8302_device::write_dtr1 ) +void zx8302_device::write_dtr1(int state) { m_dtr1 = state; } -WRITE_LINE_MEMBER( zx8302_device::write_cts2 ) +void zx8302_device::write_cts2(int state) { m_cts2 = state; } diff --git a/src/mame/sinclair/zx8302.h b/src/mame/sinclair/zx8302.h index 372bf475dd6..91eb7118c2f 100644 --- a/src/mame/sinclair/zx8302.h +++ b/src/mame/sinclair/zx8302.h @@ -77,14 +77,14 @@ public: uint8_t irq_status_r(); void irq_acknowledge_w(uint8_t data); void data_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER( vsync_w ); - DECLARE_WRITE_LINE_MEMBER( comctl_w ); - DECLARE_WRITE_LINE_MEMBER( comdata_w ); - DECLARE_WRITE_LINE_MEMBER( extint_w ); - - DECLARE_WRITE_LINE_MEMBER( write_netin ); - DECLARE_WRITE_LINE_MEMBER( write_dtr1 ); - DECLARE_WRITE_LINE_MEMBER( write_cts2 ); + void vsync_w(int state); + void comctl_w(int state); + void comdata_w(int state); + void extint_w(int state); + + void write_netin(int state); + void write_dtr1(int state); + void write_cts2(int state); protected: // device-level overrides diff --git a/src/mame/skeleton/alfaskop_s41_kb.cpp b/src/mame/skeleton/alfaskop_s41_kb.cpp index 42bf55fb602..9551308fee2 100644 --- a/src/mame/skeleton/alfaskop_s41_kb.cpp +++ b/src/mame/skeleton/alfaskop_s41_kb.cpp @@ -223,18 +223,18 @@ alfaskop_s41_keyboard_device::alfaskop_s41_keyboard_device( { } -WRITE_LINE_MEMBER(alfaskop_s41_keyboard_device::rxd_w) +void alfaskop_s41_keyboard_device::rxd_w(int state) { LOGBITS("KBD bit presented: %d\n", state); //m_rxd_high = CLEAR_LINE != state; } -// WRITE_LINE_MEMBER(alfaskop_s41_keyboard_device::hold_w) +// void alfaskop_s41_keyboard_device::hold_w(int state) // { // m_hold = CLEAR_LINE == state; // } -WRITE_LINE_MEMBER(alfaskop_s41_keyboard_device::rst_line_w) +void alfaskop_s41_keyboard_device::rst_line_w(int state) { if (state == CLEAR_LINE) { diff --git a/src/mame/skeleton/alfaskop_s41_kb.h b/src/mame/skeleton/alfaskop_s41_kb.h index d1cafaabb9c..1761022e516 100644 --- a/src/mame/skeleton/alfaskop_s41_kb.h +++ b/src/mame/skeleton/alfaskop_s41_kb.h @@ -19,9 +19,9 @@ public: alfaskop_s41_keyboard_device(machine_config const &mconfig, char const *tag, device_t *owner, uint32_t clock = 0); DECLARE_INPUT_CHANGED_MEMBER(key); - DECLARE_WRITE_LINE_MEMBER(rxd_w); - //DECLARE_WRITE_LINE_MEMBER(hold_w); - DECLARE_WRITE_LINE_MEMBER(rst_line_w); + void rxd_w(int state); + //void hold_w(int state); + void rst_line_w(int state); protected: virtual void device_start() override; diff --git a/src/mame/skeleton/ampex.cpp b/src/mame/skeleton/ampex.cpp index d6281aa4f83..96a860acb7c 100644 --- a/src/mame/skeleton/ampex.cpp +++ b/src/mame/skeleton/ampex.cpp @@ -58,9 +58,9 @@ private: u8 page_r(offs_t offset); void page_w(offs_t offset, u8 data); - DECLARE_WRITE_LINE_MEMBER(vsyn_w); - DECLARE_WRITE_LINE_MEMBER(so_w); - DECLARE_WRITE_LINE_MEMBER(dav_w); + void vsyn_w(int state); + void so_w(int state); + void dav_w(int state); void mem_map(address_map &map); @@ -154,18 +154,18 @@ void ampex_state::page_w(offs_t offset, u8 data) m_paged_ram[m_page * 0x1800 + offset] = data | m_attr << 8; } -WRITE_LINE_MEMBER(ampex_state::vsyn_w) +void ampex_state::vsyn_w(int state) { // should generate RST 6 interrupt } -WRITE_LINE_MEMBER(ampex_state::so_w) +void ampex_state::so_w(int state) { if (m_uart_loopback) m_uart->write_si(state); } -WRITE_LINE_MEMBER(ampex_state::dav_w) +void ampex_state::dav_w(int state) { // DAV should generate RST 7 } diff --git a/src/mame/skeleton/ampex210_kbd.cpp b/src/mame/skeleton/ampex210_kbd.cpp index 65acbccba88..014e953ec38 100644 --- a/src/mame/skeleton/ampex210_kbd.cpp +++ b/src/mame/skeleton/ampex210_kbd.cpp @@ -200,7 +200,7 @@ void ampex230_keyboard_device::device_start() // EXTERNAL CONTROL //************************************************************************** -WRITE_LINE_MEMBER(ampex230_keyboard_device::strobe_w) +void ampex230_keyboard_device::strobe_w(int state) { m_mcu->set_input_line(MCS48_INPUT_IRQ, state ? ASSERT_LINE : CLEAR_LINE); } diff --git a/src/mame/skeleton/ampex210_kbd.h b/src/mame/skeleton/ampex210_kbd.h index 7e038a7a038..c943f679e8e 100644 --- a/src/mame/skeleton/ampex210_kbd.h +++ b/src/mame/skeleton/ampex210_kbd.h @@ -17,7 +17,7 @@ public: auto clock_out_callback() { return m_clock_out_callback.bind(); } // external control input - DECLARE_WRITE_LINE_MEMBER(strobe_w); + void strobe_w(int state); protected: // device-level overrides diff --git a/src/mame/skeleton/attache.cpp b/src/mame/skeleton/attache.cpp index 9ab9f96f8f1..bda233f7534 100644 --- a/src/mame/skeleton/attache.cpp +++ b/src/mame/skeleton/attache.cpp @@ -142,9 +142,9 @@ public: uint8_t fdc_dma_r(); void fdc_dma_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(hreq_w); - DECLARE_WRITE_LINE_MEMBER(eop_w); - [[maybe_unused]] DECLARE_WRITE_LINE_MEMBER(fdc_dack_w); + void hreq_w(int state); + void eop_w(int state); + [[maybe_unused]] void fdc_dack_w(int state); protected: // PIO port B operation select @@ -272,8 +272,8 @@ private: void z80_comms_w(uint8_t data); uint8_t z80_comms_status_r(); void z80_comms_ctrl_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(ppi_irq); - DECLARE_WRITE_LINE_MEMBER(x86_dsr); + void ppi_irq(int state); + void x86_dsr(int state); virtual void machine_reset() override; @@ -800,19 +800,19 @@ void attache_state::dma_mem_w(offs_t offset, uint8_t data) m_maincpu->space(AS_PROGRAM).write_byte(offset,data); } -WRITE_LINE_MEMBER( attache_state::hreq_w ) +void attache_state::hreq_w(int state) { m_maincpu->set_input_line(INPUT_LINE_HALT, state ? ASSERT_LINE : CLEAR_LINE); m_dma->hack_w(state); } -WRITE_LINE_MEMBER(attache_state::eop_w) +void attache_state::eop_w(int state) { m_fdc->tc_w(state); } -WRITE_LINE_MEMBER( attache_state::fdc_dack_w ) +void attache_state::fdc_dack_w(int state) { } @@ -903,13 +903,13 @@ void attache816_state::z80_comms_ctrl_w(uint8_t data) m_extcpu->set_input_line(INPUT_LINE_RESET,(data & 0x01) ? ASSERT_LINE : CLEAR_LINE); } -WRITE_LINE_MEMBER(attache816_state::ppi_irq) +void attache816_state::ppi_irq(int state) { if(m_x86_irq_enable & 0x01) m_extcpu->set_input_line_and_vector(0,state,0x03); // I8086 } -WRITE_LINE_MEMBER(attache816_state::x86_dsr) +void attache816_state::x86_dsr(int state) { // TODO: /DSR to Z8530 SCC } diff --git a/src/mame/skeleton/bitgraph.cpp b/src/mame/skeleton/bitgraph.cpp index af9956e1440..3954c5f2981 100644 --- a/src/mame/skeleton/bitgraph.cpp +++ b/src/mame/skeleton/bitgraph.cpp @@ -123,21 +123,21 @@ protected: uint8_t pia_pb_r(); void pia_pa_w(uint8_t data); void pia_pb_w(uint8_t data); - DECLARE_READ_LINE_MEMBER(pia_ca1_r); - DECLARE_WRITE_LINE_MEMBER(pia_cb2_w); + int pia_ca1_r(); + void pia_cb2_w(int state); void baud_write(uint16_t data); - DECLARE_WRITE_LINE_MEMBER(com8116_a_fr_w); - DECLARE_WRITE_LINE_MEMBER(com8116_a_ft_w); - DECLARE_WRITE_LINE_MEMBER(com8116_b_fr_w); - DECLARE_WRITE_LINE_MEMBER(com8116_b_ft_w); + void com8116_a_fr_w(int state); + void com8116_a_ft_w(int state); + void com8116_b_fr_w(int state); + void com8116_b_ft_w(int state); uint8_t adlc_r(offs_t offset); void adlc_w(offs_t offset, uint8_t data); void earom_write(uint8_t data); void misccr_write(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(system_clock_write); + void system_clock_write(int state); uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); @@ -227,12 +227,12 @@ void bitgraph_state::pia_w(offs_t offset, uint8_t data) return m_pia->write(3 - offset, data); } -READ_LINE_MEMBER(bitgraph_state::pia_ca1_r) +int bitgraph_state::pia_ca1_r() { return m_screen->frame_number() & 1; } -WRITE_LINE_MEMBER(bitgraph_state::pia_cb2_w) +void bitgraph_state::pia_cb2_w(int state) { // no-op to shut up verbose log } @@ -309,7 +309,7 @@ void bitgraph_state::misccr_write(uint8_t data) m_misccr = data; } -WRITE_LINE_MEMBER(bitgraph_state::system_clock_write) +void bitgraph_state::system_clock_write(int state) { if (!BIT(m_pia_b, 6)) { @@ -337,25 +337,25 @@ void bitgraph_state::baud_write(uint16_t data) m_dbrga->str_w((data >> 12) & 15); // 0 HOST } -WRITE_LINE_MEMBER(bitgraph_state::com8116_a_fr_w) +void bitgraph_state::com8116_a_fr_w(int state) { m_acia0->write_txc(state); m_acia0->write_rxc(state); } -WRITE_LINE_MEMBER(bitgraph_state::com8116_a_ft_w) +void bitgraph_state::com8116_a_ft_w(int state) { m_acia1->write_txc(state); m_acia1->write_rxc(state); } -WRITE_LINE_MEMBER(bitgraph_state::com8116_b_fr_w) +void bitgraph_state::com8116_b_fr_w(int state) { m_acia2->write_txc(state); m_acia2->write_rxc(state); } -WRITE_LINE_MEMBER(bitgraph_state::com8116_b_ft_w) +void bitgraph_state::com8116_b_ft_w(int state) { if (m_acia3.found()) { diff --git a/src/mame/skeleton/blit.cpp b/src/mame/skeleton/blit.cpp index 07958e64d43..5389ebfdc36 100644 --- a/src/mame/skeleton/blit.cpp +++ b/src/mame/skeleton/blit.cpp @@ -72,7 +72,7 @@ public: , m_sysrom(*this, M68K_TAG) { } - DECLARE_WRITE_LINE_MEMBER(system_clock_write); + void system_clock_write(int state); void start_write(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); void vblank_ack(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); @@ -156,7 +156,7 @@ void blit_state::start_write(offs_t offset, uint16_t data, uint16_t mem_mask) m_videostart = data << 1; } -WRITE_LINE_MEMBER(blit_state::system_clock_write) +void blit_state::system_clock_write(int state) { m_acia0->write_txc(state); m_acia0->write_rxc(state); diff --git a/src/mame/skeleton/candela.cpp b/src/mame/skeleton/candela.cpp index b14cef154da..978da5817f0 100644 --- a/src/mame/skeleton/candela.cpp +++ b/src/mame/skeleton/candela.cpp @@ -157,9 +157,9 @@ public: uint8_t syspia_A_r(); uint8_t syspia_B_r(); void syspia_B_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER( syspia_cb2_w); - DECLARE_WRITE_LINE_MEMBER( usrpia_cb2_w); - DECLARE_WRITE_LINE_MEMBER (write_acia_clock); + void syspia_cb2_w(int state); + void usrpia_cb2_w(int state); + void write_acia_clock(int state); void can09t(machine_config &config); void can09t_map(address_map &map); protected: @@ -444,17 +444,18 @@ void can09t_state::syspia_B_w(uint8_t data) m_cass->output(BIT(data, 6) ? 1.0 : -1.0); } -WRITE_LINE_MEMBER(can09t_state::syspia_cb2_w) +void can09t_state::syspia_cb2_w(int state) { LOG("%s(%02x)\n", FUNCNAME, state); } -WRITE_LINE_MEMBER(can09t_state::usrpia_cb2_w) +void can09t_state::usrpia_cb2_w(int state) { LOG("%s(%02x)\n", FUNCNAME, state); } -WRITE_LINE_MEMBER (can09t_state::write_acia_clock){ +void can09t_state::write_acia_clock(int state) +{ m_acia->write_txc (state); m_acia->write_rxc (state); } @@ -523,7 +524,7 @@ protected: void pia1_A_w(uint8_t data); uint8_t pia1_B_r(); void pia1_B_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER( pia1_cb2_w); + void pia1_cb2_w(int state); uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void can09_map(address_map &map); required_device m_pia1; @@ -622,7 +623,7 @@ void can09_state::pia1_B_w(uint8_t data) #endif } -WRITE_LINE_MEMBER(can09_state::pia1_cb2_w) +void can09_state::pia1_cb2_w(int state) { LOG("%s(%02x)\n", FUNCNAME, state); } diff --git a/src/mame/skeleton/cd2650.cpp b/src/mame/skeleton/cd2650.cpp index 6a2c590ea7b..0f916e8340e 100644 --- a/src/mame/skeleton/cd2650.cpp +++ b/src/mame/skeleton/cd2650.cpp @@ -83,8 +83,8 @@ private: void mem_map(address_map &map); u8 keyin_r(); void kbd_put(u8 data); - DECLARE_WRITE_LINE_MEMBER(tape_deck_on_w); - DECLARE_READ_LINE_MEMBER(cass_r); + void tape_deck_on_w(int state); + int cass_r(); TIMER_DEVICE_CALLBACK_MEMBER(kansas_w); TIMER_DEVICE_CALLBACK_MEMBER(kansas_r); DECLARE_QUICKLOAD_LOAD_MEMBER(quickload_cb); @@ -132,12 +132,12 @@ TIMER_DEVICE_CALLBACK_MEMBER(cd2650_state::kansas_r) } } -WRITE_LINE_MEMBER(cd2650_state::tape_deck_on_w) +void cd2650_state::tape_deck_on_w(int state) { m_cass->change_state(state ? CASSETTE_MOTOR_ENABLED : CASSETTE_MOTOR_DISABLED, CASSETTE_MASK_MOTOR); } -READ_LINE_MEMBER(cd2650_state::cass_r) +int cd2650_state::cass_r() { return m_cass_data[2]; } diff --git a/src/mame/skeleton/cdc721.cpp b/src/mame/skeleton/cdc721.cpp index a53633af993..12eadd2f160 100644 --- a/src/mame/skeleton/cdc721.cpp +++ b/src/mame/skeleton/cdc721.cpp @@ -56,11 +56,11 @@ private: void block_select_w(u8 data); void nvram_w(offs_t offset, u8 data); - template DECLARE_WRITE_LINE_MEMBER(int_w); + template void int_w(int state); TIMER_CALLBACK_MEMBER(update_interrupts); IRQ_CALLBACK_MEMBER(restart_cb); - template DECLARE_WRITE_LINE_MEMBER(foreign_char_bank_w); + template void foreign_char_bank_w(int state); void io_map(address_map &map); void mem_map(address_map &map); @@ -88,7 +88,7 @@ void cdc721_state::interrupt_mask_w(u8 data) } template -WRITE_LINE_MEMBER(cdc721_state::int_w) +void cdc721_state::int_w(int state) { if (BIT(m_pending_interrupts, Line) == state) return; @@ -150,7 +150,7 @@ void cdc721_state::nvram_w(offs_t offset, u8 data) } template -WRITE_LINE_MEMBER(cdc721_state::foreign_char_bank_w) +void cdc721_state::foreign_char_bank_w(int state) { if (state) m_foreign_char_bank |= 1 << Bit; diff --git a/src/mame/skeleton/ckz80.cpp b/src/mame/skeleton/ckz80.cpp index b1667cf4fc2..27cba945bfc 100644 --- a/src/mame/skeleton/ckz80.cpp +++ b/src/mame/skeleton/ckz80.cpp @@ -74,9 +74,9 @@ private: u8 port81_r(); void port40_w(u8 data); void kbd_put(u8 data); - DECLARE_WRITE_LINE_MEMBER(ctc_z0_w); - DECLARE_WRITE_LINE_MEMBER(ctc_z1_w); - DECLARE_WRITE_LINE_MEMBER(ctc_z2_w); + void ctc_z0_w(int state); + void ctc_z1_w(int state); + void ctc_z2_w(int state); void io_map(address_map &map); void mem_map(address_map &map); u8 m_term_data = 0U; @@ -142,16 +142,16 @@ static const z80_daisy_config daisy_chain[] = /* Z80-CTC Interface */ -WRITE_LINE_MEMBER( ckz80_state::ctc_z0_w ) +void ckz80_state::ctc_z0_w(int state) { // guess this generates clock for z80dart } -WRITE_LINE_MEMBER( ckz80_state::ctc_z1_w ) +void ckz80_state::ctc_z1_w(int state) { } -WRITE_LINE_MEMBER( ckz80_state::ctc_z2_w ) +void ckz80_state::ctc_z2_w(int state) { } diff --git a/src/mame/skeleton/cortex.cpp b/src/mame/skeleton/cortex.cpp index 2308cdddce1..7a798016485 100644 --- a/src/mame/skeleton/cortex.cpp +++ b/src/mame/skeleton/cortex.cpp @@ -73,9 +73,9 @@ protected: private: void kbd_put(u8 data); - DECLARE_WRITE_LINE_MEMBER(keyboard_ack_w); - DECLARE_WRITE_LINE_MEMBER(romsw_w); - DECLARE_WRITE_LINE_MEMBER(vdp_int_w); + void keyboard_ack_w(int state); + void romsw_w(int state); + void vdp_int_w(int state); u8 pio_r(offs_t offset); u8 keyboard_r(offs_t offset); @@ -151,7 +151,7 @@ u8 cortex_state::keyboard_r(offs_t offset) return BIT(m_term_data, offset); } -WRITE_LINE_MEMBER( cortex_state::keyboard_ack_w ) +void cortex_state::keyboard_ack_w(int state) { if (!state) { @@ -160,12 +160,12 @@ WRITE_LINE_MEMBER( cortex_state::keyboard_ack_w ) } } -WRITE_LINE_MEMBER( cortex_state::romsw_w ) +void cortex_state::romsw_w(int state) { m_bank1->set_entry(state ? 0 : 1); } -WRITE_LINE_MEMBER( cortex_state::vdp_int_w ) +void cortex_state::vdp_int_w(int state) { m_vdp_int = state ? 0 : 1; // change polarity to match mame } diff --git a/src/mame/skeleton/cosmicos.cpp b/src/mame/skeleton/cosmicos.cpp index 3dc29715fb3..465e74bd243 100644 --- a/src/mame/skeleton/cosmicos.cpp +++ b/src/mame/skeleton/cosmicos.cpp @@ -372,36 +372,36 @@ TIMER_DEVICE_CALLBACK_MEMBER(cosmicos_state::int_tick) m_maincpu->set_input_line(COSMAC_INPUT_LINE_INT, ASSERT_LINE); } -WRITE_LINE_MEMBER( cosmicos_state::dmaout_w ) +void cosmicos_state::dmaout_w(int state) { m_dmaout = state; } -WRITE_LINE_MEMBER( cosmicos_state::efx_w ) +void cosmicos_state::efx_w(int state) { m_efx = state; } /* CDP1802 Configuration */ -READ_LINE_MEMBER( cosmicos_state::wait_r ) +int cosmicos_state::wait_r() { return m_wait; } -READ_LINE_MEMBER( cosmicos_state::clear_r ) +int cosmicos_state::clear_r() { return m_clear; } -READ_LINE_MEMBER( cosmicos_state::ef1_r ) +int cosmicos_state::ef1_r() { uint8_t special = m_special->read(); return BIT(special, 0); } -READ_LINE_MEMBER( cosmicos_state::ef2_r ) +int cosmicos_state::ef2_r() { uint8_t special = m_special->read(); int casin = (m_cassette)->input() < 0.0; @@ -411,19 +411,19 @@ READ_LINE_MEMBER( cosmicos_state::ef2_r ) return BIT(special, 1) | BIT(special, 3) | casin; } -READ_LINE_MEMBER( cosmicos_state::ef3_r ) +int cosmicos_state::ef3_r() { uint8_t special = m_special->read(); return BIT(special, 2) | BIT(special, 3); } -READ_LINE_MEMBER( cosmicos_state::ef4_r ) +int cosmicos_state::ef4_r() { return BIT(m_buttons->read(), 0); } -WRITE_LINE_MEMBER( cosmicos_state::q_w ) +void cosmicos_state::q_w(int state) { /* cassette */ m_cassette->output(state ? +1.0 : -1.0); diff --git a/src/mame/skeleton/cosmicos.h b/src/mame/skeleton/cosmicos.h index 9af09a0bbf5..84f7eb1f5d2 100644 --- a/src/mame/skeleton/cosmicos.h +++ b/src/mame/skeleton/cosmicos.h @@ -89,15 +89,15 @@ private: void sc_w(uint8_t data); void set_cdp1802_mode(int mode); void clear_input_data(); - DECLARE_WRITE_LINE_MEMBER( dmaout_w ); - DECLARE_WRITE_LINE_MEMBER( efx_w ); - DECLARE_READ_LINE_MEMBER( wait_r ); - DECLARE_READ_LINE_MEMBER( clear_r ); - DECLARE_READ_LINE_MEMBER( ef1_r ); - DECLARE_READ_LINE_MEMBER( ef2_r ); - DECLARE_READ_LINE_MEMBER( ef3_r ); - DECLARE_READ_LINE_MEMBER( ef4_r ); - DECLARE_WRITE_LINE_MEMBER( q_w ); + void dmaout_w(int state); + void efx_w(int state); + int wait_r(); + int clear_r(); + int ef1_r(); + int ef2_r(); + int ef3_r(); + int ef4_r(); + void q_w(int state); DECLARE_QUICKLOAD_LOAD_MEMBER(quickload_cb); TIMER_DEVICE_CALLBACK_MEMBER(digit_tick); TIMER_DEVICE_CALLBACK_MEMBER(int_tick); diff --git a/src/mame/skeleton/didact.cpp b/src/mame/skeleton/didact.cpp index bf6afd909b4..d44a78a2f05 100644 --- a/src/mame/skeleton/didact.cpp +++ b/src/mame/skeleton/didact.cpp @@ -177,7 +177,7 @@ protected: void pia2_kbA_w(uint8_t data); uint8_t pia2_kbB_r(); void pia2_kbB_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER( pia2_ca2_w ); + void pia2_ca2_w(int state); virtual void machine_reset() override; virtual void machine_start() override; @@ -251,7 +251,7 @@ void md6802_state::pia2_kbB_w(uint8_t data) m_segments = bitswap<8>(data, 0, 4, 5, 3, 2, 1, 7, 6); } -WRITE_LINE_MEMBER( md6802_state::pia2_ca2_w ) +void md6802_state::pia2_ca2_w(int state) { LOGKBD("--->%s(%02x) LED is connected through resisitor to +5v so logical 0 will lit it\n", FUNCNAME, state); m_led = state ? 0 :1; @@ -354,7 +354,7 @@ class mp68a_state : public didact_state void pia2_kbA_w(uint8_t data); uint8_t pia2_kbB_r(); void pia2_kbB_w(uint8_t data); - DECLARE_READ_LINE_MEMBER( pia2_cb1_r ); + int pia2_cb1_r(); template void digit_w(uint8_t data) { m_7segs[N] = data; } virtual void machine_reset() override; @@ -453,7 +453,7 @@ void mp68a_state::pia2_kbB_w(uint8_t data) m_cass->output(BIT(data, 4) ? -1.0 : +1.0); } -READ_LINE_MEMBER( mp68a_state::pia2_cb1_r ) +int mp68a_state::pia2_cb1_r() { for (unsigned i = 0U; 4U > i; ++i) m_lines[i] = m_io_lines[i]->read(); @@ -556,7 +556,7 @@ class modulab_state : public didact_state protected: uint8_t io_r(offs_t offset); void io_w(offs_t offset, u8 data); - DECLARE_WRITE_LINE_MEMBER( da_w ); + void da_w(int state); private: void modulab_map(address_map &map); // Offsets for display and keyboard i/o @@ -582,7 +582,7 @@ private: uint8_t m_da; }; -WRITE_LINE_MEMBER( modulab_state::da_w ) +void modulab_state::da_w(int state) { LOG("--->%s()\n", FUNCNAME); m_da = state == CLEAR_LINE ? 0 : 1; // Capture data available signal diff --git a/src/mame/skeleton/digel804.cpp b/src/mame/skeleton/digel804.cpp index e766682556e..614a99b64b5 100644 --- a/src/mame/skeleton/digel804.cpp +++ b/src/mame/skeleton/digel804.cpp @@ -117,8 +117,8 @@ protected: void acia_command_w(uint8_t data); uint8_t acia_control_r(); void acia_control_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER( acia_irq_w ); - DECLARE_WRITE_LINE_MEMBER( da_w ); + void acia_irq_w(int state); + void da_w(int state); void z80_mem_804_1_4(address_map &map); void z80_io_1_4(address_map &map); @@ -164,7 +164,7 @@ public: void ep804(machine_config &config); protected: - DECLARE_WRITE_LINE_MEMBER( ep804_acia_irq_w ); + void ep804_acia_irq_w(int state); void z80_mem_804_1_2(address_map &map); void z80_io_1_2(address_map &map); @@ -625,19 +625,19 @@ DEVICE_INPUT_DEFAULTS_END Machine Drivers ******************************************************************************/ -WRITE_LINE_MEMBER( digel804_state::da_w ) +void digel804_state::da_w(int state) { m_key_intq = state ? 0 : 1; m_maincpu->set_input_line(0, (m_key_intq & m_acia_intq) ? CLEAR_LINE : ASSERT_LINE); } -WRITE_LINE_MEMBER( digel804_state::acia_irq_w ) +void digel804_state::acia_irq_w(int state) { m_acia_intq = state ? 0 : 1; m_maincpu->set_input_line(0, (m_key_intq & m_acia_intq) ? CLEAR_LINE : ASSERT_LINE); } -WRITE_LINE_MEMBER( ep804_state::ep804_acia_irq_w ) +void ep804_state::ep804_acia_irq_w(int state) { } diff --git a/src/mame/skeleton/dim68k.cpp b/src/mame/skeleton/dim68k.cpp index 7d363609426..3d920986f8b 100644 --- a/src/mame/skeleton/dim68k.cpp +++ b/src/mame/skeleton/dim68k.cpp @@ -99,7 +99,7 @@ private: void dim68k_video_reset_w(u16 data); MC6845_UPDATE_ROW(crtc_update_row); - DECLARE_WRITE_LINE_MEMBER(fdc_irq_w); + void fdc_irq_w(int state); void mem_map(address_map &map); @@ -172,7 +172,7 @@ void dim68k_state::dim68k_speaker_w(u16 data) m_speaker->level_w(m_speaker_bit); } -WRITE_LINE_MEMBER(dim68k_state::fdc_irq_w) +void dim68k_state::fdc_irq_w(int state) { if (state) { diff --git a/src/mame/skeleton/dim68k_kbd.cpp b/src/mame/skeleton/dim68k_kbd.cpp index 471083ab3e4..5eccb032585 100644 --- a/src/mame/skeleton/dim68k_kbd.cpp +++ b/src/mame/skeleton/dim68k_kbd.cpp @@ -68,7 +68,7 @@ void dim68k_keyboard_device::p2_w(u8 data) m_numlock_led = !BIT(data, 6); } -WRITE_LINE_MEMBER(dim68k_keyboard_device::prog_w) +void dim68k_keyboard_device::prog_w(int state) { if (state) { diff --git a/src/mame/skeleton/dim68k_kbd.h b/src/mame/skeleton/dim68k_kbd.h index 984bffbd7f1..e6b993edc92 100644 --- a/src/mame/skeleton/dim68k_kbd.h +++ b/src/mame/skeleton/dim68k_kbd.h @@ -41,7 +41,7 @@ private: // MCU handlers u8 p1_r(); void p2_w(u8 data); - DECLARE_WRITE_LINE_MEMBER(prog_w); + void prog_w(int state); u8 eprom_r(); // address map diff --git a/src/mame/skeleton/dmv.cpp b/src/mame/skeleton/dmv.cpp index ec285d14ec8..875875edec4 100644 --- a/src/mame/skeleton/dmv.cpp +++ b/src/mame/skeleton/dmv.cpp @@ -85,12 +85,12 @@ private: void update_halt_line(); void leds_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(dma_hrq_changed); - DECLARE_WRITE_LINE_MEMBER(dmac_eop); - DECLARE_WRITE_LINE_MEMBER(dmac_dack3); - DECLARE_WRITE_LINE_MEMBER(fdc_irq); - DECLARE_WRITE_LINE_MEMBER(pit_out0); - DECLARE_WRITE_LINE_MEMBER(timint_w); + void dma_hrq_changed(int state); + void dmac_eop(int state); + void dmac_dack3(int state); + void fdc_irq(int state); + void pit_out0(int state); + void timint_w(int state); void fdd_motor_w(uint8_t data); uint8_t sys_status_r(); void tc_set_w(uint8_t data); @@ -107,27 +107,27 @@ private: void program_w(offs_t offset, uint8_t data); uint8_t exp_program_r(offs_t offset); void exp_program_w(offs_t offset, uint8_t data); - DECLARE_WRITE_LINE_MEMBER(thold7_w); + void thold7_w(int state); void update_busint(int slot, int state); - DECLARE_WRITE_LINE_MEMBER(busint2_w) { update_busint(0, state); } - DECLARE_WRITE_LINE_MEMBER(busint2a_w) { update_busint(1, state); } - DECLARE_WRITE_LINE_MEMBER(busint3_w) { update_busint(2, state); } - DECLARE_WRITE_LINE_MEMBER(busint4_w) { update_busint(3, state); } - DECLARE_WRITE_LINE_MEMBER(busint5_w) { update_busint(4, state); } - DECLARE_WRITE_LINE_MEMBER(busint6_w) { update_busint(5, state); } - DECLARE_WRITE_LINE_MEMBER(busint7_w) { update_busint(6, state); } - DECLARE_WRITE_LINE_MEMBER(busint7a_w) { update_busint(7, state); } + void busint2_w(int state) { update_busint(0, state); } + void busint2a_w(int state) { update_busint(1, state); } + void busint3_w(int state) { update_busint(2, state); } + void busint4_w(int state) { update_busint(3, state); } + void busint5_w(int state) { update_busint(4, state); } + void busint6_w(int state) { update_busint(5, state); } + void busint7_w(int state) { update_busint(6, state); } + void busint7a_w(int state) { update_busint(7, state); } void update_irqs(int slot, int state); - DECLARE_WRITE_LINE_MEMBER(irq2_w) { update_irqs(0, state); } - DECLARE_WRITE_LINE_MEMBER(irq2a_w) { update_irqs(1, state); } - DECLARE_WRITE_LINE_MEMBER(irq3_w) { update_irqs(2, state); } - DECLARE_WRITE_LINE_MEMBER(irq4_w) { update_irqs(3, state); } - DECLARE_WRITE_LINE_MEMBER(irq5_w) { update_irqs(4, state); } - DECLARE_WRITE_LINE_MEMBER(irq6_w) { update_irqs(5, state); } - DECLARE_WRITE_LINE_MEMBER(irq7_w) { update_irqs(6, state); } - DECLARE_WRITE_LINE_MEMBER(irq7a_w) { update_irqs(7, state); } + void irq2_w(int state) { update_irqs(0, state); } + void irq2a_w(int state) { update_irqs(1, state); } + void irq3_w(int state) { update_irqs(2, state); } + void irq4_w(int state) { update_irqs(3, state); } + void irq5_w(int state) { update_irqs(4, state); } + void irq6_w(int state) { update_irqs(5, state); } + void irq7_w(int state) { update_irqs(6, state); } + void irq7a_w(int state) { update_irqs(7, state); } static void floppy_formats(format_registration &fr); DECLARE_QUICKLOAD_LOAD_MEMBER(quickload_cb); @@ -466,7 +466,7 @@ uint8_t dmv_state::program_r(offs_t offset) return program_read(m_ram_bank, offset); } -WRITE_LINE_MEMBER( dmv_state::thold7_w ) +void dmv_state::thold7_w(int state) { if (m_thold7 != state) { @@ -702,7 +702,7 @@ GFXDECODE_END // I8237 //------------------------------------------------------------------------------------ -WRITE_LINE_MEMBER( dmv_state::dma_hrq_changed ) +void dmv_state::dma_hrq_changed(int state) { m_dma_hrq = state; update_halt_line(); @@ -711,7 +711,7 @@ WRITE_LINE_MEMBER( dmv_state::dma_hrq_changed ) m_dmac->hack_w(state); } -WRITE_LINE_MEMBER( dmv_state::dmac_eop ) +void dmv_state::dmac_eop(int state) { if (!(m_dack3_line || m_eop_line) && (m_dack3_line || state)) m_fdc->tc_w(true); @@ -719,7 +719,7 @@ WRITE_LINE_MEMBER( dmv_state::dmac_eop ) m_eop_line = state; } -WRITE_LINE_MEMBER( dmv_state::dmac_dack3 ) +void dmv_state::dmac_dack3(int state) { if (!(m_dack3_line || m_eop_line) && (state || m_eop_line)) m_fdc->tc_w(true); @@ -727,7 +727,7 @@ WRITE_LINE_MEMBER( dmv_state::dmac_dack3 ) m_dack3_line = state; } -WRITE_LINE_MEMBER( dmv_state::pit_out0 ) +void dmv_state::pit_out0(int state) { if (!state) { @@ -737,13 +737,13 @@ WRITE_LINE_MEMBER( dmv_state::pit_out0 ) } } -WRITE_LINE_MEMBER( dmv_state::timint_w ) +void dmv_state::timint_w(int state) { m_slot7a->timint_w(state); m_slot7->timint_w(state); } -WRITE_LINE_MEMBER( dmv_state::fdc_irq ) +void dmv_state::fdc_irq(int state) { m_slot7a->flexint_w(state); m_slot7->flexint_w(state); diff --git a/src/mame/skeleton/dmv_keyb.cpp b/src/mame/skeleton/dmv_keyb.cpp index a2a88666925..60e3adf2c5b 100644 --- a/src/mame/skeleton/dmv_keyb.cpp +++ b/src/mame/skeleton/dmv_keyb.cpp @@ -290,7 +290,7 @@ void dmv_keyboard_device::port2_w(uint8_t data) // sd_poll_w //------------------------------------------------- -DECLARE_WRITE_LINE_MEMBER(dmv_keyboard_device::sd_poll_w) +void dmv_keyboard_device::sd_poll_w(int state) { if (m_sd_poll_state && !state) m_maincpu->upi41_master_w(0, 0); @@ -302,7 +302,7 @@ DECLARE_WRITE_LINE_MEMBER(dmv_keyboard_device::sd_poll_w) // sd_poll_r //------------------------------------------------- -DECLARE_READ_LINE_MEMBER(dmv_keyboard_device::sd_poll_r) +int dmv_keyboard_device::sd_poll_r() { return m_sd_data_state; } diff --git a/src/mame/skeleton/dmv_keyb.h b/src/mame/skeleton/dmv_keyb.h index 52e59acddfb..c3ef650889a 100644 --- a/src/mame/skeleton/dmv_keyb.h +++ b/src/mame/skeleton/dmv_keyb.h @@ -27,8 +27,8 @@ public: // construction/destruction dmv_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - DECLARE_WRITE_LINE_MEMBER(sd_poll_w); - DECLARE_READ_LINE_MEMBER(sd_poll_r); + void sd_poll_w(int state); + int sd_poll_r(); protected: // device-level overrides diff --git a/src/mame/skeleton/dps1.cpp b/src/mame/skeleton/dps1.cpp index ed93f730a86..79e7d40b365 100644 --- a/src/mame/skeleton/dps1.cpp +++ b/src/mame/skeleton/dps1.cpp @@ -56,7 +56,7 @@ private: void portbe_w(u8 data); u8 portff_r(); void portff_w(u8 data); - DECLARE_WRITE_LINE_MEMBER(fdc_drq_w); + void fdc_drq_w(int state); void io_map(address_map &map); void mem_map(address_map &map); @@ -158,7 +158,7 @@ void dps1_state::portff_w(u8 data) } // do dma -WRITE_LINE_MEMBER( dps1_state::fdc_drq_w ) +void dps1_state::fdc_drq_w(int state) { if (state) { diff --git a/src/mame/skeleton/e100.cpp b/src/mame/skeleton/e100.cpp index 5e7f5f61d1f..293a68913a9 100644 --- a/src/mame/skeleton/e100.cpp +++ b/src/mame/skeleton/e100.cpp @@ -176,8 +176,8 @@ private: void pia1_kbA_w(uint8_t data); uint8_t pia1_kbB_r(); void pia1_kbB_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER( pia1_ca2_w); - DECLARE_WRITE_LINE_MEMBER( pia1_cb2_w); + void pia1_ca2_w(int state); + void pia1_cb2_w(int state); TIMER_DEVICE_CALLBACK_MEMBER(rtc_w); void e100_map(address_map &map); @@ -393,12 +393,12 @@ uint8_t e100_state::pia1_kbB_r() return m_pia1_B; } -WRITE_LINE_MEMBER(e100_state::pia1_ca2_w) +void e100_state::pia1_ca2_w(int state) { // TODO: Make this a slot device to trigger time meassurements } -WRITE_LINE_MEMBER(e100_state::pia1_cb2_w) +void e100_state::pia1_cb2_w(int state) { m_rs232->write_txd(!state); } diff --git a/src/mame/skeleton/eurocom2.cpp b/src/mame/skeleton/eurocom2.cpp index 4507d762791..9f565c8623d 100644 --- a/src/mame/skeleton/eurocom2.cpp +++ b/src/mame/skeleton/eurocom2.cpp @@ -98,7 +98,7 @@ protected: uint8_t kbd_get(); void kbd_put(u8 data); - DECLARE_WRITE_LINE_MEMBER(pia1_cb2_w); + void pia1_cb2_w(int state); void eurocom2_map(address_map &map); @@ -136,10 +136,10 @@ public: private: uint8_t waveterm_kb_r(); void waveterm_kb_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(waveterm_kbh_w); + void waveterm_kbh_w(int state); void pia3_pb_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(pia3_cb2_w); + void pia3_cb2_w(int state); uint8_t waveterm_adc(); void waveterm_dac(uint8_t data); // declared but not defined, commented in memory map @@ -220,7 +220,7 @@ void eurocom2_state::vico_w(offs_t offset, uint8_t data) } -WRITE_LINE_MEMBER(eurocom2_state::pia1_cb2_w) +void eurocom2_state::pia1_cb2_w(int state) { LOG("PIA1 CB2 <- %d (SST reset)\n", state); // reset single-step timer @@ -265,7 +265,7 @@ void waveterm_state::waveterm_kb_w(uint8_t data) m_drive = (~data) >> 4; } -WRITE_LINE_MEMBER(waveterm_state::waveterm_kbh_w) +void waveterm_state::waveterm_kbh_w(int state) { m_driveh = !state; } diff --git a/src/mame/skeleton/fanucspmg.cpp b/src/mame/skeleton/fanucspmg.cpp index 00d76ac430c..3ea67864429 100644 --- a/src/mame/skeleton/fanucspmg.cpp +++ b/src/mame/skeleton/fanucspmg.cpp @@ -615,9 +615,9 @@ private: uint16_t magic_r(); - DECLARE_WRITE_LINE_MEMBER(vsync_w); - DECLARE_WRITE_LINE_MEMBER(tc_w); - DECLARE_WRITE_LINE_MEMBER(hrq_w); + void vsync_w(int state); + void tc_w(int state); + void hrq_w(int state); MC6845_UPDATE_ROW(crtc_update_row); MC6845_UPDATE_ROW(crtc_update_row_mono); @@ -666,12 +666,12 @@ uint8_t fanucspmg_state::get_slave_ack(offs_t offset) return 0x00; } -WRITE_LINE_MEMBER(fanucspmg_state::tc_w) +void fanucspmg_state::tc_w(int state) { m_fdc->tc_w(state); } -WRITE_LINE_MEMBER(fanucspmg_state::hrq_w) +void fanucspmg_state::hrq_w(int state) { m_maincpu->set_input_line(INPUT_LINE_HALT, state); m_dmac->hlda_w(state); @@ -731,7 +731,7 @@ void fanucspmg_state::maincpu_io(address_map &map) { } -WRITE_LINE_MEMBER(fanucspmg_state::vsync_w) +void fanucspmg_state::vsync_w(int state) { if ((m_vbl_ctrl & 0x08) == 0x08) { diff --git a/src/mame/skeleton/fk1.cpp b/src/mame/skeleton/fk1.cpp index da023edabe3..adec04708a0 100644 --- a/src/mame/skeleton/fk1.cpp +++ b/src/mame/skeleton/fk1.cpp @@ -53,9 +53,9 @@ private: uint8_t ppi3_a_r(); uint8_t ppi3_b_r(); uint8_t ppi3_c_r(); - DECLARE_WRITE_LINE_MEMBER(pit_out0); - DECLARE_WRITE_LINE_MEMBER(pit_out1); - DECLARE_WRITE_LINE_MEMBER(pit_out2); + void pit_out0(int state); + void pit_out1(int state); + void pit_out2(int state); void intr_w(uint8_t data); uint8_t bank_ram_r(); uint8_t bank_rom_r(); @@ -236,22 +236,22 @@ uint8_t fk1_state::ppi3_c_r() return 0; } -WRITE_LINE_MEMBER( fk1_state::pit_out0 ) +void fk1_state::pit_out0(int state) { // System time - logerror("WRITE_LINE_MEMBER(fk1_pit_out0)\n"); + logerror("fk1_pit_out0\n"); } -WRITE_LINE_MEMBER( fk1_state::pit_out1 ) +void fk1_state::pit_out1(int state) { // Timeout for disk operation - logerror("WRITE_LINE_MEMBER(fk1_pit_out1)\n"); + logerror("fk1_pit_out1\n"); } -WRITE_LINE_MEMBER( fk1_state::pit_out2 ) +void fk1_state::pit_out2(int state) { // Overflow for disk operations - logerror("WRITE_LINE_MEMBER(fk1_pit_out2)\n"); + logerror("fk1_pit_out2\n"); } /* diff --git a/src/mame/skeleton/fs3216.cpp b/src/mame/skeleton/fs3216.cpp index be851909343..7d6cb59c4e2 100644 --- a/src/mame/skeleton/fs3216.cpp +++ b/src/mame/skeleton/fs3216.cpp @@ -54,7 +54,7 @@ private: void mmu_reg_w(offs_t offset, u16 data); u16 mmu_read(offs_t offset, u16 mem_mask); void mmu_write(offs_t offset, u16 data, u16 mem_mask); - DECLARE_WRITE_LINE_MEMBER(mmu_reset_w); + void mmu_reset_w(int state); void mmu_init_w(u16 data); u16 irq_r(); @@ -65,10 +65,10 @@ private: u16 earom_recall_r(); u16 earom_store_r(); - DECLARE_WRITE_LINE_MEMBER(fdc_int_w); - DECLARE_WRITE_LINE_MEMBER(fdc_drq_w); - DECLARE_WRITE_LINE_MEMBER(fdc_hdl_w); - DECLARE_WRITE_LINE_MEMBER(floppy_idx_w); + void fdc_int_w(int state); + void fdc_drq_w(int state); + void fdc_hdl_w(int state); + void floppy_idx_w(int state); void fdc_us_w(u8 data); u16 floppy_select_r(offs_t offset); void floppy_select_w(offs_t offset, u16 data); @@ -203,7 +203,7 @@ void fs3216_state::mmu_write(offs_t offset, u16 data, u16 mem_mask) m_clb->write16(clbaddr, data, mem_mask); } -WRITE_LINE_MEMBER(fs3216_state::mmu_reset_w) +void fs3216_state::mmu_reset_w(int state) { if (state) m_from_reset = true; @@ -256,7 +256,7 @@ u16 fs3216_state::earom_store_r() return 0xffff; } -WRITE_LINE_MEMBER(fs3216_state::fdc_int_w) +void fs3216_state::fdc_int_w(int state) { if (state) m_floppy_status |= 0x02; @@ -264,7 +264,7 @@ WRITE_LINE_MEMBER(fs3216_state::fdc_int_w) m_floppy_status &= 0xfd; } -WRITE_LINE_MEMBER(fs3216_state::fdc_drq_w) +void fs3216_state::fdc_drq_w(int state) { if (state) { @@ -282,7 +282,7 @@ WRITE_LINE_MEMBER(fs3216_state::fdc_drq_w) } } -WRITE_LINE_MEMBER(fs3216_state::fdc_hdl_w) +void fs3216_state::fdc_hdl_w(int state) { if (state) m_floppy_status |= 0x40; @@ -290,7 +290,7 @@ WRITE_LINE_MEMBER(fs3216_state::fdc_hdl_w) m_floppy_status &= 0xbf; } -WRITE_LINE_MEMBER(fs3216_state::floppy_idx_w) +void fs3216_state::floppy_idx_w(int state) { if (state) m_floppy_status |= 0x20; diff --git a/src/mame/skeleton/gimix.cpp b/src/mame/skeleton/gimix.cpp index 19331f47d81..e7287c3c456 100644 --- a/src/mame/skeleton/gimix.cpp +++ b/src/mame/skeleton/gimix.cpp @@ -92,8 +92,8 @@ public: private: void system_w(offs_t offset, uint8_t data); - DECLARE_WRITE_LINE_MEMBER(fdc_irq_w); - DECLARE_WRITE_LINE_MEMBER(fdc_drq_w); + void fdc_irq_w(int state); + void fdc_drq_w(int state); uint8_t dma_r(offs_t offset); void dma_w(offs_t offset, uint8_t data); uint8_t fdc_r(offs_t offset); @@ -384,7 +384,7 @@ void gimix_state::pia_pb_w(uint8_t data) } -WRITE_LINE_MEMBER(gimix_state::fdc_irq_w) +void gimix_state::fdc_irq_w(int state) { if(state) m_dma_status |= 0x40; @@ -397,7 +397,7 @@ WRITE_LINE_MEMBER(gimix_state::fdc_irq_w) m_irqs->in_w<6>(0); } -WRITE_LINE_MEMBER(gimix_state::fdc_drq_w) +void gimix_state::fdc_drq_w(int state) { if(state && DMA_ENABLED) { diff --git a/src/mame/skeleton/goupil.cpp b/src/mame/skeleton/goupil.cpp index 59c0e271e71..587029527a3 100644 --- a/src/mame/skeleton/goupil.cpp +++ b/src/mame/skeleton/goupil.cpp @@ -110,7 +110,7 @@ public: void via_video_pba_w(uint8_t data); void via_video_pbb_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(via_video_ca2_w); + void via_video_ca2_w(int state); void goupil_g1(machine_config &config); protected: @@ -467,7 +467,7 @@ void goupil_g1_state::via_video_pbb_w(uint8_t data) m_via_video_pbb_data = data; } -WRITE_LINE_MEMBER( goupil_g1_state::via_video_ca2_w ) +void goupil_g1_state::via_video_ca2_w(int state) { if (!m_old_state_ca2 && state) { diff --git a/src/mame/skeleton/hazeltin.cpp b/src/mame/skeleton/hazeltin.cpp index 6610a88c54a..8ee825e64cc 100644 --- a/src/mame/skeleton/hazeltin.cpp +++ b/src/mame/skeleton/hazeltin.cpp @@ -158,9 +158,9 @@ private: uint8_t kbd_status_latch_r(); uint8_t kbd_encoder_r(); - DECLARE_READ_LINE_MEMBER(ay3600_shift_r); - DECLARE_READ_LINE_MEMBER(ay3600_control_r); - DECLARE_WRITE_LINE_MEMBER(ay3600_data_ready_w); + int ay3600_shift_r(); + int ay3600_control_r(); + void ay3600_data_ready_w(int state); void refresh_address_w(uint8_t data); @@ -364,7 +364,7 @@ uint8_t hazl1500_state::kbd_encoder_r() return m_kbdc->b_r() & 0xff; // TODO: This should go through an 8048, but we have no dump of it currently. } -READ_LINE_MEMBER(hazl1500_state::ay3600_shift_r) +int hazl1500_state::ay3600_shift_r() { // either shift key if (m_kbd_misc_keys->read() & 0x06) @@ -375,7 +375,7 @@ READ_LINE_MEMBER(hazl1500_state::ay3600_shift_r) return 0; } -READ_LINE_MEMBER(hazl1500_state::ay3600_control_r) +int hazl1500_state::ay3600_control_r() { if (m_kbd_misc_keys->read() & 0x08) { @@ -385,7 +385,7 @@ READ_LINE_MEMBER(hazl1500_state::ay3600_control_r) return 0; } -WRITE_LINE_MEMBER(hazl1500_state::ay3600_data_ready_w) +void hazl1500_state::ay3600_data_ready_w(int state) { if (state) m_kbd_status_latch |= KBD_STATUS_KBDR; diff --git a/src/mame/skeleton/hazl1420.cpp b/src/mame/skeleton/hazl1420.cpp index a6320ac73fa..aefc313843b 100644 --- a/src/mame/skeleton/hazl1420.cpp +++ b/src/mame/skeleton/hazl1420.cpp @@ -53,8 +53,8 @@ private: u8 key_r(); - DECLARE_WRITE_LINE_MEMBER(crtc_lbre_w); - DECLARE_WRITE_LINE_MEMBER(crtc_vblank_w); + void crtc_lbre_w(int state); + void crtc_vblank_w(int state); void prog_map(address_map &map); void io_map(address_map &map); @@ -144,13 +144,13 @@ void hazl1420_state::machine_start() { } -WRITE_LINE_MEMBER(hazl1420_state::crtc_lbre_w) +void hazl1420_state::crtc_lbre_w(int state) { if (!state && !m_crtc->vblank_r() && !BIT(m_maincpu->p1_r(), 4)) m_mainint->in_w<0>(1); } -WRITE_LINE_MEMBER(hazl1420_state::crtc_vblank_w) +void hazl1420_state::crtc_vblank_w(int state) { if (state && !BIT(m_maincpu->p1_r(), 4)) m_mainint->in_w<0>(1); diff --git a/src/mame/skeleton/ht68k.cpp b/src/mame/skeleton/ht68k.cpp index e0aa9875897..d1ef4cff9e2 100644 --- a/src/mame/skeleton/ht68k.cpp +++ b/src/mame/skeleton/ht68k.cpp @@ -59,7 +59,7 @@ private: required_device m_fdc; required_device_array m_floppy; - DECLARE_WRITE_LINE_MEMBER(duart_txb); + void duart_txb(int state); void duart_output(uint8_t data); required_shared_ptr m_ram; void machine_reset() override; @@ -93,7 +93,7 @@ void ht68k_state::machine_reset() m_fdc->dden_w(0); } -WRITE_LINE_MEMBER(ht68k_state::duart_txb) +void ht68k_state::duart_txb(int state) { //This is the second serial channel named AUX, for modem or other serial devices. } diff --git a/src/mame/skeleton/icebox.cpp b/src/mame/skeleton/icebox.cpp index 25d8f88ec95..c7daba64b1d 100644 --- a/src/mame/skeleton/icebox.cpp +++ b/src/mame/skeleton/icebox.cpp @@ -180,8 +180,8 @@ public: void icebox(machine_config &config); private: - DECLARE_WRITE_LINE_MEMBER(drq_w); - DECLARE_WRITE_LINE_MEMBER(intrq_w); + void drq_w(int state); + void intrq_w(int state); void mem_map(address_map &map); void io_map(address_map &map); void machine_reset() override; @@ -293,14 +293,14 @@ void icebox_state::port_f1_w(u8 data) } // The next byte from floppy is available. Enable CPU so it can get the NOP byte, via IM0. -WRITE_LINE_MEMBER(icebox_state::drq_w) +void icebox_state::drq_w(int state) { if (BIT(m_f1, 2)) m_maincpu->set_input_line_and_vector(INPUT_LINE_IRQ0, state ? ASSERT_LINE : CLEAR_LINE, 0x00); // Z80 } // The next byte from floppy is available. Enable CPU so it can get the NOP byte, via IM0. -WRITE_LINE_MEMBER(icebox_state::intrq_w) +void icebox_state::intrq_w(int state) { if (BIT(m_f1, 2)) m_maincpu->set_input_line_and_vector(INPUT_LINE_IRQ0, state ? ASSERT_LINE : CLEAR_LINE, 0x00); // Z80 diff --git a/src/mame/skeleton/ikt5a.cpp b/src/mame/skeleton/ikt5a.cpp index a279af01e7e..505ddd15b99 100644 --- a/src/mame/skeleton/ikt5a.cpp +++ b/src/mame/skeleton/ikt5a.cpp @@ -41,8 +41,8 @@ protected: private: u32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(keyboard_clk_w); - DECLARE_WRITE_LINE_MEMBER(keyboard_data_w); + void keyboard_clk_w(int state); + void keyboard_data_w(int state); void eeprom_w(u8 data); void keyboard_ack_w(u8 data); @@ -76,7 +76,7 @@ u32 ikt5a_state::screen_update(screen_device &screen, bitmap_rgb32 &bitmap, cons return 0; } -WRITE_LINE_MEMBER(ikt5a_state::keyboard_clk_w) +void ikt5a_state::keyboard_clk_w(int state) { if (m_keyboard_clk && !state) { @@ -88,7 +88,7 @@ WRITE_LINE_MEMBER(ikt5a_state::keyboard_clk_w) m_keyboard_clk = state; } -WRITE_LINE_MEMBER(ikt5a_state::keyboard_data_w) +void ikt5a_state::keyboard_data_w(int state) { m_keyboard_data = state; } diff --git a/src/mame/skeleton/itt1700_kbd.cpp b/src/mame/skeleton/itt1700_kbd.cpp index e24cb0c2a64..573b7afebf7 100644 --- a/src/mame/skeleton/itt1700_kbd.cpp +++ b/src/mame/skeleton/itt1700_kbd.cpp @@ -49,7 +49,7 @@ void itt1700_keyboard_device::device_start() // line1_w - write from host to control line 1 //------------------------------------------------- -WRITE_LINE_MEMBER(itt1700_keyboard_device::line1_w) +void itt1700_keyboard_device::line1_w(int state) { m_line1_state = state; } @@ -58,7 +58,7 @@ WRITE_LINE_MEMBER(itt1700_keyboard_device::line1_w) // line2_w - write from host to control line 2 //------------------------------------------------- -WRITE_LINE_MEMBER(itt1700_keyboard_device::line2_w) +void itt1700_keyboard_device::line2_w(int state) { m_line2_state = state; } @@ -67,7 +67,7 @@ WRITE_LINE_MEMBER(itt1700_keyboard_device::line2_w) // clock_w - write clock pulse from host //------------------------------------------------- -WRITE_LINE_MEMBER(itt1700_keyboard_device::clock_w) +void itt1700_keyboard_device::clock_w(int state) { if (state && !m_clock) { @@ -85,7 +85,7 @@ WRITE_LINE_MEMBER(itt1700_keyboard_device::clock_w) // sense_r - poll return line //------------------------------------------------- -READ_LINE_MEMBER(itt1700_keyboard_device::sense_r) +int itt1700_keyboard_device::sense_r() { return !BIT(m_keys[m_scan_counter >> 3]->read(), m_scan_counter & 7); } diff --git a/src/mame/skeleton/itt1700_kbd.h b/src/mame/skeleton/itt1700_kbd.h index a5ab19c1e5c..6ffaf5cac29 100644 --- a/src/mame/skeleton/itt1700_kbd.h +++ b/src/mame/skeleton/itt1700_kbd.h @@ -20,10 +20,10 @@ public: itt1700_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock = 0); // host interface - DECLARE_WRITE_LINE_MEMBER(line1_w); - DECLARE_WRITE_LINE_MEMBER(line2_w); - DECLARE_WRITE_LINE_MEMBER(clock_w); - DECLARE_READ_LINE_MEMBER(sense_r); + void line1_w(int state); + void line2_w(int state); + void clock_w(int state); + int sense_r(); protected: // device-specific overrides diff --git a/src/mame/skeleton/itt3030.cpp b/src/mame/skeleton/itt3030.cpp index b17b1a87b8d..5c2176111b0 100644 --- a/src/mame/skeleton/itt3030.cpp +++ b/src/mame/skeleton/itt3030.cpp @@ -254,7 +254,7 @@ private: uint8_t vsync_r(); void beep_w(uint8_t data); void bank_w(uint8_t data); - DECLARE_READ_LINE_MEMBER(kbd_matrix_r); + int kbd_matrix_r(); void kbd_matrix_w(uint8_t data); uint8_t kbd_port2_r(); void kbd_port2_w(uint8_t data); @@ -264,9 +264,9 @@ private: void fdc_cmd_w(uint8_t data); static void itt3030_floppy_formats(format_registration &fr); - DECLARE_WRITE_LINE_MEMBER(fdcirq_w); - DECLARE_WRITE_LINE_MEMBER(fdcdrq_w); - DECLARE_WRITE_LINE_MEMBER(fdchld_w); + void fdcirq_w(int state); + void fdcdrq_w(int state); + void fdchld_w(int state); void itt3030_palette(palette_device &palette) const; void itt3030_io(address_map &map); @@ -334,7 +334,7 @@ void itt3030_state::itt3030_io(address_map &map) // INPUTS //************************************************************************** -READ_LINE_MEMBER(itt3030_state::kbd_matrix_r) +int itt3030_state::kbd_matrix_r() { return m_kbdread; } @@ -562,18 +562,18 @@ void itt3030_state::beep_w(uint8_t data) // FLOPPY //************************************************************************** -WRITE_LINE_MEMBER(itt3030_state::fdcirq_w) +void itt3030_state::fdcirq_w(int state) { m_fdc_irq = state; } -WRITE_LINE_MEMBER(itt3030_state::fdcdrq_w) +void itt3030_state::fdcdrq_w(int state) { m_fdc_drq = state; } -WRITE_LINE_MEMBER(itt3030_state::fdchld_w) +void itt3030_state::fdchld_w(int state) { m_fdc_hld = state; } diff --git a/src/mame/skeleton/kron.cpp b/src/mame/skeleton/kron.cpp index 185c66991a2..b39232b717f 100644 --- a/src/mame/skeleton/kron.cpp +++ b/src/mame/skeleton/kron.cpp @@ -147,7 +147,7 @@ public: private: uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(keyb_interrupt); + void keyb_interrupt(int state); void sn74259_w(offs_t offset, uint8_t data) { LOGIO("%s %02x = %02x\n", FUNCNAME, offset & 0x07, offset & 0x08 ? 1 : 0); } void ap5_w(offs_t offset, uint8_t data) { LOGIO("%s %02x = %02x\n", FUNCNAME, offset, data); } uint8_t ap5_r(offs_t offset) { LOGIO("%s() %02x = %02x\n", FUNCNAME, offset, 1); return 1; } @@ -274,7 +274,7 @@ INTERRUPT_GEN_MEMBER(kron180_state::interrupt) } #endif -WRITE_LINE_MEMBER(kron180_state::keyb_interrupt) +void kron180_state::keyb_interrupt(int state) { if(state && (m_kbd_data = m_keyboard->read())) { diff --git a/src/mame/skeleton/mfabfz.cpp b/src/mame/skeleton/mfabfz.cpp index b6c15e8b448..fee72cf1e6e 100644 --- a/src/mame/skeleton/mfabfz.cpp +++ b/src/mame/skeleton/mfabfz.cpp @@ -78,8 +78,8 @@ private: void mfabfz_mem(address_map &map); void machine_reset() override; void machine_start() override; - DECLARE_WRITE_LINE_MEMBER(kansas_r); - DECLARE_WRITE_LINE_MEMBER(kansas_w); + void kansas_r(int state); + void kansas_w(int state); u8 m_cass_data[5]{}; bool m_cassoutbit = false, m_cassbit = false, m_cassold = false; required_device m_maincpu; @@ -116,7 +116,7 @@ INPUT_PORTS_END // Note: if the other baud rates are to be supported, then this function // will need to be redesigned. -WRITE_LINE_MEMBER( mfabfz_state::kansas_w ) +void mfabfz_state::kansas_w(int state) { if ((m_cass->get_state() & CASSETTE_MASK_UISTATE) == CASSETTE_RECORD) { @@ -157,7 +157,7 @@ WRITE_LINE_MEMBER( mfabfz_state::kansas_w ) m_uart->write_txc(state); } -WRITE_LINE_MEMBER(mfabfz_state::kansas_r) +void mfabfz_state::kansas_r(int state) { // incoming @76923Hz if (state) diff --git a/src/mame/skeleton/micro20.cpp b/src/mame/skeleton/micro20.cpp index a6cd78a777d..4c793dab3a8 100644 --- a/src/mame/skeleton/micro20.cpp +++ b/src/mame/skeleton/micro20.cpp @@ -55,15 +55,15 @@ private: virtual void machine_start() override; virtual void machine_reset() override; - DECLARE_WRITE_LINE_MEMBER(m68k_reset_callback); + void m68k_reset_callback(int state); u32 buserror_r(); TIMER_DEVICE_CALLBACK_MEMBER(micro20_timer); - DECLARE_WRITE_LINE_MEMBER(h4_w); + void h4_w(int state); void portb_w(u8 data); void portc_w(u8 data); - DECLARE_WRITE_LINE_MEMBER(timerirq_w) + void timerirq_w(int state) { m_maincpu->set_input_line(M68K_IRQ_4, state); } @@ -99,13 +99,13 @@ TIMER_DEVICE_CALLBACK_MEMBER(micro20_state::micro20_timer) m_tin ^= 1; } -WRITE_LINE_MEMBER(micro20_state::h4_w) +void micro20_state::h4_w(int state) { printf("h4_w: %d\n", state); m_h4 = state ^ 1; } -WRITE_LINE_MEMBER(micro20_state::m68k_reset_callback) +void micro20_state::m68k_reset_callback(int state) { // startup test explicitly checks if the m68k RESET opcode resets the 68230 m_pit->reset(); diff --git a/src/mame/skeleton/micromon.cpp b/src/mame/skeleton/micromon.cpp index 83436b56309..ab36ed4037c 100644 --- a/src/mame/skeleton/micromon.cpp +++ b/src/mame/skeleton/micromon.cpp @@ -36,7 +36,7 @@ public: void micromon(machine_config &config); private: - DECLARE_READ_LINE_MEMBER(clear_r); + int clear_r(); void io_map(address_map &map); void mem_map(address_map &map); @@ -59,7 +59,7 @@ void micromon_state::io_map(address_map &map) static INPUT_PORTS_START( micromon ) INPUT_PORTS_END -READ_LINE_MEMBER( micromon_state::clear_r ) +int micromon_state::clear_r() { if (m_resetcnt < 0x10) m_maincpu->set_state_int(cosmac_device::COSMAC_R0, 0x0000); diff --git a/src/mame/skeleton/micronic.cpp b/src/mame/skeleton/micronic.cpp index ee630def976..57140fb96ab 100644 --- a/src/mame/skeleton/micronic.cpp +++ b/src/mame/skeleton/micronic.cpp @@ -348,7 +348,7 @@ void micronic_state::machine_reset() } -WRITE_LINE_MEMBER( micronic_state::mc146818_irq ) +void micronic_state::mc146818_irq(int state) { m_maincpu->set_input_line(0, state ? HOLD_LINE : CLEAR_LINE); } diff --git a/src/mame/skeleton/micronic.h b/src/mame/skeleton/micronic.h index 23694bd18f7..9114b5726ba 100644 --- a/src/mame/skeleton/micronic.h +++ b/src/mame/skeleton/micronic.h @@ -71,7 +71,7 @@ private: void rtc_address_w(uint8_t data); uint8_t rtc_data_r(); void rtc_data_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER( mc146818_irq ); + void mc146818_irq(int state); void micronic_palette(palette_device &palette) const; diff --git a/src/mame/skeleton/miniframe.cpp b/src/mame/skeleton/miniframe.cpp index a0aff737f19..5619d057cca 100644 --- a/src/mame/skeleton/miniframe.cpp +++ b/src/mame/skeleton/miniframe.cpp @@ -58,8 +58,8 @@ private: void general_ctrl_w(uint16_t data); - DECLARE_WRITE_LINE_MEMBER( wd2797_intrq_w ); - DECLARE_WRITE_LINE_MEMBER( wd2797_drq_w ); + void wd2797_intrq_w(int state); + void wd2797_drq_w(int state); required_shared_ptr m_mapram; diff --git a/src/mame/skeleton/mmd1.cpp b/src/mame/skeleton/mmd1.cpp index c0d76f13271..4ac4fdb697e 100644 --- a/src/mame/skeleton/mmd1.cpp +++ b/src/mame/skeleton/mmd1.cpp @@ -112,10 +112,10 @@ private: void round_leds_w(offs_t offset, u8 data); u8 keyboard_r(); u8 port13_r(); - DECLARE_READ_LINE_MEMBER(si); - DECLARE_WRITE_LINE_MEMBER(so); + int si(); + void so(int state); TIMER_DEVICE_CALLBACK_MEMBER(kansas_r); - DECLARE_WRITE_LINE_MEMBER(kansas_w); + void kansas_w(int state); void io_map(address_map &map); void mem_map(address_map &map); @@ -176,17 +176,17 @@ u8 mmd1_state::port13_r() return data; } -READ_LINE_MEMBER( mmd1_state::si ) +int mmd1_state::si() { return m_cassinbit; } -WRITE_LINE_MEMBER( mmd1_state::so ) +void mmd1_state::so(int state) { m_cassoutbit = state; } -WRITE_LINE_MEMBER( mmd1_state::kansas_w ) +void mmd1_state::kansas_w(int state) { if ((m_cass->get_state() & CASSETTE_MASK_UISTATE) == CASSETTE_RECORD) { diff --git a/src/mame/skeleton/mstation.cpp b/src/mame/skeleton/mstation.cpp index 0f2e47b139f..9c0712295f4 100644 --- a/src/mame/skeleton/mstation.cpp +++ b/src/mame/skeleton/mstation.cpp @@ -98,7 +98,7 @@ private: void irq_w(uint8_t data); void refresh_ints(); - DECLARE_WRITE_LINE_MEMBER( rtc_irq ); + void rtc_irq(int state); uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void mstation_palette(palette_device &palette) const; @@ -417,7 +417,7 @@ void mstation_state::machine_reset() m_bankdev2->set_bank(0); } -WRITE_LINE_MEMBER( mstation_state::rtc_irq ) +void mstation_state::rtc_irq(int state) { if (state) m_irq |= (1<<5); diff --git a/src/mame/skeleton/ngen.cpp b/src/mame/skeleton/ngen.cpp index 614a3020d4b..d2d4c7c87c5 100644 --- a/src/mame/skeleton/ngen.cpp +++ b/src/mame/skeleton/ngen.cpp @@ -112,16 +112,16 @@ protected: uint8_t hd_buffer_r(offs_t offset); void hd_buffer_w(offs_t offset, uint8_t data); - DECLARE_WRITE_LINE_MEMBER(pit_out0_w); - DECLARE_WRITE_LINE_MEMBER(pit_out1_w); - DECLARE_WRITE_LINE_MEMBER(pit_out2_w); - - DECLARE_WRITE_LINE_MEMBER(dma_hrq_changed); - DECLARE_WRITE_LINE_MEMBER(dma_eop_changed); - DECLARE_WRITE_LINE_MEMBER(dack0_w); - DECLARE_WRITE_LINE_MEMBER(dack1_w); - DECLARE_WRITE_LINE_MEMBER(dack2_w); - DECLARE_WRITE_LINE_MEMBER(dack3_w); + void pit_out0_w(int state); + void pit_out1_w(int state); + void pit_out2_w(int state); + + void dma_hrq_changed(int state); + void dma_eop_changed(int state); + void dack0_w(int state); + void dack1_w(int state); + void dack2_w(int state); + void dack3_w(int state); uint8_t dma_read_word(offs_t offset); void dma_write_word(offs_t offset, uint8_t data); // TODO: sort out what devices use which channels @@ -136,9 +136,9 @@ protected: MC6845_UPDATE_ROW(crtc_update_row); - DECLARE_WRITE_LINE_MEMBER(timer_clk_out); + void timer_clk_out(int state); - DECLARE_WRITE_LINE_MEMBER(fdc_irq_w); + void fdc_irq_w(int state); void ngen386_io(address_map &map); void ngen386_mem(address_map &map); @@ -164,11 +164,11 @@ private: void xbus_w(uint16_t data); uint16_t xbus_r(); - DECLARE_WRITE_LINE_MEMBER(cpu_timer_w); + void cpu_timer_w(int state); void hfd_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); uint16_t hfd_r(offs_t offset, uint16_t mem_mask = ~0); - [[maybe_unused]] DECLARE_WRITE_LINE_MEMBER(fdc_drq_w); + [[maybe_unused]] void fdc_drq_w(int state); void fdc_control_w(uint8_t data); uint8_t irq_cb(); void hdc_control_w(uint8_t data); @@ -218,34 +218,34 @@ public: private: }; -WRITE_LINE_MEMBER(ngen_state::pit_out0_w) +void ngen_state::pit_out0_w(int state) { m_pic->ir3_w(state); // Timer interrupt popmessage("PIT Timer 0 state %i\n",state); } -WRITE_LINE_MEMBER(ngen_state::pit_out1_w) +void ngen_state::pit_out1_w(int state) { popmessage("PIT Timer 1 state %i\n",state); m_iouart->rxcb_w(state); m_iouart->txcb_w(state); // channels in the correct order? } -WRITE_LINE_MEMBER(ngen_state::pit_out2_w) +void ngen_state::pit_out2_w(int state) { m_iouart->rxca_w(state); m_iouart->txca_w(state); popmessage("PIT Timer 2 state %i\n",state); } -WRITE_LINE_MEMBER(ngen_state::cpu_timer_w) +void ngen_state::cpu_timer_w(int state) { if(state != 0) popmessage("80186 Timer 0 state %i\n",state); m_pic->ir5_w(state); } -WRITE_LINE_MEMBER(ngen_state::timer_clk_out) +void ngen_state::timer_clk_out(int state) { m_viduart->write_rxc(state); // Keyboard UART Rx/Tx clocks m_viduart->write_txc(state); @@ -601,12 +601,12 @@ uint16_t ngen_state::hfd_r(offs_t offset, uint16_t mem_mask) return ret; } -WRITE_LINE_MEMBER(ngen_state::fdc_irq_w) +void ngen_state::fdc_irq_w(int state) { m_pic->ir7_w(state); } -WRITE_LINE_MEMBER(ngen_state::fdc_drq_w) +void ngen_state::fdc_drq_w(int state) { m_dmac->dreq3_w(state); } @@ -661,7 +661,7 @@ void ngen_state::hd_buffer_w(offs_t offset, uint8_t data) m_hd_buffer[offset] = data; } -WRITE_LINE_MEMBER( ngen_state::dma_hrq_changed ) +void ngen_state::dma_hrq_changed(int state) { if(m_maincpu) m_maincpu->set_input_line(INPUT_LINE_HALT, state ? ASSERT_LINE : CLEAR_LINE); @@ -669,7 +669,7 @@ WRITE_LINE_MEMBER( ngen_state::dma_hrq_changed ) m_i386cpu->set_input_line(INPUT_LINE_HALT, state ? ASSERT_LINE : CLEAR_LINE); } -WRITE_LINE_MEMBER( ngen_state::dma_eop_changed ) +void ngen_state::dma_eop_changed(int state) { if(m_dma_channel == 0) { @@ -696,10 +696,10 @@ void ngen_state::set_dma_channel(int channel, int state) m_dma_channel = -1; } -WRITE_LINE_MEMBER( ngen_state::dack0_w ) { set_dma_channel(0, state); } -WRITE_LINE_MEMBER( ngen_state::dack1_w ) { set_dma_channel(1, state); } -WRITE_LINE_MEMBER( ngen_state::dack2_w ) { set_dma_channel(2, state); } -WRITE_LINE_MEMBER( ngen_state::dack3_w ) { set_dma_channel(3, state); } +void ngen_state::dack0_w(int state) { set_dma_channel(0, state); } +void ngen_state::dack1_w(int state) { set_dma_channel(1, state); } +void ngen_state::dack2_w(int state) { set_dma_channel(2, state); } +void ngen_state::dack3_w(int state) { set_dma_channel(3, state); } uint8_t ngen_state::dma_3_dack_r() { diff --git a/src/mame/skeleton/p8k.cpp b/src/mame/skeleton/p8k.cpp index 31b795d3cc9..1a43f001b16 100644 --- a/src/mame/skeleton/p8k.cpp +++ b/src/mame/skeleton/p8k.cpp @@ -103,10 +103,10 @@ private: void port0_w(offs_t offset, uint8_t data); DECLARE_MACHINE_RESET(p8k); - [[maybe_unused]] DECLARE_WRITE_LINE_MEMBER(fdc_irq); - DECLARE_WRITE_LINE_MEMBER(p8k_daisy_interrupt); - DECLARE_WRITE_LINE_MEMBER(p8k_dma_irq_w); - DECLARE_WRITE_LINE_MEMBER(p8k_16_daisy_interrupt ); + [[maybe_unused]] void fdc_irq(int state); + void p8k_daisy_interrupt(int state); + void p8k_dma_irq_w(int state); + void p8k_16_daisy_interrupt(int state); uint8_t memory_read_byte(offs_t offset); void memory_write_byte(offs_t offset, uint8_t data); uint8_t io_read_byte(offs_t offset); @@ -204,14 +204,14 @@ void p8k_state::port0_w(offs_t offset, uint8_t data) ****************************************************************************/ -WRITE_LINE_MEMBER( p8k_state::p8k_daisy_interrupt ) +void p8k_state::p8k_daisy_interrupt(int state) { m_maincpu->set_input_line(0, state); } /* Z80 DMA */ -WRITE_LINE_MEMBER( p8k_state::p8k_dma_irq_w ) +void p8k_state::p8k_dma_irq_w(int state) { m_i8272->tc_w(state); p8k_daisy_interrupt(state); @@ -259,7 +259,7 @@ static const z80_daisy_config p8k_daisy_chain[] = /* Intel 8272 Interface */ -DECLARE_WRITE_LINE_MEMBER( p8k_state::fdc_irq ) +void p8k_state::fdc_irq(int state) { m_pio2->port_b_write(state ? 0x10 : 0x00); } @@ -368,7 +368,7 @@ void p8k_state::p8k_16_iomap(address_map &map) ****************************************************************************/ -WRITE_LINE_MEMBER( p8k_state::p8k_16_daisy_interrupt ) +void p8k_state::p8k_16_daisy_interrupt(int state) { m_maincpu->set_input_line(z8001_device::VI_LINE, state ? ASSERT_LINE : CLEAR_LINE); } diff --git a/src/mame/skeleton/pencil2.cpp b/src/mame/skeleton/pencil2.cpp index a164ea14c8a..89a9e09ce70 100644 --- a/src/mame/skeleton/pencil2.cpp +++ b/src/mame/skeleton/pencil2.cpp @@ -114,8 +114,8 @@ public: void pencil2(machine_config &config); - DECLARE_READ_LINE_MEMBER(printer_ready_r); - DECLARE_READ_LINE_MEMBER(printer_ack_r); + int printer_ready_r(); + int printer_ack_r(); private: void port10_w(u8 data); @@ -123,8 +123,8 @@ private: void port80_w(u8 data); void portc0_w(u8 data); u8 porte2_r(); - DECLARE_WRITE_LINE_MEMBER(write_centronics_ack); - DECLARE_WRITE_LINE_MEMBER(write_centronics_busy); + void write_centronics_ack(int state); + void write_centronics_busy(int state); void io_map(address_map &map); void mem_map(address_map &map); @@ -194,22 +194,22 @@ void pencil2_state::portc0_w(u8 data) { } -WRITE_LINE_MEMBER( pencil2_state::write_centronics_busy ) +void pencil2_state::write_centronics_busy(int state) { m_centronics_busy = state; } -READ_LINE_MEMBER( pencil2_state::printer_ready_r ) +int pencil2_state::printer_ready_r() { return m_centronics_busy; } -WRITE_LINE_MEMBER( pencil2_state::write_centronics_ack ) +void pencil2_state::write_centronics_ack(int state) { m_centronics_ack = state; } -READ_LINE_MEMBER( pencil2_state::printer_ack_r ) +int pencil2_state::printer_ack_r() { return m_centronics_ack; } diff --git a/src/mame/skeleton/proteus3.cpp b/src/mame/skeleton/proteus3.cpp index 3da71c4bf2d..533f59c0cd8 100644 --- a/src/mame/skeleton/proteus3.cpp +++ b/src/mame/skeleton/proteus3.cpp @@ -85,30 +85,30 @@ protected: virtual void machine_start() override; private: - DECLARE_WRITE_LINE_MEMBER(ca2_w); + void ca2_w(int state); void video_w(u8 data); void kbd_put(u8 data); - DECLARE_WRITE_LINE_MEMBER(acia1_clock_w); + void acia1_clock_w(int state); TIMER_DEVICE_CALLBACK_MEMBER(kansas_r); u32 screen_update_proteus3(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); // Clocks void write_acia_clocks(int id, int state); - DECLARE_WRITE_LINE_MEMBER (write_f1_clock){ write_acia_clocks(mc14411_device::TIMER_F1, state); } - DECLARE_WRITE_LINE_MEMBER (write_f2_clock){ write_acia_clocks(mc14411_device::TIMER_F2, state); } - DECLARE_WRITE_LINE_MEMBER (write_f3_clock){ write_acia_clocks(mc14411_device::TIMER_F3, state); } - DECLARE_WRITE_LINE_MEMBER (write_f4_clock){ write_acia_clocks(mc14411_device::TIMER_F4, state); } - DECLARE_WRITE_LINE_MEMBER (write_f5_clock){ write_acia_clocks(mc14411_device::TIMER_F5, state); } - DECLARE_WRITE_LINE_MEMBER (write_f6_clock){ write_acia_clocks(mc14411_device::TIMER_F6, state); } - DECLARE_WRITE_LINE_MEMBER (write_f7_clock){ write_acia_clocks(mc14411_device::TIMER_F7, state); } - DECLARE_WRITE_LINE_MEMBER (write_f8_clock){ write_acia_clocks(mc14411_device::TIMER_F8, state); } - DECLARE_WRITE_LINE_MEMBER (write_f9_clock){ write_acia_clocks(mc14411_device::TIMER_F9, state); } - DECLARE_WRITE_LINE_MEMBER (write_f10_clock){ write_acia_clocks(mc14411_device::TIMER_F10, state); } - DECLARE_WRITE_LINE_MEMBER (write_f11_clock){ write_acia_clocks(mc14411_device::TIMER_F11, state); } - DECLARE_WRITE_LINE_MEMBER (write_f12_clock){ write_acia_clocks(mc14411_device::TIMER_F12, state); } - DECLARE_WRITE_LINE_MEMBER (write_f13_clock){ write_acia_clocks(mc14411_device::TIMER_F13, state); } - DECLARE_WRITE_LINE_MEMBER (write_f14_clock){ write_acia_clocks(mc14411_device::TIMER_F14, state); } - DECLARE_WRITE_LINE_MEMBER (write_f15_clock){ write_acia_clocks(mc14411_device::TIMER_F15, state); } + void write_f1_clock(int state) { write_acia_clocks(mc14411_device::TIMER_F1, state); } + void write_f2_clock(int state) { write_acia_clocks(mc14411_device::TIMER_F2, state); } + void write_f3_clock(int state) { write_acia_clocks(mc14411_device::TIMER_F3, state); } + void write_f4_clock(int state) { write_acia_clocks(mc14411_device::TIMER_F4, state); } + void write_f5_clock(int state) { write_acia_clocks(mc14411_device::TIMER_F5, state); } + void write_f6_clock(int state) { write_acia_clocks(mc14411_device::TIMER_F6, state); } + void write_f7_clock(int state) { write_acia_clocks(mc14411_device::TIMER_F7, state); } + void write_f8_clock(int state) { write_acia_clocks(mc14411_device::TIMER_F8, state); } + void write_f9_clock(int state) { write_acia_clocks(mc14411_device::TIMER_F9, state); } + void write_f10_clock(int state) { write_acia_clocks(mc14411_device::TIMER_F10, state); } + void write_f11_clock(int state) { write_acia_clocks(mc14411_device::TIMER_F11, state); } + void write_f12_clock(int state) { write_acia_clocks(mc14411_device::TIMER_F12, state); } + void write_f13_clock(int state) { write_acia_clocks(mc14411_device::TIMER_F13, state); } + void write_f14_clock(int state) { write_acia_clocks(mc14411_device::TIMER_F14, state); } + void write_f15_clock(int state) { write_acia_clocks(mc14411_device::TIMER_F15, state); } void mem_map(address_map &map); @@ -220,7 +220,7 @@ TIMER_DEVICE_CALLBACK_MEMBER( proteus3_state::kansas_r ) } } -WRITE_LINE_MEMBER( proteus3_state::acia1_clock_w ) +void proteus3_state::acia1_clock_w(int state) { // Save - 8N2 - /16 - 600baud // Load - 8N2 - /1 @@ -257,7 +257,7 @@ void proteus3_state::video_w(u8 data) m_video_data = data; } -WRITE_LINE_MEMBER( proteus3_state::ca2_w ) +void proteus3_state::ca2_w(int state) { if (state) { diff --git a/src/mame/skeleton/pt68k4.cpp b/src/mame/skeleton/pt68k4.cpp index 37627775faa..808138282cc 100644 --- a/src/mame/skeleton/pt68k4.cpp +++ b/src/mame/skeleton/pt68k4.cpp @@ -123,13 +123,13 @@ private: void fdc_select_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(duart1_irq); - [[maybe_unused]] DECLARE_WRITE_LINE_MEMBER(duart2_irq); + void duart1_irq(int state); + [[maybe_unused]] void duart2_irq(int state); - DECLARE_WRITE_LINE_MEMBER(irq5_w); + void irq5_w(int state); - DECLARE_WRITE_LINE_MEMBER(keyboard_clock_w); - DECLARE_WRITE_LINE_MEMBER(keyboard_data_w); + void keyboard_clock_w(int state); + void keyboard_data_w(int state); static void floppy_formats(format_registration &fr); @@ -170,7 +170,7 @@ static void pt68k_floppies(device_slot_interface &device) } // XT keyboard interface - done in TTL instead of an 804x -WRITE_LINE_MEMBER(pt68k4_state::keyboard_clock_w) +void pt68k4_state::keyboard_clock_w(int state) { // printf("KCLK: %d\n", state ? 1 : 0); @@ -200,7 +200,7 @@ WRITE_LINE_MEMBER(pt68k4_state::keyboard_clock_w) m_kclk = (state == ASSERT_LINE) ? true : false; } -WRITE_LINE_MEMBER(pt68k4_state::keyboard_data_w) +void pt68k4_state::keyboard_data_w(int state) { // printf("KDATA: %d\n", state ? 1 : 0); m_kdata = (state == ASSERT_LINE) ? 0x80 : 0x00; @@ -381,19 +381,19 @@ void pt68k4_state::irq5_update() } } -WRITE_LINE_MEMBER(pt68k4_state::duart1_irq) +void pt68k4_state::duart1_irq(int state) { m_irq5_duart1 = state; irq5_update(); } -WRITE_LINE_MEMBER(pt68k4_state::irq5_w) +void pt68k4_state::irq5_w(int state) { m_irq5_isa = state; irq5_update(); } -WRITE_LINE_MEMBER(pt68k4_state::duart2_irq) +void pt68k4_state::duart2_irq(int state) { m_maincpu->set_input_line(M68K_IRQ_4, state); } diff --git a/src/mame/skeleton/qtsbc.cpp b/src/mame/skeleton/qtsbc.cpp index d8647515c58..68e172a83c2 100644 --- a/src/mame/skeleton/qtsbc.cpp +++ b/src/mame/skeleton/qtsbc.cpp @@ -100,8 +100,8 @@ private: void memory_w(offs_t offset, u8 data); u8 io_r(offs_t offset); void io_w(offs_t offset, u8 data); - DECLARE_WRITE_LINE_MEMBER(rts_loopback_w); - DECLARE_WRITE_LINE_MEMBER(dtr_loopback_w); + void rts_loopback_w(int state); + void dtr_loopback_w(int state); virtual void machine_start() override; virtual void machine_reset() override; @@ -239,7 +239,7 @@ void qtsbc_state::io_w(offs_t offset, u8 data) } } -WRITE_LINE_MEMBER(qtsbc_state::rts_loopback_w) +void qtsbc_state::rts_loopback_w(int state) { // Filtered through this routine to avoid infinite loops if (state != bool(m_rts)) @@ -249,7 +249,7 @@ WRITE_LINE_MEMBER(qtsbc_state::rts_loopback_w) } } -WRITE_LINE_MEMBER(qtsbc_state::dtr_loopback_w) +void qtsbc_state::dtr_loopback_w(int state) { // Filtered through this routine to avoid infinite loops if (state != bool(m_dtr)) diff --git a/src/mame/skeleton/rd100.cpp b/src/mame/skeleton/rd100.cpp index 4549e7b5ff2..b6f41dce427 100644 --- a/src/mame/skeleton/rd100.cpp +++ b/src/mame/skeleton/rd100.cpp @@ -49,8 +49,8 @@ private: uint8_t keys_r(); void key_scan_w(uint8_t data); - DECLARE_READ_LINE_MEMBER( shift_r ); - DECLARE_READ_LINE_MEMBER( ctrl_r ); + int shift_r(); + int ctrl_r(); void mem_map(address_map &map); @@ -97,7 +97,7 @@ void rd100_state::key_scan_w(uint8_t data) m_key_scan = data; } -READ_LINE_MEMBER(rd100_state::shift_r) +int rd100_state::shift_r() { if (m_shift) { @@ -110,7 +110,7 @@ READ_LINE_MEMBER(rd100_state::shift_r) return ky; } -READ_LINE_MEMBER(rd100_state::ctrl_r) +int rd100_state::ctrl_r() { if (m_ctrl) { diff --git a/src/mame/skeleton/sb8085.cpp b/src/mame/skeleton/sb8085.cpp index 2bf98763ba3..3aa10767f5e 100644 --- a/src/mame/skeleton/sb8085.cpp +++ b/src/mame/skeleton/sb8085.cpp @@ -81,12 +81,12 @@ private: void mem_w(offs_t offset, u8 data); u8 in_r(offs_t offset); void out_w(offs_t offset, u8 data); - DECLARE_WRITE_LINE_MEMBER(phantom_disable_w); + void phantom_disable_w(int state); - DECLARE_WRITE_LINE_MEMBER(printer_select_w); - DECLARE_WRITE_LINE_MEMBER(usart_txd_w); - DECLARE_WRITE_LINE_MEMBER(crt_rts_w); - DECLARE_WRITE_LINE_MEMBER(printer_rts_w); + void printer_select_w(int state); + void usart_txd_w(int state); + void crt_rts_w(int state); + void printer_rts_w(int state); void mem_map(address_map &map); void io_map(address_map &map); @@ -199,13 +199,13 @@ void sb8085_state::out_w(offs_t offset, u8 data) m_s100->sout_w(offset, data); } -WRITE_LINE_MEMBER(sb8085_state::phantom_disable_w) +void sb8085_state::phantom_disable_w(int state) { if (!state) m_phantom = true; } -WRITE_LINE_MEMBER(sb8085_state::printer_select_w) +void sb8085_state::printer_select_w(int state) { if (state && m_printer_select) { @@ -223,7 +223,7 @@ WRITE_LINE_MEMBER(sb8085_state::printer_select_w) } } -WRITE_LINE_MEMBER(sb8085_state::usart_txd_w) +void sb8085_state::usart_txd_w(int state) { m_usart_txd = state; if (m_printer_select) @@ -232,14 +232,14 @@ WRITE_LINE_MEMBER(sb8085_state::usart_txd_w) m_crt->write_txd(state); } -WRITE_LINE_MEMBER(sb8085_state::crt_rts_w) +void sb8085_state::crt_rts_w(int state) { m_crt_rts = state; if (!m_printer_select) m_usart->write_cts(state); } -WRITE_LINE_MEMBER(sb8085_state::printer_rts_w) +void sb8085_state::printer_rts_w(int state) { m_printer_rts = state; if (m_printer_select) diff --git a/src/mame/skeleton/sbrain.cpp b/src/mame/skeleton/sbrain.cpp index 26633e1a00b..7b7eb6728bb 100644 --- a/src/mame/skeleton/sbrain.cpp +++ b/src/mame/skeleton/sbrain.cpp @@ -107,13 +107,13 @@ private: u32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); TIMER_DEVICE_CALLBACK_MEMBER(kbd_scan); - DECLARE_WRITE_LINE_MEMBER(crtc_lrc_w); - DECLARE_WRITE_LINE_MEMBER(crtc_vblank_w); - DECLARE_WRITE_LINE_MEMBER(crtc_vsync_w); + void crtc_lrc_w(int state); + void crtc_vblank_w(int state); + void crtc_vsync_w(int state); - DECLARE_WRITE_LINE_MEMBER(external_txc_w); - DECLARE_WRITE_LINE_MEMBER(external_rxc_w); - DECLARE_WRITE_LINE_MEMBER(internal_txc_rxc_w); + void external_txc_w(int state); + void external_rxc_w(int state); + void internal_txc_rxc_w(int state); void main_io_map(address_map &map); void main_mem_map(address_map &map); @@ -356,19 +356,19 @@ void sbrain_state::ppi_pc_w(u8 data) m_busak = BIT(data, 5); } -WRITE_LINE_MEMBER(sbrain_state::external_txc_w) +void sbrain_state::external_txc_w(int state) { if (!BIT(m_serial_sw->read(), 0)) m_usart[1]->write_txc(state); } -WRITE_LINE_MEMBER(sbrain_state::external_rxc_w) +void sbrain_state::external_rxc_w(int state) { if (!BIT(m_serial_sw->read(), 2)) m_usart[1]->write_rxc(state); } -WRITE_LINE_MEMBER(sbrain_state::internal_txc_rxc_w) +void sbrain_state::internal_txc_rxc_w(int state) { if (!BIT(m_serial_sw->read(), 1)) m_usart[1]->write_txc(state); @@ -564,20 +564,20 @@ TIMER_DEVICE_CALLBACK_MEMBER(sbrain_state::kbd_scan) m_key_data = 0xff; } -WRITE_LINE_MEMBER(sbrain_state::crtc_lrc_w) +void sbrain_state::crtc_lrc_w(int state) { // TODO: actually triggered by BUSACK and taken after DMA burst finishes if (state && !m_crtc->lbre_r() && !m_crtc->vblank_r()) m_maincpu->set_input_line(INPUT_LINE_IRQ0, ASSERT_LINE); } -WRITE_LINE_MEMBER(sbrain_state::crtc_vblank_w) +void sbrain_state::crtc_vblank_w(int state) { if (state) m_maincpu->set_input_line(INPUT_LINE_IRQ0, ASSERT_LINE); } -WRITE_LINE_MEMBER(sbrain_state::crtc_vsync_w) +void sbrain_state::crtc_vsync_w(int state) { // TODO: internal to the CRT8002 if (!state) diff --git a/src/mame/skeleton/scopus.cpp b/src/mame/skeleton/scopus.cpp index bd98dc630ad..ebf5e369d8c 100644 --- a/src/mame/skeleton/scopus.cpp +++ b/src/mame/skeleton/scopus.cpp @@ -50,7 +50,7 @@ public: void init_sagitta180(); private: - DECLARE_WRITE_LINE_MEMBER(hrq_w); + void hrq_w(int state); uint8_t memory_read_byte(offs_t offset); I8275_DRAW_CHARACTER_MEMBER(crtc_display_pixels); @@ -163,7 +163,7 @@ static INPUT_PORTS_START( sagitta180 ) PORT_DIPUNKNOWN_DIPLOC( 0x80, 0x00, "SW1:1" ) INPUT_PORTS_END -WRITE_LINE_MEMBER(sagitta180_state::hrq_w) +void sagitta180_state::hrq_w(int state) { m_maincpu->set_input_line(INPUT_LINE_HALT, state); m_dma8257->hlda_w(state); diff --git a/src/mame/skeleton/si5500.cpp b/src/mame/skeleton/si5500.cpp index de5e6165ed4..9daba242bfc 100644 --- a/src/mame/skeleton/si5500.cpp +++ b/src/mame/skeleton/si5500.cpp @@ -39,11 +39,11 @@ protected: private: void mainic_w(offs_t offset, u8 data); - DECLARE_WRITE_LINE_MEMBER(gpib_int_w); - DECLARE_WRITE_LINE_MEMBER(acc_int_w); + void gpib_int_w(int state); + void acc_int_w(int state); u8 gpibpsi_input_r(offs_t offset); - DECLARE_WRITE_LINE_MEMBER(gpibc_we_w); - DECLARE_WRITE_LINE_MEMBER(gpibc_dbin_w); + void gpibc_we_w(int state); + void gpibc_dbin_w(int state); u8 keypad_r(offs_t offset); void mem_map(address_map &map); @@ -73,12 +73,12 @@ void si5500_state::mainic_w(offs_t offset, u8 data) m_maincpu->set_input_line(INT_9980A_CLEAR, CLEAR_LINE); } -WRITE_LINE_MEMBER(si5500_state::gpib_int_w) +void si5500_state::gpib_int_w(int state) { m_mainpsi->set_int_line(4, state); } -WRITE_LINE_MEMBER(si5500_state::acc_int_w) +void si5500_state::acc_int_w(int state) { m_mainpsi->set_int_line(5, state); } @@ -102,7 +102,7 @@ u8 si5500_state::gpibpsi_input_r(offs_t offset) } } -WRITE_LINE_MEMBER(si5500_state::gpibc_we_w) +void si5500_state::gpibc_we_w(int state) { if (!state) { @@ -111,7 +111,7 @@ WRITE_LINE_MEMBER(si5500_state::gpibc_we_w) } } -WRITE_LINE_MEMBER(si5500_state::gpibc_dbin_w) +void si5500_state::gpibc_dbin_w(int state) { if (state) { diff --git a/src/mame/skeleton/squale.cpp b/src/mame/skeleton/squale.cpp index d862c175449..05b866152ea 100644 --- a/src/mame/skeleton/squale.cpp +++ b/src/mame/skeleton/squale.cpp @@ -147,10 +147,10 @@ private: void ay_porta_w(uint8_t data); void ay_portb_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(pia_u72_ca2_w); - DECLARE_WRITE_LINE_MEMBER(pia_u72_cb2_w); + void pia_u72_ca2_w(int state); + void pia_u72_cb2_w(int state); - DECLARE_WRITE_LINE_MEMBER(pia_u75_cb2_w); + void pia_u75_cb2_w(int state); DECLARE_DEVICE_IMAGE_LOAD_MEMBER( cart_load ); virtual void machine_start() override; @@ -546,7 +546,7 @@ void squale_state::pia_u72_porta_w(uint8_t data) return; } -WRITE_LINE_MEMBER( squale_state::pia_u72_ca2_w ) +void squale_state::pia_u72_ca2_w(int state) { // U72 PIA CA2 : Cartridge address control @@ -570,7 +570,7 @@ WRITE_LINE_MEMBER( squale_state::pia_u72_ca2_w ) } } -WRITE_LINE_MEMBER( squale_state::pia_u75_cb2_w ) +void squale_state::pia_u75_cb2_w(int state) { // U75 PIA CB2 : Cartridge address reset @@ -618,7 +618,7 @@ void squale_state::pia_u72_portb_w(uint8_t data) return; } -WRITE_LINE_MEMBER( squale_state::pia_u72_cb2_w ) +void squale_state::pia_u72_cb2_w(int state) { // U72 PIA CB2 : Printer Data Strobe line diff --git a/src/mame/skeleton/swyft.cpp b/src/mame/skeleton/swyft.cpp index 112aed13692..eb7bd0c4bf6 100644 --- a/src/mame/skeleton/swyft.cpp +++ b/src/mame/skeleton/swyft.cpp @@ -354,29 +354,29 @@ private: uint32_t screen_update_swyft(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint8_t bitlatch_r(offs_t offset); - template DECLARE_WRITE_LINE_MEMBER(bitlatch_q_w); + template void bitlatch_q_w(int state); uint8_t swyft_via0_r(offs_t offset); void swyft_via0_w(offs_t offset, uint8_t data); uint8_t via0_pa_r(); void via0_pa_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(via0_ca2_w); + void via0_ca2_w(int state); uint8_t via0_pb_r(); void via0_pb_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(via0_cb1_w); - DECLARE_WRITE_LINE_MEMBER(via0_cb2_w); + void via0_cb1_w(int state); + void via0_cb2_w(int state); uint8_t swyft_via1_r(offs_t offset); void swyft_via1_w(offs_t offset, uint8_t data); uint8_t via1_pa_r(); void via1_pa_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(via1_ca2_w); + void via1_ca2_w(int state); uint8_t via1_pb_r(); void via1_pb_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(via1_cb1_w); - DECLARE_WRITE_LINE_MEMBER(via1_cb2_w); + void via1_cb1_w(int state); + void via1_cb2_w(int state); - DECLARE_WRITE_LINE_MEMBER(write_acia_clock); + void write_acia_clock(int state); void swyft_mem(address_map &map); }; @@ -616,7 +616,7 @@ uint32_t swyft_state::screen_update_swyft(screen_device &screen, bitmap_ind16 &b } template -WRITE_LINE_MEMBER(swyft_state::bitlatch_q_w) +void swyft_state::bitlatch_q_w(int state) { logerror("74HCT259: Q%d %s\n", B, state ? "on" : "off"); } @@ -679,7 +679,7 @@ void swyft_state::via0_pa_w(uint8_t data) LOGMASKED(LOG_VIA0, "VIA0: Port A written with data of 0x%02x!\n", data); } -WRITE_LINE_MEMBER ( swyft_state::via0_ca2_w ) +void swyft_state::via0_ca2_w(int state) { LOGMASKED(LOG_VIA0, "VIA0: CA2 written with %d!\n", state); } @@ -695,12 +695,12 @@ void swyft_state::via0_pb_w(uint8_t data) LOGMASKED(LOG_VIA0, "VIA0: Port B written with data of 0x%02x!\n", data); } -WRITE_LINE_MEMBER ( swyft_state::via0_cb1_w ) +void swyft_state::via0_cb1_w(int state) { LOGMASKED(LOG_VIA0, "VIA0: CB1 written with %d!\n", state); } -WRITE_LINE_MEMBER ( swyft_state::via0_cb2_w ) +void swyft_state::via0_cb2_w(int state) { LOGMASKED(LOG_VIA0, "VIA0: CB2 written with %d!\n", state); } @@ -717,7 +717,7 @@ void swyft_state::via1_pa_w(uint8_t data) LOGMASKED(LOG_VIA1, "VIA1: Port A written with data of 0x%02x!\n", data); } -WRITE_LINE_MEMBER ( swyft_state::via1_ca2_w ) +void swyft_state::via1_ca2_w(int state) { LOGMASKED(LOG_VIA1, "VIA1: CA2 written with %d!\n", state); } @@ -733,17 +733,17 @@ void swyft_state::via1_pb_w(uint8_t data) LOGMASKED(LOG_VIA1, "VIA1: Port B written with data of 0x%02x!\n", data); } -WRITE_LINE_MEMBER ( swyft_state::via1_cb1_w ) +void swyft_state::via1_cb1_w(int state) { LOGMASKED(LOG_VIA1, "VIA1: CB1 written with %d!\n", state); } -WRITE_LINE_MEMBER ( swyft_state::via1_cb2_w ) +void swyft_state::via1_cb2_w(int state) { LOGMASKED(LOG_VIA1, "VIA1: CB2 written with %d!\n", state); } -WRITE_LINE_MEMBER( swyft_state::write_acia_clock ) +void swyft_state::write_acia_clock(int state) { m_acia6850->write_txc(state); m_acia6850->write_rxc(state); diff --git a/src/mame/skeleton/systel1.cpp b/src/mame/skeleton/systel1.cpp index 15d78bd07e2..7ead948869a 100644 --- a/src/mame/skeleton/systel1.cpp +++ b/src/mame/skeleton/systel1.cpp @@ -46,12 +46,12 @@ protected: virtual void machine_reset() override; private: - DECLARE_WRITE_LINE_MEMBER(hrq_w); + void hrq_w(int state); u8 memory_r(offs_t offset); void memory_w(offs_t offset, u8 data); void floppy_control_w(u8 data); - DECLARE_WRITE_LINE_MEMBER(rts_w); - DECLARE_WRITE_LINE_MEMBER(dtr_w); + void rts_w(int state); + void dtr_w(int state); I8275_DRAW_CHARACTER_MEMBER(draw_character); @@ -84,7 +84,7 @@ void systel1_state::machine_reset() m_boot_read = true; } -WRITE_LINE_MEMBER(systel1_state::hrq_w) +void systel1_state::hrq_w(int state) { m_maincpu->set_input_line(INPUT_LINE_HALT, state); m_dmac->hlda_w(state); @@ -124,14 +124,14 @@ void systel1_state::floppy_control_w(u8 data) m_boot_read = false; } -WRITE_LINE_MEMBER(systel1_state::rts_w) +void systel1_state::rts_w(int state) { m_fdc->mr_w(state); if (m_floppy->get_device() != nullptr) m_floppy->get_device()->mon_w(!state); } -WRITE_LINE_MEMBER(systel1_state::dtr_w) +void systel1_state::dtr_w(int state) { // probably floppy-related } diff --git a/src/mame/skeleton/teleray10.cpp b/src/mame/skeleton/teleray10.cpp index a4fefcff5d4..54aa2d01836 100644 --- a/src/mame/skeleton/teleray10.cpp +++ b/src/mame/skeleton/teleray10.cpp @@ -43,8 +43,8 @@ public: void teleray10(machine_config &config); - DECLARE_WRITE_LINE_MEMBER(key_interrupt_w); - DECLARE_READ_LINE_MEMBER(timer_expired_r); + void key_interrupt_w(int state); + int timer_expired_r(); protected: virtual void machine_start() override; @@ -57,9 +57,9 @@ private: TIMER_CALLBACK_MEMBER(bell_toggle); void bell_update(); - DECLARE_WRITE_LINE_MEMBER(wide_mode_w); - DECLARE_WRITE_LINE_MEMBER(bell_off_w); - DECLARE_WRITE_LINE_MEMBER(reset_timer_w); + void wide_mode_w(int state); + void bell_off_w(int state); + void reset_timer_w(int state); void scratchpad_w(offs_t offset, u8 data); u8 serial_io_r(offs_t offset); @@ -179,16 +179,16 @@ u32 teleray10_state::screen_update(screen_device &screen, bitmap_rgb32 &bitmap, } -WRITE_LINE_MEMBER(teleray10_state::key_interrupt_w) +void teleray10_state::key_interrupt_w(int state) { m_maincpu->set_input_line(m6502_device::NMI_LINE, state ? CLEAR_LINE : ASSERT_LINE); } -WRITE_LINE_MEMBER(teleray10_state::wide_mode_w) +void teleray10_state::wide_mode_w(int state) { } -WRITE_LINE_MEMBER(teleray10_state::bell_off_w) +void teleray10_state::bell_off_w(int state) { if (state) { @@ -199,7 +199,7 @@ WRITE_LINE_MEMBER(teleray10_state::bell_off_w) bell_update(); } -WRITE_LINE_MEMBER(teleray10_state::reset_timer_w) +void teleray10_state::reset_timer_w(int state) { if (!state) { @@ -208,7 +208,7 @@ WRITE_LINE_MEMBER(teleray10_state::reset_timer_w) } } -READ_LINE_MEMBER(teleray10_state::timer_expired_r) +int teleray10_state::timer_expired_r() { return m_timer_expired; } diff --git a/src/mame/skeleton/textelcomp.cpp b/src/mame/skeleton/textelcomp.cpp index dc6fe5a99bb..82481cc0d66 100644 --- a/src/mame/skeleton/textelcomp.cpp +++ b/src/mame/skeleton/textelcomp.cpp @@ -41,8 +41,8 @@ private: virtual void machine_start() override; void keyscan_w(u8 data); u8 keyboard_r(); - DECLARE_WRITE_LINE_MEMBER(shift_data_w); - DECLARE_WRITE_LINE_MEMBER(shift_clock_w); + void shift_data_w(int state); + void shift_clock_w(int state); void update_shift_output(); void rtc_w(u8 data); @@ -89,12 +89,12 @@ u8 textelcomp_state::keyboard_r() return m_keys[m_keyscan & 0x0f]->read(); } -WRITE_LINE_MEMBER(textelcomp_state::shift_data_w) +void textelcomp_state::shift_data_w(int state) { m_shift_data = state; } -WRITE_LINE_MEMBER(textelcomp_state::shift_clock_w) +void textelcomp_state::shift_clock_w(int state) { if (state && !m_shift_clock) { diff --git a/src/mame/skeleton/tsispch.cpp b/src/mame/skeleton/tsispch.cpp index 9d75af98af6..6582172c034 100644 --- a/src/mame/skeleton/tsispch.cpp +++ b/src/mame/skeleton/tsispch.cpp @@ -159,8 +159,8 @@ private: void dsp_data_w(uint16_t data); uint16_t dsp_status_r(); void dsp_status_w(uint16_t data); - DECLARE_WRITE_LINE_MEMBER(dsp_to_8086_p0_w); - DECLARE_WRITE_LINE_MEMBER(dsp_to_8086_p1_w); + void dsp_to_8086_p0_w(int state); + void dsp_to_8086_p1_w(int state); void dsp_data_map(address_map &map); void dsp_prg_map(address_map &map); @@ -240,13 +240,13 @@ void tsispch_state::dsp_status_w(uint16_t data) m_dsp->snesdsp_write(false, data); } -WRITE_LINE_MEMBER( tsispch_state::dsp_to_8086_p0_w ) +void tsispch_state::dsp_to_8086_p0_w(int state) { LOG("upd772x changed p0 state to %d!\n",state); //TODO: do stuff here! } -WRITE_LINE_MEMBER( tsispch_state::dsp_to_8086_p1_w ) +void tsispch_state::dsp_to_8086_p1_w(int state) { LOG("upd772x changed p1 state to %d!\n",state); //TODO: do stuff here! diff --git a/src/mame/skeleton/v6809.cpp b/src/mame/skeleton/v6809.cpp index 599ab551399..806e8c43d76 100644 --- a/src/mame/skeleton/v6809.cpp +++ b/src/mame/skeleton/v6809.cpp @@ -89,8 +89,8 @@ protected: virtual void machine_reset() override; private: - DECLARE_WRITE_LINE_MEMBER(speaker_en_w); - DECLARE_WRITE_LINE_MEMBER(speaker_w); + void speaker_en_w(int state); + void speaker_w(int state); u8 pb_r(); void pa_w(u8 data); void videoram_w(u8 data); @@ -273,12 +273,12 @@ void v6809_state::pa_w(u8 data) } } -WRITE_LINE_MEMBER( v6809_state::speaker_en_w ) +void v6809_state::speaker_en_w(int state) { m_speaker_en = state; } -WRITE_LINE_MEMBER( v6809_state::speaker_w ) +void v6809_state::speaker_w(int state) { if (m_speaker_en) m_speaker->level_w(state); diff --git a/src/mame/skeleton/vp415.cpp b/src/mame/skeleton/vp415.cpp index 78454b17225..112fda8d8bf 100644 --- a/src/mame/skeleton/vp415.cpp +++ b/src/mame/skeleton/vp415.cpp @@ -109,7 +109,7 @@ TIMER_CALLBACK_MEMBER(vp415_state::drive_2ppr_tick) m_drive_2ppr_timer->adjust(attotime::from_msec(10)); } -WRITE_LINE_MEMBER(vp415_state::refv_w) +void vp415_state::refv_w(int state) { m_refv = state; m_drivecpu->set_input_line(MCS51_INT0_LINE, m_refv ? CLEAR_LINE : ASSERT_LINE); @@ -118,7 +118,7 @@ WRITE_LINE_MEMBER(vp415_state::refv_w) // CPU Datagrabber Module (W) -WRITE_LINE_MEMBER(vp415_state::cpu_int1_w) +void vp415_state::cpu_int1_w(int state) { set_int_line(0, state); } @@ -420,13 +420,13 @@ void vp415_state::drive_cpu_port1_w(uint8_t data) m_chargen->ldi_w(BIT(data, 2)); } -//READ_LINE_MEMBER(vp415_state::drive_rxd_r) +//int vp415_state::drive_rxd_r() //{ // logerror("%s: drive_rxd_r: %d\n", machine().describe_context(), 0); // return 0; //} -//WRITE_LINE_MEMBER(vp415_state::drive_txd_w) +//void vp415_state::drive_txd_w(int state) //{ // logerror("%s: drive_txd_w: %d\n", machine().describe_context(), state); //} diff --git a/src/mame/skeleton/vp415.h b/src/mame/skeleton/vp415.h index abaa86641ce..59bc8222685 100644 --- a/src/mame/skeleton/vp415.h +++ b/src/mame/skeleton/vp415.h @@ -87,7 +87,7 @@ private: void sel34_w(uint8_t data); uint8_t sel37_r(); - DECLARE_WRITE_LINE_MEMBER(cpu_int1_w); + void cpu_int1_w(int state); void data_mcu_port1_w(uint8_t data); uint8_t data_mcu_port1_r(); @@ -115,7 +115,7 @@ private: void drive_cpu_port1_w(uint8_t data); void drive_cpu_port3_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(refv_w); + void refv_w(int state); // CPU Board enums enum diff --git a/src/mame/skeleton/wicat.cpp b/src/mame/skeleton/wicat.cpp index 7ec6d4a56a0..38135ea0639 100644 --- a/src/mame/skeleton/wicat.cpp +++ b/src/mame/skeleton/wicat.cpp @@ -80,8 +80,8 @@ private: uint16_t memmap_r(); void memmap_w(uint16_t data); - DECLARE_WRITE_LINE_MEMBER(adir_w); - DECLARE_WRITE_LINE_MEMBER(bdir_w); + void adir_w(int state); + void bdir_w(int state); void via_a_w(uint8_t data); void via_b_w(uint8_t data); void videosram_store_w(uint8_t data); @@ -91,9 +91,9 @@ private: uint8_t vram_r(offs_t offset); void vram_w(offs_t offset, uint8_t data); uint8_t video_status_r(); - DECLARE_WRITE_LINE_MEMBER(dma_hrq_w); - DECLARE_WRITE_LINE_MEMBER(crtc_irq_w); - DECLARE_WRITE_LINE_MEMBER(crtc_irq_clear_w); + void dma_hrq_w(int state); + void crtc_irq_w(int state); + void crtc_irq_clear_w(int state); uint8_t hdc_r(offs_t offset); void hdc_w(offs_t offset, uint8_t data); uint8_t fdc_r(offs_t offset); @@ -221,12 +221,12 @@ void wicat_state::machine_reset() m_crtc_irq = false; } -WRITE_LINE_MEMBER(wicat_state::adir_w) +void wicat_state::adir_w(int state) { // parallel port A direction (0 = input, 1 = output) } -WRITE_LINE_MEMBER(wicat_state::bdir_w) +void wicat_state::bdir_w(int state) { // parallel port B direction (0 = input, 1 = output) } @@ -430,13 +430,13 @@ uint8_t wicat_state::video_status_r() return m_crtc_irq ? 0x04 : 0x00; } -WRITE_LINE_MEMBER(wicat_state::dma_hrq_w) +void wicat_state::dma_hrq_w(int state) { m_videocpu->set_input_line(INPUT_LINE_HALT,state ? ASSERT_LINE : CLEAR_LINE); m_videodma->hack_w(state); } -WRITE_LINE_MEMBER(wicat_state::crtc_irq_w) +void wicat_state::crtc_irq_w(int state) { if (state && m_videoctrl->q0_r()) { @@ -445,7 +445,7 @@ WRITE_LINE_MEMBER(wicat_state::crtc_irq_w) } } -WRITE_LINE_MEMBER(wicat_state::crtc_irq_clear_w) +void wicat_state::crtc_irq_clear_w(int state) { if (!state) { diff --git a/src/mame/skeleton/xor100.cpp b/src/mame/skeleton/xor100.cpp index ee35c987ea3..04151b82459 100644 --- a/src/mame/skeleton/xor100.cpp +++ b/src/mame/skeleton/xor100.cpp @@ -354,12 +354,12 @@ INPUT_PORTS_END /* Printer 8255A Interface */ -WRITE_LINE_MEMBER( xor100_state::write_centronics_busy ) +void xor100_state::write_centronics_busy(int state) { m_centronics_busy = state; } -WRITE_LINE_MEMBER( xor100_state::write_centronics_select ) +void xor100_state::write_centronics_select(int state) { m_centronics_select = state; } @@ -394,15 +394,15 @@ uint8_t xor100_state::i8255_pc_r() /* Z80-CTC Interface */ -WRITE_LINE_MEMBER( xor100_state::ctc_z0_w ) +void xor100_state::ctc_z0_w(int state) { } -WRITE_LINE_MEMBER( xor100_state::ctc_z1_w ) +void xor100_state::ctc_z1_w(int state) { } -WRITE_LINE_MEMBER( xor100_state::ctc_z2_w ) +void xor100_state::ctc_z2_w(int state) { } diff --git a/src/mame/skeleton/xor100.h b/src/mame/skeleton/xor100.h index 65020eff7bc..8f777a5ea4a 100644 --- a/src/mame/skeleton/xor100.h +++ b/src/mame/skeleton/xor100.h @@ -62,11 +62,11 @@ private: void fdc_drq_w(bool state); uint8_t i8255_pc_r(); - DECLARE_WRITE_LINE_MEMBER(ctc_z0_w); - DECLARE_WRITE_LINE_MEMBER(ctc_z1_w); - DECLARE_WRITE_LINE_MEMBER(ctc_z2_w); - DECLARE_WRITE_LINE_MEMBER(write_centronics_busy); - DECLARE_WRITE_LINE_MEMBER(write_centronics_select); + void ctc_z0_w(int state); + void ctc_z1_w(int state); + void ctc_z2_w(int state); + void write_centronics_busy(int state); + void write_centronics_select(int state); void xor100_io(address_map &map); void xor100_mem(address_map &map); diff --git a/src/mame/skeleton/zorba.cpp b/src/mame/skeleton/zorba.cpp index e0d40e09204..65ecaa4d031 100644 --- a/src/mame/skeleton/zorba.cpp +++ b/src/mame/skeleton/zorba.cpp @@ -341,13 +341,13 @@ void zorba_state::intmask_w(uint8_t data) irq_w<5>(BIT(m_intmask & m_tx_rx_rdy, 4) | BIT(m_intmask & m_tx_rx_rdy, 5)); } -template WRITE_LINE_MEMBER( zorba_state::tx_rx_rdy_w ) +template void zorba_state::tx_rx_rdy_w(int state) { m_tx_rx_rdy = (m_tx_rx_rdy & ~(1 << N)) | ((state ? 1 : 0) << N); irq_w<(N >> 1) + 3>(BIT(m_intmask & m_tx_rx_rdy, N & ~1) | BIT(m_intmask & m_tx_rx_rdy, N | 1)); } -template WRITE_LINE_MEMBER( zorba_state::irq_w ) +template void zorba_state::irq_w(int state) { m_irq = (m_irq & ~(1 << N)) | ((state ? 1 : 0) << N); @@ -375,7 +375,7 @@ template WRITE_LINE_MEMBER( zorba_state::irq_w ) // DMA controller handlers //------------------------------------------------- -WRITE_LINE_MEMBER( zorba_state::busreq_w ) +void zorba_state::busreq_w(int state) { // since our Z80 has no support for BUSACK, we assume it is granted immediately m_maincpu->set_input_line(Z80_INPUT_LINE_BUSRQ, state); @@ -413,7 +413,7 @@ void zorba_state::io_write_byte(offs_t offset, uint8_t data) // PIT handlers //------------------------------------------------- -WRITE_LINE_MEMBER( zorba_state::br1_w ) +void zorba_state::br1_w(int state) { // TODO: these can be jumpered to inputs from J2 so a modem can generate Baud rates // TODO: receive clock is exposed on J2 for external devices without Baud rate generators @@ -513,7 +513,7 @@ I8275_DRAW_CHARACTER_MEMBER( zorba_state::zorba_update_chr ) // Printer port glue //------------------------------------------------- -WRITE_LINE_MEMBER( zorba_state::printer_fault_w ) +void zorba_state::printer_fault_w(int state) { // connects to CB1 for Centronics m_printer_fault = state; @@ -521,7 +521,7 @@ WRITE_LINE_MEMBER( zorba_state::printer_fault_w ) m_pia0->cb1_w(state); } -WRITE_LINE_MEMBER( zorba_state::printer_select_w ) +void zorba_state::printer_select_w(int state) { // connects to CB1 for Prowriter m_printer_select = state; diff --git a/src/mame/skeleton/zorba.h b/src/mame/skeleton/zorba.h index 9c7266428d7..392ae6a0ff0 100644 --- a/src/mame/skeleton/zorba.h +++ b/src/mame/skeleton/zorba.h @@ -66,18 +66,18 @@ private: // Interrupt vectoring glue void intmask_w(uint8_t data); - template DECLARE_WRITE_LINE_MEMBER(tx_rx_rdy_w); - template DECLARE_WRITE_LINE_MEMBER(irq_w); + template void tx_rx_rdy_w(int state); + template void irq_w(int state); // DMA controller handlers - DECLARE_WRITE_LINE_MEMBER(busreq_w); + void busreq_w(int state); uint8_t memory_read_byte(offs_t offset); void memory_write_byte(offs_t offset, uint8_t data); uint8_t io_read_byte(offs_t offset); void io_write_byte(offs_t offset, uint8_t data); // PIT handlers - DECLARE_WRITE_LINE_MEMBER(br1_w); + void br1_w(int state); // PIA handlers void pia0_porta_w(uint8_t data); @@ -88,8 +88,8 @@ private: I8275_DRAW_CHARACTER_MEMBER(zorba_update_chr); // Printer port glue - DECLARE_WRITE_LINE_MEMBER(printer_fault_w); - DECLARE_WRITE_LINE_MEMBER(printer_select_w); + void printer_fault_w(int state); + void printer_select_w(int state); required_ioport m_config_port; diff --git a/src/mame/skeleton/zorbakbd.cpp b/src/mame/skeleton/zorbakbd.cpp index 5d965d10791..7ce74f9ecbe 100644 --- a/src/mame/skeleton/zorbakbd.cpp +++ b/src/mame/skeleton/zorbakbd.cpp @@ -265,7 +265,7 @@ zorba_keyboard_device::zorba_keyboard_device( } -WRITE_LINE_MEMBER(zorba_keyboard_device::txd_w) +void zorba_keyboard_device::txd_w(int state) { m_txd_high = CLEAR_LINE != state; } diff --git a/src/mame/skeleton/zorbakbd.h b/src/mame/skeleton/zorbakbd.h index 0f7f5f41b11..8897af7346e 100644 --- a/src/mame/skeleton/zorbakbd.h +++ b/src/mame/skeleton/zorbakbd.h @@ -17,7 +17,7 @@ public: zorba_keyboard_device(machine_config const &mconfig, char const *tag, device_t *owner, uint32_t clock = 0); - DECLARE_WRITE_LINE_MEMBER(txd_w); + void txd_w(int state); protected: u8 mcu_pa_r(); diff --git a/src/mame/slicer/slicer.cpp b/src/mame/slicer/slicer.cpp index 59ce9806713..8815fe356b9 100644 --- a/src/mame/slicer/slicer.cpp +++ b/src/mame/slicer/slicer.cpp @@ -32,8 +32,8 @@ public: private: void sio_out_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(drive_size_w); - template DECLARE_WRITE_LINE_MEMBER(drive_sel_w); + void drive_size_w(int state); + template void drive_sel_w(int state); void slicer_io(address_map &map); void slicer_map(address_map &map); @@ -58,7 +58,7 @@ void slicer_state::sio_out_w(uint8_t data) } template -WRITE_LINE_MEMBER(slicer_state::drive_sel_w) +void slicer_state::drive_sel_w(int state) { floppy_image_device *floppy; char devname[8]; @@ -71,7 +71,7 @@ WRITE_LINE_MEMBER(slicer_state::drive_sel_w) m_fdc->set_floppy(floppy); } -WRITE_LINE_MEMBER(slicer_state::drive_size_w) +void slicer_state::drive_size_w(int state) { m_fdc->set_unscaled_clock (state ? 1'000'000 : 2'000'000); } diff --git a/src/mame/snk/hng64.cpp b/src/mame/snk/hng64.cpp index 62fa35e8ea2..1d4098679d3 100644 --- a/src/mame/snk/hng64.cpp +++ b/src/mame/snk/hng64.cpp @@ -2516,7 +2516,7 @@ void hng64_state::ioport4_w(uint8_t data) // there are also serial reads, TLCS870 core doesn't support them yet -WRITE_LINE_MEMBER( hng64_state::sio0_w ) +void hng64_state::sio0_w(int state) { // tlcs870 core provides better logging than anything we could put here at the moment } diff --git a/src/mame/snk/hng64.h b/src/mame/snk/hng64.h index 9f9a08661e4..6c664a9d6fe 100644 --- a/src/mame/snk/hng64.h +++ b/src/mame/snk/hng64.h @@ -407,7 +407,7 @@ private: // unknown access void ioport4_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER( sio0_w ); + void sio0_w(int state); uint8_t m_port7 = 0; uint8_t m_port1 = 0; @@ -443,7 +443,7 @@ private: virtual void machine_reset() override; virtual void video_start() override; uint32_t screen_update_hng64(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(screen_vblank_hng64); + void screen_vblank_hng64(int state); TIMER_DEVICE_CALLBACK_MEMBER(hng64_irq); void do_dma(address_space &space); @@ -503,12 +503,12 @@ private: void reset_sound(); void reset_net(); - DECLARE_WRITE_LINE_MEMBER(dma_hreq_cb); + void dma_hreq_cb(int state); uint8_t dma_memr_cb(offs_t offset); void dma_iow3_cb(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(tcu_tm0_cb); - DECLARE_WRITE_LINE_MEMBER(tcu_tm1_cb); - DECLARE_WRITE_LINE_MEMBER(tcu_tm2_cb); + void tcu_tm0_cb(int state); + void tcu_tm1_cb(int state); + void tcu_tm2_cb(int state); diff --git a/src/mame/snk/hng64_a.cpp b/src/mame/snk/hng64_a.cpp index 3dbc30707be..d17d840cbc6 100644 --- a/src/mame/snk/hng64_a.cpp +++ b/src/mame/snk/hng64_a.cpp @@ -316,7 +316,7 @@ void hng64_state::hng_sound_io(address_map &map) } -WRITE_LINE_MEMBER(hng64_state::dma_hreq_cb) +void hng64_state::dma_hreq_cb(int state) { m_audiocpu->hack_w(1); } @@ -335,13 +335,13 @@ void hng64_state::dma_iow3_cb(uint8_t data) if (data!=0x00) logerror("dma_iow3_cb %02x\n", data); } -WRITE_LINE_MEMBER(hng64_state::tcu_tm0_cb) +void hng64_state::tcu_tm0_cb(int state) { // this goes high once near startup logerror("tcu_tm0_cb %02x\n", state); } -WRITE_LINE_MEMBER(hng64_state::tcu_tm1_cb) +void hng64_state::tcu_tm1_cb(int state) { // these are very active, maybe they feed back into the v53 via one of the IRQ pins? TM2 toggles more rapidly than TM1 // logerror("tcu_tm1_cb %02x\n", state); @@ -351,7 +351,7 @@ WRITE_LINE_MEMBER(hng64_state::tcu_tm1_cb) } -WRITE_LINE_MEMBER(hng64_state::tcu_tm2_cb) +void hng64_state::tcu_tm2_cb(int state) { // these are very active, maybe they feed back into the v53 via one of the IRQ pins? TM2 toggles more rapidly than TM1 // logerror("tcu_tm2_cb %02x\n", state); diff --git a/src/mame/snk/hng64_v.cpp b/src/mame/snk/hng64_v.cpp index 204609e8176..0b2998676dd 100644 --- a/src/mame/snk/hng64_v.cpp +++ b/src/mame/snk/hng64_v.cpp @@ -1222,7 +1222,7 @@ uint32_t hng64_state::screen_update_hng64(screen_device &screen, bitmap_rgb32 &b return 0; } -WRITE_LINE_MEMBER(hng64_state::screen_vblank_hng64) +void hng64_state::screen_vblank_hng64(int state) { // rising edge and buffer swap if (state && (m_tcram[0x50 / 4] & 0x10000)) diff --git a/src/mame/snk/munchmo.cpp b/src/mame/snk/munchmo.cpp index 1be5bf0532f..df691d616a9 100644 --- a/src/mame/snk/munchmo.cpp +++ b/src/mame/snk/munchmo.cpp @@ -68,18 +68,18 @@ protected: virtual void video_start() override; private: - DECLARE_WRITE_LINE_MEMBER(nmi_enable_w); + void nmi_enable_w(int state); void nmi_ack_w(u8 data); void sound_nmi_ack_w(u8 data); template u8 ayreset_r(); - DECLARE_WRITE_LINE_MEMBER(palette_bank_0_w); - DECLARE_WRITE_LINE_MEMBER(palette_bank_1_w); - DECLARE_WRITE_LINE_MEMBER(flipscreen_w); + void palette_bank_0_w(int state); + void palette_bank_1_w(int state); + void flipscreen_w(int state); void palette(palette_device &palette) const; - DECLARE_WRITE_LINE_MEMBER(vblank_irq); + void vblank_irq(int state); IRQ_CALLBACK_MEMBER(generic_irq_ack); @@ -150,17 +150,17 @@ void munchmo_state::palette(palette_device &palette) const } } -WRITE_LINE_MEMBER(munchmo_state::palette_bank_0_w) +void munchmo_state::palette_bank_0_w(int state) { m_palette_bank = (state ? 1 : 0) | (m_palette_bank & 2); } -WRITE_LINE_MEMBER(munchmo_state::palette_bank_1_w) +void munchmo_state::palette_bank_1_w(int state) { m_palette_bank = (state ? 2 : 0) | (m_palette_bank & 1); } -WRITE_LINE_MEMBER(munchmo_state::flipscreen_w) +void munchmo_state::flipscreen_w(int state) { m_flipscreen = state; } @@ -277,13 +277,13 @@ u32 munchmo_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, co * *************************************/ -WRITE_LINE_MEMBER(munchmo_state::nmi_enable_w) +void munchmo_state::nmi_enable_w(int state) { m_nmi_enable = state; } // trusted through schematics, NMI and IRQ triggers at vblank, at the same time (!) -WRITE_LINE_MEMBER(munchmo_state::vblank_irq) +void munchmo_state::vblank_irq(int state) { if (state) { diff --git a/src/mame/snk/ngp.cpp b/src/mame/snk/ngp.cpp index d781beffc46..c1937355128 100644 --- a/src/mame/snk/ngp.cpp +++ b/src/mame/snk/ngp.cpp @@ -194,8 +194,8 @@ private: void ngp_z80_clear_irq(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(ngp_vblank_pin_w); - DECLARE_WRITE_LINE_MEMBER(ngp_hblank_pin_w); + void ngp_vblank_pin_w(int state); + void ngp_hblank_pin_w(int state); void ngp_tlcs900_porta(offs_t offset, uint8_t data); uint32_t screen_update_ngp(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); TIMER_CALLBACK_MEMBER(ngp_seconds_callback); @@ -628,13 +628,13 @@ static INPUT_PORTS_START(ngp) INPUT_PORTS_END -WRITE_LINE_MEMBER(ngp_state::ngp_vblank_pin_w) +void ngp_state::ngp_vblank_pin_w(int state) { m_maincpu->set_input_line(TLCS900_INT4, state ? ASSERT_LINE : CLEAR_LINE); } -WRITE_LINE_MEMBER(ngp_state::ngp_hblank_pin_w) +void ngp_state::ngp_hblank_pin_w(int state) { m_maincpu->set_input_line(TLCS900_TIO, state ? ASSERT_LINE : CLEAR_LINE); } diff --git a/src/mame/snk/snk.cpp b/src/mame/snk/snk.cpp index cf46480d8ee..014d7b159a8 100644 --- a/src/mame/snk/snk.cpp +++ b/src/mame/snk/snk.cpp @@ -855,13 +855,13 @@ TIMER_CALLBACK_MEMBER(snk_state::sndirq_update_callback) } -WRITE_LINE_MEMBER(snk_state::ymirq_callback_1 ) +void snk_state::ymirq_callback_1(int state) { if (state) machine().scheduler().synchronize(timer_expired_delegate(FUNC(snk_state::sndirq_update_callback),this), YM1IRQ_ASSERT); } -WRITE_LINE_MEMBER(snk_state::ymirq_callback_2) +void snk_state::ymirq_callback_2(int state) { if (state) machine().scheduler().synchronize(timer_expired_delegate(FUNC(snk_state::sndirq_update_callback),this), YM2IRQ_ASSERT); @@ -874,7 +874,7 @@ void snk_state::snk_soundlatch_w(uint8_t data) machine().scheduler().synchronize(timer_expired_delegate(FUNC(snk_state::sndirq_update_callback),this), CMDIRQ_BUSY_ASSERT); } -READ_LINE_MEMBER(snk_state::sound_busy_r) +int snk_state::sound_busy_r() { return (m_sound_status & 4) ? 1 : 0; } diff --git a/src/mame/snk/snk.h b/src/mame/snk/snk.h index f0ac901b90a..1c8fa919870 100644 --- a/src/mame/snk/snk.h +++ b/src/mame/snk/snk.h @@ -63,7 +63,7 @@ public: void sgladiat(machine_config &config); void madcrush(machine_config &config); - DECLARE_READ_LINE_MEMBER(sound_busy_r); + int sound_busy_r(); template DECLARE_CUSTOM_INPUT_MEMBER(gwar_rotary); template DECLARE_CUSTOM_INPUT_MEMBER(gwarb_rotary); DECLARE_CUSTOM_INPUT_MEMBER(countryc_trackball_x); @@ -236,7 +236,7 @@ private: uint32_t screen_update_fitegolf2(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); TIMER_CALLBACK_MEMBER(sgladiat_sndirq_update_callback); TIMER_CALLBACK_MEMBER(sndirq_update_callback); - DECLARE_WRITE_LINE_MEMBER(ymirq_callback_2); + void ymirq_callback_2(int state); void marvins_draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect, const int scrollx, const int scrolly, const int from, const int to); void tnk3_draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect, const int xscroll, const int yscroll); void ikari_draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect, const int start, const int xscroll, const int yscroll, const uint8_t *source, const int gfxnum ); @@ -245,7 +245,7 @@ private: int hardflags_check8(int num); int turbofront_check(int small, int num); int turbofront_check8(int small, int num); - DECLARE_WRITE_LINE_MEMBER(ymirq_callback_1); + void ymirq_callback_1(int state); void Y8950_sound_map(address_map &map); void YM3526_Y8950_sound_map(address_map &map); diff --git a/src/mame/snk/snk6502_a.cpp b/src/mame/snk/snk6502_a.cpp index 16aeee28691..70c6618f09c 100644 --- a/src/mame/snk/snk6502_a.cpp +++ b/src/mame/snk/snk6502_a.cpp @@ -319,7 +319,7 @@ void snk6502_sound_device::set_music_clock(double clock_time) m_tone_clock = 0; } -READ_LINE_MEMBER(snk6502_sound_device::music0_playing) +int snk6502_sound_device::music0_playing() { return m_tone_channels[0].mute ? 1 : 0; } diff --git a/src/mame/snk/snk6502_a.h b/src/mame/snk/snk6502_a.h index 9b067ed166c..bbbd28d126a 100644 --- a/src/mame/snk/snk6502_a.h +++ b/src/mame/snk/snk6502_a.h @@ -19,7 +19,7 @@ class snk6502_sound_device : public device_t, public device_sound_interface public: snk6502_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - DECLARE_READ_LINE_MEMBER(music0_playing); + int music0_playing(); void set_music_freq(int freq); void set_music_clock(double clock_time); diff --git a/src/mame/sony/cat702.cpp b/src/mame/sony/cat702.cpp index a9b586ab06c..86e4983a271 100644 --- a/src/mame/sony/cat702.cpp +++ b/src/mame/sony/cat702.cpp @@ -183,7 +183,7 @@ void cat702_device::apply_sbox(const uint8_t *sbox) m_state = r; } -WRITE_LINE_MEMBER(cat702_device::write_select) +void cat702_device::write_select(int state) { if (m_select != state) { @@ -201,7 +201,7 @@ WRITE_LINE_MEMBER(cat702_device::write_select) } } -WRITE_LINE_MEMBER(cat702_device::write_clock) +void cat702_device::write_clock(int state) { static const uint8_t initial_sbox[8] = { 0xff, 0xfe, 0xfc, 0xf8, 0xf0, 0xe0, 0xc0, 0x7f }; @@ -229,7 +229,7 @@ WRITE_LINE_MEMBER(cat702_device::write_clock) m_clock = state; } -WRITE_LINE_MEMBER(cat702_device::write_datain) +void cat702_device::write_datain(int state) { m_datain = state; } diff --git a/src/mame/sony/cat702.h b/src/mame/sony/cat702.h index 4b566891aa2..febddbc1d45 100644 --- a/src/mame/sony/cat702.h +++ b/src/mame/sony/cat702.h @@ -18,9 +18,9 @@ public: // configuration helpers auto dataout_handler() { return m_dataout_handler.bind(); } - DECLARE_WRITE_LINE_MEMBER(write_select); - DECLARE_WRITE_LINE_MEMBER(write_datain); - DECLARE_WRITE_LINE_MEMBER(write_clock); + void write_select(int state); + void write_datain(int state); + void write_clock(int state); protected: virtual void device_start() override; diff --git a/src/mame/sony/ps2sony.cpp b/src/mame/sony/ps2sony.cpp index fab7e08b542..fcef2da40db 100644 --- a/src/mame/sony/ps2sony.cpp +++ b/src/mame/sony/ps2sony.cpp @@ -251,7 +251,7 @@ protected: uint64_t ee_iop_ram_r(offs_t offset); void iop_debug_w(uint32_t data); - DECLARE_WRITE_LINE_MEMBER(iop_timer_irq); + void iop_timer_irq(int state); void mem_map(address_map &map); void iop_map(address_map &map); @@ -514,7 +514,7 @@ void ps2sony_state::ipu_fifo_w(offs_t offset, uint64_t data, uint64_t mem_mask) } } -WRITE_LINE_MEMBER(ps2sony_state::iop_timer_irq) +void ps2sony_state::iop_timer_irq(int state) { logerror("%s: iop_timer_irq: %d\n", machine().describe_context(), state); if (state) diff --git a/src/mame/sony/pve500.cpp b/src/mame/sony/pve500.cpp index bcc65468fb8..5c017fb69d3 100644 --- a/src/mame/sony/pve500.cpp +++ b/src/mame/sony/pve500.cpp @@ -89,11 +89,11 @@ public: void init_pve500(); private: - DECLARE_WRITE_LINE_MEMBER(mb8421_intl); - DECLARE_WRITE_LINE_MEMBER(mb8421_intr); - DECLARE_WRITE_LINE_MEMBER(GPI_w); - DECLARE_WRITE_LINE_MEMBER(cxdio_reset_w); - DECLARE_WRITE_LINE_MEMBER(external_monitor_w); + void mb8421_intl(int state); + void mb8421_intr(int state); + void GPI_w(int state); + void cxdio_reset_w(int state); + void external_monitor_w(int state); uint8_t io_ky_r(); void io_sc_w(uint8_t data); @@ -120,18 +120,18 @@ private: int LD_data[4]{}; }; -WRITE_LINE_MEMBER(pve500_state::GPI_w) +void pve500_state::GPI_w(int state) { /* TODO: Implement-me */ } -WRITE_LINE_MEMBER(pve500_state::cxdio_reset_w) +void pve500_state::cxdio_reset_w(int state) { if (!state) m_cxdio->reset(); } -WRITE_LINE_MEMBER(pve500_state::external_monitor_w) +void pve500_state::external_monitor_w(int state) { /* TODO: Implement-me */ } @@ -277,13 +277,13 @@ void pve500_state::machine_reset() m_buzzer->set_state(0); } -WRITE_LINE_MEMBER(pve500_state::mb8421_intl) +void pve500_state::mb8421_intl(int state) { // shared ram interrupt request from subcpu side m_maincpu->trg1(state); } -WRITE_LINE_MEMBER(pve500_state::mb8421_intr) +void pve500_state::mb8421_intr(int state) { // shared ram interrupt request from maincpu side m_subcpu->trg1(state); diff --git a/src/mame/sony/smc777.cpp b/src/mame/sony/smc777.cpp index 2ad35265e09..90ac6db57d0 100644 --- a/src/mame/sony/smc777.cpp +++ b/src/mame/sony/smc777.cpp @@ -105,15 +105,15 @@ private: void vsync_irq_enable_w(uint8_t data); void smc777_palette(palette_device &palette) const; uint32_t screen_update_smc777(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(vsync_w); + void vsync_w(int state); TIMER_DEVICE_CALLBACK_MEMBER(keyboard_callback); uint8_t fdc_r(offs_t offset); void fdc_w(offs_t offset, uint8_t data); uint8_t fdc1_fast_status_r(); void fdc1_select_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(fdc_intrq_w); - DECLARE_WRITE_LINE_MEMBER(fdc_drq_w); + void fdc_intrq_w(int state); + void fdc_drq_w(int state); DECLARE_QUICKLOAD_LOAD_MEMBER(quickload_cb); @@ -482,12 +482,12 @@ void smc777_state::fdc1_select_w(uint8_t data) printf("floppy access %02x\n", data); } -WRITE_LINE_MEMBER( smc777_state::fdc_intrq_w ) +void smc777_state::fdc_intrq_w(int state) { m_fdc_irq_flag = state; } -WRITE_LINE_MEMBER( smc777_state::fdc_drq_w ) +void smc777_state::fdc_drq_w(int state) { m_fdc_drq_flag = state; } @@ -1086,7 +1086,7 @@ void smc777_state::smc777_palette(palette_device &palette) const } -WRITE_LINE_MEMBER(smc777_state::vsync_w) +void smc777_state::vsync_w(int state) { if (state && m_vsync_ief) { diff --git a/src/mame/sony/zn.cpp b/src/mame/sony/zn.cpp index 034b46e7f73..c31597f15fb 100644 --- a/src/mame/sony/zn.cpp +++ b/src/mame/sony/zn.cpp @@ -1762,12 +1762,12 @@ Notes: * - Unpopulated DIP42 socket */ -READ_LINE_MEMBER(jdredd_state::gun_mux_r) +int jdredd_state::gun_mux_r() { return m_gun_mux; } -WRITE_LINE_MEMBER(jdredd_state::vblank) +void jdredd_state::vblank(int state) { if (state) { diff --git a/src/mame/sony/zn.h b/src/mame/sony/zn.h index 86f388a5b07..a6b8d5dc2f0 100644 --- a/src/mame/sony/zn.h +++ b/src/mame/sony/zn.h @@ -65,8 +65,8 @@ public: void gameboard_cat702(machine_config &config); protected: - template DECLARE_WRITE_LINE_MEMBER(cat702_dataout) { m_cat702_dataout[Chip] = state; update_sio0_rxd(); } - DECLARE_WRITE_LINE_MEMBER(znmcu_dataout) { m_znmcu_dataout = state; update_sio0_rxd(); } + template void cat702_dataout(int state) { m_cat702_dataout[Chip] = state; update_sio0_rxd(); } + void znmcu_dataout(int state) { m_znmcu_dataout = state; update_sio0_rxd(); } void update_sio0_rxd() { m_sio0->write_rxd(m_cat702_dataout[0] && m_cat702_dataout[1] && m_znmcu_dataout); } uint8_t znsecsel_r(offs_t offset, uint8_t mem_mask = ~0); void znsecsel_w(offs_t offset, uint8_t data, uint8_t mem_mask = ~0); @@ -244,14 +244,14 @@ public: void jdredd(machine_config &config); - DECLARE_READ_LINE_MEMBER(gun_mux_r); + int gun_mux_r(); private: virtual void machine_start() override; void main_map(address_map &map); - DECLARE_WRITE_LINE_MEMBER(vblank); + void vblank(int state); required_ioport_array<2> m_gun_x; required_ioport_array<2> m_gun_y; diff --git a/src/mame/sony/znmcu.cpp b/src/mame/sony/znmcu.cpp index 75288a8af79..2978aa38342 100644 --- a/src/mame/sony/znmcu.cpp +++ b/src/mame/sony/znmcu.cpp @@ -43,7 +43,7 @@ void znmcu_device::device_start() memset(m_send, 0, sizeof(m_send)); } -WRITE_LINE_MEMBER(znmcu_device::write_select) +void znmcu_device::write_select(int state) { if (m_select != state) { @@ -64,7 +64,7 @@ WRITE_LINE_MEMBER(znmcu_device::write_select) } } -WRITE_LINE_MEMBER(znmcu_device::write_clock) +void znmcu_device::write_clock(int state) { if (m_clk != state) { diff --git a/src/mame/sony/znmcu.h b/src/mame/sony/znmcu.h index 9d154076898..c2f00b4df38 100644 --- a/src/mame/sony/znmcu.h +++ b/src/mame/sony/znmcu.h @@ -20,8 +20,8 @@ public: auto dataout_handler() { return m_dataout_handler.bind(); } auto dsr_handler() { return m_dsr_handler.bind(); } - WRITE_LINE_MEMBER(write_select); - WRITE_LINE_MEMBER(write_clock); + void write_select(int state); + void write_clock(int state); protected: // device-level overrides diff --git a/src/mame/sord/m5.cpp b/src/mame/sord/m5.cpp index e557fae041c..bd350fa4604 100644 --- a/src/mame/sord/m5.cpp +++ b/src/mame/sord/m5.cpp @@ -370,7 +370,7 @@ private: static void floppy_formats(format_registration &fr); - DECLARE_WRITE_LINE_MEMBER(write_centronics_busy); + void write_centronics_busy(int state); // memory u8 mem64KBI_r(); @@ -445,7 +445,7 @@ private: // MEMORY BANKING //************************************************************************** -WRITE_LINE_MEMBER( m5_state::write_centronics_busy ) +void m5_state::write_centronics_busy(int state) { m_centronics_busy = state; } diff --git a/src/mame/stern/mazerbla.cpp b/src/mame/stern/mazerbla.cpp index f0e8e8c4c60..857aa3babbd 100644 --- a/src/mame/stern/mazerbla.cpp +++ b/src/mame/stern/mazerbla.cpp @@ -168,7 +168,7 @@ private: void gg_led_ctrl_w(uint8_t data); void mazerbla_palette(palette_device &palette); uint32_t screen_update_mazerbla(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(screen_vblank); + void screen_vblank(int state); INTERRUPT_GEN_MEMBER(sound_interrupt); TIMER_CALLBACK_MEMBER(deferred_ls670_0_w); TIMER_CALLBACK_MEMBER(deferred_ls670_1_w); @@ -260,7 +260,7 @@ uint32_t mazerbla_state::screen_update_mazerbla(screen_device &screen, bitmap_rg return 0; } -WRITE_LINE_MEMBER(mazerbla_state::screen_vblank) +void mazerbla_state::screen_vblank(int state) { if (state) { diff --git a/src/mame/stm/pp.cpp b/src/mame/stm/pp.cpp index 41552c3d8e2..99929ee2b5d 100644 --- a/src/mame/stm/pp.cpp +++ b/src/mame/stm/pp.cpp @@ -60,21 +60,21 @@ protected: private: SCN2672_DRAW_CHARACTER_MEMBER(display_char); - template DECLARE_WRITE_LINE_MEMBER(int_w); + template void int_w(int state); TIMER_CALLBACK_MEMBER(int_update); IRQ_CALLBACK_MEMBER(intak_cb); void kbd_scan_w(u8 data); u8 kbd_cols_r(); - DECLARE_READ_LINE_MEMBER(cntl_r); - DECLARE_READ_LINE_MEMBER(shift_r); - DECLARE_WRITE_LINE_MEMBER(printer_busy_w); + int cntl_r(); + int shift_r(); + void printer_busy_w(int state); u8 memory_r(offs_t offset); void memory_w(offs_t offset, u8 data); u8 stat_r(); void co_w(u8 data); - DECLARE_WRITE_LINE_MEMBER(hld_w); + void hld_w(int state); void mode_w(u8 data); void mem_map(address_map &map); @@ -136,7 +136,7 @@ void pp_state::machine_reset() template -WRITE_LINE_MEMBER(pp_state::int_w) +void pp_state::int_w(int state) { if (BIT(m_int_pending, Line) == state) return; @@ -210,19 +210,19 @@ u8 pp_state::kbd_cols_r() return m_kbd_rows[m_kbd_scan & 7]->read(); } -READ_LINE_MEMBER(pp_state::cntl_r) +int pp_state::cntl_r() { // pin 1 of J13 connector return (m_modifiers->read() & 0x5) == 0x5; } -READ_LINE_MEMBER(pp_state::shift_r) +int pp_state::shift_r() { // pin 3 of J13 connector return (m_modifiers->read() & 0x6) == 0x6; } -WRITE_LINE_MEMBER(pp_state::printer_busy_w) +void pp_state::printer_busy_w(int state) { m_printer_busy = state; } @@ -302,7 +302,7 @@ void pp_state::co_w(u8 data) m_kbd_release = BIT(data, 7); } -WRITE_LINE_MEMBER(pp_state::hld_w) +void pp_state::hld_w(int state) { for (int i = 0; i < 2; i++) if (m_floppy[i]->get_device() != nullptr) diff --git a/src/mame/sun/sun2.cpp b/src/mame/sun/sun2.cpp index 4656f576b4a..e8b39233fad 100644 --- a/src/mame/sun/sun2.cpp +++ b/src/mame/sun/sun2.cpp @@ -187,7 +187,7 @@ private: void ram_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); uint8_t ethernet_r(); void ethernet_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(ethernet_int_w); + void ethernet_int_w(int state); uint16_t edlc_mmu_r(offs_t offset, uint16_t mem_mask); void edlc_mmu_w(offs_t offset, uint16_t data, uint16_t mem_mask); @@ -519,7 +519,7 @@ void sun2_state::ethernet_w(uint8_t data) m_maincpu->set_input_line(M68K_IRQ_3, BIT(m_ethernet_status, 0) && BIT(m_ethernet_status, 4) ? ASSERT_LINE : CLEAR_LINE); } -WRITE_LINE_MEMBER(sun2_state::ethernet_int_w) +void sun2_state::ethernet_int_w(int state) { if (state) { diff --git a/src/mame/sun/sun4.cpp b/src/mame/sun/sun4.cpp index 7b7ff18331a..ac65b1094dc 100644 --- a/src/mame/sun/sun4.cpp +++ b/src/mame/sun/sun4.cpp @@ -594,12 +594,12 @@ protected: void dma_addr_w(offs_t offset, u32 data, u32 mem_mask = ~0); void dma_count_w(offs_t offset, u32 data, u32 mem_mask = ~0); - DECLARE_WRITE_LINE_MEMBER(scsi_irq); - DECLARE_WRITE_LINE_MEMBER(scsi_drq); + void scsi_irq(int state); + void scsi_drq(int state); - template DECLARE_WRITE_LINE_MEMBER(scc_int); + template void scc_int(int state); - DECLARE_WRITE_LINE_MEMBER(fdc_irq); + void fdc_irq(int state); void ncr53c90(device_t *device); @@ -711,7 +711,7 @@ private: virtual void machine_start() override; virtual void machine_reset() override; - template DECLARE_WRITE_LINE_MEMBER(sbus_irq_w); + template void sbus_irq_w(int state); void type1space_map(address_map &map); @@ -1089,7 +1089,7 @@ void sun4_base_state::irq_w(u8 data) } template -WRITE_LINE_MEMBER(sun4_base_state::scc_int) +void sun4_base_state::scc_int(int state) { LOGMASKED(LOG_IRQ_WRITES, "scc_int<%d>: %d (%d)\n", Chip, state, m_scc_int[0] || m_scc_int[1]); m_scc_int[Chip] = state; @@ -1312,7 +1312,7 @@ void sun4_base_state::dma_count_w(offs_t offset, u32 data, u32 mem_mask) m_dma_count = data; } -WRITE_LINE_MEMBER(sun4_base_state::scsi_irq) +void sun4_base_state::scsi_irq(int state) { const bool old_irq = m_scsi_irq; m_scsi_irq = state; @@ -1323,7 +1323,7 @@ WRITE_LINE_MEMBER(sun4_base_state::scsi_irq) } } -WRITE_LINE_MEMBER(sun4_base_state::scsi_drq) +void sun4_base_state::scsi_drq(int state) { LOGMASKED(LOG_SCSI_DRQ, "scsi_drq %d\n", state); m_dma_ctrl &= ~DMA_REQ_PEND; @@ -1339,7 +1339,7 @@ WRITE_LINE_MEMBER(sun4_base_state::scsi_drq) } } -WRITE_LINE_MEMBER(sun4_base_state::fdc_irq) +void sun4_base_state::fdc_irq(int state) { const bool old_irq = m_fdc_irq; m_fdc_irq = state; @@ -1351,7 +1351,7 @@ WRITE_LINE_MEMBER(sun4_base_state::fdc_irq) } template -WRITE_LINE_MEMBER(sun4c_state::sbus_irq_w) +void sun4c_state::sbus_irq_w(int state) { m_maincpu->set_input_line(Line, state); } diff --git a/src/mame/svi/svi318.cpp b/src/mame/svi/svi318.cpp index 5806b79fd8b..a6b1dd66f14 100644 --- a/src/mame/svi/svi318.cpp +++ b/src/mame/svi/svi318.cpp @@ -86,16 +86,16 @@ private: uint8_t ppi_port_b_r(); void ppi_port_c_w(uint8_t data); void bank_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER( intvdp_w ); + void intvdp_w(int state); uint8_t mreq_r(offs_t offset); void mreq_w(offs_t offset, uint8_t data); // from expander bus - DECLARE_WRITE_LINE_MEMBER( intexp_w ); - DECLARE_WRITE_LINE_MEMBER( romdis_w ); - DECLARE_WRITE_LINE_MEMBER( ramdis_w ); - DECLARE_WRITE_LINE_MEMBER( ctrl1_w ); + void intexp_w(int state); + void romdis_w(int state); + void ramdis_w(int state); + void ctrl1_w(int state); DECLARE_DEVICE_IMAGE_LOAD_MEMBER(cart_load); @@ -325,7 +325,7 @@ INPUT_PORTS_END // VIDEO EMULATION //************************************************************************** -WRITE_LINE_MEMBER( svi3x8_state::intvdp_w ) +void svi3x8_state::intvdp_w(int state) { m_intvdp = state; @@ -468,7 +468,7 @@ void svi3x8_state::ppi_port_c_w(uint8_t data) m_speaker->level_w(BIT(data, 7)); } -WRITE_LINE_MEMBER( svi3x8_state::intexp_w ) +void svi3x8_state::intexp_w(int state) { m_intexp = state; @@ -478,17 +478,17 @@ WRITE_LINE_MEMBER( svi3x8_state::intexp_w ) m_maincpu->set_input_line(INPUT_LINE_IRQ0, (m_intvdp || m_intexp) ? ASSERT_LINE : CLEAR_LINE); } -WRITE_LINE_MEMBER( svi3x8_state::romdis_w ) +void svi3x8_state::romdis_w(int state) { m_romdis = state; } -WRITE_LINE_MEMBER( svi3x8_state::ramdis_w ) +void svi3x8_state::ramdis_w(int state) { m_ramdis = state; } -WRITE_LINE_MEMBER( svi3x8_state::ctrl1_w ) +void svi3x8_state::ctrl1_w(int state) { m_ctrl1 = state; diff --git a/src/mame/svision/svision.cpp b/src/mame/svision/svision.cpp index 0dccfc1e5c4..9a13b93ef3b 100644 --- a/src/mame/svision/svision.cpp +++ b/src/mame/svision/svision.cpp @@ -85,12 +85,12 @@ protected: uint8_t m_timer_shot = 0; bool m_dma_finished = false; - DECLARE_WRITE_LINE_MEMBER(sound_irq_w); + void sound_irq_w(int state); uint8_t regs_r(offs_t offset); void regs_w(offs_t offset, uint8_t data); uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(frame_int_w); + void frame_int_w(int state); DECLARE_DEVICE_IMAGE_LOAD_MEMBER(cart_load); void svision_palette(palette_device &palette) const; @@ -196,7 +196,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(svisions_state::pet_timer_dev) pet_timer(param); } -WRITE_LINE_MEMBER(svision_state::sound_irq_w) +void svision_state::sound_irq_w(int state) { m_dma_finished = true; check_irq(); @@ -603,7 +603,7 @@ uint32_t tvlink_state::screen_update(screen_device &screen, bitmap_rgb32 &bitmap return 0; } -WRITE_LINE_MEMBER(svision_state::frame_int_w) +void svision_state::frame_int_w(int state) { if (!state) return; diff --git a/src/mame/swtpc/swtpc09.h b/src/mame/swtpc/swtpc09.h index 1edae23de49..d25844c498e 100644 --- a/src/mame/swtpc/swtpc09.h +++ b/src/mame/swtpc/swtpc09.h @@ -75,23 +75,23 @@ private: static void floppy_uniflex_formats(format_registration &fr); uint8_t pia0_a_r(); - DECLARE_WRITE_LINE_MEMBER( pia0_irq_a ); + void pia0_irq_a(int state); - DECLARE_WRITE_LINE_MEMBER(io_irq_w); + void io_irq_w(int state); - DECLARE_WRITE_LINE_MEMBER( ptm_o1_callback ); - DECLARE_WRITE_LINE_MEMBER( ptm_o3_callback ); - DECLARE_WRITE_LINE_MEMBER( ptm_irq ); + void ptm_o1_callback(int state); + void ptm_o3_callback(int state); + void ptm_irq(int state); - DECLARE_WRITE_LINE_MEMBER( fdc_intrq_w ); - DECLARE_WRITE_LINE_MEMBER( fdc_drq_w ); - DECLARE_WRITE_LINE_MEMBER( fdc_sso_w ); + void fdc_intrq_w(int state); + void fdc_drq_w(int state); + void fdc_sso_w(int state); uint8_t dmaf3_via_read_porta(); uint8_t dmaf3_via_read_portb(); void dmaf3_via_write_porta(uint8_t data); void dmaf3_via_write_portb(uint8_t data); - DECLARE_WRITE_LINE_MEMBER( dmaf3_via_irq ); + void dmaf3_via_irq(int state); TIMER_CALLBACK_MEMBER(floppy_motor_callback); @@ -109,8 +109,8 @@ private: uint8_t dmaf3_control_reg_r(); void dmaf3_control_reg_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(dmaf3_hdc_intrq_w); - DECLARE_WRITE_LINE_MEMBER( dmaf3_hdc_drq_w ); + void dmaf3_hdc_intrq_w(int state); + void dmaf3_hdc_drq_w(int state); uint8_t dmaf3_hdc_control_r(); void dmaf3_hdc_control_w(uint8_t data); uint8_t dmaf3_hdc_reset_r(); diff --git a/src/mame/swtpc/swtpc09_m.cpp b/src/mame/swtpc/swtpc09_m.cpp index 0ba07376a4a..330fc1204ec 100644 --- a/src/mame/swtpc/swtpc09_m.cpp +++ b/src/mame/swtpc/swtpc09_m.cpp @@ -36,7 +36,7 @@ void swtpc09_state::unmapped_w(offs_t offset, uint8_t data) logerror("%s Unmapped write to addr %04x with data %02x\n", machine().describe_context(), offset, data); } -WRITE_LINE_MEMBER(swtpc09_state::io_irq_w) +void swtpc09_state::io_irq_w(int state) { if (state) swtpc09_irq_handler(IO_IRQ, ASSERT_LINE); @@ -47,20 +47,20 @@ WRITE_LINE_MEMBER(swtpc09_state::io_irq_w) /******* MC6840 PTM on MPID Board *******/ // 6840 PTM handlers -WRITE_LINE_MEMBER( swtpc09_state::ptm_o1_callback ) +void swtpc09_state::ptm_o1_callback(int state) { m_pia_counter++; //pia_counter = pia_counter && 0xff; if (m_pia_counter & 0x80) m_pia->ca1_w(1); } -WRITE_LINE_MEMBER( swtpc09_state::ptm_o3_callback ) +void swtpc09_state::ptm_o3_callback(int state) { // the output from timer3 is the input clock for timer2 //m_ptm->set_c2(state); } -WRITE_LINE_MEMBER( swtpc09_state::ptm_irq ) +void swtpc09_state::ptm_irq(int state) { if (state) swtpc09_irq_handler(PTM_IRQ, ASSERT_LINE); @@ -76,7 +76,7 @@ uint8_t swtpc09_state::pia0_a_r() return m_pia_counter; } -WRITE_LINE_MEMBER( swtpc09_state::pia0_irq_a ) +void swtpc09_state::pia0_irq_a(int state) { if ( m_pia->irq_a_state()) swtpc09_irq_handler(PIA_IRQ, ASSERT_LINE); @@ -339,7 +339,7 @@ void swtpc09_state::swtpc09_irq_handler(uint8_t peripheral, uint8_t state) } /* handlers for fdc */ -WRITE_LINE_MEMBER( swtpc09_state::fdc_intrq_w ) +void swtpc09_state::fdc_intrq_w(int state) { if ( m_system_type == UNIFLEX_DMAF3 ) { @@ -385,7 +385,7 @@ WRITE_LINE_MEMBER( swtpc09_state::fdc_intrq_w ) } } -WRITE_LINE_MEMBER( swtpc09_state::fdc_drq_w ) +void swtpc09_state::fdc_drq_w(int state) { if (state) { @@ -398,7 +398,7 @@ WRITE_LINE_MEMBER( swtpc09_state::fdc_drq_w ) m_fdc_status &= 0x7f; } -WRITE_LINE_MEMBER( swtpc09_state::fdc_sso_w ) +void swtpc09_state::fdc_sso_w(int state) { // The DMAF2 and DMAF3 do not appear to use a SSO output? } @@ -461,14 +461,14 @@ void swtpc09_state::dmaf3_via_write_portb(uint8_t data) m_dmaf3_via_portb &= data; } -//WRITE_LINE_MEMBER( swtpc09_state::dmaf3_via_write_ca1 ) +//void swtpc09_state::dmaf3_via_write_ca1(int state) //{ // return m_via_ca1_input; // logerror("swtpc09_dmaf3_via_write_ca1 %02X\n", state); //} -WRITE_LINE_MEMBER( swtpc09_state::dmaf3_via_irq ) +void swtpc09_state::dmaf3_via_irq(int state) { if (state) swtpc09_irq_handler(VIA_IRQ, ASSERT_LINE); @@ -535,7 +535,7 @@ void swtpc09_state::dmaf3_control_reg_w(uint8_t data) // DMAF3 WD1000 hard disk controller. -WRITE_LINE_MEMBER( swtpc09_state::dmaf3_hdc_intrq_w ) +void swtpc09_state::dmaf3_hdc_intrq_w(int state) { // The IRQ from WD1000 is connected into VIA CB2 inverted, and perhaps // connected to a VIA port B bit 3? @@ -553,7 +553,7 @@ WRITE_LINE_MEMBER( swtpc09_state::dmaf3_hdc_intrq_w ) } } -WRITE_LINE_MEMBER( swtpc09_state::dmaf3_hdc_drq_w ) +void swtpc09_state::dmaf3_hdc_drq_w(int state) { if (state) m6844_hdc_dma_transfer(1); diff --git a/src/mame/synertek/ktm3.cpp b/src/mame/synertek/ktm3.cpp index dc9b96cefdf..d14d89dfe1e 100644 --- a/src/mame/synertek/ktm3.cpp +++ b/src/mame/synertek/ktm3.cpp @@ -42,8 +42,8 @@ public: void ktm3(machine_config &config); - DECLARE_READ_LINE_MEMBER(ac_r); - template DECLARE_READ_LINE_MEMBER(sw_r); + int ac_r(); + template int sw_r(); protected: virtual void machine_start() override; @@ -58,7 +58,7 @@ private: void pcpu_map(address_map &map); void vcpu_map(address_map &map); - DECLARE_WRITE_LINE_MEMBER(signal_w); + void signal_w(int state); required_device m_pcpu; required_device m_vcpu; @@ -122,18 +122,18 @@ void ktm3_state::vcpu_map(address_map &map) map(0x0300, 0x03ff).mirror(0xfc00).rom().region("program", 0x100); } -WRITE_LINE_MEMBER(ktm3_state::signal_w) +void ktm3_state::signal_w(int state) { m_signal = state; } -READ_LINE_MEMBER(ktm3_state::ac_r) +int ktm3_state::ac_r() { return m_signal; } template -READ_LINE_MEMBER(ktm3_state::sw_r) +int ktm3_state::sw_r() { return BIT(m_option_sw->read(), N); } diff --git a/src/mame/synertek/sym1.cpp b/src/mame/synertek/sym1.cpp index 771002abb0e..0aa764a7551 100644 --- a/src/mame/synertek/sym1.cpp +++ b/src/mame/synertek/sym1.cpp @@ -82,15 +82,15 @@ private: virtual void machine_start() override { m_digits.resolve(); } TIMER_CALLBACK_MEMBER(led_refresh); TIMER_DEVICE_CALLBACK_MEMBER(cass_r); - DECLARE_WRITE_LINE_MEMBER(sym1_74145_output_0_w); - DECLARE_WRITE_LINE_MEMBER(sym1_74145_output_1_w); - DECLARE_WRITE_LINE_MEMBER(sym1_74145_output_2_w); - DECLARE_WRITE_LINE_MEMBER(sym1_74145_output_3_w); - DECLARE_WRITE_LINE_MEMBER(sym1_74145_output_4_w); - DECLARE_WRITE_LINE_MEMBER(sym1_74145_output_5_w); - DECLARE_WRITE_LINE_MEMBER(sym1_74145_output_7_w); - DECLARE_WRITE_LINE_MEMBER(via1_ca2_w); - DECLARE_WRITE_LINE_MEMBER(via1_cb2_w); + void sym1_74145_output_0_w(int state); + void sym1_74145_output_1_w(int state); + void sym1_74145_output_2_w(int state); + void sym1_74145_output_3_w(int state); + void sym1_74145_output_4_w(int state); + void sym1_74145_output_5_w(int state); + void sym1_74145_output_7_w(int state); + void via1_ca2_w(int state); + void via1_cb2_w(int state); uint8_t riot_a_r(); uint8_t riot_b_r(); void riot_a_w(uint8_t data); @@ -120,15 +120,15 @@ private: // KEYBOARD INPUT & LED OUTPUT //************************************************************************** -WRITE_LINE_MEMBER( sym1_state::sym1_74145_output_0_w ) { if (state) m_led_update->adjust(LED_REFRESH_DELAY, 0); } -WRITE_LINE_MEMBER( sym1_state::sym1_74145_output_1_w ) { if (state) m_led_update->adjust(LED_REFRESH_DELAY, 1); } -WRITE_LINE_MEMBER( sym1_state::sym1_74145_output_2_w ) { if (state) m_led_update->adjust(LED_REFRESH_DELAY, 2); } -WRITE_LINE_MEMBER( sym1_state::sym1_74145_output_3_w ) { if (state) m_led_update->adjust(LED_REFRESH_DELAY, 3); } -WRITE_LINE_MEMBER( sym1_state::sym1_74145_output_4_w ) { if (state) m_led_update->adjust(LED_REFRESH_DELAY, 4); } -WRITE_LINE_MEMBER( sym1_state::sym1_74145_output_5_w ) { if (state) m_led_update->adjust(LED_REFRESH_DELAY, 5); } -WRITE_LINE_MEMBER( sym1_state::sym1_74145_output_7_w ) { m_cass->output( state ? -1.0 : +1.0); } +void sym1_state::sym1_74145_output_0_w(int state) { if (state) m_led_update->adjust(LED_REFRESH_DELAY, 0); } +void sym1_state::sym1_74145_output_1_w(int state) { if (state) m_led_update->adjust(LED_REFRESH_DELAY, 1); } +void sym1_state::sym1_74145_output_2_w(int state) { if (state) m_led_update->adjust(LED_REFRESH_DELAY, 2); } +void sym1_state::sym1_74145_output_3_w(int state) { if (state) m_led_update->adjust(LED_REFRESH_DELAY, 3); } +void sym1_state::sym1_74145_output_4_w(int state) { if (state) m_led_update->adjust(LED_REFRESH_DELAY, 4); } +void sym1_state::sym1_74145_output_5_w(int state) { if (state) m_led_update->adjust(LED_REFRESH_DELAY, 5); } +void sym1_state::sym1_74145_output_7_w(int state) { m_cass->output( state ? -1.0 : +1.0); } -WRITE_LINE_MEMBER( sym1_state::via1_cb2_w ) +void sym1_state::via1_cb2_w(int state) { m_cb2 = state; m_cass->change_state(state ? CASSETTE_MOTOR_ENABLED : CASSETTE_MOTOR_DISABLED, CASSETTE_MASK_MOTOR); @@ -282,7 +282,7 @@ INPUT_PORTS_END // CA2 will be forced high when the VIA is reset, causing the ROM to be switched in // When the bios clears POR, FF80-FFFF becomes a mirror of A600-A67F -WRITE_LINE_MEMBER( sym1_state::via1_ca2_w ) +void sym1_state::via1_ca2_w(int state) { m_banks[8]->set_entry(state); } diff --git a/src/mame/ta/alphatpx.cpp b/src/mame/ta/alphatpx.cpp index bed4bc40878..3a5dcca1df9 100644 --- a/src/mame/ta/alphatpx.cpp +++ b/src/mame/ta/alphatpx.cpp @@ -116,7 +116,7 @@ private: u32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); - DECLARE_READ_LINE_MEMBER(kbd_matrix_r); + int kbd_matrix_r(); void kbd_matrix_w(u8 data); u8 kbd_port2_r(); void kbd_port2_w(u8 data); @@ -126,9 +126,9 @@ private: u8 fdc_stat_r(); void fdc_cmd_w(u8 data); - DECLARE_WRITE_LINE_MEMBER(fdcirq_w); - DECLARE_WRITE_LINE_MEMBER(fdcdrq_w); - DECLARE_WRITE_LINE_MEMBER(fdchld_w); + void fdcirq_w(int state); + void fdcdrq_w(int state); + void fdchld_w(int state); void beep_w(u8 data); void bank_w(u8 data); @@ -188,7 +188,7 @@ private: u32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); - DECLARE_READ_LINE_MEMBER(kbd_matrix_r); + int kbd_matrix_r(); void kbd_matrix_w(u8 data); u8 kbd_port2_r(); void kbd_port2_w(u8 data); @@ -198,9 +198,9 @@ private: u8 fdc_stat_r(); void fdc_cmd_w(u8 data); - DECLARE_WRITE_LINE_MEMBER(fdcirq_w); - DECLARE_WRITE_LINE_MEMBER(fdcdrq_w); - DECLARE_WRITE_LINE_MEMBER(fdchld_w); + void fdcirq_w(int state); + void fdcdrq_w(int state); + void fdchld_w(int state); void beep_w(u8 data); void bank_w(u8 data); u8 start88_r(offs_t offset); @@ -466,7 +466,7 @@ void alphatp_34_state::gfxext_w(offs_t offset, u8 data) // INPUTS - Alphatronic P1, P2, P2S, P2U and Hell 2069 //************************************************************************** -READ_LINE_MEMBER(alphatp_12_state::kbd_matrix_r) +int alphatp_12_state::kbd_matrix_r() { return m_kbdread; } @@ -499,7 +499,7 @@ u8 alphatp_12_state::kbd_port2_r() // INPUTS - Alphatronic P3, P4, P30 and P40 //************************************************************************** -READ_LINE_MEMBER(alphatp_34_state::kbd_matrix_r) +int alphatp_34_state::kbd_matrix_r() { return m_kbdread; } @@ -1013,17 +1013,17 @@ void alphatp_34_state::beep_w(u8 data) // FLOPPY - Alphatronic P1, P2, P2S, P2U and Hell 2069 //************************************************************************** -WRITE_LINE_MEMBER(alphatp_12_state::fdcirq_w) +void alphatp_12_state::fdcirq_w(int state) { m_fdc_irq = state; } -WRITE_LINE_MEMBER(alphatp_12_state::fdcdrq_w) +void alphatp_12_state::fdcdrq_w(int state) { m_fdc_drq = state; } -WRITE_LINE_MEMBER(alphatp_12_state::fdchld_w) +void alphatp_12_state::fdchld_w(int state) { m_fdc_hld = state; } @@ -1096,17 +1096,17 @@ void alphatp_12_state::fdc_cmd_w(u8 data) // FLOPPY - Alphatronic P3, P4, P30 and P40 //************************************************************************** -WRITE_LINE_MEMBER(alphatp_34_state::fdcirq_w) +void alphatp_34_state::fdcirq_w(int state) { m_fdc_irq = state; } -WRITE_LINE_MEMBER(alphatp_34_state::fdcdrq_w) +void alphatp_34_state::fdcdrq_w(int state) { m_fdc_drq = state; } -WRITE_LINE_MEMBER(alphatp_34_state::fdchld_w) +void alphatp_34_state::fdchld_w(int state) { m_fdc_hld = state; } diff --git a/src/mame/ta/alphatro.cpp b/src/mame/ta/alphatro.cpp index 851466a2b05..629a1ae9dfb 100644 --- a/src/mame/ta/alphatro.cpp +++ b/src/mame/ta/alphatro.cpp @@ -98,10 +98,10 @@ private: uint8_t port30_r(); uint8_t portf0_r(); void portf0_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(hrq_w); + void hrq_w(int state); void alphatro_palette(palette_device &palette) const; - DECLARE_WRITE_LINE_MEMBER(kansas_r); - DECLARE_WRITE_LINE_MEMBER(kansas_w); + void kansas_r(int state); + void kansas_w(int state); MC6845_UPDATE_ROW(crtc_update_row); std::pair load_cart(device_image_interface &image, generic_slot_device *slot); @@ -733,7 +733,7 @@ void alphatro_state::alphatro_palette(palette_device &palette) const } -WRITE_LINE_MEMBER(alphatro_state::kansas_w) +void alphatro_state::kansas_w(int state) { // incoming @19230Hz u8 twobit = m_cass_data[3] & 3; @@ -762,7 +762,7 @@ WRITE_LINE_MEMBER(alphatro_state::kansas_w) m_usart->write_txc(state); } -WRITE_LINE_MEMBER(alphatro_state::kansas_r) +void alphatro_state::kansas_r(int state) { if (!BIT(m_port_10, 3)) { @@ -784,7 +784,7 @@ WRITE_LINE_MEMBER(alphatro_state::kansas_r) m_usart->write_rxc(state); } -WRITE_LINE_MEMBER(alphatro_state::hrq_w) +void alphatro_state::hrq_w(int state) { m_maincpu->set_input_line(INPUT_LINE_HALT, state); m_dmac->hlda_w(state); diff --git a/src/mame/taito/ashnojoe.cpp b/src/mame/taito/ashnojoe.cpp index fb836af00cb..7d2ffe1a64f 100644 --- a/src/mame/taito/ashnojoe.cpp +++ b/src/mame/taito/ashnojoe.cpp @@ -150,7 +150,7 @@ private: TILE_GET_INFO_MEMBER(get_tile_info_midhigh); TILE_GET_INFO_MEMBER(get_tile_info_lowest); u32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(vclk_cb); + void vclk_cb(int state); void main_map(address_map &map); void sound_map(address_map &map); void sound_portmap(address_map &map); @@ -501,7 +501,7 @@ void ashnojoe_state::ym2203_write_b(u8 data) m_audiobank->set_entry(data & 0x0f); } -WRITE_LINE_MEMBER(ashnojoe_state::vclk_cb) +void ashnojoe_state::vclk_cb(int state) { if (m_msm5205_vclk_toggle == 0) { diff --git a/src/mame/taito/asuka.cpp b/src/mame/taito/asuka.cpp index f89b4be5523..6c4524251a7 100644 --- a/src/mame/taito/asuka.cpp +++ b/src/mame/taito/asuka.cpp @@ -352,7 +352,7 @@ protected: void variable_colpri_cb(u32 &sprite_colbank, u32 &pri_mask, u16 sprite_ctrl); void fixed_colpri_cb(u32 &sprite_colbank, u32 &pri_mask, u16 sprite_ctrl); uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(screen_vblank); + void screen_vblank(int state); void z80_map(address_map &map); @@ -393,7 +393,7 @@ private: void msm5205_address_w(u8 data); void msm5205_start_w(u8 data); void msm5205_stop_w(u8 data); - DECLARE_WRITE_LINE_MEMBER(msm5205_vck); + void msm5205_vck(int state); void asuka_map(address_map &map); void z80_map(address_map &map); @@ -528,7 +528,7 @@ void base_state::sound_bankswitch_w(u8 data) } -WRITE_LINE_MEMBER(msm_state::msm5205_vck) +void msm_state::msm5205_vck(int state) { if (!state) return; @@ -1049,7 +1049,7 @@ void cadash_state::machine_start() m_int5_timer = timer_alloc(FUNC(cadash_state::interrupt5), this); } -WRITE_LINE_MEMBER(base_state::screen_vblank) +void base_state::screen_vblank(int state) { // rising edge if (state) diff --git a/src/mame/taito/bking.h b/src/mame/taito/bking.h index 61ffff48726..df2a992265e 100644 --- a/src/mame/taito/bking.h +++ b/src/mame/taito/bking.h @@ -104,7 +104,7 @@ private: DECLARE_MACHINE_RESET(bking3); DECLARE_MACHINE_RESET(common); uint32_t screen_update_bking(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(screen_vblank_bking); + void screen_vblank_bking(int state); void bking3_io_map(address_map &map); void bking_audio_map(address_map &map); void bking_io_map(address_map &map); diff --git a/src/mame/taito/bking_v.cpp b/src/mame/taito/bking_v.cpp index 43194f90582..ce22a61cb72 100644 --- a/src/mame/taito/bking_v.cpp +++ b/src/mame/taito/bking_v.cpp @@ -249,7 +249,7 @@ uint32_t bking_state::screen_update_bking(screen_device &screen, bitmap_ind16 &b } -WRITE_LINE_MEMBER(bking_state::screen_vblank_bking) +void bking_state::screen_vblank_bking(int state) { // rising edge if (state) diff --git a/src/mame/taito/champbwl.cpp b/src/mame/taito/champbwl.cpp index 16a597994a3..411e8206e56 100644 --- a/src/mame/taito/champbwl.cpp +++ b/src/mame/taito/champbwl.cpp @@ -209,7 +209,7 @@ private: uint8_t trackball_reset_r(); void misc_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(screen_vblank); + void screen_vblank(int state); void prg_map(address_map &map); @@ -236,7 +236,7 @@ private: void outputs_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(screen_vblank); + void screen_vblank(int state); void prg_map(address_map &map); }; @@ -537,7 +537,7 @@ uint32_t champbwl_base_state::screen_update(screen_device &screen, bitmap_ind16 return 0; } -WRITE_LINE_MEMBER(champbwl_state::screen_vblank) +void champbwl_state::screen_vblank(int state) { // rising edge if (state) @@ -580,7 +580,7 @@ void champbwl_state::champbwl(machine_config &config) } -WRITE_LINE_MEMBER(doraemon_state::screen_vblank) +void doraemon_state::screen_vblank(int state) { // rising edge if (state) diff --git a/src/mame/taito/changela.cpp b/src/mame/taito/changela.cpp index eb606614f0c..26c8ff7e250 100644 --- a/src/mame/taito/changela.cpp +++ b/src/mame/taito/changela.cpp @@ -133,27 +133,27 @@ uint8_t changela_state::changela_2d_r() return (ioport("IN1")->read() & 0x20) | gas | (v8 << 4); } -WRITE_LINE_MEMBER(changela_state::mcu_pc_0_w) +void changela_state::mcu_pc_0_w(int state) { m_mcu->pc_w(0xfe | state); } -WRITE_LINE_MEMBER(changela_state::collision_reset_0_w) +void changela_state::collision_reset_0_w(int state) { m_collision_reset = state; } -WRITE_LINE_MEMBER(changela_state::collision_reset_1_w) +void changela_state::collision_reset_1_w(int state) { m_tree_collision_reset = state; } -WRITE_LINE_MEMBER(changela_state::coin_counter_1_w) +void changela_state::coin_counter_1_w(int state) { machine().bookkeeping().coin_counter_w(0, state); } -WRITE_LINE_MEMBER(changela_state::coin_counter_2_w) +void changela_state::coin_counter_2_w(int state) { machine().bookkeeping().coin_counter_w(1, state); } diff --git a/src/mame/taito/changela.h b/src/mame/taito/changela.h index 3415404c152..a82aac428ef 100644 --- a/src/mame/taito/changela.h +++ b/src/mame/taito/changela.h @@ -64,11 +64,11 @@ public: uint8_t changela_31_r(); uint8_t changela_2c_r(); uint8_t changela_2d_r(); - DECLARE_WRITE_LINE_MEMBER(mcu_pc_0_w); - DECLARE_WRITE_LINE_MEMBER(collision_reset_0_w); - DECLARE_WRITE_LINE_MEMBER(collision_reset_1_w); - DECLARE_WRITE_LINE_MEMBER(coin_counter_1_w); - DECLARE_WRITE_LINE_MEMBER(coin_counter_2_w); + void mcu_pc_0_w(int state); + void collision_reset_0_w(int state); + void collision_reset_1_w(int state); + void coin_counter_1_w(int state); + void coin_counter_2_w(int state); void changela_colors_w(offs_t offset, uint8_t data); void changela_mem_device_select_w(uint8_t data); void changela_mem_device_w(offs_t offset, uint8_t data); diff --git a/src/mame/taito/crbaloon.cpp b/src/mame/taito/crbaloon.cpp index 97b511f6003..1a1c5593997 100644 --- a/src/mame/taito/crbaloon.cpp +++ b/src/mame/taito/crbaloon.cpp @@ -352,7 +352,7 @@ void crbaloon_state::machine_reset() * *************************************/ -WRITE_LINE_MEMBER(crbaloon_state::vbl_int_w) +void crbaloon_state::vbl_int_w(int state) { if (state && m_irq_mask) m_maincpu->set_input_line(INPUT_LINE_IRQ0, ASSERT_LINE); diff --git a/src/mame/taito/crbaloon.h b/src/mame/taito/crbaloon.h index d021e8de373..d674c04c1f1 100644 --- a/src/mame/taito/crbaloon.h +++ b/src/mame/taito/crbaloon.h @@ -62,7 +62,7 @@ private: TILE_GET_INFO_MEMBER(get_bg_tile_info); void crbaloon_palette(palette_device &palette) const; uint32_t screen_update_crbaloon(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(vbl_int_w); + void vbl_int_w(int state); void crbaloon_audio_set_music_freq(uint8_t data); void crbaloon_audio_set_music_enable(uint8_t data); void crbaloon_audio_set_laugh_enable(uint8_t data); diff --git a/src/mame/taito/cyclemb.cpp b/src/mame/taito/cyclemb.cpp index 2e769debda6..a1bf53d18c5 100644 --- a/src/mame/taito/cyclemb.cpp +++ b/src/mame/taito/cyclemb.cpp @@ -143,7 +143,7 @@ public: void skydest_i8741_0_w(offs_t offset, uint8_t data); uint8_t skydest_i8741_1_r(offs_t offset); void skydest_i8741_1_w(offs_t offset, uint8_t data); -// DECLARE_WRITE_LINE_MEMBER(ym_irq); +// void ym_irq(int state); void update_dial(int P); template DECLARE_CUSTOM_INPUT_MEMBER(dial_r); diff --git a/src/mame/taito/darius.cpp b/src/mame/taito/darius.cpp index e0ebc55a42f..aa166d2e457 100644 --- a/src/mame/taito/darius.cpp +++ b/src/mame/taito/darius.cpp @@ -445,7 +445,7 @@ void darius_state::darius_sound2_map(address_map &map) } -WRITE_LINE_MEMBER(darius_state::adpcm_int) +void darius_state::adpcm_int(int state) { if (m_nmi_enable) m_adpcm->pulse_input_line(INPUT_LINE_NMI, attotime::zero); diff --git a/src/mame/taito/darius.h b/src/mame/taito/darius.h index 8d90be56ab7..64c758179e4 100644 --- a/src/mame/taito/darius.h +++ b/src/mame/taito/darius.h @@ -117,7 +117,7 @@ private: void update_psg0(int port); void update_psg1(int port); void update_da(); - DECLARE_WRITE_LINE_MEMBER(adpcm_int); + void adpcm_int(int state); void darius_cpub_map(address_map &map); void darius_map(address_map &map); void darius_sound2_io_map(address_map &map); diff --git a/src/mame/taito/fgoal.cpp b/src/mame/taito/fgoal.cpp index 7e20b080eb2..2317c223c94 100644 --- a/src/mame/taito/fgoal.cpp +++ b/src/mame/taito/fgoal.cpp @@ -46,7 +46,7 @@ public: void fgoal(machine_config &config); - DECLARE_READ_LINE_MEMBER(_80_r); + int _80_r(); protected: virtual void machine_start() override; @@ -296,7 +296,7 @@ uint8_t fgoal_state::analog_r() } -READ_LINE_MEMBER(fgoal_state::_80_r) +int fgoal_state::_80_r() { return BIT(m_screen->vpos(), 7); } diff --git a/src/mame/taito/galastrm.cpp b/src/mame/taito/galastrm.cpp index 51bfcf9d5cc..38a8ef467e4 100644 --- a/src/mame/taito/galastrm.cpp +++ b/src/mame/taito/galastrm.cpp @@ -116,7 +116,7 @@ public: { } void galastrm(machine_config &config); - DECLARE_READ_LINE_MEMBER(frame_counter_r); + int frame_counter_r(); protected: virtual void video_start() override; @@ -721,7 +721,7 @@ void galastrm_state::tc0610_w(offs_t offset, u16 data) } -READ_LINE_MEMBER(galastrm_state::frame_counter_r) +int galastrm_state::frame_counter_r() { return m_frame_counter; } diff --git a/src/mame/taito/gladiatr.cpp b/src/mame/taito/gladiatr.cpp index 0f6fe3339e3..4fb172432ce 100644 --- a/src/mame/taito/gladiatr.cpp +++ b/src/mame/taito/gladiatr.cpp @@ -221,7 +221,7 @@ void gladiatr_state::gladiator_int_control_w(u8 data) } /* YM2203 IRQ */ -WRITE_LINE_MEMBER(gladiatr_state_base::ym_irq) +void gladiatr_state_base::ym_irq(int state) { /* NMI IRQ is not used by gladiator sound program */ m_subcpu->set_input_line(INPUT_LINE_NMI, state ? ASSERT_LINE : CLEAR_LINE); @@ -265,7 +265,7 @@ u8 gladiatr_state_base::adpcm_command_r() return m_soundlatch->read(); } -WRITE_LINE_MEMBER(gladiatr_state_base::flipscreen_w) +void gladiatr_state_base::flipscreen_w(int state) { flip_screen_set(state); } @@ -279,7 +279,7 @@ void gladiatr_state::gladiatr_irq_patch_w(u8 data) #endif -WRITE_LINE_MEMBER(gladiatr_state::tclk_w) +void gladiatr_state::tclk_w(int state) { m_tclk_val = state != 0; } @@ -307,13 +307,13 @@ void gladiatr_state::ccpu_p2_w(u8 data) machine().bookkeeping().coin_counter_w(1, !BIT(data, 7)); } -READ_LINE_MEMBER(gladiatr_state::tclk_r) +int gladiatr_state::tclk_r() { // fed to t0 on comms MCUs return m_tclk_val ? 1 : 0; } -READ_LINE_MEMBER(gladiatr_state::ucpu_t1_r) +int gladiatr_state::ucpu_t1_r() { // connected to p1 on other MCU return BIT(m_csnd_p1, 1); @@ -332,7 +332,7 @@ void gladiatr_state::ucpu_p1_w(u8 data) m_ucpu_p1 = data; } -READ_LINE_MEMBER(gladiatr_state::csnd_t1_r) +int gladiatr_state::csnd_t1_r() { // connected to p1 on other MCU return BIT(m_ucpu_p1, 1); diff --git a/src/mame/taito/gladiatr.h b/src/mame/taito/gladiatr.h index 50e1a8a3c5e..92f862026fa 100644 --- a/src/mame/taito/gladiatr.h +++ b/src/mame/taito/gladiatr.h @@ -17,11 +17,11 @@ public: void colorram_w(offs_t offset, u8 data); void textram_w(offs_t offset, u8 data); void paletteram_w(offs_t offset, u8 data); - DECLARE_WRITE_LINE_MEMBER(spritebuffer_w); + void spritebuffer_w(int state); void adpcm_command_w(u8 data); u8 adpcm_command_r(); - DECLARE_WRITE_LINE_MEMBER(flipscreen_w); - DECLARE_WRITE_LINE_MEMBER(ym_irq); + void flipscreen_w(int state); + void ym_irq(int state); void cpu2_map(address_map &map); protected: @@ -121,23 +121,23 @@ public: void init_gladiatr(); private: - DECLARE_WRITE_LINE_MEMBER(spritebank_w); + void spritebank_w(int state); void gladiatr_video_registers_w(offs_t offset, u8 data); void gladiatr_irq_patch_w(u8 data); void gladiator_int_control_w(u8 data); void gladiator_adpcm_w(u8 data); - DECLARE_WRITE_LINE_MEMBER(tclk_w); + void tclk_w(int state); u8 cctl_p1_r(); u8 cctl_p2_r(); void ccpu_p2_w(u8 data); - DECLARE_READ_LINE_MEMBER(tclk_r); - DECLARE_READ_LINE_MEMBER(ucpu_t1_r); + int tclk_r(); + int ucpu_t1_r(); u8 ucpu_p1_r(); void ucpu_p1_w(u8 data); u8 ucpu_p2_r(); - DECLARE_READ_LINE_MEMBER(csnd_t1_r); + int csnd_t1_r(); u8 csnd_p1_r(); void csnd_p1_w(u8 data); u8 csnd_p2_r(); diff --git a/src/mame/taito/gladiatr_v.cpp b/src/mame/taito/gladiatr_v.cpp index c413aaac375..ceaadab19c6 100644 --- a/src/mame/taito/gladiatr_v.cpp +++ b/src/mame/taito/gladiatr_v.cpp @@ -127,12 +127,12 @@ void gladiatr_state_base::paletteram_w(offs_t offset, u8 data) } -WRITE_LINE_MEMBER(gladiatr_state_base::spritebuffer_w) +void gladiatr_state_base::spritebuffer_w(int state) { m_sprite_buffer = state; } -WRITE_LINE_MEMBER(gladiatr_state::spritebank_w) +void gladiatr_state::spritebank_w(int state) { m_sprite_bank = state ? 4 : 2; } diff --git a/src/mame/taito/groundfx.cpp b/src/mame/taito/groundfx.cpp index 9005cc6e879..c980d55b533 100644 --- a/src/mame/taito/groundfx.cpp +++ b/src/mame/taito/groundfx.cpp @@ -135,7 +135,7 @@ private: void rotate_control_w(offs_t offset, u16 data); void motor_control_w(u32 data); u32 irq_speedup_r(); - DECLARE_READ_LINE_MEMBER(frame_counter_r); + int frame_counter_r(); void coin_word_w(u8 data); u32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(interrupt); @@ -414,7 +414,7 @@ u32 groundfx_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, c GAME INPUTS **********************************************************/ -READ_LINE_MEMBER(groundfx_state::frame_counter_r) +int groundfx_state::frame_counter_r() { return m_frame_counter; } diff --git a/src/mame/taito/heromem.cpp b/src/mame/taito/heromem.cpp index 32a95ac883a..ff90be05745 100644 --- a/src/mame/taito/heromem.cpp +++ b/src/mame/taito/heromem.cpp @@ -63,8 +63,8 @@ private: void tc0091lvc_l_prg_map(address_map &map); void tc0091lvc_r_prg_map(address_map &map); - DECLARE_WRITE_LINE_MEMBER(screen_vblank_l) { if (state) { m_tc0091lvc_l->screen_eof(); } } - DECLARE_WRITE_LINE_MEMBER(screen_vblank_r) { if (state) { m_tc0091lvc_l->screen_eof(); } } + void screen_vblank_l(int state) { if (state) { m_tc0091lvc_l->screen_eof(); } } + void screen_vblank_r(int state) { if (state) { m_tc0091lvc_l->screen_eof(); } } TIMER_DEVICE_CALLBACK_MEMBER(irq_scanline_l); TIMER_DEVICE_CALLBACK_MEMBER(irq_scanline_r); diff --git a/src/mame/taito/jollyjgr.cpp b/src/mame/taito/jollyjgr.cpp index 11dd586f332..667bb03273b 100644 --- a/src/mame/taito/jollyjgr.cpp +++ b/src/mame/taito/jollyjgr.cpp @@ -176,7 +176,7 @@ private: void jollyjgr_palette(palette_device &palette) const; uint32_t screen_update_jollyjgr(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); uint32_t screen_update_fspider(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(vblank_irq); + void vblank_irq(int state); void draw_bitmap( bitmap_rgb32 &bitmap ); required_device m_maincpu; required_device m_gfxdecode; @@ -653,7 +653,7 @@ GFXDECODE_END * *************************************/ -WRITE_LINE_MEMBER(jollyjgr_state::vblank_irq) +void jollyjgr_state::vblank_irq(int state) { if (state && m_nmi_enable) m_maincpu->set_input_line(INPUT_LINE_NMI, ASSERT_LINE); diff --git a/src/mame/taito/lgp.cpp b/src/mame/taito/lgp.cpp index 875cb5ea3df..9a327615756 100644 --- a/src/mame/taito/lgp.cpp +++ b/src/mame/taito/lgp.cpp @@ -98,7 +98,7 @@ private: uint8_t ldp_read(); uint32_t screen_update_lgp(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(vblank_callback_lgp); - DECLARE_WRITE_LINE_MEMBER(ld_command_strobe_cb); + void ld_command_strobe_cb(int state); void lgp_palette(palette_device &palette) const; void main_io_map(address_map &map); @@ -367,7 +367,7 @@ void lgp_state::machine_start() { } -WRITE_LINE_MEMBER(lgp_state::ld_command_strobe_cb) +void lgp_state::ld_command_strobe_cb(int state) { //m_maincpu->set_input_line(INPUT_LINE_NMI, state ? ASSERT_LINE : CLEAR_LINE); } diff --git a/src/mame/taito/missb2.cpp b/src/mame/taito/missb2.cpp index 7752518b7de..76503840b98 100644 --- a/src/mame/taito/missb2.cpp +++ b/src/mame/taito/missb2.cpp @@ -51,7 +51,7 @@ private: void missb2_bg_bank_w(uint8_t data); void missb2_oki_w(uint8_t data); uint8_t missb2_oki_r(); - DECLARE_WRITE_LINE_MEMBER(irqhandler); + void irqhandler(int state); uint32_t screen_update_missb2(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); void maincpu_map(address_map &map); @@ -441,7 +441,7 @@ GFXDECODE_END /* Sound Interfaces */ // Handler called by the 3526 emulator when the internal timers cause an IRQ -WRITE_LINE_MEMBER(missb2_state::irqhandler) +void missb2_state::irqhandler(int state) { logerror("YM3526 firing an IRQ\n"); // m_audiocpu->set_input_line(0, irq ? ASSERT_LINE : CLEAR_LINE); diff --git a/src/mame/taito/mlanding.cpp b/src/mame/taito/mlanding.cpp index 6c914b2f959..971cc7d0525 100644 --- a/src/mame/taito/mlanding.cpp +++ b/src/mame/taito/mlanding.cpp @@ -166,8 +166,8 @@ private: void msm5205_1_addr_hi_w(u8 data); void msm5205_2_start_w(u8 data); void msm5205_2_stop_w(u8 data); - DECLARE_WRITE_LINE_MEMBER(msm5205_1_vck); - DECLARE_WRITE_LINE_MEMBER(z80ctc_to0); + void msm5205_1_vck(int state); + void z80ctc_to0(int state); u8 motor_r(); @@ -588,14 +588,14 @@ void mlanding_state::msm5205_update(unsigned chip) } -WRITE_LINE_MEMBER(mlanding_state::msm5205_1_vck) +void mlanding_state::msm5205_1_vck(int state) { if (state) msm5205_update(0); } -WRITE_LINE_MEMBER(mlanding_state::z80ctc_to0) +void mlanding_state::z80ctc_to0(int state) { if (m_msm2_vck2 && !state) { diff --git a/src/mame/taito/opwolf.cpp b/src/mame/taito/opwolf.cpp index 4522de07852..051e5fea454 100644 --- a/src/mame/taito/opwolf.cpp +++ b/src/mame/taito/opwolf.cpp @@ -351,7 +351,7 @@ private: void opwolf_colpri_cb(u32 &sprite_colbank, u32 &pri_mask, u16 sprite_ctrl); uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void opwolf_msm5205_vck(msm5205_device *device, int chip); - template DECLARE_WRITE_LINE_MEMBER(msm5205_vck_w); + template void msm5205_vck_w(int state); void opwolf_map(address_map &map); void opwolf_sound_z80_map(address_map &map); @@ -719,7 +719,7 @@ GFXDECODE_END //7 - N/C template -WRITE_LINE_MEMBER(opwolf_state::msm5205_vck_w) +void opwolf_state::msm5205_vck_w(int state) { if (m_adpcm_data[N] != -1) { diff --git a/src/mame/taito/othunder.cpp b/src/mame/taito/othunder.cpp index 28fd747168f..840d78a0fb2 100644 --- a/src/mame/taito/othunder.cpp +++ b/src/mame/taito/othunder.cpp @@ -308,13 +308,13 @@ void othunder_state::irq_ack_w(offs_t offset, u16 data) } } -WRITE_LINE_MEMBER( othunder_state::vblank_w ) +void othunder_state::vblank_w(int state) { if (state) m_maincpu->set_input_line(5, ASSERT_LINE); } -WRITE_LINE_MEMBER( othunder_state::adc_eoc_w ) +void othunder_state::adc_eoc_w(int state) { if (state) m_maincpu->set_input_line(6, ASSERT_LINE); diff --git a/src/mame/taito/othunder.h b/src/mame/taito/othunder.h index 0f22d6a7111..16b6e98bbcb 100644 --- a/src/mame/taito/othunder.h +++ b/src/mame/taito/othunder.h @@ -55,11 +55,11 @@ private: void irq_ack_w(offs_t offset, u16 data); void eeprom_w(u8 data); void coins_w(u8 data); - DECLARE_WRITE_LINE_MEMBER(adc_eoc_w); + void adc_eoc_w(int state); void sound_bankswitch_w(u8 data); void tc0310fam_w(offs_t offset, u8 data); u32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(vblank_w); + void vblank_w(int state); void othunder_map(address_map &map); void z80_sound_map(address_map &map); diff --git a/src/mame/taito/pitnrun.cpp b/src/mame/taito/pitnrun.cpp index 5204dee6012..a7eb0390954 100644 --- a/src/mame/taito/pitnrun.cpp +++ b/src/mame/taito/pitnrun.cpp @@ -102,7 +102,7 @@ public: void pitnrun(machine_config &config); - DECLARE_WRITE_LINE_MEMBER(tilt_w); // TODO: privatize eventually + void tilt_w(int state); // TODO: privatize eventually protected: virtual void machine_start() override; @@ -136,23 +136,23 @@ private: tilemap_t *m_bg = nullptr; tilemap_t *m_fg = nullptr; - DECLARE_WRITE_LINE_MEMBER(nmi_enable_w); - DECLARE_WRITE_LINE_MEMBER(hflip_w); - DECLARE_WRITE_LINE_MEMBER(vflip_w); + void nmi_enable_w(int state); + void hflip_w(int state); + void vflip_w(int state); uint8_t inputs_watchdog_r(); template void videoram_w(offs_t offset, uint8_t data); - DECLARE_WRITE_LINE_MEMBER(char_bank_select_w); + void char_bank_select_w(int state); void scroll_w(offs_t offset, uint8_t data); void scroll_y_w(uint8_t data); void ha_w(uint8_t data); void h_heed_w(uint8_t data); void v_heed_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(color_select_w); + void color_select_w(int state); TILE_GET_INFO_MEMBER(get_tile_info_fg); TILE_GET_INFO_MEMBER(get_tile_info_bg); - DECLARE_WRITE_LINE_MEMBER(vbl_w); + void vbl_w(int state); void main_map(address_map &map); @@ -254,7 +254,7 @@ void pitnrun_state::videoram_w(offs_t offset, uint8_t data) Which ? m_bg->mark_all_dirty() : m_fg->mark_all_dirty(); } -WRITE_LINE_MEMBER(pitnrun_state::char_bank_select_w) +void pitnrun_state::char_bank_select_w(int state) { m_char_bank = state; m_bg->mark_all_dirty(); @@ -287,7 +287,7 @@ void pitnrun_state::v_heed_w(uint8_t data) m_v_heed = data; } -WRITE_LINE_MEMBER(pitnrun_state::color_select_w) +void pitnrun_state::color_select_w(int state) { m_color_select = state; machine().tilemap().mark_all_dirty(); @@ -638,32 +638,32 @@ void pitnrun_mcu_state::machine_reset() m_mcu->set_input_line(0, CLEAR_LINE); } -WRITE_LINE_MEMBER(pitnrun_state::tilt_w) +void pitnrun_state::tilt_w(int state) { // HACK: this input actually asserts the master reset line on all devices if (state) reset(); } -WRITE_LINE_MEMBER(pitnrun_state::vbl_w) +void pitnrun_state::vbl_w(int state) { if (state && m_nmi) m_maincpu->set_input_line(INPUT_LINE_NMI, ASSERT_LINE); } -WRITE_LINE_MEMBER(pitnrun_state::nmi_enable_w) +void pitnrun_state::nmi_enable_w(int state) { m_nmi = state; if (!m_nmi) m_maincpu->set_input_line(INPUT_LINE_NMI, CLEAR_LINE); } -WRITE_LINE_MEMBER(pitnrun_state::hflip_w) +void pitnrun_state::hflip_w(int state) { flip_screen_x_set(state); } -WRITE_LINE_MEMBER(pitnrun_state::vflip_w) +void pitnrun_state::vflip_w(int state) { flip_screen_y_set(state); } diff --git a/src/mame/taito/qix.cpp b/src/mame/taito/qix.cpp index b05b930de1f..1532cb6e0e3 100644 --- a/src/mame/taito/qix.cpp +++ b/src/mame/taito/qix.cpp @@ -1443,12 +1443,12 @@ void qix_state::init_kram3() m_bank1->set_entry(0); } -WRITE_LINE_MEMBER(qix_state::kram3_lic_maincpu_changed) +void qix_state::kram3_lic_maincpu_changed(int state) { m_bank0->set_entry( state ? 1 : 0 ); } -WRITE_LINE_MEMBER(qix_state::kram3_lic_videocpu_changed) +void qix_state::kram3_lic_videocpu_changed(int state) { m_bank1->set_entry( state ? 1 : 0 ); } diff --git a/src/mame/taito/qix.h b/src/mame/taito/qix.h index bc18b808b8b..602e2349531 100644 --- a/src/mame/taito/qix.h +++ b/src/mame/taito/qix.h @@ -124,30 +124,30 @@ protected: TIMER_CALLBACK_MEMBER(pia_w_callback); TIMER_CALLBACK_MEMBER(deferred_sndpia1_porta_w); - DECLARE_WRITE_LINE_MEMBER(qix_vsync_changed); + void qix_vsync_changed(int state); void qix_pia_w(offs_t offset, uint8_t data); void qix_coinctl_w(uint8_t data); void slither_76489_0_w(uint8_t data); void slither_76489_1_w(uint8_t data); uint8_t slither_trak_lr_r(); uint8_t slither_trak_ud_r(); - DECLARE_WRITE_LINE_MEMBER(display_enable_changed); - DECLARE_WRITE_LINE_MEMBER(qix_flip_screen_w); + void display_enable_changed(int state); + void qix_flip_screen_w(int state); void qix_dac_w(uint8_t data); void qix_vol_w(uint8_t data); void sndpia_2_warning_w(uint8_t data); void sync_sndpia1_porta_w(uint8_t data); void slither_coinctl_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(qix_pia_dint); - DECLARE_WRITE_LINE_MEMBER(qix_pia_sint); + void qix_pia_dint(int state); + void qix_pia_sint(int state); MC6845_BEGIN_UPDATE(crtc_begin_update); MC6845_UPDATE_ROW(crtc_update_row); void set_pen(int offs); int kram3_permut1(int idx, int value); int kram3_permut2(int tbl_index, int idx, const uint8_t *xor_table); int kram3_decrypt(int address, int value); - DECLARE_WRITE_LINE_MEMBER(kram3_lic_maincpu_changed); - DECLARE_WRITE_LINE_MEMBER(kram3_lic_videocpu_changed); + void kram3_lic_maincpu_changed(int state); + void kram3_lic_videocpu_changed(int state); void audio_map(address_map &map); void kram3_main_map(address_map &map); diff --git a/src/mame/taito/qix_a.cpp b/src/mame/taito/qix_a.cpp index 0d91566498b..9cf97840aa7 100644 --- a/src/mame/taito/qix_a.cpp +++ b/src/mame/taito/qix_a.cpp @@ -131,7 +131,7 @@ void qix_state::slither_coinctl_w(uint8_t data) * *************************************/ -WRITE_LINE_MEMBER(qix_state::qix_pia_dint) +void qix_state::qix_pia_dint(int state) { int combined_state = m_sndpia0->irq_a_state() | m_sndpia0->irq_b_state(); @@ -140,7 +140,7 @@ WRITE_LINE_MEMBER(qix_state::qix_pia_dint) } -WRITE_LINE_MEMBER(qix_state::qix_pia_sint) +void qix_state::qix_pia_sint(int state) { int combined_state = m_sndpia1->irq_a_state() | m_sndpia1->irq_b_state(); diff --git a/src/mame/taito/qix_m.cpp b/src/mame/taito/qix_m.cpp index c71c1d72b27..ab6037400a3 100644 --- a/src/mame/taito/qix_m.cpp +++ b/src/mame/taito/qix_m.cpp @@ -50,7 +50,7 @@ void zookeep_state::machine_start() * *************************************/ -WRITE_LINE_MEMBER(qix_state::qix_vsync_changed) +void qix_state::qix_vsync_changed(int state) { m_sndpia0->cb1_w(state); } diff --git a/src/mame/taito/qix_v.cpp b/src/mame/taito/qix_v.cpp index dd05cb0b5da..7ed8ae82ab8 100644 --- a/src/mame/taito/qix_v.cpp +++ b/src/mame/taito/qix_v.cpp @@ -41,7 +41,7 @@ void qix_state::video_start() * *************************************/ -WRITE_LINE_MEMBER(qix_state::display_enable_changed) +void qix_state::display_enable_changed(int state) { /* on the rising edge, latch the scanline */ if (state) @@ -62,7 +62,7 @@ WRITE_LINE_MEMBER(qix_state::display_enable_changed) * *************************************/ -WRITE_LINE_MEMBER(qix_state::qix_flip_screen_w) +void qix_state::qix_flip_screen_w(int state) { m_flip = state; } diff --git a/src/mame/taito/rastan.cpp b/src/mame/taito/rastan.cpp index 892e281497e..1506698e5af 100644 --- a/src/mame/taito/rastan.cpp +++ b/src/mame/taito/rastan.cpp @@ -218,7 +218,7 @@ private: void msm5205_stop_w(u8 data); void colpri_cb(u32 &sprite_colbank, u32 &pri_mask, u16 sprite_ctrl); u32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(msm5205_vck); + void msm5205_vck(int state); void main_map(address_map &map); void sound_map(address_map &map); }; @@ -265,7 +265,7 @@ void rastan_state::sound_bankswitch_w(u8 data) m_audiobank->set_entry(data & 3); } -WRITE_LINE_MEMBER(rastan_state::msm5205_vck) +void rastan_state::msm5205_vck(int state) { if (!state) return; diff --git a/src/mame/taito/retofinv.cpp b/src/mame/taito/retofinv.cpp index 0a629b2661d..432279e95a0 100644 --- a/src/mame/taito/retofinv.cpp +++ b/src/mame/taito/retofinv.cpp @@ -159,10 +159,10 @@ protected: private: void cpu2_m6000_w(uint8_t data); uint8_t cpu0_mf800_r(); - DECLARE_WRITE_LINE_MEMBER(irq0_ack_w); - DECLARE_WRITE_LINE_MEMBER(irq1_ack_w); + void irq0_ack_w(int state); + void irq1_ack_w(int state); void coincounter_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(coinlockout_w); + void coinlockout_w(int state); void bg_videoram_w(offs_t offset, uint8_t data); void fg_videoram_w(offs_t offset, uint8_t data); void gfx_ctrl_w(offs_t offset, uint8_t data); @@ -479,14 +479,14 @@ uint8_t retofinv_state::cpu0_mf800_r() return m_cpu2_m6000; } -WRITE_LINE_MEMBER(retofinv_state::irq0_ack_w) +void retofinv_state::irq0_ack_w(int state) { m_main_irq_mask = state; if (!m_main_irq_mask) m_maincpu->set_input_line(0, CLEAR_LINE); } -WRITE_LINE_MEMBER(retofinv_state::irq1_ack_w) +void retofinv_state::irq1_ack_w(int state) { m_sub_irq_mask = state; if (!m_sub_irq_mask) @@ -498,7 +498,7 @@ void retofinv_state::coincounter_w(uint8_t data) machine().bookkeeping().coin_counter_w(0, data & 1); } -WRITE_LINE_MEMBER(retofinv_state::coinlockout_w) +void retofinv_state::coinlockout_w(int state) { machine().bookkeeping().coin_lockout_w(0, !state); } diff --git a/src/mame/taito/rollrace.cpp b/src/mame/taito/rollrace.cpp index b48f2ef2a53..9b3dfc9677c 100644 --- a/src/mame/taito/rollrace.cpp +++ b/src/mame/taito/rollrace.cpp @@ -87,17 +87,17 @@ private: uint8_t fake_d900_r(); void fake_d900_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(nmi_mask_w); + void nmi_mask_w(int state); void sound_nmi_mask_w(uint8_t data); - template DECLARE_WRITE_LINE_MEMBER(coin_counter_w); - DECLARE_WRITE_LINE_MEMBER(charbank_0_w); - DECLARE_WRITE_LINE_MEMBER(charbank_1_w); + template void coin_counter_w(int state); + void charbank_0_w(int state); + void charbank_1_w(int state); void bkgpen_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(spritebank_w); + void spritebank_w(int state); void backgroundpage_w(uint8_t data); void backgroundcolor_w(uint8_t data); void flipy_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(flipx_w); + void flipx_w(int state); void vram_w(offs_t offset, uint8_t data); void cram_w(offs_t offset, uint8_t data); TILE_GET_INFO_MEMBER(get_fg_tile_info); @@ -107,7 +107,7 @@ private: uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(vblank_irq); + void vblank_irq(int state); INTERRUPT_GEN_MEMBER(sound_timer_irq); void main_map(address_map &map); void sound_map(address_map &map); @@ -200,13 +200,13 @@ void rollrace_state::palette(palette_device &palette) const } } -WRITE_LINE_MEMBER(rollrace_state::charbank_0_w) +void rollrace_state::charbank_0_w(int state) { m_chrbank = state | (m_chrbank & 2); m_fg_tilemap->mark_all_dirty(); } -WRITE_LINE_MEMBER(rollrace_state::charbank_1_w) +void rollrace_state::charbank_1_w(int state) { m_chrbank = (m_chrbank & 1) | (state << 1); m_fg_tilemap->mark_all_dirty(); @@ -217,7 +217,7 @@ void rollrace_state::bkgpen_w(uint8_t data) m_bkgpen = data; } -WRITE_LINE_MEMBER(rollrace_state::spritebank_w) +void rollrace_state::spritebank_w(int state) { m_spritebank = state; } @@ -241,7 +241,7 @@ void rollrace_state::flipy_w(uint8_t data) // bit 2: cleared at night stage in attract, unknown purpose } -WRITE_LINE_MEMBER(rollrace_state::flipx_w) +void rollrace_state::flipx_w(int state) { m_flipx = state; m_fg_tilemap->set_flip(m_flipx ? TILEMAP_FLIPX | TILEMAP_FLIPY : 0); @@ -341,7 +341,7 @@ void rollrace_state::fake_d900_w(uint8_t data) LOGD900("d900: %02X\n", data); } -WRITE_LINE_MEMBER(rollrace_state::nmi_mask_w) +void rollrace_state::nmi_mask_w(int state) { m_nmi_mask = state; if (!m_nmi_mask) @@ -354,7 +354,7 @@ void rollrace_state::sound_nmi_mask_w(uint8_t data) } template -WRITE_LINE_MEMBER(rollrace_state::coin_counter_w) +void rollrace_state::coin_counter_w(int state) { machine().bookkeeping().coin_counter_w(Which, state); } @@ -530,7 +530,7 @@ static GFXDECODE_START( gfx_rollrace ) GFXDECODE_ENTRY( "sprites_2", 0x0000, spritelayout, 0, 32 ) GFXDECODE_END -WRITE_LINE_MEMBER(rollrace_state::vblank_irq) +void rollrace_state::vblank_irq(int state) { if (state && m_nmi_mask) m_maincpu->set_input_line(INPUT_LINE_NMI, ASSERT_LINE); diff --git a/src/mame/taito/sbmjb.cpp b/src/mame/taito/sbmjb.cpp index fa58dfc4858..03484337492 100644 --- a/src/mame/taito/sbmjb.cpp +++ b/src/mame/taito/sbmjb.cpp @@ -69,7 +69,7 @@ private: required_device m_maincpu; required_device m_vdpcpu; - DECLARE_WRITE_LINE_MEMBER(screen_vblank); + void screen_vblank(int state); TIMER_DEVICE_CALLBACK_MEMBER(scanline_callback); void main_map(address_map &map); @@ -78,7 +78,7 @@ private: }; -WRITE_LINE_MEMBER(sbmjb_state::screen_vblank) // TODO: copy-pasted from other drivers using same chip, to be verified +void sbmjb_state::screen_vblank(int state) // TODO: copy-pasted from other drivers using same chip, to be verified { if (state) { diff --git a/src/mame/taito/scyclone.cpp b/src/mame/taito/scyclone.cpp index ba4875dda29..0e95e04b702 100644 --- a/src/mame/taito/scyclone.cpp +++ b/src/mame/taito/scyclone.cpp @@ -68,7 +68,7 @@ public: void scyclone(machine_config &config); - DECLARE_READ_LINE_MEMBER(collision_r); + int collision_r(); private: void vidctrl_w(uint8_t data); @@ -354,7 +354,7 @@ void scyclone_state::scyclone_sub_iomap(address_map &map) // appears to be when a white bitmap pixel (col 0x7) collides with a large sprite? // if you simply set it to 1 and shoot in the left corner, the game gets stuck // but if you have it set to 0 there are no collisions with large objects -READ_LINE_MEMBER(scyclone_state::collision_r) +int scyclone_state::collision_r() { return m_hascollided; } diff --git a/src/mame/taito/slapshot.h b/src/mame/taito/slapshot.h index 99116c35be3..f791a7e7b68 100644 --- a/src/mame/taito/slapshot.h +++ b/src/mame/taito/slapshot.h @@ -101,7 +101,7 @@ private: void coin_control_w(u8 data); u32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(screen_vblank_no_buffer); + void screen_vblank_no_buffer(int state); void draw_sprites(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, u32 *primasks, int y_offset); void handle_sprite_buffering(); void update_sprites_active_area(); diff --git a/src/mame/taito/slapshot_v.cpp b/src/mame/taito/slapshot_v.cpp index 11e44c010a1..fe0c7a26d6f 100644 --- a/src/mame/taito/slapshot_v.cpp +++ b/src/mame/taito/slapshot_v.cpp @@ -402,7 +402,7 @@ void slapshot_state::update_sprites_active_area() } } -WRITE_LINE_MEMBER(slapshot_state::screen_vblank_no_buffer) +void slapshot_state::screen_vblank_no_buffer(int state) { // rising edge if (state) diff --git a/src/mame/taito/ssrj.cpp b/src/mame/taito/ssrj.cpp index a69ceff597d..f11b3b09687 100644 --- a/src/mame/taito/ssrj.cpp +++ b/src/mame/taito/ssrj.cpp @@ -86,7 +86,7 @@ private: void palette(palette_device &palette) const; uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(screen_vblank); + void screen_vblank(int state); void draw_objects(bitmap_ind16 &bitmap, const rectangle &cliprect); void prg_map(address_map &map); diff --git a/src/mame/taito/superqix.cpp b/src/mame/taito/superqix.cpp index 1f1c0586472..9977d8f8c3c 100644 --- a/src/mame/taito/superqix.cpp +++ b/src/mame/taito/superqix.cpp @@ -226,12 +226,12 @@ The MCU acts this way: **************************************************************************/ -READ_LINE_MEMBER(superqix_state::fromz80_semaphore_input_r) +int superqix_state::fromz80_semaphore_input_r() { return (m_z80_has_written ? 1 : 0); } -READ_LINE_MEMBER(superqix_state::frommcu_semaphore_input_r) +int superqix_state::frommcu_semaphore_input_r() { return (m_mcu_has_written ? 1 : 0); } @@ -1428,7 +1428,7 @@ static GFXDECODE_START( gfx_sqix ) GFXDECODE_END -WRITE_LINE_MEMBER(hotsmash_state::vblank_irq) +void hotsmash_state::vblank_irq(int state) { if (state && m_nmi_mask) m_maincpu->set_input_line(INPUT_LINE_NMI, ASSERT_LINE); diff --git a/src/mame/taito/superqix.h b/src/mame/taito/superqix.h index 5d895479095..53cc1a51a16 100644 --- a/src/mame/taito/superqix.h +++ b/src/mame/taito/superqix.h @@ -93,8 +93,8 @@ public: void sqix_8031(machine_config &config); void sqix_nomcu(machine_config &config); - DECLARE_READ_LINE_MEMBER(fromz80_semaphore_input_r); - DECLARE_READ_LINE_MEMBER(frommcu_semaphore_input_r); + int fromz80_semaphore_input_r(); + int frommcu_semaphore_input_r(); protected: virtual void machine_start() override; @@ -176,7 +176,7 @@ private: void pbillian_sample_trigger_w(u8 data); void pbillian_0410_w(u8 data); - DECLARE_WRITE_LINE_MEMBER(vblank_irq); + void vblank_irq(int state); SAMPLES_START_CB_MEMBER(pbillian_sh_start); diff --git a/src/mame/taito/taito_f2.h b/src/mame/taito/taito_f2.h index fd672262295..fe7979b9183 100644 --- a/src/mame/taito/taito_f2.h +++ b/src/mame/taito/taito_f2.h @@ -233,11 +233,11 @@ protected: u32 screen_update_deadconx(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); u32 screen_update_yesnoj(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); u32 screen_update_metalb(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(screen_vblank_no_buffer); - DECLARE_WRITE_LINE_MEMBER(screen_vblank_partial_buffer_delayed); - DECLARE_WRITE_LINE_MEMBER(screen_vblank_partial_buffer_delayed_thundfox); - DECLARE_WRITE_LINE_MEMBER(screen_vblank_full_buffer_delayed); - DECLARE_WRITE_LINE_MEMBER(screen_vblank_partial_buffer_delayed_qzchikyu); + void screen_vblank_no_buffer(int state); + void screen_vblank_partial_buffer_delayed(int state); + void screen_vblank_partial_buffer_delayed_thundfox(int state); + void screen_vblank_full_buffer_delayed(int state); + void screen_vblank_partial_buffer_delayed_qzchikyu(int state); INTERRUPT_GEN_MEMBER(interrupt); INTERRUPT_GEN_MEMBER(megab_interrupt); TIMER_DEVICE_CALLBACK_MEMBER(cchip_irq_clear_cb); diff --git a/src/mame/taito/taito_f2_v.cpp b/src/mame/taito/taito_f2_v.cpp index ebbeeb5fbd9..c2081ece5a3 100644 --- a/src/mame/taito/taito_f2_v.cpp +++ b/src/mame/taito/taito_f2_v.cpp @@ -878,7 +878,7 @@ void taitof2_state::update_sprites_active_area() } -WRITE_LINE_MEMBER(taitof2_state::screen_vblank_no_buffer) +void taitof2_state::screen_vblank_no_buffer(int state) { // rising edge if (state) @@ -889,7 +889,7 @@ WRITE_LINE_MEMBER(taitof2_state::screen_vblank_no_buffer) } } -WRITE_LINE_MEMBER(taitof2_state::screen_vblank_full_buffer_delayed) +void taitof2_state::screen_vblank_full_buffer_delayed(int state) { // rising edge if (state) @@ -904,7 +904,7 @@ WRITE_LINE_MEMBER(taitof2_state::screen_vblank_full_buffer_delayed) } } -WRITE_LINE_MEMBER(taitof2_state::screen_vblank_partial_buffer_delayed) +void taitof2_state::screen_vblank_partial_buffer_delayed(int state) { // rising edge if (state) @@ -919,7 +919,7 @@ WRITE_LINE_MEMBER(taitof2_state::screen_vblank_partial_buffer_delayed) } } -WRITE_LINE_MEMBER(taitof2_state::screen_vblank_partial_buffer_delayed_thundfox) +void taitof2_state::screen_vblank_partial_buffer_delayed_thundfox(int state) { // rising edge if (state) @@ -938,7 +938,7 @@ WRITE_LINE_MEMBER(taitof2_state::screen_vblank_partial_buffer_delayed_thundfox) } } -WRITE_LINE_MEMBER(taitof2_state::screen_vblank_partial_buffer_delayed_qzchikyu) +void taitof2_state::screen_vblank_partial_buffer_delayed_qzchikyu(int state) { // rising edge if (state) diff --git a/src/mame/taito/taito_f3.h b/src/mame/taito/taito_f3.h index 76acda4c845..e3ecbcb6b66 100644 --- a/src/mame/taito/taito_f3.h +++ b/src/mame/taito/taito_f3.h @@ -302,7 +302,7 @@ protected: TILE_GET_INFO_MEMBER(get_tile_info_text); TILE_GET_INFO_MEMBER(get_tile_info_pixel); u32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(screen_vblank); + void screen_vblank(int state); void bubsympb_map(address_map &map); void f3_map(address_map &map); diff --git a/src/mame/taito/taito_f3_v.cpp b/src/mame/taito/taito_f3_v.cpp index cd4da179eeb..052ce8491f5 100644 --- a/src/mame/taito/taito_f3_v.cpp +++ b/src/mame/taito/taito_f3_v.cpp @@ -451,7 +451,7 @@ TILE_GET_INFO_MEMBER(taito_f3_state::get_tile_info_pixel) /******************************************************************************/ -WRITE_LINE_MEMBER(taito_f3_state::screen_vblank) +void taito_f3_state::screen_vblank(int state) { // rising edge if (state) diff --git a/src/mame/taito/taito_l.cpp b/src/mame/taito/taito_l.cpp index 48593b8ac52..5768c6fcf1a 100644 --- a/src/mame/taito/taito_l.cpp +++ b/src/mame/taito/taito_l.cpp @@ -208,7 +208,7 @@ u8 taitol_state::mcu_control_r() return 0x1; } -WRITE_LINE_MEMBER(champwr_state::msm5205_vck) +void champwr_state::msm5205_vck(int state) { if (m_adpcm_data != -1) { diff --git a/src/mame/taito/taito_l.h b/src/mame/taito/taito_l.h index 4ad14acc53b..e5b9c2e03d9 100644 --- a/src/mame/taito/taito_l.h +++ b/src/mame/taito/taito_l.h @@ -39,7 +39,7 @@ protected: void mcu_control_w(u8 data); u8 mcu_control_r(); - DECLARE_WRITE_LINE_MEMBER(screen_vblank_taitol); + void screen_vblank_taitol(int state); TIMER_DEVICE_CALLBACK_MEMBER(vbl_interrupt); void l_system_video(machine_config &config) ATTR_COLD; @@ -132,7 +132,7 @@ public: { } - DECLARE_WRITE_LINE_MEMBER(msm5205_vck); + void msm5205_vck(int state); void msm5205_lo_w(u8 data); void msm5205_hi_w(u8 data); diff --git a/src/mame/taito/taito_l_v.cpp b/src/mame/taito/taito_l_v.cpp index 22c597cf032..28b4d1bdf3e 100644 --- a/src/mame/taito/taito_l_v.cpp +++ b/src/mame/taito/taito_l_v.cpp @@ -33,7 +33,7 @@ void horshoes_state::bankg_w(u8 data) ***************************************************************************/ -WRITE_LINE_MEMBER(taitol_state::screen_vblank_taitol) +void taitol_state::screen_vblank_taitol(int state) { // rising edge if (state) diff --git a/src/mame/taito/taito_z.h b/src/mame/taito/taito_z.h index 6402bc6417c..c168421c69e 100644 --- a/src/mame/taito/taito_z.h +++ b/src/mame/taito/taito_z.h @@ -169,7 +169,7 @@ protected: private: u8 contcirc_input_bypass_r(); void contcirc_out_w(u8 data); - DECLARE_WRITE_LINE_MEMBER(scope_vblank); + void scope_vblank(int state); void contcirc_draw_sprites_16x8(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int y_offs); u32 screen_update_contcirc(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); diff --git a/src/mame/taito/taito_z_v.cpp b/src/mame/taito/taito_z_v.cpp index 67926a2a367..44d0f13c686 100644 --- a/src/mame/taito/taito_z_v.cpp +++ b/src/mame/taito/taito_z_v.cpp @@ -800,7 +800,7 @@ void contcirc_state::contcirc_out_w(u8 data) m_road_palbank = (data & 0xc0) >> 6; } -WRITE_LINE_MEMBER(contcirc_state::scope_vblank) +void contcirc_state::scope_vblank(int state) { if (state) { diff --git a/src/mame/taito/taitoio_yoke.cpp b/src/mame/taito/taitoio_yoke.cpp index eac82c0f369..b35998f1263 100644 --- a/src/mame/taito/taitoio_yoke.cpp +++ b/src/mame/taito/taitoio_yoke.cpp @@ -100,42 +100,42 @@ u16 taitoio_yoke_device::throttle_r() return m_throttle->read(); } -READ_LINE_MEMBER( taitoio_yoke_device::slot_down_r ) +int taitoio_yoke_device::slot_down_r() { uint16_t throttle = m_throttle->read(); return (throttle & 0xe00) == 0x600; } -READ_LINE_MEMBER( taitoio_yoke_device::slot_up_r ) +int taitoio_yoke_device::slot_up_r() { uint16_t throttle = m_throttle->read(); return (throttle & 0xe00) == 0x800; } -READ_LINE_MEMBER( taitoio_yoke_device::handle_left_r ) +int taitoio_yoke_device::handle_left_r() { uint16_t x = m_stick_x->read(); return (x & 0xe00) == 0x800; } -READ_LINE_MEMBER( taitoio_yoke_device::handle_right_r ) +int taitoio_yoke_device::handle_right_r() { uint16_t x = m_stick_x->read(); return (x & 0xe00) == 0x600; } -READ_LINE_MEMBER( taitoio_yoke_device::handle_up_r ) +int taitoio_yoke_device::handle_up_r() { uint16_t y = m_stick_y->read(); return (y & 0xe00) == 0x800; } -READ_LINE_MEMBER( taitoio_yoke_device::handle_down_r ) +int taitoio_yoke_device::handle_down_r() { uint16_t y = m_stick_y->read(); diff --git a/src/mame/taito/taitoio_yoke.h b/src/mame/taito/taitoio_yoke.h index 716c12597c8..aeb4e9be36a 100644 --- a/src/mame/taito/taitoio_yoke.h +++ b/src/mame/taito/taitoio_yoke.h @@ -26,12 +26,12 @@ public: u16 stickx_r(); u16 sticky_r(); - DECLARE_READ_LINE_MEMBER( slot_up_r ); - DECLARE_READ_LINE_MEMBER( slot_down_r ); - DECLARE_READ_LINE_MEMBER( handle_left_r ); - DECLARE_READ_LINE_MEMBER( handle_right_r ); - DECLARE_READ_LINE_MEMBER( handle_up_r ); - DECLARE_READ_LINE_MEMBER( handle_down_r ); + int slot_up_r(); + int slot_down_r(); + int handle_left_r(); + int handle_right_r(); + int handle_up_r(); + int handle_down_r(); protected: virtual ioport_constructor device_input_ports() const override; diff --git a/src/mame/taito/taitosj.h b/src/mame/taito/taitosj.h index f624b971813..b8251f15cd3 100644 --- a/src/mame/taito/taitosj.h +++ b/src/mame/taito/taitosj.h @@ -127,8 +127,8 @@ private: uint8_t fake_status_r(); uint8_t mcu_mem_r(offs_t offset); void mcu_mem_w(offs_t offset, uint8_t data); - DECLARE_WRITE_LINE_MEMBER(mcu_intrq_w); - DECLARE_WRITE_LINE_MEMBER(mcu_busrq_w); + void mcu_intrq_w(int state); + void mcu_busrq_w(int state); uint8_t spacecr_prot_r(); void alpine_protection_w(uint8_t data); void alpinea_bankswitch_w(uint8_t data); diff --git a/src/mame/taito/taitosj_m.cpp b/src/mame/taito/taitosj_m.cpp index 691e16b2309..f555345dfff 100644 --- a/src/mame/taito/taitosj_m.cpp +++ b/src/mame/taito/taitosj_m.cpp @@ -100,14 +100,14 @@ void taitosj_state::mcu_mem_w(offs_t offset, uint8_t data) m_maincpu->space(AS_PROGRAM).write_byte(offset, data); } -WRITE_LINE_MEMBER(taitosj_state::mcu_intrq_w) +void taitosj_state::mcu_intrq_w(int state) { // FIXME: there's a logic network here that makes this edge sensitive or something and mixes it with other interrupt sources if (CLEAR_LINE != state) LOG(("68705 68INTRQ **NOT SUPPORTED**!\n")); } -WRITE_LINE_MEMBER(taitosj_state::mcu_busrq_w) +void taitosj_state::mcu_busrq_w(int state) { // this actually goes to the Z80 BUSRQ (aka WAIT) pin, and the MCU waits for the bus to become available // we're pretending this happens immediately to make life easier diff --git a/src/mame/taito/taitosjsec.cpp b/src/mame/taito/taitosjsec.cpp index 91cdf1e0b15..cf649f0e7be 100644 --- a/src/mame/taito/taitosjsec.cpp +++ b/src/mame/taito/taitosjsec.cpp @@ -70,12 +70,12 @@ void taito_sj_security_mcu_device::data_w(offs_t offset, u8 data) } } -WRITE_LINE_MEMBER(taito_sj_security_mcu_device::busak_w) +void taito_sj_security_mcu_device::busak_w(int state) { m_busak = (ASSERT_LINE == state); } -WRITE_LINE_MEMBER(taito_sj_security_mcu_device::reset_w) +void taito_sj_security_mcu_device::reset_w(int state) { m_reset = (ASSERT_LINE == state); if (CLEAR_LINE != state) diff --git a/src/mame/taito/taitosjsec.h b/src/mame/taito/taitosjsec.h index a6997d776d5..953ec684179 100644 --- a/src/mame/taito/taitosjsec.h +++ b/src/mame/taito/taitosjsec.h @@ -37,8 +37,8 @@ public: u8 data_r(address_space &space, offs_t offset); void data_w(offs_t offset, u8 data); - DECLARE_WRITE_LINE_MEMBER(busak_w); - DECLARE_WRITE_LINE_MEMBER(reset_w); + void busak_w(int state); + void reset_w(int state); protected: void device_start() override; diff --git a/src/mame/taito/taitotz.cpp b/src/mame/taito/taitotz.cpp index b8dcbc05661..c9ea63ce3e8 100644 --- a/src/mame/taito/taitotz.cpp +++ b/src/mame/taito/taitotz.cpp @@ -628,7 +628,7 @@ private: INTERRUPT_GEN_MEMBER(taitotz_vbi); uint16_t tlcs_ide0_r(offs_t offset, uint16_t mem_mask = ~0); uint16_t tlcs_ide1_r(offs_t offset, uint16_t mem_mask = ~0); - DECLARE_WRITE_LINE_MEMBER(ide_interrupt); + void ide_interrupt(int state); void draw_tile(uint32_t pos, uint32_t tile); uint32_t video_mem_r(uint32_t address); void video_mem_w(uint32_t address, uint32_t data); @@ -2625,7 +2625,7 @@ INTERRUPT_GEN_MEMBER(taitotz_state::taitotz_vbi) m_iocpu->set_input_line(TLCS900_INT3, ASSERT_LINE); } -WRITE_LINE_MEMBER(taitotz_state::ide_interrupt) +void taitotz_state::ide_interrupt(int state) { m_iocpu->set_input_line(TLCS900_INT2, state); } diff --git a/src/mame/taito/tc0080vco.cpp b/src/mame/taito/tc0080vco.cpp index 28c18d5ce30..b2bb9c01faa 100644 --- a/src/mame/taito/tc0080vco.cpp +++ b/src/mame/taito/tc0080vco.cpp @@ -765,7 +765,7 @@ u16 tc0080vco_device::scrram_r(int offset) return m_scroll_ram[offset]; } -READ_LINE_MEMBER( tc0080vco_device::flipscreen_r ) +int tc0080vco_device::flipscreen_r() { return m_flipscreen; } diff --git a/src/mame/taito/tc0080vco.h b/src/mame/taito/tc0080vco.h index 660330c3897..f98a0c00553 100644 --- a/src/mame/taito/tc0080vco.h +++ b/src/mame/taito/tc0080vco.h @@ -36,7 +36,7 @@ public: u16 sprram_r(int offset); u16 scrram_r(int offset); void scrollram_w(offs_t offset, u16 data); - READ_LINE_MEMBER( flipscreen_r ); + int flipscreen_r(); int get_sprite_x() { return m_sprite.x0; } int get_sprite_y() { return m_sprite.y0; } diff --git a/src/mame/taito/tnzs.cpp b/src/mame/taito/tnzs.cpp index c1debfd699e..0d6d9f4f025 100644 --- a/src/mame/taito/tnzs.cpp +++ b/src/mame/taito/tnzs.cpp @@ -896,7 +896,7 @@ public: void tnzsb(machine_config &config) ATTR_COLD; protected: - DECLARE_WRITE_LINE_MEMBER(ym2203_irqhandler); + void ym2203_irqhandler(int state); void sound_command_w(uint8_t data); @@ -1409,7 +1409,7 @@ void tnzsb_state::sound_command_w(uint8_t data) } // handler called by the 2203 emulator when the internal timers cause an IRQ -WRITE_LINE_MEMBER(tnzsb_state::ym2203_irqhandler) +void tnzsb_state::ym2203_irqhandler(int state) { m_audiocpu->set_input_line(INPUT_LINE_NMI, state ? ASSERT_LINE : CLEAR_LINE); } diff --git a/src/mame/taito/tnzs_video.cpp b/src/mame/taito/tnzs_video.cpp index 042abf1ef38..f2c4f31f9f7 100644 --- a/src/mame/taito/tnzs_video.cpp +++ b/src/mame/taito/tnzs_video.cpp @@ -38,7 +38,7 @@ uint32_t tnzs_video_state_base::screen_update_tnzs(screen_device &screen, bitmap return 0; } -WRITE_LINE_MEMBER(tnzs_video_state_base::screen_vblank_tnzs) +void tnzs_video_state_base::screen_vblank_tnzs(int state) { // rising edge if (state) diff --git a/src/mame/taito/tnzs_video.h b/src/mame/taito/tnzs_video.h index e4a9dd30324..74a1c36f1ab 100644 --- a/src/mame/taito/tnzs_video.h +++ b/src/mame/taito/tnzs_video.h @@ -25,7 +25,7 @@ protected: void prompalette(palette_device &palette) const; uint32_t screen_update_tnzs(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(screen_vblank_tnzs); + void screen_vblank_tnzs(int state); required_device m_maincpu; required_device m_spritegen; diff --git a/src/mame/taito/topspeed.cpp b/src/mame/taito/topspeed.cpp index 5db76d9db57..6dd9a5430c1 100644 --- a/src/mame/taito/topspeed.cpp +++ b/src/mame/taito/topspeed.cpp @@ -283,7 +283,7 @@ void topspeed_state::msm5205_update(int chip) m_msm_nibble[chip] ^= 1; } -WRITE_LINE_MEMBER(topspeed_state::msm5205_1_vck) +void topspeed_state::msm5205_1_vck(int state) { msm5205_update(0); } @@ -338,7 +338,7 @@ void topspeed_state::volume_w(offs_t offset, u8 data) filter->flt_volume_set_volume(data / 255.0f); } -WRITE_LINE_MEMBER(topspeed_state::z80ctc_to0) +void topspeed_state::z80ctc_to0(int state) { if (m_msm2_vck2 && !state) { diff --git a/src/mame/taito/topspeed.h b/src/mame/taito/topspeed.h index 2c5c35b22fb..f22f66f463e 100644 --- a/src/mame/taito/topspeed.h +++ b/src/mame/taito/topspeed.h @@ -98,8 +98,8 @@ private: void coins_w(u8 data); void msm5205_command_w(offs_t offset, u8 data); - DECLARE_WRITE_LINE_MEMBER(msm5205_1_vck); - DECLARE_WRITE_LINE_MEMBER(z80ctc_to0); + void msm5205_1_vck(int state); + void z80ctc_to0(int state); void volume_w(offs_t offset, u8 data); // video/topspeed.cpp diff --git a/src/mame/taito/tsamurai.cpp b/src/mame/taito/tsamurai.cpp index b3b28a22ad2..b0a72b28de4 100644 --- a/src/mame/taito/tsamurai.cpp +++ b/src/mame/taito/tsamurai.cpp @@ -74,12 +74,12 @@ void vsgongf_state::machine_start() save_item(NAME(m_vsgongf_sound_nmi_enabled)); } -WRITE_LINE_MEMBER(tsamurai_state::nmi_enable_w) +void tsamurai_state::nmi_enable_w(int state) { m_nmi_enabled = state; } -WRITE_LINE_MEMBER(tsamurai_state::vblank_irq) +void tsamurai_state::vblank_irq(int state) { if (state && m_nmi_enabled) m_maincpu->pulse_input_line(INPUT_LINE_NMI, attotime::zero); @@ -128,17 +128,17 @@ void m660_state::m660_sound_command3_w(uint8_t data) m_audio3->set_input_line(0, HOLD_LINE ); } -WRITE_LINE_MEMBER(tsamurai_state::flip_screen_w) +void tsamurai_state::flip_screen_w(int state) { flip_screen_set(state); } -WRITE_LINE_MEMBER(tsamurai_state::coin1_counter_w) +void tsamurai_state::coin1_counter_w(int state) { machine().bookkeeping().coin_counter_w(0, state); } -WRITE_LINE_MEMBER(tsamurai_state::coin2_counter_w) +void tsamurai_state::coin2_counter_w(int state) { machine().bookkeeping().coin_counter_w(1, state); } diff --git a/src/mame/taito/tsamurai.h b/src/mame/taito/tsamurai.h index 6841b633912..9346a3ae284 100644 --- a/src/mame/taito/tsamurai.h +++ b/src/mame/taito/tsamurai.h @@ -33,16 +33,16 @@ protected: virtual void video_start() override; // common - DECLARE_WRITE_LINE_MEMBER(nmi_enable_w); - DECLARE_WRITE_LINE_MEMBER(coin1_counter_w); - DECLARE_WRITE_LINE_MEMBER(coin2_counter_w); - DECLARE_WRITE_LINE_MEMBER(textbank1_w); + void nmi_enable_w(int state); + void coin1_counter_w(int state); + void coin2_counter_w(int state); + void textbank1_w(int state); void fg_videoram_w(offs_t offset, uint8_t data); // tsamurai and m660 specific void bg_videoram_w(offs_t offset, uint8_t data); void fg_colorram_w(offs_t offset, uint8_t data); - DECLARE_WRITE_LINE_MEMBER(flip_screen_w); + void flip_screen_w(int state); void scrolly_w(uint8_t data); void scrollx_w(uint8_t data); void bgcolor_w(uint8_t data); @@ -59,7 +59,7 @@ protected: uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(vblank_irq); + void vblank_irq(int state); void main_map(address_map &map); void sound1_map(address_map &map); @@ -158,7 +158,7 @@ protected: private: // m660 specific - DECLARE_WRITE_LINE_MEMBER(textbank2_w); + void textbank2_w(int state); uint8_t m660_unknown_d803_r(); void m660_sound_command3_w(uint8_t data); uint8_t m660_sound_command3_r(); diff --git a/src/mame/taito/tsamurai_v.cpp b/src/mame/taito/tsamurai_v.cpp index 7ce8b37255c..71bdda20160 100644 --- a/src/mame/taito/tsamurai_v.cpp +++ b/src/mame/taito/tsamurai_v.cpp @@ -112,13 +112,13 @@ void tsamurai_state::bgcolor_w(uint8_t data) m_bgcolor = data; } -WRITE_LINE_MEMBER(tsamurai_state::textbank1_w) +void tsamurai_state::textbank1_w(int state) { m_textbank1 = state; m_foreground->mark_all_dirty(); } -WRITE_LINE_MEMBER(m660_state::textbank2_w) +void m660_state::textbank2_w(int state) { m_textbank2 = state; m_foreground->mark_all_dirty(); diff --git a/src/mame/taito/undrfire.cpp b/src/mame/taito/undrfire.cpp index e646bb2a805..d1ff6bb563b 100644 --- a/src/mame/taito/undrfire.cpp +++ b/src/mame/taito/undrfire.cpp @@ -210,7 +210,7 @@ Board contains only 29 ROMs and not much else. GAME INPUTS **********************************************************/ -READ_LINE_MEMBER(undrfire_state::frame_counter_r) +int undrfire_state::frame_counter_r() { return m_frame_counter; } diff --git a/src/mame/taito/undrfire.h b/src/mame/taito/undrfire.h index 611bf62f5bd..185764a8e1f 100644 --- a/src/mame/taito/undrfire.h +++ b/src/mame/taito/undrfire.h @@ -84,7 +84,7 @@ private: void rotate_control_w(offs_t offset, u16 data); void motor_control_w(u8 data); void cbombers_cpua_ctrl_w(u32 data); - DECLARE_READ_LINE_MEMBER(frame_counter_r); + int frame_counter_r(); u32 screen_update_undrfire(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); u32 screen_update_cbombers(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(undrfire_interrupt); diff --git a/src/mame/tangerine/hhtiger.cpp b/src/mame/tangerine/hhtiger.cpp index 410d0a9a1e3..f66b77b6628 100644 --- a/src/mame/tangerine/hhtiger.cpp +++ b/src/mame/tangerine/hhtiger.cpp @@ -95,7 +95,7 @@ private: uint8_t disable_rom_r(); uint8_t read(offs_t offset); void write(offs_t offset, uint8_t data); - DECLARE_WRITE_LINE_MEMBER(busreq_w); + void busreq_w(int state); uint8_t memory_read_byte(offs_t offset); void memory_write_byte(offs_t offset, uint8_t data); uint8_t io_read_byte(offs_t offset); @@ -108,19 +108,19 @@ private: uint8_t pio_pa_r(); void pio_pa_w(uint8_t data); void pio_pb_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(ardy_w); - DECLARE_WRITE_LINE_MEMBER(brdy_w); + void ardy_w(int state); + void brdy_w(int state); uint8_t via_0_in_a(); void via_0_out_a(uint8_t data); void via_0_out_b(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(via_0_out_ca2); - DECLARE_WRITE_LINE_MEMBER(via_0_out_cb2); + void via_0_out_ca2(int state); + void via_0_out_cb2(int state); void via_1_out_a(uint8_t data); void via_1_out_b(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(via_1_out_ca2); - DECLARE_WRITE_LINE_MEMBER(via_1_out_cb2); + void via_1_out_ca2(int state); + void via_1_out_cb2(int state); void z80_mem(address_map &map); void z80_io(address_map &map); @@ -273,7 +273,7 @@ void hhtiger_state::write(offs_t offset, uint8_t data) } -WRITE_LINE_MEMBER(hhtiger_state::busreq_w) +void hhtiger_state::busreq_w(int state) { // since our Z80 has no support for BUSACK, we assume it is granted immediately m_maincpu->set_input_line(Z80_INPUT_LINE_BUSRQ, state); @@ -384,13 +384,13 @@ void hhtiger_state::pio_pb_w(uint8_t data) m_via[0]->write_pb(data); } -WRITE_LINE_MEMBER(hhtiger_state::ardy_w) +void hhtiger_state::ardy_w(int state) { LOG("ardy_w %d\n", state); m_via[0]->write_ca1(state); } -WRITE_LINE_MEMBER(hhtiger_state::brdy_w) +void hhtiger_state::brdy_w(int state) { LOG("brdy_w %d\n", state); m_via[0]->write_cb1(state); @@ -417,13 +417,13 @@ void hhtiger_state::via_0_out_b(uint8_t data) LOG("via0_out_b %02X\n", data); } -WRITE_LINE_MEMBER(hhtiger_state::via_0_out_ca2) +void hhtiger_state::via_0_out_ca2(int state) { LOG("via0_out_ca2 %d\n", state); m_pio->strobe_a(state); } -WRITE_LINE_MEMBER(hhtiger_state::via_0_out_cb2) +void hhtiger_state::via_0_out_cb2(int state) { LOG("via0_out_cb2 %d\n", state); } @@ -439,12 +439,12 @@ void hhtiger_state::via_1_out_b(uint8_t data) LOG("via1_out_b %02X\n", data); } -WRITE_LINE_MEMBER(hhtiger_state::via_1_out_ca2) +void hhtiger_state::via_1_out_ca2(int state) { LOG("via1_out_ca2 %d\n", state); } -WRITE_LINE_MEMBER(hhtiger_state::via_1_out_cb2) +void hhtiger_state::via_1_out_cb2(int state) { LOG("via1_out_cb2 %d\n", state); } diff --git a/src/mame/tangerine/microtan.cpp b/src/mame/tangerine/microtan.cpp index 98bc24ee002..6bcaa0086bc 100644 --- a/src/mame/tangerine/microtan.cpp +++ b/src/mame/tangerine/microtan.cpp @@ -110,7 +110,7 @@ void mt6809_state::mt6809_map(address_map &map) } -WRITE_LINE_MEMBER(microtan_state::trigger_reset) +void microtan_state::trigger_reset(int state) { m_maincpu->set_input_line(INPUT_LINE_RESET, state ? ASSERT_LINE : CLEAR_LINE); @@ -120,7 +120,7 @@ WRITE_LINE_MEMBER(microtan_state::trigger_reset) } } -WRITE_LINE_MEMBER(mt6809_state::trigger_reset) +void mt6809_state::trigger_reset(int state) { m_maincpu->set_input_line(INPUT_LINE_RESET, state ? ASSERT_LINE : CLEAR_LINE); diff --git a/src/mame/tangerine/microtan.h b/src/mame/tangerine/microtan.h index 208f704efb6..64cf8076607 100644 --- a/src/mame/tangerine/microtan.h +++ b/src/mame/tangerine/microtan.h @@ -41,7 +41,7 @@ public: void micron(machine_config &config); void spinveti(machine_config &config); - DECLARE_WRITE_LINE_MEMBER(trigger_reset); + void trigger_reset(int state); protected: virtual void machine_start() override; @@ -101,7 +101,7 @@ public: void mt6809(machine_config &config); - DECLARE_WRITE_LINE_MEMBER(trigger_reset); + void trigger_reset(int state); protected: virtual void machine_start() override; diff --git a/src/mame/tangerine/oric.cpp b/src/mame/tangerine/oric.cpp index 6571430576e..cb8a2c88b1c 100644 --- a/src/mame/tangerine/oric.cpp +++ b/src/mame/tangerine/oric.cpp @@ -81,10 +81,10 @@ public: DECLARE_INPUT_CHANGED_MEMBER(nmi_pressed); void via_a_w(uint8_t data); void via_b_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(via_ca2_w); - DECLARE_WRITE_LINE_MEMBER(via_cb2_w); - DECLARE_WRITE_LINE_MEMBER(via_irq_w); - DECLARE_WRITE_LINE_MEMBER(ext_irq_w); + void via_ca2_w(int state); + void via_cb2_w(int state); + void via_irq_w(int state); + void ext_irq_w(int state); void psg_a_w(uint8_t data); TIMER_CALLBACK_MEMBER(update_tape); @@ -92,7 +92,7 @@ public: virtual void machine_reset() override; virtual void video_start() override; uint32_t screen_update_oric(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(vblank_w); + void vblank_w(int state); void oric_common(machine_config &config); void oric(machine_config &config); @@ -146,15 +146,15 @@ public: void via2_a_w(uint8_t data); void via2_b_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(via2_ca2_w); - DECLARE_WRITE_LINE_MEMBER(via2_cb2_w); - DECLARE_WRITE_LINE_MEMBER(via2_irq_w); + void via2_ca2_w(int state); + void via2_cb2_w(int state); + void via2_irq_w(int state); - DECLARE_WRITE_LINE_MEMBER(acia_irq_w); + void acia_irq_w(int state); - DECLARE_WRITE_LINE_MEMBER(fdc_irq_w); - DECLARE_WRITE_LINE_MEMBER(fdc_drq_w); - DECLARE_WRITE_LINE_MEMBER(fdc_hld_w); + void fdc_irq_w(int state); + void fdc_drq_w(int state); + void fdc_hld_w(int state); static void floppy_formats(format_registration &fr); @@ -360,25 +360,25 @@ void oric_state::via_b_w(uint8_t data) m_cassette->output(data & 0x80 ? -1.0 : +1.0); } -WRITE_LINE_MEMBER(oric_state::via_ca2_w) +void oric_state::via_ca2_w(int state) { m_via_ca2 = state; update_psg(); } -WRITE_LINE_MEMBER(oric_state::via_cb2_w) +void oric_state::via_cb2_w(int state) { m_via_cb2 = state; update_psg(); } -WRITE_LINE_MEMBER(oric_state::via_irq_w) +void oric_state::via_irq_w(int state) { m_via_irq = state; update_irq(); } -WRITE_LINE_MEMBER(oric_state::ext_irq_w) +void oric_state::ext_irq_w(int state) { m_ext_irq = state; update_irq(); @@ -396,7 +396,7 @@ TIMER_CALLBACK_MEMBER(oric_state::update_tape) m_via->write_cb1(m_cassette->input() > 0.0038); } -WRITE_LINE_MEMBER(oric_state::vblank_w) +void oric_state::vblank_w(int state) { if(m_config->read()) m_via->write_cb1(state); @@ -503,17 +503,17 @@ void telestrat_state::via2_b_w(uint8_t data) m_via2->write_pb(port); } -WRITE_LINE_MEMBER(telestrat_state::via2_ca2_w) +void telestrat_state::via2_ca2_w(int state) { m_via2_ca2 = state; } -WRITE_LINE_MEMBER(telestrat_state::via2_cb2_w) +void telestrat_state::via2_cb2_w(int state) { m_via2_cb2 = state; } -WRITE_LINE_MEMBER(telestrat_state::via2_irq_w) +void telestrat_state::via2_irq_w(int state) { m_via2_irq = state; update_irq(); @@ -543,24 +543,24 @@ u8 telestrat_state::port_318_r() } -WRITE_LINE_MEMBER(telestrat_state::acia_irq_w) +void telestrat_state::acia_irq_w(int state) { m_acia_irq = state; update_irq(); } -WRITE_LINE_MEMBER(telestrat_state::fdc_irq_w) +void telestrat_state::fdc_irq_w(int state) { m_fdc_irq = state; update_irq(); } -WRITE_LINE_MEMBER(telestrat_state::fdc_drq_w) +void telestrat_state::fdc_drq_w(int state) { m_fdc_drq = state; } -WRITE_LINE_MEMBER(telestrat_state::fdc_hld_w) +void telestrat_state::fdc_hld_w(int state) { m_fdc_hld = state; } diff --git a/src/mame/tatsumi/lockon.cpp b/src/mame/tatsumi/lockon.cpp index d005c782f1a..3479dc66847 100644 --- a/src/mame/tatsumi/lockon.cpp +++ b/src/mame/tatsumi/lockon.cpp @@ -399,7 +399,7 @@ void lockon_state::sound_vol(uint8_t data) m_f2203_3r->flt_volume_set_volume(rgain); } -WRITE_LINE_MEMBER(lockon_state::ym2203_irq) +void lockon_state::ym2203_irq(int state) { m_audiocpu->set_input_line(0, state ? ASSERT_LINE : CLEAR_LINE ); } diff --git a/src/mame/tatsumi/lockon.h b/src/mame/tatsumi/lockon.h index c14378c5dd0..66c84a7bf1b 100644 --- a/src/mame/tatsumi/lockon.h +++ b/src/mame/tatsumi/lockon.h @@ -142,7 +142,7 @@ private: TILE_GET_INFO_MEMBER(get_lockon_tile_info); void lockon_palette(palette_device &palette) const; uint32_t screen_update_lockon(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(screen_vblank_lockon); + void screen_vblank_lockon(int state); TIMER_CALLBACK_MEMBER(cursor_callback); TIMER_CALLBACK_MEMBER(bufend_callback); void scene_draw(); @@ -150,7 +150,7 @@ private: void objects_draw(); void rotate_draw( bitmap_ind16 &bitmap, const rectangle &cliprect ); void hud_draw( bitmap_ind16 &bitmap, const rectangle &cliprect ); - DECLARE_WRITE_LINE_MEMBER(ym2203_irq); + void ym2203_irq(int state); void ground_v30(address_map &map); void main_v30(address_map &map); void object_v30(address_map &map); diff --git a/src/mame/tatsumi/lockon_v.cpp b/src/mame/tatsumi/lockon_v.cpp index 76b22dfb911..f4e0e7ed56e 100644 --- a/src/mame/tatsumi/lockon_v.cpp +++ b/src/mame/tatsumi/lockon_v.cpp @@ -905,7 +905,7 @@ uint32_t lockon_state::screen_update_lockon(screen_device &screen, bitmap_ind16 return 0; } -WRITE_LINE_MEMBER(lockon_state::screen_vblank_lockon) +void lockon_state::screen_vblank_lockon(int state) { // on falling edge if (!state) diff --git a/src/mame/tatsumi/tatsumi.cpp b/src/mame/tatsumi/tatsumi.cpp index c7a7d7471cd..b3af227e629 100644 --- a/src/mame/tatsumi/tatsumi.cpp +++ b/src/mame/tatsumi/tatsumi.cpp @@ -850,7 +850,7 @@ INTERRUPT_GEN_MEMBER(tatsumi_state::v30_interrupt) device.execute().set_input_line_and_vector(0, HOLD_LINE, 0xc8/4); /* V30 - VBL */ } -WRITE_LINE_MEMBER(apache3_state::apache3_68000_reset) +void apache3_state::apache3_68000_reset(int state) { m_subcpu2->pulse_input_line(INPUT_LINE_RESET, attotime::zero); } diff --git a/src/mame/tatsumi/tatsumi.h b/src/mame/tatsumi/tatsumi.h index f03b2f24a16..e45f531e520 100644 --- a/src/mame/tatsumi/tatsumi.h +++ b/src/mame/tatsumi/tatsumi.h @@ -112,7 +112,7 @@ private: DECLARE_MACHINE_RESET(apache3); DECLARE_VIDEO_START(apache3); uint32_t screen_update_apache3(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(apache3_68000_reset); + void apache3_68000_reset(int state); void apache3_68000_map(address_map &map); void apache3_v20_map(address_map &map); diff --git a/src/mame/tatsumi/tx1.h b/src/mame/tatsumi/tx1.h index 482d1813136..31dcab7ee40 100644 --- a/src/mame/tatsumi/tx1.h +++ b/src/mame/tatsumi/tx1.h @@ -232,8 +232,8 @@ private: uint32_t screen_update_buggyboy_middle(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_buggyboy_right(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_buggybjr(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(screen_vblank_tx1); - DECLARE_WRITE_LINE_MEMBER(screen_vblank_buggyboy); + void screen_vblank_tx1(int state); + void screen_vblank_buggyboy(int state); TIMER_CALLBACK_MEMBER(interrupt_callback); void buggybjr_main(address_map &map); diff --git a/src/mame/tatsumi/tx1_v.cpp b/src/mame/tatsumi/tx1_v.cpp index a63c6d32d60..d1367e726bc 100644 --- a/src/mame/tatsumi/tx1_v.cpp +++ b/src/mame/tatsumi/tx1_v.cpp @@ -1108,7 +1108,7 @@ VIDEO_START_MEMBER(tx1_state,tx1) m_interrupt_timer->adjust(m_screen->time_until_pos(CURSOR_YPOS, CURSOR_XPOS)); } -WRITE_LINE_MEMBER(tx1_state::screen_vblank_tx1) +void tx1_state::screen_vblank_tx1(int state) { // rising edge if (state) @@ -3006,7 +3006,7 @@ VIDEO_START_MEMBER(tx1_state,buggybjr) m_interrupt_timer->adjust(m_screen->time_until_pos(CURSOR_YPOS, CURSOR_XPOS)); } -WRITE_LINE_MEMBER(tx1_state::screen_vblank_buggyboy) +void tx1_state::screen_vblank_buggyboy(int state) { // rising edge if (state) diff --git a/src/mame/tatung/einstein.cpp b/src/mame/tatung/einstein.cpp index 186c57e2ccd..1f9c2b9ed40 100644 --- a/src/mame/tatung/einstein.cpp +++ b/src/mame/tatung/einstein.cpp @@ -12,9 +12,7 @@ ******************************************************************************/ #include "emu.h" -#include "cpu/z80/z80.h" -#include "machine/z80daisy.h" -#include "machine/z80daisy_generic.h" + #include "bus/centronics/ctronics.h" #include "bus/einstein/pipe/pipe.h" #include "bus/einstein/userport/userport.h" @@ -24,6 +22,7 @@ #include "imagedev/cassette.h" #include "imagedev/floppy.h" #include "imagedev/snapquik.h" +#include "cpu/z80/z80.h" #include "machine/adc0844.h" #include "machine/i8251.h" #include "machine/ram.h" @@ -31,10 +30,12 @@ #include "machine/timer.h" #include "machine/wd_fdc.h" #include "machine/z80ctc.h" +#include "machine/z80daisy.h" +#include "machine/z80daisy_generic.h" #include "machine/z80pio.h" +#include "sound/ay8910.h" #include "video/tms9928a.h" #include "video/v9938.h" -#include "sound/ay8910.h" #include "screen.h" #include "softlist_dev.h" @@ -122,18 +123,18 @@ private: void reset_w(uint8_t data); uint8_t rom_r(); void rom_w(uint8_t data); - template DECLARE_WRITE_LINE_MEMBER(int_w); + template void int_w(int state); uint8_t kybint_msk_r(); void kybint_msk_w(uint8_t data); void adcint_msk_w(uint8_t data); void fireint_msk_w(uint8_t data); void evdpint_msk_w(uint8_t data); void drsel_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(write_centronics_ack); - DECLARE_WRITE_LINE_MEMBER(write_centronics_busy); - DECLARE_WRITE_LINE_MEMBER(write_centronics_perror); - DECLARE_WRITE_LINE_MEMBER(write_centronics_fault); - DECLARE_WRITE_LINE_MEMBER(ardy_w); + void write_centronics_ack(int state); + void write_centronics_busy(int state); + void write_centronics_perror(int state); + void write_centronics_fault(int state); + void ardy_w(int state); TIMER_DEVICE_CALLBACK_MEMBER(strobe_callback); uint8_t system_r(); @@ -288,27 +289,27 @@ void einstein_state::drsel_w(uint8_t data) CENTRONICS ***************************************************************************/ -WRITE_LINE_MEMBER(einstein_state::write_centronics_ack) +void einstein_state::write_centronics_ack(int state) { m_centronics_ack = state; } -WRITE_LINE_MEMBER( einstein_state::write_centronics_busy ) +void einstein_state::write_centronics_busy(int state) { m_centronics_busy = state; } -WRITE_LINE_MEMBER( einstein_state::write_centronics_perror ) +void einstein_state::write_centronics_perror(int state) { m_centronics_perror = state; } -WRITE_LINE_MEMBER( einstein_state::write_centronics_fault ) +void einstein_state::write_centronics_fault(int state) { m_centronics_fault = state; } -WRITE_LINE_MEMBER( einstein_state::ardy_w ) +void einstein_state::ardy_w(int state) { if (m_strobe == 0 && state == 1) { @@ -349,13 +350,14 @@ static const z80_daisy_config einst256_daisy_chain[] = { nullptr } }; -template WRITE_LINE_MEMBER( einstein_state::int_w ) +template +void einstein_state::int_w(int state) { int old = m_int; if (state) { - m_int |= (1 << src); + m_int |= (1 << Src); if (!old) { m_maincpu->set_input_line(INPUT_LINE_IRQ0, ASSERT_LINE); @@ -364,7 +366,7 @@ template WRITE_LINE_MEMBER( einstein_state::int_w ) } else { - m_int &= ~(1 << src); + m_int &= ~(1 << Src); if (old && !m_int) { m_maincpu->set_input_line(INPUT_LINE_IRQ0, CLEAR_LINE); diff --git a/src/mame/tch/wheelfir.cpp b/src/mame/tch/wheelfir.cpp index d3339991985..4541cc71702 100644 --- a/src/mame/tch/wheelfir.cpp +++ b/src/mame/tch/wheelfir.cpp @@ -208,7 +208,7 @@ public: { } void wheelfir(machine_config &config); - DECLARE_READ_LINE_MEMBER(adc_eoc_r); + int adc_eoc_r(); protected: virtual void machine_start() override; @@ -254,9 +254,9 @@ private: void wheelfir_7c0000_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); uint16_t wheelfir_7c0000_r(offs_t offset, uint16_t mem_mask = ~0); void coin_cnt_w(uint16_t data); - DECLARE_WRITE_LINE_MEMBER(adc_eoc_w); + void adc_eoc_w(int state); uint32_t screen_update_wheelfir(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(screen_vblank_wheelfir); + void screen_vblank_wheelfir(int state); TIMER_DEVICE_CALLBACK_MEMBER(scanline_timer_callback); void ramdac_map(address_map &map); void wheelfir_main(address_map &map); @@ -512,7 +512,7 @@ uint32_t wheelfir_state::screen_update_wheelfir(screen_device &screen, bitmap_in return 0; } -WRITE_LINE_MEMBER(wheelfir_state::screen_vblank_wheelfir) +void wheelfir_state::screen_vblank_wheelfir(int state) { // rising edge if (state) @@ -638,12 +638,12 @@ static INPUT_PORTS_START( wheelfir ) PORT_BIT(0xff, 0x00, IPT_PEDAL2) PORT_INVERT PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_NAME("Brake Pedal") PORT_MINMAX(0x00, 0xff) PORT_REVERSE INPUT_PORTS_END -READ_LINE_MEMBER( wheelfir_state::adc_eoc_r ) +int wheelfir_state::adc_eoc_r() { return m_adc_eoc; } -WRITE_LINE_MEMBER( wheelfir_state::adc_eoc_w ) +void wheelfir_state::adc_eoc_w(int state) { m_adc_eoc = state; } diff --git a/src/mame/tecfri/ambush.cpp b/src/mame/tecfri/ambush.cpp index 1a3116dd027..b1a375eecb2 100644 --- a/src/mame/tecfri/ambush.cpp +++ b/src/mame/tecfri/ambush.cpp @@ -92,17 +92,17 @@ private: TILE_GET_INFO_MEMBER(mariobl_char_tile_info); TILE_GET_INFO_MEMBER(dkong3abl_char_tile_info); - DECLARE_WRITE_LINE_MEMBER(flip_screen_w); + void flip_screen_w(int state); void scroll_ram_w(offs_t offset, uint8_t data); - DECLARE_WRITE_LINE_MEMBER(color_bank_1_w); - DECLARE_WRITE_LINE_MEMBER(color_bank_2_w); + void color_bank_1_w(int state); + void color_bank_2_w(int state); DECLARE_MACHINE_START(ambush); DECLARE_MACHINE_START(mariobl); DECLARE_MACHINE_START(dkong3abl); - DECLARE_WRITE_LINE_MEMBER(coin_counter_1_w); - DECLARE_WRITE_LINE_MEMBER(coin_counter_2_w); + void coin_counter_1_w(int state); + void coin_counter_2_w(int state); void output_latches_w(offs_t offset, uint8_t data); void bootleg_map(address_map &map); @@ -557,7 +557,7 @@ uint32_t ambush_state::screen_update_bootleg(screen_device &screen, bitmap_ind16 return 0; } -WRITE_LINE_MEMBER(ambush_state::flip_screen_w) +void ambush_state::flip_screen_w(int state) { flip_screen_set(state); } @@ -568,12 +568,12 @@ void ambush_state::scroll_ram_w(offs_t offset, uint8_t data) m_char_tilemap->set_scrolly(offset, data + 1); } -WRITE_LINE_MEMBER(ambush_state::color_bank_1_w) +void ambush_state::color_bank_1_w(int state) { m_color_bank = (m_color_bank & 0x02) | (state ? 0x01 : 0x00); } -WRITE_LINE_MEMBER(ambush_state::color_bank_2_w) +void ambush_state::color_bank_2_w(int state) { m_color_bank = (m_color_bank & 0x01) | (state ? 0x02 : 0x00); } @@ -705,12 +705,12 @@ MACHINE_START_MEMBER( ambush_state, dkong3abl ) m_char_tilemap->set_transparent_pen(0); } -WRITE_LINE_MEMBER(ambush_state::coin_counter_1_w) +void ambush_state::coin_counter_1_w(int state) { machine().bookkeeping().coin_counter_w(0, state); } -WRITE_LINE_MEMBER(ambush_state::coin_counter_2_w) +void ambush_state::coin_counter_2_w(int state) { machine().bookkeeping().coin_counter_w(1, state); } diff --git a/src/mame/tecfri/holeland.cpp b/src/mame/tecfri/holeland.cpp index 27570fdbcf4..c2458cd49f9 100644 --- a/src/mame/tecfri/holeland.cpp +++ b/src/mame/tecfri/holeland.cpp @@ -64,14 +64,14 @@ protected: tilemap_t *m_bg_tilemap = nullptr; uint8_t m_palette_offset = 0U; - DECLARE_WRITE_LINE_MEMBER(coin_counter_w); + void coin_counter_w(int state); void videoram_w(offs_t offset, uint8_t data); void colorram_w(offs_t offset, uint8_t data); void pal_offs_w(uint8_t data); void scroll_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(flipscreen_x_w); - DECLARE_WRITE_LINE_MEMBER(flipscreen_y_w); + void flipscreen_x_w(int state); + void flipscreen_y_w(int state); void io_map(address_map &map); }; @@ -202,12 +202,12 @@ void base_state::scroll_w(uint8_t data) m_bg_tilemap->set_scrollx(0, data); } -WRITE_LINE_MEMBER(base_state::flipscreen_x_w) +void base_state::flipscreen_x_w(int state) { flip_screen_x_set(state); } -WRITE_LINE_MEMBER(base_state::flipscreen_y_w) +void base_state::flipscreen_y_w(int state) { flip_screen_y_set(state); } @@ -302,7 +302,7 @@ uint32_t crzrally_state::screen_update(screen_device &screen, bitmap_ind16 &bitm // machine -WRITE_LINE_MEMBER(base_state::coin_counter_w) +void base_state::coin_counter_w(int state) { machine().bookkeeping().coin_counter_w(0, state); } diff --git a/src/mame/tecfri/sauro.cpp b/src/mame/tecfri/sauro.cpp index 315f1ca29f3..ec4b71a278d 100644 --- a/src/mame/tecfri/sauro.cpp +++ b/src/mame/tecfri/sauro.cpp @@ -172,10 +172,10 @@ protected: bool m_irq_enable = 0; // common - DECLARE_WRITE_LINE_MEMBER(vblank_irq); - DECLARE_WRITE_LINE_MEMBER(irq_reset_w); - template DECLARE_WRITE_LINE_MEMBER(coin_w); - DECLARE_WRITE_LINE_MEMBER(flip_screen_w); + void vblank_irq(int state); + void irq_reset_w(int state); + template void coin_w(int state); + void flip_screen_w(int state); void bg_videoram_w(offs_t offset, uint8_t data); void bg_colorram_w(offs_t offset, uint8_t data); void scroll_bg_w(uint8_t data); @@ -228,8 +228,8 @@ private: void sound_command_w(uint8_t data); uint8_t sound_command_r(); - DECLARE_WRITE_LINE_MEMBER(palette_bank0_w); - DECLARE_WRITE_LINE_MEMBER(palette_bank1_w); + void palette_bank0_w(int state); + void palette_bank1_w(int state); void scroll_fg_w(uint8_t data); void fg_videoram_w(offs_t offset, uint8_t data); void fg_colorram_w(offs_t offset, uint8_t data); @@ -302,7 +302,7 @@ TILE_GET_INFO_MEMBER(sauro_state::get_tile_info_fg) static const int scroll2_map[8] = {2, 1, 4, 3, 6, 5, 0, 7}; static const int scroll2_map_flip[8] = {0, 7, 2, 1, 4, 3, 6, 5}; -WRITE_LINE_MEMBER(sauro_state::palette_bank0_w) +void sauro_state::palette_bank0_w(int state) { if (state) m_palette_bank |= 0x10; @@ -311,7 +311,7 @@ WRITE_LINE_MEMBER(sauro_state::palette_bank0_w) machine().tilemap().mark_all_dirty(); } -WRITE_LINE_MEMBER(sauro_state::palette_bank1_w) +void sauro_state::palette_bank1_w(int state) { if (state) m_palette_bank |= 0x20; @@ -486,13 +486,13 @@ uint8_t sauro_state::sound_command_r() return ret; } -WRITE_LINE_MEMBER(base_state::vblank_irq) +void base_state::vblank_irq(int state) { if (state && m_irq_enable) m_maincpu->set_input_line(0, ASSERT_LINE); } -WRITE_LINE_MEMBER(base_state::irq_reset_w) +void base_state::irq_reset_w(int state) { m_irq_enable = !state; if (m_irq_enable) @@ -500,12 +500,12 @@ WRITE_LINE_MEMBER(base_state::irq_reset_w) } template -WRITE_LINE_MEMBER(base_state::coin_w) +void base_state::coin_w(int state) { machine().bookkeeping().coin_counter_w(Which, state); } -WRITE_LINE_MEMBER(base_state::flip_screen_w) +void base_state::flip_screen_w(int state) { flip_screen_set(state); } diff --git a/src/mame/technos/blockout.cpp b/src/mame/technos/blockout.cpp index 5376150488d..eda44fc8046 100644 --- a/src/mame/technos/blockout.cpp +++ b/src/mame/technos/blockout.cpp @@ -121,7 +121,7 @@ private: required_device m_palette; required_device m_soundlatch; - DECLARE_WRITE_LINE_MEMBER(irq_handler); + void irq_handler(int state); void irq6_ack_w(uint16_t data); void irq5_ack_w(uint16_t data); void frontcolor_w(offs_t offset, u16 data, u16 mem_mask = ~0); @@ -404,7 +404,7 @@ INPUT_PORTS_END *************************************/ // handler called by the 2151 emulator when the internal timers cause an IRQ -WRITE_LINE_MEMBER(blockout_state::irq_handler) +void blockout_state::irq_handler(int state) { m_audiocpu->set_input_line_and_vector(0, state ? ASSERT_LINE : CLEAR_LINE, 0xff); // Z80 } diff --git a/src/mame/technos/chinagat.cpp b/src/mame/technos/chinagat.cpp index f93dac403bb..847108f8271 100644 --- a/src/mame/technos/chinagat.cpp +++ b/src/mame/technos/chinagat.cpp @@ -304,8 +304,8 @@ private: void saiyugoub1_adpcm_rom_addr_w(uint8_t data); void saiyugoub1_adpcm_control_w(uint8_t data); void saiyugoub1_m5205_clk_w(uint8_t data); - DECLARE_READ_LINE_MEMBER(saiyugoub1_m5205_irq_r); - DECLARE_WRITE_LINE_MEMBER(saiyugoub1_m5205_irq_w); + int saiyugoub1_m5205_irq_r(); + void saiyugoub1_m5205_irq_w(int state); void i8748_map(address_map &map); void main_map(address_map &map); @@ -514,7 +514,7 @@ void chinagat_state::saiyugoub1_adpcm_control_w(uint8_t data) #endif } -READ_LINE_MEMBER(chinagat_state::saiyugoub1_m5205_irq_r ) +int chinagat_state::saiyugoub1_m5205_irq_r() { if (m_adpcm_sound_irq) { @@ -524,7 +524,7 @@ READ_LINE_MEMBER(chinagat_state::saiyugoub1_m5205_irq_r ) return 0; } -WRITE_LINE_MEMBER(chinagat_state::saiyugoub1_m5205_irq_w) +void chinagat_state::saiyugoub1_m5205_irq_w(int state) { m_adpcm_sound_irq = 1; } diff --git a/src/mame/technos/ddragon.cpp b/src/mame/technos/ddragon.cpp index 94934fbdeb2..d622cd4bb10 100644 --- a/src/mame/technos/ddragon.cpp +++ b/src/mame/technos/ddragon.cpp @@ -333,7 +333,7 @@ void ddragon_state::ddragonba_port_w(uint8_t data) * *************************************/ -READ_LINE_MEMBER(ddragon_state::subcpu_bus_free_r) +int ddragon_state::subcpu_bus_free_r() { // Corresponds to BA (Bus Available) on the HD63701 if (m_subcpu) @@ -441,12 +441,12 @@ void ddragon_state::dd_adpcm_int( int chip ) } } -WRITE_LINE_MEMBER(ddragon_state::dd_adpcm_int_1) +void ddragon_state::dd_adpcm_int_1(int state) { dd_adpcm_int(0); } -WRITE_LINE_MEMBER(ddragon_state::dd_adpcm_int_2) +void ddragon_state::dd_adpcm_int_2(int state) { dd_adpcm_int(1); } diff --git a/src/mame/technos/ddragon.h b/src/mame/technos/ddragon.h index d8b8591cdf4..e4f8730fbc4 100644 --- a/src/mame/technos/ddragon.h +++ b/src/mame/technos/ddragon.h @@ -55,7 +55,7 @@ public: void init_ddragon(); void init_ddragon6809(); - DECLARE_READ_LINE_MEMBER(subcpu_bus_free_r); + int subcpu_bus_free_r(); protected: virtual void machine_start() override; @@ -136,8 +136,8 @@ private: void dd_adpcm_w(offs_t offset, uint8_t data); uint8_t dd_adpcm_status_r(); void ddragonba_port_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(dd_adpcm_int_1); - DECLARE_WRITE_LINE_MEMBER(dd_adpcm_int_2); + void dd_adpcm_int_1(int state); + void dd_adpcm_int_2(int state); void dd2_map(address_map &map); void dd2_sound_map(address_map &map); diff --git a/src/mame/technos/renegade.cpp b/src/mame/technos/renegade.cpp index 9220dad382b..61c4706cf28 100644 --- a/src/mame/technos/renegade.cpp +++ b/src/mame/technos/renegade.cpp @@ -200,7 +200,7 @@ private: void adpcm_start_w(uint8_t data); void adpcm_addr_w(uint8_t data); void adpcm_stop_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(adpcm_int); + void adpcm_int(int state); TILE_GET_INFO_MEMBER(get_bg_tilemap_info); TILE_GET_INFO_MEMBER(get_fg_tilemap_info); @@ -384,7 +384,7 @@ void renegade_state::adpcm_stop_w(uint8_t data) m_audiocpu->set_input_line(INPUT_LINE_NMI, ASSERT_LINE); } -WRITE_LINE_MEMBER(renegade_state::adpcm_int) +void renegade_state::adpcm_int(int state) { if (!m_adpcm_playing || !state) return; diff --git a/src/mame/technos/spdodgeb.cpp b/src/mame/technos/spdodgeb.cpp index 3ce6f0c87de..cb99f505034 100644 --- a/src/mame/technos/spdodgeb.cpp +++ b/src/mame/technos/spdodgeb.cpp @@ -61,7 +61,7 @@ public: void spdodgeb(machine_config &config); - DECLARE_READ_LINE_MEMBER(mcu_busy_r); + int mcu_busy_r(); protected: virtual void machine_start() override; @@ -95,7 +95,7 @@ private: tilemap_t *m_bg_tilemap = nullptr; uint16_t m_lastscroll = 0; - template DECLARE_WRITE_LINE_MEMBER(adpcm_int); + template void adpcm_int(int state); void adpcm_w(offs_t offset, uint8_t data); uint8_t mcu63701_r(offs_t offset); void mcu_data_w(offs_t offset, uint8_t data); @@ -356,7 +356,7 @@ void spdodgeb_state::adpcm_w(offs_t offset, uint8_t data) } template -WRITE_LINE_MEMBER(spdodgeb_state::adpcm_int) +void spdodgeb_state::adpcm_int(int state) { if (m_adpcm_pos[Which] >= m_adpcm_end[Which] || m_adpcm_pos[Which] >= 0x10000) { @@ -438,7 +438,7 @@ void spdodgeb_state::mcu_map(address_map &map) } -READ_LINE_MEMBER(spdodgeb_state::mcu_busy_r) +int spdodgeb_state::mcu_busy_r() { return BIT(m_mcu_status, 7); } diff --git a/src/mame/technos/wwfsstar.cpp b/src/mame/technos/wwfsstar.cpp index 6809a28df01..8cc71fb6492 100644 --- a/src/mame/technos/wwfsstar.cpp +++ b/src/mame/technos/wwfsstar.cpp @@ -177,7 +177,7 @@ public: void wwfsstar(machine_config &config); void wwfsstarb2(machine_config &config); - DECLARE_READ_LINE_MEMBER(vblank_r); + int vblank_r(); protected: virtual void video_start() override; @@ -538,7 +538,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(wwfsstar_state::scanline) } } -READ_LINE_MEMBER(wwfsstar_state::vblank_r) +int wwfsstar_state::vblank_r() { return m_vblank; } diff --git a/src/mame/technos/xain.cpp b/src/mame/technos/xain.cpp index 11292a79e40..031eda348dd 100644 --- a/src/mame/technos/xain.cpp +++ b/src/mame/technos/xain.cpp @@ -263,7 +263,7 @@ void xain_state::irqB_clear_w(uint8_t data) m_subcpu->set_input_line(M6809_IRQ_LINE, CLEAR_LINE); } -READ_LINE_MEMBER(xain_state::vblank_r) +int xain_state::vblank_r() { return m_vblank; } diff --git a/src/mame/technos/xain.h b/src/mame/technos/xain.h index 56ae8d600c5..87822efd16d 100644 --- a/src/mame/technos/xain.h +++ b/src/mame/technos/xain.h @@ -38,7 +38,7 @@ public: void xsleena(machine_config &config); void xsleenab(machine_config &config); - DECLARE_READ_LINE_MEMBER(vblank_r); + int vblank_r(); DECLARE_CUSTOM_INPUT_MEMBER(mcu_status_r); protected: diff --git a/src/mame/tecmo/bombjack.cpp b/src/mame/tecmo/bombjack.cpp index d4ebab46189..f70913a4138 100644 --- a/src/mame/tecmo/bombjack.cpp +++ b/src/mame/tecmo/bombjack.cpp @@ -142,7 +142,7 @@ private: TILE_GET_INFO_MEMBER(get_bg_tile_info); TILE_GET_INFO_MEMBER(get_fg_tile_info); uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(vblank_irq); + void vblank_irq(int state); TIMER_CALLBACK_MEMBER(soundlatch_callback); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); @@ -531,7 +531,7 @@ void bombjack_state::machine_reset() } -WRITE_LINE_MEMBER(bombjack_state::vblank_irq) +void bombjack_state::vblank_irq(int state) { if (state && m_nmi_mask) m_maincpu->set_input_line(INPUT_LINE_NMI, ASSERT_LINE); diff --git a/src/mame/tecmo/gaiden.cpp b/src/mame/tecmo/gaiden.cpp index 9e2bf350b67..675945388b7 100644 --- a/src/mame/tecmo/gaiden.cpp +++ b/src/mame/tecmo/gaiden.cpp @@ -908,7 +908,7 @@ void gaiden_state::mastninj_sound_map(address_map &map) map(0xf000, 0xf7ff).ram(); } -WRITE_LINE_MEMBER(gaiden_state::vck_flipflop_w) +void gaiden_state::vck_flipflop_w(int state) { if (!state) return; diff --git a/src/mame/tecmo/gaiden.h b/src/mame/tecmo/gaiden.h index 9f6c7be95d2..002f8da6f4e 100644 --- a/src/mame/tecmo/gaiden.h +++ b/src/mame/tecmo/gaiden.h @@ -101,7 +101,7 @@ private: optional_device_array m_adpcm_select; // mastninja ADPCM control - DECLARE_WRITE_LINE_MEMBER(vck_flipflop_w); + void vck_flipflop_w(int state); void adpcm_bankswitch_w(uint8_t data); void irq_ack_w(uint16_t data); @@ -134,7 +134,7 @@ private: DECLARE_VIDEO_START(gaiden); DECLARE_VIDEO_START(drgnbowl); DECLARE_VIDEO_START(raiga); - DECLARE_WRITE_LINE_MEMBER(screen_vblank_raiga); + void screen_vblank_raiga(int state); uint32_t screen_update_gaiden(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); uint32_t screen_update_raiga(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); uint32_t screen_update_drgnbowl(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); diff --git a/src/mame/tecmo/gaiden_v.cpp b/src/mame/tecmo/gaiden_v.cpp index 488db27fd89..109f3e8cf16 100644 --- a/src/mame/tecmo/gaiden_v.cpp +++ b/src/mame/tecmo/gaiden_v.cpp @@ -340,7 +340,7 @@ uint32_t gaiden_state::screen_update_drgnbowl(screen_device &screen, bitmap_ind1 return 0; } -WRITE_LINE_MEMBER(gaiden_state::screen_vblank_raiga) +void gaiden_state::screen_vblank_raiga(int state) { if (state) { diff --git a/src/mame/tecmo/pbaction.cpp b/src/mame/tecmo/pbaction.cpp index a5fe73a9e1c..d4acc2b6d9f 100644 --- a/src/mame/tecmo/pbaction.cpp +++ b/src/mame/tecmo/pbaction.cpp @@ -142,7 +142,7 @@ protected: virtual void machine_reset() override; virtual void video_start() override; - DECLARE_WRITE_LINE_MEMBER(sound_irq_clear); + void sound_irq_clear(int state); void alt_sound_map(address_map &map); void sound_io_map(address_map &map); @@ -185,7 +185,7 @@ private: TILE_GET_INFO_MEMBER(get_bg_tile_info); TILE_GET_INFO_MEMBER(get_fg_tile_info); uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(vblank_irq); + void vblank_irq(int state); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); void decrypted_opcodes_map(address_map &map); void main_map(address_map &map); @@ -220,8 +220,8 @@ private: uint8_t subcpu_r(); void subcpu_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(sub8000_w); - DECLARE_WRITE_LINE_MEMBER(sub8001_w); + void sub8000_w(int state); + void sub8001_w(int state); void sub8008_w(uint8_t data); void subtomain_w(uint8_t data); @@ -432,13 +432,13 @@ void pbaction_state::sound_io_map(address_map &map) map(0x30, 0x31).w("ay3", FUNC(ay8910_device::address_data_w)); } -WRITE_LINE_MEMBER(pbaction_tecfri_state::sub8000_w) +void pbaction_tecfri_state::sub8000_w(int state) { m_outlatch = state; } -WRITE_LINE_MEMBER(pbaction_tecfri_state::sub8001_w) +void pbaction_tecfri_state::sub8001_w(int state) { // writes 01 , 00 to clock after writing data to 8000 if (state) @@ -669,13 +669,13 @@ void pbaction_state::machine_reset() m_maincpu->set_input_line(INPUT_LINE_NMI, CLEAR_LINE); } -WRITE_LINE_MEMBER(pbaction_state::vblank_irq) +void pbaction_state::vblank_irq(int state) { if (state && m_nmi_mask) m_maincpu->set_input_line(INPUT_LINE_NMI, ASSERT_LINE); } -WRITE_LINE_MEMBER(pbaction_state::sound_irq_clear) +void pbaction_state::sound_irq_clear(int state) { if (state) m_audiocpu->set_input_line(0, CLEAR_LINE); diff --git a/src/mame/tecmo/senjyo.cpp b/src/mame/tecmo/senjyo.cpp index da0d9cd6e36..20f8658e56d 100644 --- a/src/mame/tecmo/senjyo.cpp +++ b/src/mame/tecmo/senjyo.cpp @@ -106,7 +106,7 @@ void senjyo_state::flip_screen_w(uint8_t data) flip_screen_set(data); } -WRITE_LINE_MEMBER(senjyo_state::dac_clock_w) +void senjyo_state::dac_clock_w(int state) { if (state) m_dac->write(m_dac_prom->base()[m_dac_clock++ & 0xf]); diff --git a/src/mame/tecmo/senjyo.h b/src/mame/tecmo/senjyo.h index 3a476e3b511..64923ec30dc 100644 --- a/src/mame/tecmo/senjyo.h +++ b/src/mame/tecmo/senjyo.h @@ -111,7 +111,7 @@ private: void bg3videoram_w(offs_t offset, uint8_t data); void dac_volume_w(uint8_t data); void dac_enable_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(dac_clock_w); + void dac_clock_w(int state); void irq_ctrl_w(uint8_t data); static rgb_t IIBBGGRR(uint32_t raw); diff --git a/src/mame/tecmo/tbowl.cpp b/src/mame/tecmo/tbowl.cpp index ae05c334246..d8417e6b81b 100644 --- a/src/mame/tecmo/tbowl.cpp +++ b/src/mame/tecmo/tbowl.cpp @@ -103,7 +103,7 @@ private: uint32_t screen_update_left(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_right(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - template DECLARE_WRITE_LINE_MEMBER(adpcm_int); + template void adpcm_int(int state); void _6206A_map(address_map &map); void _6206B_map(address_map &map); @@ -340,7 +340,7 @@ void tbowl_state::adpcm_vol_w(uint8_t data) } template -WRITE_LINE_MEMBER(tbowl_state::adpcm_int) +void tbowl_state::adpcm_int(int state) { if (m_adpcm_pos[Which] >= m_adpcm_end[Which] || m_adpcm_pos[Which] >= m_adpcm_rom.bytes() / 2) diff --git a/src/mame/tecmo/tecmo.cpp b/src/mame/tecmo/tecmo.cpp index e1f381c6bee..c445321b936 100644 --- a/src/mame/tecmo/tecmo.cpp +++ b/src/mame/tecmo/tecmo.cpp @@ -257,7 +257,7 @@ void tecmo_state::adpcm_vol_w(uint8_t data) m_msm->set_output_gain(ALL_OUTPUTS, (data & 15) / 15.0); } -WRITE_LINE_MEMBER(tecmo_state::adpcm_int) +void tecmo_state::adpcm_int(int state) { if (m_adpcm_pos >= m_adpcm_end || m_adpcm_pos >= m_adpcm_rom.bytes()) diff --git a/src/mame/tecmo/tecmo.h b/src/mame/tecmo/tecmo.h index 9a49a0b4f0a..6ce66ab3683 100644 --- a/src/mame/tecmo/tecmo.h +++ b/src/mame/tecmo/tecmo.h @@ -90,7 +90,7 @@ private: void flipscreen_w(uint8_t data); void adpcm_start_w(uint8_t data); void adpcm_vol_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(adpcm_int); + void adpcm_int(int state); TILE_GET_INFO_MEMBER(get_bg_tile_info); TILE_GET_INFO_MEMBER(get_fg_tile_info); diff --git a/src/mame/tecmo/tecmo16.cpp b/src/mame/tecmo/tecmo16.cpp index e2859d96aeb..c878ffb61c6 100644 --- a/src/mame/tecmo/tecmo16.cpp +++ b/src/mame/tecmo/tecmo16.cpp @@ -125,7 +125,7 @@ private: DECLARE_VIDEO_START(riot); uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(screen_vblank); + void screen_vblank(int state); void save_state(); void common_map(address_map& map); @@ -329,7 +329,7 @@ uint32_t tecmo16_state::screen_update(screen_device &screen, bitmap_rgb32 &bitma return 0; } -WRITE_LINE_MEMBER(tecmo16_state::screen_vblank) +void tecmo16_state::screen_vblank(int state) { if (state) { diff --git a/src/mame/tecmo/tehkanwc.cpp b/src/mame/tecmo/tehkanwc.cpp index c335cd5ee1a..574bd2e7b43 100644 --- a/src/mame/tecmo/tehkanwc.cpp +++ b/src/mame/tecmo/tehkanwc.cpp @@ -173,7 +173,7 @@ private: void portA_w(uint8_t data); void portB_w(uint8_t data); void msm_reset_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(adpcm_int); + void adpcm_int(int state); TILE_GET_INFO_MEMBER(get_bg_tile_info); TILE_GET_INFO_MEMBER(get_fg_tile_info); @@ -408,7 +408,7 @@ void tehkanwc_state::msm_reset_w(uint8_t data) m_msm->reset_w(data ? 0 : 1); } -WRITE_LINE_MEMBER(tehkanwc_state::adpcm_int) +void tehkanwc_state::adpcm_int(int state) { uint8_t msm_data = m_adpcm_rom[m_msm_data_offs & 0x7fff]; diff --git a/src/mame/tecmo/wc90b.cpp b/src/mame/tecmo/wc90b.cpp index f500bfbffbd..d3bf19c8e85 100644 --- a/src/mame/tecmo/wc90b.cpp +++ b/src/mame/tecmo/wc90b.cpp @@ -153,7 +153,7 @@ protected: void fgvideoram_w(offs_t offset, uint8_t data); void txvideoram_w(offs_t offset, uint8_t data); void bankswitch_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(adpcm_int); + void adpcm_int(int state); void sound_map(address_map &map); void sub_map(address_map &map); @@ -637,7 +637,7 @@ GFXDECODE_END -WRITE_LINE_MEMBER(wc90b_state::adpcm_int) +void wc90b_state::adpcm_int(int state) { m_toggle ^= 1; if(m_toggle) diff --git a/src/mame/tektronix/tek405x.cpp b/src/mame/tektronix/tek405x.cpp index b03d1c76233..3d87cafc3e1 100644 --- a/src/mame/tektronix/tek405x.cpp +++ b/src/mame/tektronix/tek405x.cpp @@ -410,21 +410,21 @@ void tek4051_state::x_pia_pb_w(uint8_t data) */ } -WRITE_LINE_MEMBER( tek4051_state::adot_w ) +void tek4051_state::adot_w(int state) { } -WRITE_LINE_MEMBER( tek4051_state::bufclk_w ) +void tek4051_state::bufclk_w(int state) { } -WRITE_LINE_MEMBER( tek4051_state::x_pia_irqa_w ) +void tek4051_state::x_pia_irqa_w(int state) { m_x_pia_irqa = state; update_irq(); } -WRITE_LINE_MEMBER( tek4051_state::x_pia_irqb_w ) +void tek4051_state::x_pia_irqb_w(int state) { m_x_pia_irqb = state; update_irq(); @@ -486,17 +486,17 @@ void tek4051_state::sb_w(uint8_t data) */ } -WRITE_LINE_MEMBER( tek4051_state::sot_w ) +void tek4051_state::sot_w(int state) { } -WRITE_LINE_MEMBER( tek4051_state::y_pia_irqa_w ) +void tek4051_state::y_pia_irqa_w(int state) { m_y_pia_irqa = state; update_nmi(); } -WRITE_LINE_MEMBER( tek4051_state::y_pia_irqb_w ) +void tek4051_state::y_pia_irqb_w(int state) { m_y_pia_irqb = state; update_nmi(); @@ -593,17 +593,17 @@ void tek4051_state::kb_pia_pb_w(uint8_t data) m_gpib->host_ren_w(!BIT(data, 7)); } -WRITE_LINE_MEMBER( tek4051_state::kb_halt_w ) +void tek4051_state::kb_halt_w(int state) { } -WRITE_LINE_MEMBER( tek4051_state::kb_pia_irqa_w ) +void tek4051_state::kb_pia_irqa_w(int state) { m_kb_pia_irqa = state; update_irq(); } -WRITE_LINE_MEMBER( tek4051_state::kb_pia_irqb_w ) +void tek4051_state::kb_pia_irqb_w(int state) { m_kb_pia_irqb = state; update_irq(); @@ -666,13 +666,13 @@ void tek4051_state::tape_pia_pb_w(uint8_t data) */ } -WRITE_LINE_MEMBER( tek4051_state::tape_pia_irqa_w ) +void tek4051_state::tape_pia_irqa_w(int state) { m_tape_pia_irqa = state; update_nmi(); } -WRITE_LINE_MEMBER( tek4051_state::tape_pia_irqb_w ) +void tek4051_state::tape_pia_irqb_w(int state) { m_tape_pia_irqb = state; update_nmi(); @@ -774,7 +774,7 @@ void tek4051_state::gpib_pia_pb_w(uint8_t data) } } -WRITE_LINE_MEMBER( tek4051_state::talk_w ) +void tek4051_state::talk_w(int state) { m_talk = state; @@ -786,13 +786,13 @@ WRITE_LINE_MEMBER( tek4051_state::talk_w ) } } -WRITE_LINE_MEMBER( tek4051_state::gpib_pia_irqa_w ) +void tek4051_state::gpib_pia_irqa_w(int state) { m_gpib_pia_irqa = state; update_irq(); } -WRITE_LINE_MEMBER( tek4051_state::gpib_pia_irqb_w ) +void tek4051_state::gpib_pia_irqb_w(int state) { m_gpib_pia_irqb = state; update_irq(); @@ -877,25 +877,25 @@ void tek4051_state::com_pia_pb_w(uint8_t data) m_acia_clock->set_clock_scale((double) 1 / div); } -WRITE_LINE_MEMBER( tek4051_state::com_pia_irqa_w ) +void tek4051_state::com_pia_irqa_w(int state) { m_com_pia_irqa = state; update_irq(); } -WRITE_LINE_MEMBER( tek4051_state::com_pia_irqb_w ) +void tek4051_state::com_pia_irqb_w(int state) { m_com_pia_irqb = state; update_irq(); } -WRITE_LINE_MEMBER( tek4051_state::acia_irq_w ) +void tek4051_state::acia_irq_w(int state) { m_acia_irq = state; update_irq(); } -WRITE_LINE_MEMBER( tek4051_state::write_acia_clock ) +void tek4051_state::write_acia_clock(int state) { m_acia->write_txc(state); m_acia->write_rxc(state); diff --git a/src/mame/tektronix/tek405x.h b/src/mame/tektronix/tek405x.h index 11c6ce6b115..6fe1853ed6f 100644 --- a/src/mame/tektronix/tek405x.h +++ b/src/mame/tektronix/tek405x.h @@ -70,45 +70,45 @@ private: uint8_t x_pia_pa_r(); void x_pia_pa_w(uint8_t data); void x_pia_pb_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER( adot_w ); - DECLARE_WRITE_LINE_MEMBER( bufclk_w ); - DECLARE_WRITE_LINE_MEMBER( x_pia_irqa_w ); - DECLARE_WRITE_LINE_MEMBER( x_pia_irqb_w ); + void adot_w(int state); + void bufclk_w(int state); + void x_pia_irqa_w(int state); + void x_pia_irqb_w(int state); uint8_t sa_r(); void y_pia_pa_w(uint8_t data); void sb_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER( sot_w ); - DECLARE_WRITE_LINE_MEMBER( y_pia_irqa_w ); - DECLARE_WRITE_LINE_MEMBER( y_pia_irqb_w ); + void sot_w(int state); + void y_pia_irqa_w(int state); + void y_pia_irqb_w(int state); uint8_t kb_pia_pa_r(); uint8_t kb_pia_pb_r(); void kb_pia_pb_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER( kb_halt_w ); - DECLARE_WRITE_LINE_MEMBER( kb_pia_irqa_w ); - DECLARE_WRITE_LINE_MEMBER( kb_pia_irqb_w ); + void kb_halt_w(int state); + void kb_pia_irqa_w(int state); + void kb_pia_irqb_w(int state); uint8_t tape_pia_pa_r(); void tape_pia_pa_w(uint8_t data); void tape_pia_pb_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER( tape_pia_irqa_w ); - DECLARE_WRITE_LINE_MEMBER( tape_pia_irqb_w ); + void tape_pia_irqa_w(int state); + void tape_pia_irqb_w(int state); void dio_w(uint8_t data); uint8_t gpib_pia_pb_r(); void gpib_pia_pb_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER( talk_w ); - DECLARE_WRITE_LINE_MEMBER( gpib_pia_irqa_w ); - DECLARE_WRITE_LINE_MEMBER( gpib_pia_irqb_w ); + void talk_w(int state); + void gpib_pia_irqa_w(int state); + void gpib_pia_irqb_w(int state); void com_pia_pa_w(uint8_t data); uint8_t com_pia_pb_r(); void com_pia_pb_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER( com_pia_irqa_w ); - DECLARE_WRITE_LINE_MEMBER( com_pia_irqb_w ); - DECLARE_WRITE_LINE_MEMBER( acia_irq_w ); - DECLARE_WRITE_LINE_MEMBER( write_acia_clock ); + void com_pia_irqa_w(int state); + void com_pia_irqb_w(int state); + void acia_irq_w(int state); + void write_acia_clock(int state); TIMER_DEVICE_CALLBACK_MEMBER(keyboard_tick); void tek4051_mem(address_map &map); diff --git a/src/mame/tektronix/tek410x.cpp b/src/mame/tektronix/tek410x.cpp index 5b5e4835df6..dfbf4c52851 100644 --- a/src/mame/tektronix/tek410x.cpp +++ b/src/mame/tektronix/tek410x.cpp @@ -57,9 +57,9 @@ private: u16 system_reset_r(); void ppi_pc_w(u8 data); - DECLARE_WRITE_LINE_MEMBER(kb_rdata_w); - DECLARE_WRITE_LINE_MEMBER(kb_tdata_w); - DECLARE_WRITE_LINE_MEMBER(kb_rclamp_w); + void kb_rdata_w(int state); + void kb_tdata_w(int state); + void kb_rclamp_w(int state); void xpos_w(u16 data); void ypos_w(u16 data); @@ -124,14 +124,14 @@ void tek4107a_state::ppi_pc_w(u8 data) m_ppi_pc = data; } -WRITE_LINE_MEMBER(tek4107a_state::kb_rdata_w) +void tek4107a_state::kb_rdata_w(int state) { m_kb_rdata = state; if (!m_kb_rclamp) m_duart[0]->rx_a_w(state); } -WRITE_LINE_MEMBER(tek4107a_state::kb_rclamp_w) +void tek4107a_state::kb_rclamp_w(int state) { if (m_kb_rclamp != !state) { @@ -144,7 +144,7 @@ WRITE_LINE_MEMBER(tek4107a_state::kb_rclamp_w) } } -WRITE_LINE_MEMBER(tek4107a_state::kb_tdata_w) +void tek4107a_state::kb_tdata_w(int state) { if (m_kb_tdata != state) { diff --git a/src/mame/tektronix/tek410x_kbd.cpp b/src/mame/tektronix/tek410x_kbd.cpp index 4d0d1beea46..e8bf5a40961 100644 --- a/src/mame/tektronix/tek410x_kbd.cpp +++ b/src/mame/tektronix/tek410x_kbd.cpp @@ -168,7 +168,7 @@ void tek410x_keyboard_device::device_start() save_item(NAME(m_kdo)); } -WRITE_LINE_MEMBER(tek410x_keyboard_device::kdi_w) +void tek410x_keyboard_device::kdi_w(int state) { m_kdi = state; if (BIT(m_p2_out, 7)) @@ -178,14 +178,14 @@ WRITE_LINE_MEMBER(tek410x_keyboard_device::kdi_w) } } -WRITE_LINE_MEMBER(tek410x_keyboard_device::kdo_w) +void tek410x_keyboard_device::kdo_w(int state) { m_kdo = state; if (BIT(m_p2_out, 5)) m_rdata_callback(state); } -WRITE_LINE_MEMBER(tek410x_keyboard_device::reset_w) +void tek410x_keyboard_device::reset_w(int state) { m_mcu->set_input_line(INPUT_LINE_RESET, state ? CLEAR_LINE : ASSERT_LINE); if (!state) diff --git a/src/mame/tektronix/tek410x_kbd.h b/src/mame/tektronix/tek410x_kbd.h index 63a9e775d27..2702cfb8498 100644 --- a/src/mame/tektronix/tek410x_kbd.h +++ b/src/mame/tektronix/tek410x_kbd.h @@ -25,9 +25,9 @@ public: auto rdata_callback() { return m_rdata_callback.bind(); } // line inputs - DECLARE_WRITE_LINE_MEMBER(kdi_w); - DECLARE_WRITE_LINE_MEMBER(kdo_w); - DECLARE_WRITE_LINE_MEMBER(reset_w); + void kdi_w(int state); + void kdo_w(int state); + void reset_w(int state); protected: // device-level overrides diff --git a/src/mame/tektronix/tek440x.cpp b/src/mame/tektronix/tek440x.cpp index 02b77a6df42..2bb15f1fca4 100644 --- a/src/mame/tektronix/tek440x.cpp +++ b/src/mame/tektronix/tek440x.cpp @@ -101,9 +101,9 @@ private: void sound_w(u8 data); void diag_w(u8 data); - DECLARE_WRITE_LINE_MEMBER(kb_rdata_w); - DECLARE_WRITE_LINE_MEMBER(kb_tdata_w); - DECLARE_WRITE_LINE_MEMBER(kb_rclamp_w); + void kb_rdata_w(int state); + void kb_tdata_w(int state); + void kb_rclamp_w(int state); void logical_map(address_map &map); void physical_map(address_map &map); @@ -268,14 +268,14 @@ void tek440x_state::diag_w(u8 data) m_kb_loop = BIT(data, 7); } -WRITE_LINE_MEMBER(tek440x_state::kb_rdata_w) +void tek440x_state::kb_rdata_w(int state) { m_kb_rdata = state; if (!m_kb_rclamp) m_duart->rx_a_w(state); } -WRITE_LINE_MEMBER(tek440x_state::kb_rclamp_w) +void tek440x_state::kb_rclamp_w(int state) { if (m_kb_rclamp != !state) { @@ -288,7 +288,7 @@ WRITE_LINE_MEMBER(tek440x_state::kb_rclamp_w) } } -WRITE_LINE_MEMBER(tek440x_state::kb_tdata_w) +void tek440x_state::kb_tdata_w(int state) { if (m_kb_tdata != state) { diff --git a/src/mame/telenova/compis.cpp b/src/mame/telenova/compis.cpp index 5f6c9731193..60a5fe58559 100644 --- a/src/mame/telenova/compis.cpp +++ b/src/mame/telenova/compis.cpp @@ -146,18 +146,18 @@ public: uint8_t ppi_pb_r(); void ppi_pc_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER( tmr0_w ); - DECLARE_WRITE_LINE_MEMBER( tmr1_w ); - DECLARE_WRITE_LINE_MEMBER( tmr2_w ); - DECLARE_WRITE_LINE_MEMBER( tmr5_w ); + void tmr0_w(int state); + void tmr1_w(int state); + void tmr2_w(int state); + void tmr5_w(int state); TIMER_DEVICE_CALLBACK_MEMBER( tape_tick ); int m_centronics_busy; int m_centronics_select; - DECLARE_WRITE_LINE_MEMBER(write_centronics_busy); - DECLARE_WRITE_LINE_MEMBER(write_centronics_select); + void write_centronics_busy(int state); + void write_centronics_select(int state); int m_tmr0; void compis(machine_config &config); @@ -564,7 +564,7 @@ uint8_t compis_state::compis_irq_callback() return m_osp->inta_r(); } -WRITE_LINE_MEMBER( compis_state::tmr0_w ) +void compis_state::tmr0_w(int state) { m_tmr0 = state; @@ -573,7 +573,7 @@ WRITE_LINE_MEMBER( compis_state::tmr0_w ) m_maincpu->tmrin0_w(state); } -WRITE_LINE_MEMBER( compis_state::tmr1_w ) +void compis_state::tmr1_w(int state) { m_isbx0->mclk_w(state); m_isbx1->mclk_w(state); @@ -586,14 +586,14 @@ WRITE_LINE_MEMBER( compis_state::tmr1_w ) // I80130_INTERFACE( osp_intf ) //------------------------------------------------- -WRITE_LINE_MEMBER( compis_state::tmr2_w ) +void compis_state::tmr2_w(int state) { m_uart->write_rxc(state); m_uart->write_txc(state); } -WRITE_LINE_MEMBER( compis_state::tmr5_w ) +void compis_state::tmr5_w(int state) { m_mpsc->rxca_w(state); m_mpsc->txca_w(state); @@ -603,12 +603,12 @@ WRITE_LINE_MEMBER( compis_state::tmr5_w ) // I8255A interface //------------------------------------------------- -WRITE_LINE_MEMBER(compis_state::write_centronics_busy) +void compis_state::write_centronics_busy(int state) { m_centronics_busy = state; } -WRITE_LINE_MEMBER(compis_state::write_centronics_select) +void compis_state::write_centronics_select(int state) { m_centronics_select = state; } diff --git a/src/mame/telenova/compiskb.cpp b/src/mame/telenova/compiskb.cpp index c20d71434fb..d19d677e165 100644 --- a/src/mame/telenova/compiskb.cpp +++ b/src/mame/telenova/compiskb.cpp @@ -253,7 +253,7 @@ void compis_keyboard_device::device_start() // si_w - serial input write //------------------------------------------------- -WRITE_LINE_MEMBER( compis_keyboard_device::si_w ) +void compis_keyboard_device::si_w(int state) { m_maincpu->set_input_line(MCS48_INPUT_IRQ, state ? CLEAR_LINE : ASSERT_LINE); } diff --git a/src/mame/telenova/compiskb.h b/src/mame/telenova/compiskb.h index 436b9a234d4..8b101fd87f9 100644 --- a/src/mame/telenova/compiskb.h +++ b/src/mame/telenova/compiskb.h @@ -29,7 +29,7 @@ public: auto out_tx_handler() { return m_out_tx_handler.bind(); } - DECLARE_WRITE_LINE_MEMBER( si_w ); + void si_w(int state); protected: // device-level overrides diff --git a/src/mame/telercas/tmc1800.cpp b/src/mame/telercas/tmc1800.cpp index b07aae7c45a..461d46e5f7a 100644 --- a/src/mame/telercas/tmc1800.cpp +++ b/src/mame/telercas/tmc1800.cpp @@ -551,68 +551,68 @@ INPUT_PORTS_END // Telmac 1800 -READ_LINE_MEMBER( tmc1800_state::clear_r ) +int tmc1800_state::clear_r() { return BIT(m_run->read(), 0); } -READ_LINE_MEMBER( tmc1800_state::ef2_r ) +int tmc1800_state::ef2_r() { return m_cassette->input() < 0; } -READ_LINE_MEMBER( tmc1800_state::ef3_r ) +int tmc1800_state::ef3_r() { return CLEAR_LINE; // TODO } -WRITE_LINE_MEMBER( tmc1800_state::q_w ) +void tmc1800_state::q_w(int state) { m_cassette->output(state ? 1.0 : -1.0); } // Oscom 1000B -READ_LINE_MEMBER( osc1000b_state::clear_r ) +int osc1000b_state::clear_r() { return BIT(m_run->read(), 0); } -READ_LINE_MEMBER( osc1000b_state::ef2_r ) +int osc1000b_state::ef2_r() { return m_cassette->input() < 0; } -READ_LINE_MEMBER( osc1000b_state::ef3_r ) +int osc1000b_state::ef3_r() { return CLEAR_LINE; // TODO } -WRITE_LINE_MEMBER( osc1000b_state::q_w ) +void osc1000b_state::q_w(int state) { m_cassette->output(state ? 1.0 : -1.0); } // Telmac 2000 -READ_LINE_MEMBER( tmc2000_state::clear_r ) +int tmc2000_state::clear_r() { return BIT(m_run->read(), 0); } -READ_LINE_MEMBER( tmc2000_state::ef2_r ) +int tmc2000_state::ef2_r() { return (m_cassette)->input() < 0; } -READ_LINE_MEMBER( tmc2000_state::ef3_r ) +int tmc2000_state::ef3_r() { uint8_t data = ~m_key_row[m_keylatch / 8]->read(); return BIT(data, m_keylatch % 8); } -WRITE_LINE_MEMBER( tmc2000_state::q_w ) +void tmc2000_state::q_w(int state) { /* CDP1864 audio output enable */ m_cti->aoe_w(state); @@ -634,7 +634,7 @@ void tmc2000_state::dma_w(offs_t offset, uint8_t data) // OSCOM Nano -READ_LINE_MEMBER( nano_state::clear_r ) +int nano_state::clear_r() { int run = BIT(m_run->read(), 0); int monitor = BIT(m_monitor->read(), 0); @@ -642,12 +642,12 @@ READ_LINE_MEMBER( nano_state::clear_r ) return run && monitor; } -READ_LINE_MEMBER( nano_state::ef2_r ) +int nano_state::ef2_r() { return m_cassette->input() < 0; } -READ_LINE_MEMBER( nano_state::ef3_r ) +int nano_state::ef3_r() { uint8_t data = 0xff; @@ -657,7 +657,7 @@ READ_LINE_MEMBER( nano_state::ef3_r ) return !BIT(data, m_keylatch & 0x07); } -WRITE_LINE_MEMBER( nano_state::q_w ) +void nano_state::q_w(int state) { /* CDP1864 audio output enable */ m_cti->aoe_w(state); diff --git a/src/mame/telercas/tmc1800.h b/src/mame/telercas/tmc1800.h index d2b247c1d68..a2fa65efa40 100644 --- a/src/mame/telercas/tmc1800.h +++ b/src/mame/telercas/tmc1800.h @@ -57,10 +57,10 @@ public: void keylatch_w(uint8_t data); uint8_t dispon_r(); void dispoff_w(uint8_t data); - DECLARE_READ_LINE_MEMBER( clear_r ); - DECLARE_READ_LINE_MEMBER( ef2_r ); - DECLARE_READ_LINE_MEMBER( ef3_r ); - DECLARE_WRITE_LINE_MEMBER( q_w ); + int clear_r(); + int ef2_r(); + int ef3_r(); + void q_w(int state); void tmc1800(machine_config &config); void tmc1800_video(machine_config &config); @@ -87,10 +87,10 @@ public: uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); void keylatch_w(uint8_t data); - DECLARE_READ_LINE_MEMBER( clear_r ); - DECLARE_READ_LINE_MEMBER( ef2_r ); - DECLARE_READ_LINE_MEMBER( ef3_r ); - DECLARE_WRITE_LINE_MEMBER( q_w ); + int clear_r(); + int ef2_r(); + int ef3_r(); + void q_w(int state); void osc1000b(machine_config &config); void osc1000b_video(machine_config &config); @@ -118,14 +118,14 @@ public: void keylatch_w(uint8_t data); void bankswitch_w(uint8_t data); - DECLARE_READ_LINE_MEMBER( clear_r ); - DECLARE_READ_LINE_MEMBER( ef2_r ); - DECLARE_READ_LINE_MEMBER( ef3_r ); - DECLARE_WRITE_LINE_MEMBER( q_w ); + int clear_r(); + int ef2_r(); + int ef3_r(); + void q_w(int state); void dma_w(offs_t offset, uint8_t data); - DECLARE_READ_LINE_MEMBER( rdata_r ); - DECLARE_READ_LINE_MEMBER( bdata_r ); - DECLARE_READ_LINE_MEMBER( gdata_r ); + int rdata_r(); + int bdata_r(); + int gdata_r(); DECLARE_INPUT_CHANGED_MEMBER( run_pressed ); void bankswitch(); @@ -169,10 +169,10 @@ public: void keylatch_w(uint8_t data); void bankswitch_w(uint8_t data); - DECLARE_READ_LINE_MEMBER( clear_r ); - DECLARE_READ_LINE_MEMBER( ef2_r ); - DECLARE_READ_LINE_MEMBER( ef3_r ); - DECLARE_WRITE_LINE_MEMBER( q_w ); + int clear_r(); + int ef2_r(); + int ef3_r(); + void q_w(int state); DECLARE_INPUT_CHANGED_MEMBER( run_pressed ); DECLARE_INPUT_CHANGED_MEMBER( monitor_pressed ); diff --git a/src/mame/telercas/tmc1800_v.cpp b/src/mame/telercas/tmc1800_v.cpp index ee162c20f32..9f42671b669 100644 --- a/src/mame/telercas/tmc1800_v.cpp +++ b/src/mame/telercas/tmc1800_v.cpp @@ -13,17 +13,17 @@ /* Telmac 2000 */ -READ_LINE_MEMBER( tmc2000_state::rdata_r ) +int tmc2000_state::rdata_r() { return BIT(m_color, 2); } -READ_LINE_MEMBER( tmc2000_state::bdata_r ) +int tmc2000_state::bdata_r() { return BIT(m_color, 1); } -READ_LINE_MEMBER( tmc2000_state::gdata_r ) +int tmc2000_state::gdata_r() { return BIT(m_color, 0); } diff --git a/src/mame/telercas/tmc2000e.cpp b/src/mame/telercas/tmc2000e.cpp index b023d7bc38c..c72765f7057 100644 --- a/src/mame/telercas/tmc2000e.cpp +++ b/src/mame/telercas/tmc2000e.cpp @@ -204,41 +204,41 @@ INPUT_PORTS_END /* Video */ -READ_LINE_MEMBER( tmc2000e_state::rdata_r ) +int tmc2000e_state::rdata_r() { return BIT(m_color, 2); } -READ_LINE_MEMBER( tmc2000e_state::bdata_r ) +int tmc2000e_state::bdata_r() { return BIT(m_color, 1); } -READ_LINE_MEMBER( tmc2000e_state::gdata_r ) +int tmc2000e_state::gdata_r() { return BIT(m_color, 0); } /* CDP1802 Interface */ -READ_LINE_MEMBER( tmc2000e_state::clear_r ) +int tmc2000e_state::clear_r() { return BIT(m_run->read(), 0); } -READ_LINE_MEMBER( tmc2000e_state::ef2_r ) +int tmc2000e_state::ef2_r() { return m_cassette->input() < 0; } -READ_LINE_MEMBER( tmc2000e_state::ef3_r ) +int tmc2000e_state::ef3_r() { uint8_t data = ~(m_key_row[m_keylatch / 8])->read(); return BIT(data, m_keylatch % 8); } -WRITE_LINE_MEMBER( tmc2000e_state::q_w ) +void tmc2000e_state::q_w(int state) { // turn CDP1864 sound generator on/off m_cti->aoe_w(state); diff --git a/src/mame/telercas/tmc2000e.h b/src/mame/telercas/tmc2000e.h index 32a956e2514..8bdb0202f98 100644 --- a/src/mame/telercas/tmc2000e.h +++ b/src/mame/telercas/tmc2000e.h @@ -44,13 +44,13 @@ private: void io_w(uint8_t data); void io_select_w(uint8_t data); void keyboard_latch_w(uint8_t data); - DECLARE_READ_LINE_MEMBER( rdata_r ); - DECLARE_READ_LINE_MEMBER( bdata_r ); - DECLARE_READ_LINE_MEMBER( gdata_r ); - DECLARE_READ_LINE_MEMBER( clear_r ); - DECLARE_READ_LINE_MEMBER( ef2_r ); - DECLARE_READ_LINE_MEMBER( ef3_r ); - DECLARE_WRITE_LINE_MEMBER( q_w ); + int rdata_r(); + int bdata_r(); + int gdata_r(); + int clear_r(); + int ef2_r(); + int ef3_r(); + void q_w(int state); void dma_w(offs_t offset, uint8_t data); /* video state */ diff --git a/src/mame/telercas/tmc600.cpp b/src/mame/telercas/tmc600.cpp index 65ad4d3d5ea..fa9bb4a9295 100644 --- a/src/mame/telercas/tmc600.cpp +++ b/src/mame/telercas/tmc600.cpp @@ -229,17 +229,17 @@ INPUT_PORTS_END /* CDP1802 Interface */ -READ_LINE_MEMBER( tmc600_state::ef2_r ) +int tmc600_state::ef2_r() { return m_cassette->input() < 0; } -READ_LINE_MEMBER( tmc600_state::ef3_r ) +int tmc600_state::ef3_r() { return !BIT(m_key_row[(m_out3 >> 3) & 0x07]->read(), m_out3 & 0x07); } -WRITE_LINE_MEMBER( tmc600_state::q_w ) +void tmc600_state::q_w(int state) { m_cassette->output(state ? +1.0 : -1.0); } diff --git a/src/mame/telercas/tmc600.h b/src/mame/telercas/tmc600.h index 6332bbd4d0f..5b33991a12c 100644 --- a/src/mame/telercas/tmc600.h +++ b/src/mame/telercas/tmc600.h @@ -70,13 +70,13 @@ private: void vismac_register_w(uint8_t data); void vismac_data_w(uint8_t data); void page_ram_w(offs_t offset, uint8_t data); - DECLARE_READ_LINE_MEMBER( clear_r ); - DECLARE_READ_LINE_MEMBER( ef2_r ); - DECLARE_READ_LINE_MEMBER( ef3_r ); - DECLARE_WRITE_LINE_MEMBER( q_w ); + int clear_r(); + int ef2_r(); + int ef3_r(); + void q_w(int state); void sc_w(uint8_t data); void out3_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER( prd_w ); + void prd_w(int state); uint8_t get_color(uint16_t pma); diff --git a/src/mame/telercas/tmc600_v.cpp b/src/mame/telercas/tmc600_v.cpp index d342cf56af5..273b8d686a6 100644 --- a/src/mame/telercas/tmc600_v.cpp +++ b/src/mame/telercas/tmc600_v.cpp @@ -68,7 +68,7 @@ CDP1869_PCB_READ_MEMBER( tmc600_state::tmc600_pcb_r ) return BIT(color, 0); } -WRITE_LINE_MEMBER( tmc600_state::prd_w ) +void tmc600_state::prd_w(int state) { if (!state) { m_frame++; diff --git a/src/mame/televideo/tv910.cpp b/src/mame/televideo/tv910.cpp index 6b407bc6509..176729a42a5 100644 --- a/src/mame/televideo/tv910.cpp +++ b/src/mame/televideo/tv910.cpp @@ -83,12 +83,12 @@ private: void nmi_ack_w(uint8_t data); void control_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(vbl_w); + void vbl_w(int state); - DECLARE_READ_LINE_MEMBER(ay3600_shift_r); - DECLARE_READ_LINE_MEMBER(ay3600_control_r); - DECLARE_WRITE_LINE_MEMBER(ay3600_data_ready_w); - DECLARE_WRITE_LINE_MEMBER(ay3600_ako_w); + int ay3600_shift_r(); + int ay3600_control_r(); + void ay3600_data_ready_w(int state); + void ay3600_ako_w(int state); void tv910_mem(address_map &map); @@ -185,7 +185,7 @@ uint8_t tv910_state::kbd_flags_r() return rv; } -READ_LINE_MEMBER(tv910_state::ay3600_shift_r) +int tv910_state::ay3600_shift_r() { // either shift key if (m_kbspecial->read() & 0x06) @@ -196,7 +196,7 @@ READ_LINE_MEMBER(tv910_state::ay3600_shift_r) return CLEAR_LINE; } -READ_LINE_MEMBER(tv910_state::ay3600_control_r) +int tv910_state::ay3600_control_r() { if (m_kbspecial->read() & 0x08) { @@ -206,7 +206,7 @@ READ_LINE_MEMBER(tv910_state::ay3600_control_r) return CLEAR_LINE; } -WRITE_LINE_MEMBER(tv910_state::ay3600_data_ready_w) +void tv910_state::ay3600_data_ready_w(int state) { if (state == ASSERT_LINE) { @@ -219,7 +219,7 @@ WRITE_LINE_MEMBER(tv910_state::ay3600_data_ready_w) } } -WRITE_LINE_MEMBER(tv910_state::ay3600_ako_w) +void tv910_state::ay3600_ako_w(int state) { m_anykeydown = (state == ASSERT_LINE) ? true : false; @@ -458,7 +458,7 @@ MC6845_ON_UPDATE_ADDR_CHANGED( tv910_state::crtc_update_addr ) { } -WRITE_LINE_MEMBER(tv910_state::vbl_w) +void tv910_state::vbl_w(int state) { // this is ACKed by vbl_ack_w, state going 0 here doesn't ack the IRQ if (state) diff --git a/src/mame/televideo/tv950.cpp b/src/mame/televideo/tv950.cpp index 881e4a75e81..b9536320cf1 100644 --- a/src/mame/televideo/tv950.cpp +++ b/src/mame/televideo/tv950.cpp @@ -76,12 +76,12 @@ private: void via_a_w(uint8_t data); void via_b_w(uint8_t data); uint8_t via_b_r(); - DECLARE_WRITE_LINE_MEMBER(crtc_vs_w); + void crtc_vs_w(int state); MC6845_UPDATE_ROW(crtc_update_row); MC6845_ON_UPDATE_ADDR_CHANGED(crtc_update_addr); void row_addr_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(via_crtc_reset_w); + void via_crtc_reset_w(int state); void tv950_mem(address_map &map); @@ -209,12 +209,12 @@ void tv950_state::machine_reset() m_attr_screen = 0; } -WRITE_LINE_MEMBER(tv950_state::crtc_vs_w) +void tv950_state::crtc_vs_w(int state) { m_attr_screen = 0; } -WRITE_LINE_MEMBER(tv950_state::via_crtc_reset_w) +void tv950_state::via_crtc_reset_w(int state) { //printf("via_crtc_reset_w: %d\n", state); m_via->write_ca1(state); diff --git a/src/mame/televideo/tv950kb.cpp b/src/mame/televideo/tv950kb.cpp index f36aecc0cde..86f6fe992ac 100644 --- a/src/mame/televideo/tv950kb.cpp +++ b/src/mame/televideo/tv950kb.cpp @@ -30,7 +30,7 @@ void tv950kb_device::device_start() { } -WRITE_LINE_MEMBER(tv950kb_device::rx_w) +void tv950kb_device::rx_w(int state) { m_beeper->level_w(state); } @@ -47,7 +47,7 @@ u8 tv950kb_device::keys_r() return result; } -WRITE_LINE_MEMBER(tv950kb_device::tx_w) +void tv950kb_device::tx_w(int state) { m_tx_cb(state); } diff --git a/src/mame/televideo/tv950kb.h b/src/mame/televideo/tv950kb.h index 0a9ebb5a51a..d12b94a4223 100644 --- a/src/mame/televideo/tv950kb.h +++ b/src/mame/televideo/tv950kb.h @@ -25,7 +25,7 @@ public: // configuration auto tx_cb() { return m_tx_cb.bind(); } - DECLARE_WRITE_LINE_MEMBER(rx_w); + void rx_w(int state); protected: // device-specific overrides @@ -37,7 +37,7 @@ protected: private: u8 keys_r(); - DECLARE_WRITE_LINE_MEMBER(tx_w); + void tx_w(int state); void rw_map(address_map &map); diff --git a/src/mame/televideo/tv955.cpp b/src/mame/televideo/tv955.cpp index 20b8e58bb1e..ba455846fe4 100644 --- a/src/mame/televideo/tv955.cpp +++ b/src/mame/televideo/tv955.cpp @@ -43,7 +43,7 @@ private: SCN2674_DRAW_CHARACTER_MEMBER(draw_character); void control_latch_w(u8 data); - DECLARE_WRITE_LINE_MEMBER(system_reset_w); + void system_reset_w(int state); void mem_map(address_map &map); void char_map(address_map &map); @@ -105,7 +105,7 @@ void tv955_state::control_latch_w(u8 data) } } -WRITE_LINE_MEMBER(tv955_state::system_reset_w) +void tv955_state::system_reset_w(int state) { m_maincpu->set_input_line(INPUT_LINE_RESET, state ? CLEAR_LINE : ASSERT_LINE); if (!state) diff --git a/src/mame/televideo/tv955kb.cpp b/src/mame/televideo/tv955kb.cpp index 6b9063f1f3f..87bf42ca9f9 100644 --- a/src/mame/televideo/tv955kb.cpp +++ b/src/mame/televideo/tv955kb.cpp @@ -68,7 +68,7 @@ void tv955kb_device::bell_reset() m_bell_timer->enable(false); } -WRITE_LINE_MEMBER(tv955kb_device::write_rxd) +void tv955kb_device::write_rxd(int state) { m_mcu->set_input_line(MCS48_INPUT_IRQ, state ? CLEAR_LINE : ASSERT_LINE); } @@ -86,7 +86,7 @@ u8 tv955kb_device::keys_r() return result; } -WRITE_LINE_MEMBER(tv955kb_device::bell_w) +void tv955kb_device::bell_w(int state) { if (state && m_bell_timer->enabled()) bell_reset(); @@ -98,12 +98,12 @@ WRITE_LINE_MEMBER(tv955kb_device::bell_w) } } -WRITE_LINE_MEMBER(tv955kb_device::txd_w) +void tv955kb_device::txd_w(int state) { m_txd_cb(state); } -WRITE_LINE_MEMBER(tv955kb_device::reset_w) +void tv955kb_device::reset_w(int state) { m_mcu->set_input_line(INPUT_LINE_RESET, state ? CLEAR_LINE : ASSERT_LINE); if (!state) diff --git a/src/mame/televideo/tv955kb.h b/src/mame/televideo/tv955kb.h index e054cb628b6..2d6ad11cd88 100644 --- a/src/mame/televideo/tv955kb.h +++ b/src/mame/televideo/tv955kb.h @@ -25,7 +25,7 @@ public: auto txd_cb() { return m_txd_cb.bind(); } auto reset_cb() { return m_reset_cb.bind(); } - DECLARE_WRITE_LINE_MEMBER(write_rxd); + void write_rxd(int state); protected: // device-specific overrides @@ -38,9 +38,9 @@ protected: private: u8 keys_r(); - DECLARE_WRITE_LINE_MEMBER(bell_w); - DECLARE_WRITE_LINE_MEMBER(txd_w); - DECLARE_WRITE_LINE_MEMBER(reset_w); + void bell_w(int state); + void txd_w(int state); + void reset_w(int state); TIMER_CALLBACK_MEMBER(bell_q8); void bell_reset(); diff --git a/src/mame/televideo/tv990.cpp b/src/mame/televideo/tv990.cpp index 1231ab30dd9..926980ad8ee 100644 --- a/src/mame/televideo/tv990.cpp +++ b/src/mame/televideo/tv990.cpp @@ -84,10 +84,10 @@ private: uint8_t kbdc_r(offs_t offset); void kbdc_w(offs_t offset, uint8_t data); - DECLARE_WRITE_LINE_MEMBER(uart0_irq); - DECLARE_WRITE_LINE_MEMBER(uart1_irq); - DECLARE_WRITE_LINE_MEMBER(lpt_irq); - DECLARE_WRITE_LINE_MEMBER(vblank_irq); + void uart0_irq(int state); + void uart1_irq(int state); + void lpt_irq(int state); + void vblank_irq(int state); required_device m_maincpu; required_shared_ptr m_vram; @@ -105,7 +105,7 @@ private: int m_height = 0; }; -WRITE_LINE_MEMBER(tv990_state::vblank_irq) +void tv990_state::vblank_irq(int state) { if (state) { @@ -132,17 +132,17 @@ TIMER_CALLBACK_MEMBER(tv990_state::trigger_row_irq) m_screen->update_now(); } -WRITE_LINE_MEMBER(tv990_state::uart0_irq) +void tv990_state::uart0_irq(int state) { m_maincpu->set_input_line(M68K_IRQ_5, state); } -WRITE_LINE_MEMBER(tv990_state::uart1_irq) +void tv990_state::uart1_irq(int state) { m_maincpu->set_input_line(M68K_IRQ_4, state); } -WRITE_LINE_MEMBER(tv990_state::lpt_irq) +void tv990_state::lpt_irq(int state) { m_maincpu->set_input_line(M68K_IRQ_3, state); } diff --git a/src/mame/tesla/ondra.cpp b/src/mame/tesla/ondra.cpp index 18682329a00..b9ebbad1c3d 100644 --- a/src/mame/tesla/ondra.cpp +++ b/src/mame/tesla/ondra.cpp @@ -150,7 +150,7 @@ u32 ondra_state::screen_update_ondra(screen_device &screen, bitmap_ind16 &bitmap return 0; } -WRITE_LINE_MEMBER(ondra_state::vblank_irq) +void ondra_state::vblank_irq(int state) { if (state) m_maincpu->set_input_line(0, HOLD_LINE); diff --git a/src/mame/tesla/ondra.h b/src/mame/tesla/ondra.h index 80a3d6a46d5..d3e970ae128 100644 --- a/src/mame/tesla/ondra.h +++ b/src/mame/tesla/ondra.h @@ -38,7 +38,7 @@ private: u8 port09_r(); void port0a_w(u8 data); u32 screen_update_ondra(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(vblank_irq); + void vblank_irq(int state); void io_map(address_map &map); void mem_map(address_map &map); diff --git a/src/mame/tesla/sapi1.cpp b/src/mame/tesla/sapi1.cpp index 0194ce96a71..f8ecb1b541e 100644 --- a/src/mame/tesla/sapi1.cpp +++ b/src/mame/tesla/sapi1.cpp @@ -105,8 +105,8 @@ private: uint8_t port40_r(); uint8_t port41_r(); MC6845_UPDATE_ROW(crtc_update_row); - DECLARE_READ_LINE_MEMBER(si); - DECLARE_WRITE_LINE_MEMBER(so); + int si(); + void so(int state); uint32_t screen_update_sapi1(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_sapi3(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); @@ -127,7 +127,7 @@ private: uint8_t m_refresh_counter = 0U; uint8_t m_zps3_25 = 0U; TIMER_DEVICE_CALLBACK_MEMBER(kansas_r); - DECLARE_WRITE_LINE_MEMBER(kansas_w); + void kansas_w(int state); u8 m_cass_data[4]{}; bool m_cassinbit = 0, m_cassoutbit = 0, m_cassold = 0; bool m_ier = 0, m_iet = 0; @@ -623,17 +623,17 @@ void sapi_state::port43_w(uint8_t data) m_uart->transmit(~data); } -READ_LINE_MEMBER( sapi_state::si ) +int sapi_state::si() { return m_cassinbit; } -WRITE_LINE_MEMBER( sapi_state::so ) +void sapi_state::so(int state) { m_cassoutbit = state; } -WRITE_LINE_MEMBER( sapi_state::kansas_w ) +void sapi_state::kansas_w(int state) { if ((m_cass->get_state() & CASSETTE_MASK_UISTATE) == CASSETTE_RECORD) { diff --git a/src/mame/thepit/thepit.cpp b/src/mame/thepit/thepit.cpp index 6e8f5c499f1..5f301cb1f89 100644 --- a/src/mame/thepit/thepit.cpp +++ b/src/mame/thepit/thepit.cpp @@ -186,24 +186,24 @@ uint8_t thepit_state::intrepid_colorram_mirror_r(offs_t offset) return m_colorram[offset]; } -WRITE_LINE_MEMBER(thepit_state::coin_lockout_w) +void thepit_state::coin_lockout_w(int state) { machine().bookkeeping().coin_lockout_w(0, !state); } -WRITE_LINE_MEMBER(thepit_state::sound_enable_w) +void thepit_state::sound_enable_w(int state) { machine().sound().system_mute(!state); } -WRITE_LINE_MEMBER(thepit_state::nmi_mask_w) +void thepit_state::nmi_mask_w(int state) { m_nmi_mask = state; if (!m_nmi_mask) m_maincpu->set_input_line(INPUT_LINE_NMI, CLEAR_LINE); } -WRITE_LINE_MEMBER(thepit_state::vblank_w) +void thepit_state::vblank_w(int state) { if (state) { diff --git a/src/mame/thepit/thepit.h b/src/mame/thepit/thepit.h index 3f8350a1a7f..9a7eac6a668 100644 --- a/src/mame/thepit/thepit.h +++ b/src/mame/thepit/thepit.h @@ -70,20 +70,20 @@ private: int m_question_rom = 0; int m_remap_address[16]{}; - DECLARE_WRITE_LINE_MEMBER(coin_lockout_w); - DECLARE_WRITE_LINE_MEMBER(sound_enable_w); - DECLARE_WRITE_LINE_MEMBER(nmi_mask_w); - DECLARE_WRITE_LINE_MEMBER(vblank_w); + void coin_lockout_w(int state); + void sound_enable_w(int state); + void nmi_mask_w(int state); + void vblank_w(int state); TIMER_CALLBACK_MEMBER(vsync_callback); IRQ_CALLBACK_MEMBER(vsync_int_ack); void videoram_w(offs_t offset, uint8_t data); void colorram_w(offs_t offset, uint8_t data); - DECLARE_WRITE_LINE_MEMBER(flip_screen_x_w); - DECLARE_WRITE_LINE_MEMBER(flip_screen_y_w); + void flip_screen_x_w(int state); + void flip_screen_y_w(int state); uint8_t input_port_0_r(); uint8_t intrepid_colorram_mirror_r(offs_t offset); - DECLARE_WRITE_LINE_MEMBER(intrepid_graphics_bank_w); + void intrepid_graphics_bank_w(int state); uint8_t rtriv_question_r(offs_t offset); diff --git a/src/mame/thepit/thepit_v.cpp b/src/mame/thepit/thepit_v.cpp index a9329ba60af..3e6a8760b59 100644 --- a/src/mame/thepit/thepit_v.cpp +++ b/src/mame/thepit/thepit_v.cpp @@ -165,7 +165,7 @@ void thepit_state::colorram_w(offs_t offset, uint8_t data) } -WRITE_LINE_MEMBER(thepit_state::flip_screen_x_w) +void thepit_state::flip_screen_x_w(int state) { m_flip_x = state; @@ -178,7 +178,7 @@ WRITE_LINE_MEMBER(thepit_state::flip_screen_x_w) } -WRITE_LINE_MEMBER(thepit_state::flip_screen_y_w) +void thepit_state::flip_screen_y_w(int state) { m_flip_y = state; @@ -191,7 +191,7 @@ WRITE_LINE_MEMBER(thepit_state::flip_screen_y_w) } -WRITE_LINE_MEMBER(thepit_state::intrepid_graphics_bank_w) +void thepit_state::intrepid_graphics_bank_w(int state) { m_graphics_bank = state; diff --git a/src/mame/thepit/timelimt.cpp b/src/mame/thepit/timelimt.cpp index 0eb285b9b7c..6e22d0cca4a 100644 --- a/src/mame/thepit/timelimt.cpp +++ b/src/mame/thepit/timelimt.cpp @@ -70,8 +70,8 @@ private: tilemap_t *m_bg_tilemap = nullptr; tilemap_t *m_fg_tilemap = nullptr; - DECLARE_WRITE_LINE_MEMBER(nmi_enable_w); - DECLARE_WRITE_LINE_MEMBER(coin_lockout_w); + void nmi_enable_w(int state); + void coin_lockout_w(int state); void videoram_w(offs_t offset, uint8_t data); void bg_videoram_w(offs_t offset, uint8_t data); @@ -267,12 +267,12 @@ void timelimt_state::machine_start() save_item(NAME(m_nmi_enabled)); } -WRITE_LINE_MEMBER(timelimt_state::nmi_enable_w) +void timelimt_state::nmi_enable_w(int state) { m_nmi_enabled = bool(state); } -WRITE_LINE_MEMBER(timelimt_state::coin_lockout_w) +void timelimt_state::coin_lockout_w(int state) { machine().bookkeeping().coin_lockout_w(0, !state); } diff --git a/src/mame/thomson/thomson.h b/src/mame/thomson/thomson.h index bd502d08470..0a294ce0be4 100644 --- a/src/mame/thomson/thomson.h +++ b/src/mame/thomson/thomson.h @@ -158,25 +158,25 @@ protected: DECLARE_DEVICE_IMAGE_LOAD_MEMBER( to7_cartridge ); - DECLARE_WRITE_LINE_MEMBER( to7_set_cassette_motor ); - DECLARE_WRITE_LINE_MEMBER( thom_dev_irq_0 ); + void to7_set_cassette_motor(int state); + void thom_dev_irq_0(int state); void to7_cartridge_w(offs_t offset, uint8_t data); uint8_t to7_cartridge_r(offs_t offset); void to7_timer_port_out(uint8_t data); uint8_t to7_timer_port_in(); - DECLARE_WRITE_LINE_MEMBER( to7_set_cassette ); - DECLARE_WRITE_LINE_MEMBER( to7_sys_cb2_out ); + void to7_set_cassette(int state); + void to7_sys_cb2_out(int state); void to7_sys_portb_out(uint8_t data); uint8_t to7_sys_porta_in(); uint8_t to7_sys_portb_in(); uint8_t to7_game_porta_in(); uint8_t to7_game_portb_in(); void to7_game_portb_out(uint8_t data); - DECLARE_WRITE_LINE_MEMBER( to7_game_cb2_out ); + void to7_game_cb2_out(int state); TIMER_CALLBACK_MEMBER( to7_game_update_cb ); DECLARE_MACHINE_RESET( to7 ); DECLARE_MACHINE_START( to7 ); - DECLARE_WRITE_LINE_MEMBER( to770_sys_cb2_out ); + void to770_sys_cb2_out(int state); uint8_t to770_sys_porta_in(); void to7_update_cart_bank_postload(); void to770_update_ram_bank_postload(); @@ -195,7 +195,7 @@ protected: void to770_vram_w(offs_t offset, uint8_t data); TIMER_CALLBACK_MEMBER( thom_set_init ); - DECLARE_WRITE_LINE_MEMBER(thom_vblank); + void thom_vblank(int state); uint8_t to7_5p14_r(offs_t offset); void to7_5p14_w(offs_t offset, uint8_t data); @@ -343,7 +343,7 @@ protected: unsigned to7_lightpen_gpl( int decx, int decy ); void thom_configure_palette( double gamma, const uint16_t* pal, palette_device& palette ); - DECLARE_WRITE_LINE_MEMBER( mo5_set_cassette_motor ); + void mo5_set_cassette_motor(int state); DECLARE_DEVICE_IMAGE_LOAD_MEMBER( mo5_cartridge ); }; @@ -443,12 +443,12 @@ protected: void to8_sys_portb_out(uint8_t data); uint8_t to8_timer_port_in(); void to8_timer_port_out(uint8_t data); - DECLARE_WRITE_LINE_MEMBER( to8_timer_cp2_out ); + void to8_timer_cp2_out(int state); void to8_lightpen_cb( int step ); DECLARE_MACHINE_RESET( to8 ); DECLARE_MACHINE_START( to8 ); - DECLARE_WRITE_LINE_MEMBER(write_centronics_busy); + void write_centronics_busy(int state); void to8_sys_lo_w(offs_t offset, uint8_t data); void to8_sys_hi_w(offs_t offset, uint8_t data); @@ -548,14 +548,14 @@ protected: void mo6_cartridge_w(offs_t offset, uint8_t data); uint8_t mo6_cartridge_r(offs_t offset); void mo6_ext_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER( mo6_centronics_busy ); + void mo6_centronics_busy(int state); void mo6_game_porta_out(uint8_t data); - DECLARE_WRITE_LINE_MEMBER( mo6_game_cb2_out ); + void mo6_game_cb2_out(int state); TIMER_CALLBACK_MEMBER( mo6_game_update_cb ); uint8_t mo6_sys_porta_in(); uint8_t mo6_sys_portb_in(); void mo6_sys_porta_out(uint8_t data); - DECLARE_WRITE_LINE_MEMBER( mo6_sys_cb2_out ); + void mo6_sys_cb2_out(int state); uint8_t mo6_gatearray_r(offs_t offset); void mo6_gatearray_w(offs_t offset, uint8_t data); uint8_t mo6_vreg_r(offs_t offset); diff --git a/src/mame/thomson/thomson_m.cpp b/src/mame/thomson/thomson_m.cpp index f0af0d0975a..a5f67a77d7b 100644 --- a/src/mame/thomson/thomson_m.cpp +++ b/src/mame/thomson/thomson_m.cpp @@ -111,14 +111,14 @@ int thomson_state::to7_get_cassette() /* 1-bit cassette output */ -WRITE_LINE_MEMBER(thomson_state::to7_set_cassette) +void thomson_state::to7_set_cassette(int state) { m_cassette->output(state ? 1. : -1. ); } -WRITE_LINE_MEMBER( thomson_state::to7_set_cassette_motor ) +void thomson_state::to7_set_cassette_motor(int state) { cassette_state cassstate = m_cassette->get_state(); double pos = m_cassette->get_position(); @@ -189,7 +189,7 @@ void thomson_state::mo5_set_cassette( int data ) -WRITE_LINE_MEMBER( thomson_state::mo5_set_cassette_motor ) +void thomson_state::mo5_set_cassette_motor(int state) { cassette_state cassstate = m_cassette->get_state(); double pos = m_cassette->get_position(); @@ -409,7 +409,7 @@ void thomson_state::to7_set_init( int init ) -WRITE_LINE_MEMBER( thomson_state::to7_sys_cb2_out ) +void thomson_state::to7_sys_cb2_out(int state) { m_to7_lightpen = !state; } @@ -582,7 +582,7 @@ void thomson_state::to7_game_portb_out(uint8_t data) -WRITE_LINE_MEMBER( thomson_state::to7_game_cb2_out ) +void thomson_state::to7_game_cb2_out(int state) { /* undocumented */ /* some TO8 games (e.g.: F15) seem to write here a lot */ @@ -738,7 +738,7 @@ MACHINE_START_MEMBER( thomson_state, to7 ) -WRITE_LINE_MEMBER( thomson_state::to770_sys_cb2_out ) +void thomson_state::to770_sys_cb2_out(int state) { /* video overlay: black pixels are transparent and show TV image underneath */ LOG("$%04x to770_sys_cb2_out: video overlay %i\n", m_maincpu->pc(), state); @@ -3030,7 +3030,7 @@ void to9_state::to8_sys_portb_out(uint8_t data) /* ------------ 6846 (timer, I/O) ------------ */ -WRITE_LINE_MEMBER(to9_state::write_centronics_busy ) +void to9_state::write_centronics_busy(int state) { m_centronics_busy = state; } @@ -3059,7 +3059,7 @@ void to9_state::to8_timer_port_out(uint8_t data) -WRITE_LINE_MEMBER( to9_state::to8_timer_cp2_out ) +void to9_state::to8_timer_cp2_out(int state) { /* mute */ m_to7_game_mute = state; @@ -3610,7 +3610,7 @@ void mo6_state::mo6_ext_w(uint8_t data) /* similar to SX 90-018, but with a few differences: mute, printer */ -WRITE_LINE_MEMBER( mo6_state::mo6_centronics_busy ) +void mo6_state::mo6_centronics_busy(int state) { m_pia_game->cb1_w(state); } @@ -3626,7 +3626,7 @@ void mo6_state::mo6_game_porta_out(uint8_t data) -WRITE_LINE_MEMBER( mo6_state::mo6_game_cb2_out ) +void mo6_state::mo6_game_cb2_out(int state) { LOG("$%04x %f mo6_game_cb2_out: CENTRONICS set strobe=%i\n", m_maincpu->pc(), machine().time().as_double(), state); @@ -3723,7 +3723,7 @@ void mo6_state::mo6_sys_porta_out(uint8_t data) -WRITE_LINE_MEMBER( mo6_state::mo6_sys_cb2_out ) +void mo6_state::mo6_sys_cb2_out(int state) { /* SCART pin 8 = slow switch (?) */ LOG("mo6_sys_cb2_out: SCART slow switch set to %i\n", state); diff --git a/src/mame/thomson/thomson_v.cpp b/src/mame/thomson/thomson_v.cpp index 8911557db69..b6ea65c039c 100644 --- a/src/mame/thomson/thomson_v.cpp +++ b/src/mame/thomson/thomson_v.cpp @@ -1044,7 +1044,7 @@ TIMER_CALLBACK_MEMBER( thomson_state::thom_set_init ) } /* call this at the very beginning of each new frame */ -WRITE_LINE_MEMBER(thomson_state::thom_vblank) +void thomson_state::thom_vblank(int state) { // rising edge if (state) diff --git a/src/mame/ti/avigo.cpp b/src/mame/ti/avigo.cpp index c09c11e611f..dc0cff8a3b4 100644 --- a/src/mame/ti/avigo.cpp +++ b/src/mame/ti/avigo.cpp @@ -100,7 +100,7 @@ void avigo_state::refresh_ints() } /* does not do anything yet */ -WRITE_LINE_MEMBER( avigo_state::tc8521_alarm_int ) +void avigo_state::tc8521_alarm_int(int state) { //#if 0 m_irq &=~(1<<5); @@ -114,7 +114,7 @@ WRITE_LINE_MEMBER( avigo_state::tc8521_alarm_int ) //#endif } -WRITE_LINE_MEMBER( avigo_state::com_interrupt ) +void avigo_state::com_interrupt(int state) { LOG(("com int\r\n")); diff --git a/src/mame/ti/avigo.h b/src/mame/ti/avigo.h index 26ad8847b1f..40e6d71d798 100644 --- a/src/mame/ti/avigo.h +++ b/src/mame/ti/avigo.h @@ -60,8 +60,8 @@ protected: void refresh_ints(); void nvram_init(nvram_device &nvram, void *base, size_t size); - DECLARE_WRITE_LINE_MEMBER( tc8521_alarm_int ); - DECLARE_WRITE_LINE_MEMBER( com_interrupt ); + void tc8521_alarm_int(int state); + void com_interrupt(int state); uint8_t key_data_read_r(); void set_key_line_w(uint8_t data); diff --git a/src/mame/ti/geneve.cpp b/src/mame/ti/geneve.cpp index 6ed56482df3..dede583e650 100644 --- a/src/mame/ti/geneve.cpp +++ b/src/mame/ti/geneve.cpp @@ -279,23 +279,23 @@ private: // Connections with the system interface TMS9901 uint8_t psi_input(offs_t offset); - DECLARE_WRITE_LINE_MEMBER(peripheral_bus_reset); - DECLARE_WRITE_LINE_MEMBER(VDP_reset); - DECLARE_WRITE_LINE_MEMBER(joystick_select); - DECLARE_WRITE_LINE_MEMBER(keyboard_reset); - DECLARE_WRITE_LINE_MEMBER(video_wait_states); - DECLARE_WRITE_LINE_MEMBER(left_mouse_button); + void peripheral_bus_reset(int state); + void VDP_reset(int state); + void joystick_select(int state); + void keyboard_reset(int state); + void video_wait_states(int state); + void left_mouse_button(int state); - DECLARE_WRITE_LINE_MEMBER(keyboard_clock_line); - DECLARE_WRITE_LINE_MEMBER(keyboard_data_line); + void keyboard_clock_line(int state); + void keyboard_data_line(int state); - DECLARE_WRITE_LINE_MEMBER(clock_out); + void clock_out(int state); void external_operation(offs_t offset, uint8_t data); void tms9901_interrupt(offs_t offset, uint8_t data); - DECLARE_WRITE_LINE_MEMBER( keyboard_interrupt ); + void keyboard_interrupt(int state); required_device m_cpu; required_device m_tms9901; @@ -322,19 +322,19 @@ private: void read_eprom_or_pfm(offs_t offset, uint8_t& value); void write_pfm(offs_t offset, uint8_t data); - DECLARE_WRITE_LINE_MEMBER( pfm_a17 ); - DECLARE_WRITE_LINE_MEMBER( pfm_a18 ); - DECLARE_WRITE_LINE_MEMBER( pfm_oe ); + void pfm_a17(int state); + void pfm_a18(int state); + void pfm_oe(int state); // Interrupts - DECLARE_WRITE_LINE_MEMBER( inta ); - DECLARE_WRITE_LINE_MEMBER( intb ); - DECLARE_WRITE_LINE_MEMBER( keyboard_int ); - DECLARE_WRITE_LINE_MEMBER( int2_from_v9938 ); + void inta(int state); + void intb(int state); + void keyboard_int(int state); + void int2_from_v9938(int state); // READY line contributors - DECLARE_WRITE_LINE_MEMBER( extready ); - DECLARE_WRITE_LINE_MEMBER( sndready ); + void extready(int state); + void sndready(int state); // Memory bus void setaddress_debug(bool debug, offs_t address, uint8_t busctrl); @@ -738,19 +738,19 @@ void geneve_state::memwrite(offs_t offset, uint8_t data) PFM handling *****************************************************************************/ -WRITE_LINE_MEMBER( geneve_state::pfm_a17 ) +void geneve_state::pfm_a17(int state) { if (state==ASSERT_LINE) m_pfm_prefix |= 0x20000; else m_pfm_prefix &= ~0x20000; } -WRITE_LINE_MEMBER( geneve_state::pfm_a18 ) +void geneve_state::pfm_a18(int state) { if (state==ASSERT_LINE) m_pfm_prefix |= 0x40000; else m_pfm_prefix &= ~0x40000; } -WRITE_LINE_MEMBER( geneve_state::pfm_oe ) +void geneve_state::pfm_oe(int state) { // Negative logic LOGMASKED(LOG_PFM, "PFM output %s\n", (state==0)? "enable" : "disable"); @@ -908,7 +908,7 @@ uint8_t geneve_state::psi_input(offs_t offset) } } -WRITE_LINE_MEMBER( geneve_state::left_mouse_button ) +void geneve_state::left_mouse_button(int state) { m_left_button = state; } @@ -916,7 +916,7 @@ WRITE_LINE_MEMBER( geneve_state::left_mouse_button ) /* Write PE bus reset line */ -WRITE_LINE_MEMBER( geneve_state::peripheral_bus_reset ) +void geneve_state::peripheral_bus_reset(int state) { m_peribox->reset_in(state); } @@ -924,7 +924,7 @@ WRITE_LINE_MEMBER( geneve_state::peripheral_bus_reset ) /* Write VDP reset line */ -WRITE_LINE_MEMBER( geneve_state::VDP_reset ) +void geneve_state::VDP_reset(int state) { m_video->reset_line(state); } @@ -932,7 +932,7 @@ WRITE_LINE_MEMBER( geneve_state::VDP_reset ) /* Write joystick select line. 1 selects joystick 1 (pin 7), 0 selects joystick 2 (pin 2) */ -WRITE_LINE_MEMBER( geneve_state::joystick_select ) +void geneve_state::joystick_select(int state) { m_joyport->write_port((state==ASSERT_LINE)? 1:2); } @@ -941,7 +941,7 @@ WRITE_LINE_MEMBER( geneve_state::joystick_select ) Keyboard reset (active low). Most keyboards do not use a dedicated reset line but trigger a reset when the clock line is held low for some time. */ -WRITE_LINE_MEMBER( geneve_state::keyboard_reset ) +void geneve_state::keyboard_reset(int state) { if (state==CLEAR_LINE) LOG("Keyboard reset (line not connected)\n"); @@ -966,7 +966,7 @@ void geneve_state::tms9901_interrupt(offs_t offset, uint8_t data) /* inta is connected to both tms9901 IRQ1 line and to tms9995 INT4/EC line. */ -WRITE_LINE_MEMBER( geneve_state::inta ) +void geneve_state::inta(int state) { m_inta = (state!=0)? ASSERT_LINE : CLEAR_LINE; m_tms9901->set_int_line(1, state); @@ -976,7 +976,7 @@ WRITE_LINE_MEMBER( geneve_state::inta ) /* intb is connected to tms9901 IRQ12 line. */ -WRITE_LINE_MEMBER( geneve_state::intb ) +void geneve_state::intb(int state) { m_intb = (state!=0)? ASSERT_LINE : CLEAR_LINE; m_tms9901->set_int_line(12, state); @@ -985,7 +985,7 @@ WRITE_LINE_MEMBER( geneve_state::intb ) /* set the state of int2 (called by the v9938 core) */ -WRITE_LINE_MEMBER(geneve_state::int2_from_v9938) +void geneve_state::int2_from_v9938(int state) { // This method is frequently called without level change, so we only // react on changes @@ -999,7 +999,7 @@ WRITE_LINE_MEMBER(geneve_state::int2_from_v9938) /* Interrupt from the keyboard. */ -WRITE_LINE_MEMBER( geneve_state::keyboard_interrupt ) +void geneve_state::keyboard_interrupt(int state) { m_keyint = (state!=0)? ASSERT_LINE : CLEAR_LINE; m_tms9901->set_int_line(8, state); @@ -1008,7 +1008,7 @@ WRITE_LINE_MEMBER( geneve_state::keyboard_interrupt ) /* READY from the box is connected to the Gate Array and the Genmod board. */ -WRITE_LINE_MEMBER( geneve_state::extready ) +void geneve_state::extready(int state) { m_gatearray->extready_in(state); if (m_genmod) @@ -1018,7 +1018,7 @@ WRITE_LINE_MEMBER( geneve_state::extready ) /* READY from the sound chip is connected to the Gate Array and the Genmod board. */ -WRITE_LINE_MEMBER( geneve_state::sndready ) +void geneve_state::sndready(int state) { m_gatearray->sndready_in(state); if (m_genmod) @@ -1035,7 +1035,7 @@ void geneve_state::external_operation(offs_t offset, uint8_t data) /* Clock line from the CPU. Used to control wait state generation. */ -WRITE_LINE_MEMBER( geneve_state::clock_out ) +void geneve_state::clock_out(int state) { m_tms9901->phi_line(state); m_gatearray->clock_in(state); diff --git a/src/mame/ti/ti990_10.cpp b/src/mame/ti/ti990_10.cpp index d197514438b..80bb0a2aad7 100644 --- a/src/mame/ti/ti990_10.cpp +++ b/src/mame/ti/ti990_10.cpp @@ -100,11 +100,11 @@ private: void main_map(address_map &map); void io_map(address_map &map); - WRITE_LINE_MEMBER( key_interrupt ); - WRITE_LINE_MEMBER( line_interrupt ); - WRITE_LINE_MEMBER( tape_interrupt ); - WRITE_LINE_MEMBER( set_int13 ); - [[maybe_unused]] WRITE_LINE_MEMBER( ckon_ckof_callback ); + void key_interrupt(int state); + void line_interrupt(int state); + void tape_interrupt(int state); + void set_int13(int state); + [[maybe_unused]] void ckon_ckof_callback(int state); uint8_t panel_read(offs_t offset); void panel_write(uint8_t data); @@ -146,7 +146,7 @@ void ti990_10_state::set_int_line(int line, int state) } -WRITE_LINE_MEMBER(ti990_10_state::set_int13) +void ti990_10_state::set_int13(int state) { set_int_line(13, state); } @@ -172,14 +172,14 @@ void ti990_10_state::hold_load() /* m_ckon_state: 1 if line clock active (RTCLR flip-flop on TI990/10 schematics - SMI sheet 4) */ -WRITE_LINE_MEMBER(ti990_10_state::line_interrupt) +void ti990_10_state::line_interrupt(int state) { // set_int10(state); if (m_ckon_state) set_int_line(5, 1); } -WRITE_LINE_MEMBER(ti990_10_state::ckon_ckof_callback) +void ti990_10_state::ckon_ckof_callback(int state) { m_ckon_state = state; if (! m_ckon_state) @@ -283,7 +283,7 @@ void ti990_10_state::lrex_callback) We emulate a single VDT911 CRT terminal. */ -WRITE_LINE_MEMBER(ti990_10_state::key_interrupt) +void ti990_10_state::key_interrupt(int state) { // set_int10(state); } @@ -326,7 +326,7 @@ void ti990_10_state::io_map(address_map &map) /* Callback from the tape controller. */ -WRITE_LINE_MEMBER(ti990_10_state::tape_interrupt) +void ti990_10_state::tape_interrupt(int state) { // set_int9(state); } diff --git a/src/mame/ti/ti990_4.cpp b/src/mame/ti/ti990_4.cpp index 69da44fb49c..9ba1a73a7e1 100644 --- a/src/mame/ti/ti990_4.cpp +++ b/src/mame/ti/ti990_4.cpp @@ -68,10 +68,10 @@ private: void panel_write(offs_t offset, uint8_t data); void external_operation(offs_t offset, uint8_t data); uint8_t interrupt_level(); - DECLARE_WRITE_LINE_MEMBER( fd_interrupt ); - DECLARE_WRITE_LINE_MEMBER( asrkey_interrupt ); - DECLARE_WRITE_LINE_MEMBER( vdtkey_interrupt ); - DECLARE_WRITE_LINE_MEMBER( line_interrupt ); + void fd_interrupt(int state); + void asrkey_interrupt(int state); + void vdtkey_interrupt(int state); + void line_interrupt(int state); void crumap(address_map &map); void crumap_v(address_map &map); @@ -148,7 +148,7 @@ void ti990_4_state::reset_int_lines() /* Callback from the floppy controller. */ -WRITE_LINE_MEMBER(ti990_4_state::fd_interrupt) +void ti990_4_state::fd_interrupt(int state) { set_int_line(7, state); } @@ -156,12 +156,12 @@ WRITE_LINE_MEMBER(ti990_4_state::fd_interrupt) /* Connection to VDT */ -WRITE_LINE_MEMBER(ti990_4_state::vdtkey_interrupt) +void ti990_4_state::vdtkey_interrupt(int state) { set_int_line(3, state); } -WRITE_LINE_MEMBER(ti990_4_state::line_interrupt) +void ti990_4_state::line_interrupt(int state) { if (m_ckon_state) set_int_line(5, state); } @@ -169,7 +169,7 @@ WRITE_LINE_MEMBER(ti990_4_state::line_interrupt) /* Callback from the terminal. */ -WRITE_LINE_MEMBER(ti990_4_state::asrkey_interrupt) +void ti990_4_state::asrkey_interrupt(int state) { set_int_line(6, state); } diff --git a/src/mame/ti/ti99_2.cpp b/src/mame/ti/ti99_2.cpp index 717687b701c..becc78b2833 100644 --- a/src/mame/ti/ti99_2.cpp +++ b/src/mame/ti/ti99_2.cpp @@ -217,12 +217,12 @@ private: uint8_t mem_read(offs_t offset); void mem_write(offs_t offset, uint8_t data); - DECLARE_WRITE_LINE_MEMBER(hold); - DECLARE_WRITE_LINE_MEMBER(holda); - DECLARE_WRITE_LINE_MEMBER(interrupt); - DECLARE_WRITE_LINE_MEMBER(cassette_output); + void hold(int state); + void holda(int state); + void interrupt(int state); + void cassette_output(int state); - DECLARE_WRITE_LINE_MEMBER( rombank_set ); + void rombank_set(int state); void crumap(address_map &map); void memmap(address_map &map); @@ -260,7 +260,7 @@ void ti99_2_state::driver_reset() m_maincpu->reset_line(ASSERT_LINE); } -WRITE_LINE_MEMBER( ti99_2_state::rombank_set ) +void ti99_2_state::rombank_set(int state) { m_otherbank = (state==ASSERT_LINE); } @@ -383,7 +383,7 @@ void ti99_2_state::mem_write(offs_t offset, uint8_t data) /* Called by the VDC as a vblank interrupt */ -WRITE_LINE_MEMBER(ti99_2_state::interrupt) +void ti99_2_state::interrupt(int state) { LOGMASKED(LOG_SIGNALS, "Interrupt: %d\n", state); m_maincpu->set_input_line(INT_9995_INT4, state); @@ -392,7 +392,7 @@ WRITE_LINE_MEMBER(ti99_2_state::interrupt) /* Called by the VDC to HOLD the CPU */ -WRITE_LINE_MEMBER(ti99_2_state::hold) +void ti99_2_state::hold(int state) { LOGMASKED(LOG_SIGNALS, "HOLD: %d\n", state); m_maincpu->hold_line(state); @@ -401,7 +401,7 @@ WRITE_LINE_MEMBER(ti99_2_state::hold) /* Called by the CPU to ack the HOLD */ -WRITE_LINE_MEMBER(ti99_2_state::holda) +void ti99_2_state::holda(int state) { LOGMASKED(LOG_SIGNALS, "HOLDA: %d\n", state); } diff --git a/src/mame/ti/ti99_4p.cpp b/src/mame/ti/ti99_4p.cpp index 02cb1568d27..e0a18c0b982 100644 --- a/src/mame/ti/ti99_4p.cpp +++ b/src/mame/ti/ti99_4p.cpp @@ -166,9 +166,9 @@ public: void driver_reset() override; private: - DECLARE_WRITE_LINE_MEMBER( ready_line ); - DECLARE_WRITE_LINE_MEMBER( extint ); - DECLARE_WRITE_LINE_MEMBER( notconnected ); + void ready_line(int state); + void extint(int state); + void notconnected(int state); uint8_t interrupt_level(); void setaddress(offs_t mode, uint16_t address); @@ -176,22 +176,22 @@ private: void memwrite(offs_t offset, uint16_t data); void external_operation(offs_t offset, uint8_t data); - DECLARE_WRITE_LINE_MEMBER( clock_out ); + void clock_out(int state); // CRU (Communication Register Unit) handling uint8_t cruread(offs_t offset); void cruwrite(offs_t offset, uint8_t data); uint8_t psi_input(offs_t offset); - DECLARE_WRITE_LINE_MEMBER(keyC0); - DECLARE_WRITE_LINE_MEMBER(keyC1); - DECLARE_WRITE_LINE_MEMBER(keyC2); - DECLARE_WRITE_LINE_MEMBER(cs_motor); - DECLARE_WRITE_LINE_MEMBER(audio_gate); - DECLARE_WRITE_LINE_MEMBER(cassette_output); + void keyC0(int state); + void keyC1(int state); + void keyC2(int state); + void cs_motor(int state); + void audio_gate(int state); + void cassette_output(int state); void tms9901_interrupt(offs_t offset, uint8_t data); - DECLARE_WRITE_LINE_MEMBER(alphaW); + void alphaW(int state); - DECLARE_WRITE_LINE_MEMBER(video_interrupt_in); + void video_interrupt_in(int state); void crumap(address_map &map); void memmap(address_map &map); @@ -623,7 +623,7 @@ void ti99_4p_state::debugger_write(offs_t offset, uint16_t data) The datamux is connected to the clock line in order to operate the wait state counter and to read/write the bytes. */ -WRITE_LINE_MEMBER( ti99_4p_state::datamux_clock_in ) +void ti99_4p_state::datamux_clock_in(int state) { // return immediately if the datamux is currently inactive if (m_waitcount>0) @@ -856,17 +856,17 @@ void ti99_4p_state::set_keyboard_column(int number, int data) } } -WRITE_LINE_MEMBER( ti99_4p_state::keyC0 ) +void ti99_4p_state::keyC0(int state) { set_keyboard_column(0, state); } -WRITE_LINE_MEMBER( ti99_4p_state::keyC1 ) +void ti99_4p_state::keyC1(int state) { set_keyboard_column(1, state); } -WRITE_LINE_MEMBER( ti99_4p_state::keyC2 ) +void ti99_4p_state::keyC2(int state) { set_keyboard_column(2, state); } @@ -874,7 +874,7 @@ WRITE_LINE_MEMBER( ti99_4p_state::keyC2 ) /* WRITE alpha lock line (P5) */ -WRITE_LINE_MEMBER( ti99_4p_state::alphaW ) +void ti99_4p_state::alphaW(int state) { m_check_alphalock = (state==0); } @@ -882,7 +882,7 @@ WRITE_LINE_MEMBER( ti99_4p_state::alphaW ) /* command CS1 (only) tape unit motor (P6) */ -WRITE_LINE_MEMBER( ti99_4p_state::cs_motor ) +void ti99_4p_state::cs_motor(int state) { m_cassette->change_state((state!=0)? CASSETTE_MOTOR_ENABLED : CASSETTE_MOTOR_DISABLED,CASSETTE_MASK_MOTOR); } @@ -896,14 +896,14 @@ WRITE_LINE_MEMBER( ti99_4p_state::cs_motor ) We do not really need to emulate this as the tape recorder generates sound on its own. */ -WRITE_LINE_MEMBER( ti99_4p_state::audio_gate ) +void ti99_4p_state::audio_gate(int state) { } /* tape output (P9) */ -WRITE_LINE_MEMBER( ti99_4p_state::cassette_output ) +void ti99_4p_state::cassette_output(int state) { m_cassette->output((state!=0)? +1 : -1); } @@ -928,7 +928,7 @@ void ti99_4p_state::ready_join() /* Incoming READY line from other cards in the Peripheral Expansion Box. */ -WRITE_LINE_MEMBER( ti99_4p_state::ready_line ) +void ti99_4p_state::ready_line(int state) { if (state != m_sysready) LOGMASKED(LOG_READY, "READY line from PBox = %d\n", state); m_sysready = (line_state)state; @@ -936,14 +936,14 @@ WRITE_LINE_MEMBER( ti99_4p_state::ready_line ) ready_join(); } -WRITE_LINE_MEMBER( ti99_4p_state::extint ) +void ti99_4p_state::extint(int state) { LOGMASKED(LOG_INTERRUPTS, "EXTINT level = %02x\n", state); m_int1 = (line_state)state; m_tms9901->set_int_line(1, state); } -WRITE_LINE_MEMBER( ti99_4p_state::notconnected ) +void ti99_4p_state::notconnected(int state) { LOGMASKED(LOG_INTERRUPTS, "Setting a not connected line ... ignored\n"); } @@ -951,7 +951,7 @@ WRITE_LINE_MEMBER( ti99_4p_state::notconnected ) /* Clock line from the CPU. Used to control wait state generation. */ -WRITE_LINE_MEMBER( ti99_4p_state::clock_out ) +void ti99_4p_state::clock_out(int state) { m_tms9901->phi_line(state); datamux_clock_in(state); @@ -1017,7 +1017,7 @@ void ti99_4p_state::driver_start() /* set the state of int2 (called by the v9938) */ -WRITE_LINE_MEMBER(ti99_4p_state::video_interrupt_in) +void ti99_4p_state::video_interrupt_in(int state) { LOGMASKED(LOG_INTERRUPTS, "VDP INT2 from EVPC on tms9901, level=%d\n", state); m_int2 = (line_state)state; diff --git a/src/mame/ti/ti99_4x.cpp b/src/mame/ti/ti99_4x.cpp index a668fa52492..aa39e4981ce 100644 --- a/src/mame/ti/ti99_4x.cpp +++ b/src/mame/ti/ti99_4x.cpp @@ -130,41 +130,41 @@ private: uint8_t interrupt_level(); void cruwrite(offs_t offset, uint8_t data); void external_operation(offs_t offset, uint8_t data); - DECLARE_WRITE_LINE_MEMBER( clock_out ); + void clock_out(int state); // Connections from outside towards the CPU (callbacks) - DECLARE_WRITE_LINE_MEMBER( console_ready_dmux ); - DECLARE_WRITE_LINE_MEMBER( console_ready_sound ); - [[maybe_unused]] DECLARE_WRITE_LINE_MEMBER( console_ready_pbox ); - DECLARE_WRITE_LINE_MEMBER( console_ready_cart ); - DECLARE_WRITE_LINE_MEMBER( console_ready_grom ); - DECLARE_WRITE_LINE_MEMBER( console_reset ); - [[maybe_unused]] DECLARE_WRITE_LINE_MEMBER( notconnected ); + void console_ready_dmux(int state); + void console_ready_sound(int state); + [[maybe_unused]] void console_ready_pbox(int state); + void console_ready_cart(int state); + void console_ready_grom(int state); + void console_reset(int state); + [[maybe_unused]] void notconnected(int state); // GROM clock - DECLARE_WRITE_LINE_MEMBER( gromclk_in ); + void gromclk_in(int state); // Connections with the system interface chip 9901 - DECLARE_WRITE_LINE_MEMBER( extint ); - DECLARE_WRITE_LINE_MEMBER( video_interrupt_in ); - DECLARE_WRITE_LINE_MEMBER( handset_interrupt_in ); + void extint(int state); + void video_interrupt_in(int state); + void handset_interrupt_in(int state); // Connections with the system interface TMS9901 uint8_t psi_input_4(offs_t offset); uint8_t psi_input_4a(offs_t offset); - DECLARE_WRITE_LINE_MEMBER(keyC0); - DECLARE_WRITE_LINE_MEMBER(keyC1); - DECLARE_WRITE_LINE_MEMBER(keyC2); - DECLARE_WRITE_LINE_MEMBER(cs1_motor); - DECLARE_WRITE_LINE_MEMBER(audio_gate); - DECLARE_WRITE_LINE_MEMBER(cassette_output); - DECLARE_WRITE_LINE_MEMBER(tms9901_interrupt); - DECLARE_WRITE_LINE_MEMBER(handset_ack); - DECLARE_WRITE_LINE_MEMBER(cs2_motor); - DECLARE_WRITE_LINE_MEMBER(alphaW); + void keyC0(int state); + void keyC1(int state); + void keyC2(int state); + void cs1_motor(int state); + void audio_gate(int state); + void cassette_output(int state); + void tms9901_interrupt(int state); + void handset_ack(int state); + void cs2_motor(int state); + void alphaW(int state); // Used by EVPC - DECLARE_WRITE_LINE_MEMBER( video_interrupt_evpc_in ); + void video_interrupt_evpc_in(int state); TIMER_CALLBACK_MEMBER(gromclk_tick); void crumap(address_map &map); @@ -598,7 +598,7 @@ uint8_t ti99_4x_state::psi_input_4a(offs_t offset) /* Handler for TMS9901 P0 pin (handset data acknowledge); only for 99/4 */ -WRITE_LINE_MEMBER( ti99_4x_state::handset_ack ) +void ti99_4x_state::handset_ack(int state) { // Write a value to the joyport. If there is a handset this will set its // ACK line. @@ -629,17 +629,17 @@ void ti99_4x_state::set_keyboard_column(int number, int data) // joystick 2 = column 7 } -WRITE_LINE_MEMBER( ti99_4x_state::keyC0 ) +void ti99_4x_state::keyC0(int state) { set_keyboard_column(0, state); } -WRITE_LINE_MEMBER( ti99_4x_state::keyC1 ) +void ti99_4x_state::keyC1(int state) { set_keyboard_column(1, state); } -WRITE_LINE_MEMBER( ti99_4x_state::keyC2 ) +void ti99_4x_state::keyC2(int state) { set_keyboard_column(2, state); } @@ -647,7 +647,7 @@ WRITE_LINE_MEMBER( ti99_4x_state::keyC2 ) /* Select alpha lock line - TI99/4a only (P5) */ -WRITE_LINE_MEMBER( ti99_4x_state::alphaW ) +void ti99_4x_state::alphaW(int state) { m_check_alphalock = (state==0); } @@ -655,7 +655,7 @@ WRITE_LINE_MEMBER( ti99_4x_state::alphaW ) /* Control CS1 tape unit motor (P6) */ -WRITE_LINE_MEMBER( ti99_4x_state::cs1_motor ) +void ti99_4x_state::cs1_motor(int state) { m_cassette1->change_state(state==ASSERT_LINE? CASSETTE_MOTOR_ENABLED : CASSETTE_MOTOR_DISABLED,CASSETTE_MASK_MOTOR); } @@ -663,7 +663,7 @@ WRITE_LINE_MEMBER( ti99_4x_state::cs1_motor ) /* Control CS2 tape unit motor (P7) */ -WRITE_LINE_MEMBER( ti99_4x_state::cs2_motor ) +void ti99_4x_state::cs2_motor(int state) { m_cassette2->change_state(state==ASSERT_LINE? CASSETTE_MOTOR_ENABLED : CASSETTE_MOTOR_DISABLED,CASSETTE_MASK_MOTOR); } @@ -677,7 +677,7 @@ WRITE_LINE_MEMBER( ti99_4x_state::cs2_motor ) TODO: Emulate a pop sound when turning on/off the audio gate; there are some few programs that generate a sound with this feature */ -WRITE_LINE_MEMBER( ti99_4x_state::audio_gate ) +void ti99_4x_state::audio_gate(int state) { } @@ -685,13 +685,13 @@ WRITE_LINE_MEMBER( ti99_4x_state::audio_gate ) Tape output (P9) I think polarity is correct, but don't take my word for it. */ -WRITE_LINE_MEMBER( ti99_4x_state::cassette_output ) +void ti99_4x_state::cassette_output(int state) { m_cassette1->output(state==ASSERT_LINE? +1 : -1); m_cassette2->output(state==ASSERT_LINE? +1 : -1); } -WRITE_LINE_MEMBER( ti99_4x_state::tms9901_interrupt ) +void ti99_4x_state::tms9901_interrupt(int state) { m_cpu->set_input_line(INT_9900_INTREQ, state); } @@ -704,10 +704,11 @@ uint8_t ti99_4x_state::interrupt_level() return 1; } + /* Clock line from the CPU. Used to control wait state generation. */ -WRITE_LINE_MEMBER( ti99_4x_state::clock_out ) +void ti99_4x_state::clock_out(int state) { m_tms9901->phi_line(state); m_datamux->clock_in(state); @@ -717,7 +718,7 @@ WRITE_LINE_MEMBER( ti99_4x_state::clock_out ) /* GROMCLK from VDP, propagating to datamux */ -WRITE_LINE_MEMBER( ti99_4x_state::gromclk_in ) +void ti99_4x_state::gromclk_in(int state) { m_datamux->gromclk_in(state); } @@ -737,7 +738,7 @@ TIMER_CALLBACK_MEMBER(ti99_4x_state::gromclk_tick) /*****************************************************************************/ -WRITE_LINE_MEMBER( ti99_4x_state::video_interrupt_evpc_in ) +void ti99_4x_state::video_interrupt_evpc_in(int state) { LOGMASKED(LOG_INTERRUPTS, "VDP INT2 from EVPC on tms9901, level=%d\n", state); m_int2 = (line_state)state; @@ -747,7 +748,7 @@ WRITE_LINE_MEMBER( ti99_4x_state::video_interrupt_evpc_in ) /* set the state of TMS9901's INT2 (called by the tms9928 core) */ -WRITE_LINE_MEMBER( ti99_4x_state::video_interrupt_in ) +void ti99_4x_state::video_interrupt_in(int state) { LOGMASKED(LOG_INTERRUPTS, "VDP %s /INT2 on TMS9901\n", (state==ASSERT_LINE)? "asserts" : "clears"); m_int2 = (line_state)state; @@ -759,7 +760,7 @@ WRITE_LINE_MEMBER( ti99_4x_state::video_interrupt_in ) /* set the state of TMS9901's INT12 (called by the handset prototype of TI-99/4) */ -WRITE_LINE_MEMBER( ti99_4x_state::handset_interrupt_in) +void ti99_4x_state::handset_interrupt_in(int state) { LOGMASKED(LOG_INTERRUPTS, "joyport INT12 on tms9901, level=%d\n", state); m_int12 = (line_state)state; @@ -803,28 +804,28 @@ void ti99_4x_state::console_ready_join(int id, int state) Connections to the READY line. This might look a bit ugly; we need an implementation of a "Wired AND" device. */ -WRITE_LINE_MEMBER( ti99_4x_state::console_ready_grom ) +void ti99_4x_state::console_ready_grom(int state) { LOGMASKED(LOG_READY, "GROM ready = %d\n", state); console_ready_join(READY_GROM, state); } -WRITE_LINE_MEMBER( ti99_4x_state::console_ready_dmux ) +void ti99_4x_state::console_ready_dmux(int state) { console_ready_join(READY_DMUX, state); } -WRITE_LINE_MEMBER( ti99_4x_state::console_ready_pbox ) +void ti99_4x_state::console_ready_pbox(int state) { console_ready_join(READY_PBOX, state); } -WRITE_LINE_MEMBER( ti99_4x_state::console_ready_sound ) +void ti99_4x_state::console_ready_sound(int state) { console_ready_join(READY_SOUND, state); } -WRITE_LINE_MEMBER( ti99_4x_state::console_ready_cart ) +void ti99_4x_state::console_ready_cart(int state) { console_ready_join(READY_CART, state); } @@ -833,7 +834,7 @@ WRITE_LINE_MEMBER( ti99_4x_state::console_ready_cart ) The RESET line leading to a reset of the CPU. This is asserted when a cartridge is plugged in. */ -WRITE_LINE_MEMBER( ti99_4x_state::console_reset ) +void ti99_4x_state::console_reset(int state) { if (machine().phase() != machine_phase::INIT) { @@ -844,14 +845,14 @@ WRITE_LINE_MEMBER( ti99_4x_state::console_reset ) } } -WRITE_LINE_MEMBER( ti99_4x_state::extint ) +void ti99_4x_state::extint(int state) { LOGMASKED(LOG_INTERRUPTS, "EXTINT level = %02x\n", state); m_int1 = (line_state)state; m_tms9901->set_int_line(1, state); } -WRITE_LINE_MEMBER( ti99_4x_state::notconnected ) +void ti99_4x_state::notconnected(int state) { LOGMASKED(LOG_INTERRUPTS, "Setting a not connected line ... ignored\n"); } diff --git a/src/mame/ti/ti99_8.cpp b/src/mame/ti/ti99_8.cpp index ad941285fd2..7cf2675ab00 100644 --- a/src/mame/ti/ti99_8.cpp +++ b/src/mame/ti/ti99_8.cpp @@ -238,30 +238,30 @@ private: uint8_t cruread(offs_t offset); void cruwrite(offs_t offset, uint8_t data); void external_operation(offs_t offset, uint8_t data); - DECLARE_WRITE_LINE_MEMBER( clock_out ); + void clock_out(int state); // Connections from outside towards the CPU (callbacks) - DECLARE_WRITE_LINE_MEMBER( console_ready ); - DECLARE_WRITE_LINE_MEMBER( console_reset ); - DECLARE_WRITE_LINE_MEMBER( cpu_hold ); - DECLARE_WRITE_LINE_MEMBER( notconnected ); + void console_ready(int state); + void console_reset(int state); + void cpu_hold(int state); + void notconnected(int state); // GROM clock (coming from Vaquerro) - DECLARE_WRITE_LINE_MEMBER( gromclk_in ); + void gromclk_in(int state); // Connections with the system interface chip 9901 - DECLARE_WRITE_LINE_MEMBER( extint ); - DECLARE_WRITE_LINE_MEMBER( video_interrupt ); + void extint(int state); + void video_interrupt(int state); // Connections with the system interface TMS9901 uint8_t psi_input(offs_t offset); - DECLARE_WRITE_LINE_MEMBER(keyC0); - DECLARE_WRITE_LINE_MEMBER(keyC1); - DECLARE_WRITE_LINE_MEMBER(keyC2); - DECLARE_WRITE_LINE_MEMBER(keyC3); - DECLARE_WRITE_LINE_MEMBER(audio_gate); - DECLARE_WRITE_LINE_MEMBER(cassette_output); - DECLARE_WRITE_LINE_MEMBER(cassette_motor); + void keyC0(int state); + void keyC1(int state); + void keyC2(int state); + void keyC3(int state); + void audio_gate(int state); + void cassette_output(int state); + void cassette_motor(int state); void tms9901_interrupt(offs_t offset, uint8_t data); void crumap(address_map &map); @@ -508,22 +508,22 @@ void ti99_8_state::set_keyboard_column(int number, int data) } } -WRITE_LINE_MEMBER( ti99_8_state::keyC0 ) +void ti99_8_state::keyC0(int state) { set_keyboard_column(0, state); } -WRITE_LINE_MEMBER( ti99_8_state::keyC1 ) +void ti99_8_state::keyC1(int state) { set_keyboard_column(1, state); } -WRITE_LINE_MEMBER( ti99_8_state::keyC2 ) +void ti99_8_state::keyC2(int state) { set_keyboard_column(2, state); } -WRITE_LINE_MEMBER( ti99_8_state::keyC3 ) +void ti99_8_state::keyC3(int state) { set_keyboard_column(3, state); } @@ -531,7 +531,7 @@ WRITE_LINE_MEMBER( ti99_8_state::keyC3 ) /* Control cassette tape unit motor (P6) */ -WRITE_LINE_MEMBER( ti99_8_state::cassette_motor ) +void ti99_8_state::cassette_motor(int state) { m_cassette->change_state(state==ASSERT_LINE? CASSETTE_MOTOR_ENABLED : CASSETTE_MOTOR_DISABLED,CASSETTE_MASK_MOTOR); } @@ -543,7 +543,7 @@ WRITE_LINE_MEMBER( ti99_8_state::cassette_motor ) We do not really need to emulate this as the tape recorder generates sound on its own. */ -WRITE_LINE_MEMBER( ti99_8_state::audio_gate ) +void ti99_8_state::audio_gate(int state) { } @@ -551,7 +551,7 @@ WRITE_LINE_MEMBER( ti99_8_state::audio_gate ) Tape output (P9) I think polarity is correct, but don't take my word for it. */ -WRITE_LINE_MEMBER( ti99_8_state::cassette_output ) +void ti99_8_state::cassette_output(int state) { m_cassette->output(state==ASSERT_LINE? +1 : -1); } @@ -566,7 +566,7 @@ void ti99_8_state::tms9901_interrupt(offs_t offset, uint8_t data) /* set the state of TMS9901's INT2 (called by the VDP) */ -WRITE_LINE_MEMBER( ti99_8_state::video_interrupt ) +void ti99_8_state::video_interrupt(int state) { LOGMASKED(LOG_INTERRUPTS, "VDP int 2 on tms9901, level=%02x\n", state); m_int2 = (line_state)state; @@ -591,7 +591,7 @@ void ti99_8_state::console_ready(int state) /* Enqueue a RESET signal. */ -WRITE_LINE_MEMBER( ti99_8_state::console_reset ) +void ti99_8_state::console_reset(int state) { LOGMASKED(LOG_RESETLOAD, "Incoming RESET line = %d\n", state); if (machine().phase() != machine_phase::INIT) @@ -615,20 +615,20 @@ WRITE_LINE_MEMBER( ti99_8_state::console_reset ) /* The HOLD line leading to the CPU entering the HOLD state. */ -WRITE_LINE_MEMBER( ti99_8_state::cpu_hold ) +void ti99_8_state::cpu_hold(int state) { LOGMASKED(LOG_INTERRUPTS, "Incoming HOLD line = %d\n", state); m_cpu->hold_line(state); } -WRITE_LINE_MEMBER( ti99_8_state::extint ) +void ti99_8_state::extint(int state) { LOGMASKED(LOG_INTERRUPTS, "EXTINT level = %02x\n", state); m_int1 = (line_state)state; m_tms9901->set_int_line(1, state); } -[[maybe_unused]] WRITE_LINE_MEMBER( ti99_8_state::notconnected ) +[[maybe_unused]] void ti99_8_state::notconnected(int state) { LOGMASKED(LOG_INTERRUPTS, "Setting a not connected line ... ignored\n"); } @@ -644,7 +644,7 @@ void ti99_8_state::external_operation(offs_t offset, uint8_t data) /* Clock line from the CPU. Used to control wait state generation. */ -WRITE_LINE_MEMBER( ti99_8_state::clock_out ) +void ti99_8_state::clock_out(int state) { m_tms9901->phi_line(state); m_mainboard->clock_in(state); diff --git a/src/mame/ti/tm990189.cpp b/src/mame/ti/tm990189.cpp index 84ee8ce2c7a..c19916112f8 100644 --- a/src/mame/ti/tm990189.cpp +++ b/src/mame/ti/tm990189.cpp @@ -109,19 +109,19 @@ protected: private: void external_operation(offs_t offset, uint8_t data); - template DECLARE_WRITE_LINE_MEMBER(usr9901_led_w) { led_set(N, state); } - DECLARE_WRITE_LINE_MEMBER(usr9901_interrupt_callback); + template void usr9901_led_w(int state) { led_set(N, state); } + void usr9901_interrupt_callback(int state); - DECLARE_WRITE_LINE_MEMBER(sys9901_interrupt_callback); + void sys9901_interrupt_callback(int state); uint8_t sys9901_r(offs_t offset); - template DECLARE_WRITE_LINE_MEMBER(sys9901_digitsel_w) { digitsel(N, state); } - template DECLARE_WRITE_LINE_MEMBER(sys9901_segment_w) { segment_set(N, state); } + template void sys9901_digitsel_w(int state) { digitsel(N, state); } + template void sys9901_segment_w(int state) { segment_set(N, state); } - DECLARE_WRITE_LINE_MEMBER(sys9901_dsplytrgr_w); - DECLARE_WRITE_LINE_MEMBER(sys9901_shiftlight_w); - DECLARE_WRITE_LINE_MEMBER(sys9901_spkrdrive_w); - DECLARE_WRITE_LINE_MEMBER(sys9901_tapewdata_w); + void sys9901_dsplytrgr_w(int state); + void sys9901_shiftlight_w(int state); + void sys9901_spkrdrive_w(int state); + void sys9901_tapewdata_w(int state); void xmit_callback(uint8_t data); @@ -288,7 +288,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(tm990189_state::display_callback) tms9901 code */ -WRITE_LINE_MEMBER( tm990189_state::usr9901_interrupt_callback ) +void tm990189_state::usr9901_interrupt_callback(int state) { // Triggered by internal timer (set by ROM to 1.6 ms cycle) on level 3 // or by keyboard interrupt (level 6) @@ -306,7 +306,7 @@ void tm990189_state::led_set(int offset, bool state) m_LED_state &= ~(1 << offset); } -WRITE_LINE_MEMBER( tm990189_state::sys9901_interrupt_callback ) +void tm990189_state::sys9901_interrupt_callback(int state) { // TODO: Check this m_tms9901_usr->set_int_line(5, state); @@ -373,7 +373,7 @@ void tm990189_state::segment_set(int offset, bool state) } -WRITE_LINE_MEMBER( tm990189_state::sys9901_dsplytrgr_w ) +void tm990189_state::sys9901_dsplytrgr_w(int state) { if ((!state) && (m_digitsel < 10)) { @@ -382,7 +382,7 @@ WRITE_LINE_MEMBER( tm990189_state::sys9901_dsplytrgr_w ) } } -WRITE_LINE_MEMBER( tm990189_state::sys9901_shiftlight_w ) +void tm990189_state::sys9901_shiftlight_w(int state) { if (state) m_LED_state |= 0x10; @@ -390,12 +390,12 @@ WRITE_LINE_MEMBER( tm990189_state::sys9901_shiftlight_w ) m_LED_state &= ~0x10; } -WRITE_LINE_MEMBER( tm990189_state::sys9901_spkrdrive_w ) +void tm990189_state::sys9901_spkrdrive_w(int state) { m_speaker->level_w(state); } -WRITE_LINE_MEMBER( tm990189_state::sys9901_tapewdata_w ) +void tm990189_state::sys9901_tapewdata_w(int state) { m_cass->output(state ? +1.0 : -1.0); } diff --git a/src/mame/tiki/tiki100.cpp b/src/mame/tiki/tiki100.cpp index 0ed7af5e76b..e218588d34e 100644 --- a/src/mame/tiki/tiki100.cpp +++ b/src/mame/tiki/tiki100.cpp @@ -536,17 +536,17 @@ uint32_t tiki100_state::screen_update(screen_device &screen, bitmap_rgb32 &bitma /* Z80-PIO Interface */ -DECLARE_WRITE_LINE_MEMBER( tiki100_state::write_centronics_ack ) +void tiki100_state::write_centronics_ack(int state) { m_centronics_ack = state; } -DECLARE_WRITE_LINE_MEMBER( tiki100_state::write_centronics_busy ) +void tiki100_state::write_centronics_busy(int state) { m_centronics_busy = state; } -DECLARE_WRITE_LINE_MEMBER( tiki100_state::write_centronics_perror ) +void tiki100_state::write_centronics_perror(int state) { m_centronics_perror = state; } @@ -616,7 +616,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(tiki100_state::ctc_tick) m_ctc->trg1(0); } -WRITE_LINE_MEMBER( tiki100_state::bar0_w ) +void tiki100_state::bar0_w(int state) { m_ctc->trg2(state); @@ -625,7 +625,7 @@ WRITE_LINE_MEMBER( tiki100_state::bar0_w ) if (!m_st) m_dart->txca_w(state); } -WRITE_LINE_MEMBER( tiki100_state::bar2_w ) +void tiki100_state::bar2_w(int state) { if (m_st) m_dart->txca_w(state); @@ -672,7 +672,7 @@ TIMER_DEVICE_CALLBACK_MEMBER( tiki100_state::tape_tick ) m_pio->port_b_write((m_cassette->input() > 0.0) << 7); } -WRITE_LINE_MEMBER( tiki100_state::busrq_w ) +void tiki100_state::busrq_w(int state) { // since our Z80 has no support for BUSACK, we assume it is granted immediately m_maincpu->set_input_line(Z80_INPUT_LINE_BUSRQ, state); diff --git a/src/mame/tiki/tiki100.h b/src/mame/tiki/tiki100.h index 252c2c35776..d99a84475c2 100644 --- a/src/mame/tiki/tiki100.h +++ b/src/mame/tiki/tiki100.h @@ -85,8 +85,8 @@ private: void video_mode_w(uint8_t data); void palette_w(uint8_t data); void system_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER( bar0_w ); - DECLARE_WRITE_LINE_MEMBER( bar2_w ); + void bar0_w(int state); + void bar2_w(int state); void video_scroll_w(uint8_t data); uint8_t pio_pb_r(); @@ -98,11 +98,11 @@ private: TIMER_DEVICE_CALLBACK_MEMBER( tape_tick ); TIMER_DEVICE_CALLBACK_MEMBER( scanline_start ); - DECLARE_WRITE_LINE_MEMBER(write_centronics_ack); - DECLARE_WRITE_LINE_MEMBER(write_centronics_busy); - DECLARE_WRITE_LINE_MEMBER(write_centronics_perror); + void write_centronics_ack(int state); + void write_centronics_busy(int state); + void write_centronics_perror(int state); - DECLARE_WRITE_LINE_MEMBER( busrq_w ); + void busrq_w(int state); void tiki100_io(address_map &map); void tiki100_mem(address_map &map); diff --git a/src/mame/toaplan/gp9001.cpp b/src/mame/toaplan/gp9001.cpp index dabe10276b9..19b3f49e7ce 100644 --- a/src/mame/toaplan/gp9001.cpp +++ b/src/mame/toaplan/gp9001.cpp @@ -604,7 +604,7 @@ void gp9001vdp_device::pipibibi_bootleg_spriteram16_w(offs_t offset, u16 data, u Blanking Signal Polling ***************************************************************************/ -READ_LINE_MEMBER(gp9001vdp_device::hsync_r) +int gp9001vdp_device::hsync_r() { int hpos = screen().hpos(); @@ -612,7 +612,7 @@ READ_LINE_MEMBER(gp9001vdp_device::hsync_r) return (hpos > 325) && (hpos < 380) ? 0 : 1; } -READ_LINE_MEMBER(gp9001vdp_device::vsync_r) +int gp9001vdp_device::vsync_r() { int vpos = screen().vpos(); @@ -620,7 +620,7 @@ READ_LINE_MEMBER(gp9001vdp_device::vsync_r) return (vpos >= 232) && (vpos <= 245) ? 0 : 1; } -READ_LINE_MEMBER(gp9001vdp_device::fblank_r) +int gp9001vdp_device::fblank_r() { // ?? Dogyuun is too slow if this is wrong return (hsync_r() == 0 || vsync_r() == 0) ? 0 : 1; diff --git a/src/mame/toaplan/gp9001.h b/src/mame/toaplan/gp9001.h index 66b06d169df..edac957af25 100644 --- a/src/mame/toaplan/gp9001.h +++ b/src/mame/toaplan/gp9001.h @@ -46,9 +46,9 @@ public: u16 read(offs_t offset, u16 mem_mask = ~0); void write(offs_t offset, u16 data, u16 mem_mask = ~0); - DECLARE_READ_LINE_MEMBER(hsync_r); - DECLARE_READ_LINE_MEMBER(vsync_r); - DECLARE_READ_LINE_MEMBER(fblank_r); + int hsync_r(); + int vsync_r(); + int fblank_r(); // this bootleg has strange access u16 pipibibi_bootleg_videoram16_r(offs_t offset); diff --git a/src/mame/toaplan/mjsister.cpp b/src/mame/toaplan/mjsister.cpp index 1e6fb0ef3bc..30c24975600 100644 --- a/src/mame/toaplan/mjsister.cpp +++ b/src/mame/toaplan/mjsister.cpp @@ -73,14 +73,14 @@ private: std::unique_ptr m_vram; void dac_adr_s_w(uint8_t data); void dac_adr_e_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(rombank_w); - DECLARE_WRITE_LINE_MEMBER(flip_screen_w); - DECLARE_WRITE_LINE_MEMBER(colorbank_w); - DECLARE_WRITE_LINE_MEMBER(video_enable_w); - DECLARE_WRITE_LINE_MEMBER(irq_enable_w); - DECLARE_WRITE_LINE_MEMBER(vrambank_w); - DECLARE_WRITE_LINE_MEMBER(dac_bank_w); - DECLARE_WRITE_LINE_MEMBER(coin_counter_w); + void rombank_w(int state); + void flip_screen_w(int state); + void colorbank_w(int state); + void video_enable_w(int state); + void irq_enable_w(int state); + void vrambank_w(int state); + void dac_bank_w(int state); + void coin_counter_w(int state); void input_sel1_w(uint8_t data); void input_sel2_w(uint8_t data); uint8_t keys_r(); @@ -184,44 +184,44 @@ void mjsister_state::dac_adr_e_w(uint8_t data) m_dac_busy = 1; } -WRITE_LINE_MEMBER(mjsister_state::rombank_w) +void mjsister_state::rombank_w(int state) { m_rombank->set_entry((m_mainlatch[0]->q0_r() << 1) | m_mainlatch[1]->q6_r()); } -WRITE_LINE_MEMBER(mjsister_state::flip_screen_w) +void mjsister_state::flip_screen_w(int state) { flip_screen_set(state); } -WRITE_LINE_MEMBER(mjsister_state::colorbank_w) +void mjsister_state::colorbank_w(int state) { m_colorbank = (m_mainlatch[0]->output_state() >> 2) & 7; } -WRITE_LINE_MEMBER(mjsister_state::video_enable_w) +void mjsister_state::video_enable_w(int state) { m_video_enable = state; } -WRITE_LINE_MEMBER(mjsister_state::irq_enable_w) +void mjsister_state::irq_enable_w(int state) { m_irq_enable = state; if (!m_irq_enable) m_maincpu->set_input_line(0, CLEAR_LINE); } -WRITE_LINE_MEMBER(mjsister_state::vrambank_w) +void mjsister_state::vrambank_w(int state) { m_vrambank->set_entry(state); } -WRITE_LINE_MEMBER(mjsister_state::dac_bank_w) +void mjsister_state::dac_bank_w(int state) { m_dac_bank = state; } -WRITE_LINE_MEMBER(mjsister_state::coin_counter_w) +void mjsister_state::coin_counter_w(int state) { machine().bookkeeping().coin_counter_w(0, state); } diff --git a/src/mame/toaplan/slapfght.cpp b/src/mame/toaplan/slapfght.cpp index e532afa7baa..3a7e5c8bd29 100644 --- a/src/mame/toaplan/slapfght.cpp +++ b/src/mame/toaplan/slapfght.cpp @@ -376,13 +376,13 @@ void slapfght_state::slapfighb2_map(address_map &map) /**************************************************************************/ -WRITE_LINE_MEMBER(slapfght_state::vblank_irq) +void slapfght_state::vblank_irq(int state) { if (state && m_main_irq_enabled) m_maincpu->set_input_line(0, ASSERT_LINE); } -WRITE_LINE_MEMBER(slapfght_state::irq_enable_w) +void slapfght_state::irq_enable_w(int state) { m_main_irq_enabled = state ? true : false; @@ -390,7 +390,7 @@ WRITE_LINE_MEMBER(slapfght_state::irq_enable_w) m_maincpu->set_input_line(0, CLEAR_LINE); } -WRITE_LINE_MEMBER(slapfght_state::sound_reset_w) +void slapfght_state::sound_reset_w(int state) { m_audiocpu->set_input_line(INPUT_LINE_RESET, state ? CLEAR_LINE : ASSERT_LINE); diff --git a/src/mame/toaplan/slapfght.h b/src/mame/toaplan/slapfght.h index f4f90fb7867..1ad546a221a 100644 --- a/src/mame/toaplan/slapfght.h +++ b/src/mame/toaplan/slapfght.h @@ -100,8 +100,8 @@ private: uint8_t m_tigerhb_cmd = 0; uint8_t tigerh_mcu_status_r(); - DECLARE_WRITE_LINE_MEMBER(sound_reset_w); - DECLARE_WRITE_LINE_MEMBER(irq_enable_w); + void sound_reset_w(int state); + void irq_enable_w(int state); uint8_t vblank_r(); void sound_nmi_enable_w(offs_t offset, uint8_t data); void videoram_w(offs_t offset, uint8_t data); @@ -111,8 +111,8 @@ private: void scrollx_lo_w(uint8_t data); void scrollx_hi_w(uint8_t data); void scrolly_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(flipscreen_w); - DECLARE_WRITE_LINE_MEMBER(palette_bank_w); + void flipscreen_w(int state); + void palette_bank_w(int state); void scroll_from_mcu_w(offs_t offset, uint8_t data); @@ -137,7 +137,7 @@ private: uint32_t screen_update_perfrman(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_slapfight(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(vblank_irq); + void vblank_irq(int state); INTERRUPT_GEN_MEMBER(sound_nmi); void getstar_map(address_map &map); diff --git a/src/mame/toaplan/slapfght_ms.cpp b/src/mame/toaplan/slapfght_ms.cpp index 38026529e97..6dfbeca45f9 100644 --- a/src/mame/toaplan/slapfght_ms.cpp +++ b/src/mame/toaplan/slapfght_ms.cpp @@ -83,9 +83,9 @@ private: tilemap_t *m_pf1_tilemap = nullptr; tilemap_t *m_fix_tilemap = nullptr; - DECLARE_WRITE_LINE_MEMBER(vblank_irq); - DECLARE_WRITE_LINE_MEMBER(irq_enable_w); - DECLARE_WRITE_LINE_MEMBER(sound_reset_w); + void vblank_irq(int state); + void irq_enable_w(int state); + void sound_reset_w(int state); void videoram_w(offs_t offset, uint8_t data); void colorram_w(offs_t offset, uint8_t data); @@ -206,13 +206,13 @@ void slapfght_ms_state::video_start() // machine -WRITE_LINE_MEMBER(slapfght_ms_state::vblank_irq) +void slapfght_ms_state::vblank_irq(int state) { if (state && m_main_irq_enabled) m_maincpu->set_input_line(0, ASSERT_LINE); } -WRITE_LINE_MEMBER(slapfght_ms_state::irq_enable_w) +void slapfght_ms_state::irq_enable_w(int state) { m_main_irq_enabled = state ? true : false; @@ -220,7 +220,7 @@ WRITE_LINE_MEMBER(slapfght_ms_state::irq_enable_w) m_maincpu->set_input_line(0, CLEAR_LINE); } -WRITE_LINE_MEMBER(slapfght_ms_state::sound_reset_w) +void slapfght_ms_state::sound_reset_w(int state) { m_audiocpu->set_input_line(INPUT_LINE_RESET, state ? CLEAR_LINE : ASSERT_LINE); diff --git a/src/mame/toaplan/slapfght_v.cpp b/src/mame/toaplan/slapfght_v.cpp index 93cea874afc..d3bafc10674 100644 --- a/src/mame/toaplan/slapfght_v.cpp +++ b/src/mame/toaplan/slapfght_v.cpp @@ -118,12 +118,12 @@ void slapfght_state::scrolly_w(uint8_t data) m_scrolly = data; } -WRITE_LINE_MEMBER(slapfght_state::flipscreen_w) +void slapfght_state::flipscreen_w(int state) { flip_screen_set(state ? 0 : 1); } -WRITE_LINE_MEMBER(slapfght_state::palette_bank_w) +void slapfght_state::palette_bank_w(int state) { m_palette_bank = state; } diff --git a/src/mame/toaplan/toaplan1.h b/src/mame/toaplan/toaplan1.h index a35935cf2e3..07217b4e926 100644 --- a/src/mame/toaplan/toaplan1.h +++ b/src/mame/toaplan/toaplan1.h @@ -125,7 +125,7 @@ protected: DECLARE_MACHINE_RESET(zerowing); u32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(screen_vblank); + void screen_vblank(int state); void interrupt(); void create_tilemaps(); @@ -136,7 +136,7 @@ protected: void log_vram(); void draw_sprites(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); virtual void reset_sound(); - DECLARE_WRITE_LINE_MEMBER(reset_callback); + void reset_callback(int state); required_device m_maincpu; required_device m_audiocpu; required_device m_ymsnd; @@ -174,14 +174,14 @@ protected: virtual void video_start() override; private: - DECLARE_WRITE_LINE_MEMBER(coin_counter_1_w); - DECLARE_WRITE_LINE_MEMBER(coin_counter_2_w); - DECLARE_WRITE_LINE_MEMBER(coin_lockout_1_w); - DECLARE_WRITE_LINE_MEMBER(coin_lockout_2_w); + void coin_counter_1_w(int state); + void coin_counter_2_w(int state); + void coin_lockout_1_w(int state); + void coin_lockout_2_w(int state); u16 tileram_r(offs_t offset); void pri_cb(u8 priority, u32 &pri_mask); u32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(screen_vblank); + void screen_vblank(int state); required_device m_spritegen; void rallybik_main_map(address_map &map); @@ -216,7 +216,7 @@ private: u16 dsp_r(); void dsp_w(u16 data); void dsp_bio_w(u16 data); - DECLARE_READ_LINE_MEMBER(bio_r); + int bio_r(); void dsp_ctrl_w(u8 data); void dsp_int_w(int enable); @@ -248,7 +248,7 @@ private: u8 cmdavailable_r(); u8 port_6_word_r(); - DECLARE_WRITE_LINE_MEMBER(screen_vblank); + void screen_vblank(int state); void hd647180_io_map(address_map &map); void main_map(address_map &map); diff --git a/src/mame/toaplan/toaplan1_m.cpp b/src/mame/toaplan/toaplan1_m.cpp index de17890a729..b66509583ba 100644 --- a/src/mame/toaplan/toaplan1_m.cpp +++ b/src/mame/toaplan/toaplan1_m.cpp @@ -95,7 +95,7 @@ void toaplan1_demonwld_state::dsp_bio_w(u16 data) } } -READ_LINE_MEMBER(toaplan1_demonwld_state::bio_r) +int toaplan1_demonwld_state::bio_r() { return m_dsp_bio; } @@ -177,22 +177,22 @@ void toaplan1_state::reset_sound_w(u8 data) } -WRITE_LINE_MEMBER(toaplan1_rallybik_state::coin_counter_1_w) +void toaplan1_rallybik_state::coin_counter_1_w(int state) { machine().bookkeeping().coin_counter_w(0, state); } -WRITE_LINE_MEMBER(toaplan1_rallybik_state::coin_counter_2_w) +void toaplan1_rallybik_state::coin_counter_2_w(int state) { machine().bookkeeping().coin_counter_w(1, state); } -WRITE_LINE_MEMBER(toaplan1_rallybik_state::coin_lockout_1_w) +void toaplan1_rallybik_state::coin_lockout_1_w(int state) { machine().bookkeeping().coin_lockout_w(0, !state); } -WRITE_LINE_MEMBER(toaplan1_rallybik_state::coin_lockout_2_w) +void toaplan1_rallybik_state::coin_lockout_2_w(int state) { machine().bookkeeping().coin_lockout_w(1, !state); } @@ -207,7 +207,7 @@ void toaplan1_state::coin_w(u8 data) machine().bookkeeping().coin_lockout_w(1, !BIT(data, 3)); } -WRITE_LINE_MEMBER(toaplan1_state::reset_callback) +void toaplan1_state::reset_callback(int state) { reset_sound(); } diff --git a/src/mame/toaplan/toaplan1_v.cpp b/src/mame/toaplan/toaplan1_v.cpp index 43304777dad..28b175656bb 100644 --- a/src/mame/toaplan/toaplan1_v.cpp +++ b/src/mame/toaplan/toaplan1_v.cpp @@ -804,7 +804,7 @@ u32 toaplan1_state::screen_update(screen_device &screen, bitmap_rgb32 &bitmap, c assume it happens automatically every frame, at the end of vblank ****************************************************************************/ -WRITE_LINE_MEMBER(toaplan1_rallybik_state::screen_vblank) +void toaplan1_rallybik_state::screen_vblank(int state) { // rising edge if (state) @@ -814,7 +814,7 @@ WRITE_LINE_MEMBER(toaplan1_rallybik_state::screen_vblank) } } -WRITE_LINE_MEMBER(toaplan1_state::screen_vblank) +void toaplan1_state::screen_vblank(int state) { // rising edge if (state) @@ -825,7 +825,7 @@ WRITE_LINE_MEMBER(toaplan1_state::screen_vblank) } } -WRITE_LINE_MEMBER(toaplan1_samesame_state::screen_vblank) +void toaplan1_samesame_state::screen_vblank(int state) { // rising edge if (state) diff --git a/src/mame/toaplan/toaplan2.cpp b/src/mame/toaplan/toaplan2.cpp index 12c71777dd2..d97e9a1e1fd 100644 --- a/src/mame/toaplan/toaplan2.cpp +++ b/src/mame/toaplan/toaplan2.cpp @@ -430,7 +430,7 @@ void truxton2_state::machine_start() } -WRITE_LINE_MEMBER(toaplan2_state::toaplan2_reset) +void toaplan2_state::toaplan2_reset(int state) { if (m_audiocpu != nullptr) m_audiocpu->pulse_input_line(INPUT_LINE_RESET, attotime::zero); @@ -663,7 +663,7 @@ void toaplan2_state::shared_ram_w(offs_t offset, u8 data) } -READ_LINE_MEMBER(toaplan2_state::c2map_r) +int toaplan2_state::c2map_r() { // For Teki Paki hardware // bit 4 high signifies secondary CPU is ready diff --git a/src/mame/toaplan/toaplan2.h b/src/mame/toaplan/toaplan2.h index f3b724242f9..2a898d1e2fa 100644 --- a/src/mame/toaplan/toaplan2.h +++ b/src/mame/toaplan/toaplan2.h @@ -58,7 +58,7 @@ public: void init_pipibibsbl(); void init_vfive(); - DECLARE_READ_LINE_MEMBER(c2map_r); + int c2map_r(); protected: // We encode priority with colour in the tilemaps, so need a larger palette @@ -106,11 +106,11 @@ protected: u32 screen_update_toaplan2(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); u32 screen_update_dogyuun(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); u32 screen_update_batsugun(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(screen_vblank); + void screen_vblank(int state); void cpu_space_fixeightbl_map(address_map &map); void cpu_space_pipibibsbl_map(address_map &map); - DECLARE_WRITE_LINE_MEMBER(toaplan2_reset); + void toaplan2_reset(int state); void batsugun_68k_mem(address_map &map); void batsugunbl_68k_mem(address_map &map); diff --git a/src/mame/toaplan/toaplan2_v.cpp b/src/mame/toaplan/toaplan2_v.cpp index ca075f81a98..8e563d45edd 100644 --- a/src/mame/toaplan/toaplan2_v.cpp +++ b/src/mame/toaplan/toaplan2_v.cpp @@ -393,7 +393,7 @@ u32 truxton2_state::screen_update_truxton2(screen_device &screen, bitmap_ind16 & } -WRITE_LINE_MEMBER(toaplan2_state::screen_vblank) +void toaplan2_state::screen_vblank(int state) { // rising edge if (state) diff --git a/src/mame/toaplan/twincobr.h b/src/mame/toaplan/twincobr.h index d2da936a9fc..9607bdffb19 100644 --- a/src/mame/toaplan/twincobr.h +++ b/src/mame/toaplan/twincobr.h @@ -89,13 +89,13 @@ protected: void twincobr_dsp_bio_w(u16 data); u16 fsharkbt_dsp_r(); void fsharkbt_dsp_w(u16 data); - DECLARE_READ_LINE_MEMBER(twincobr_bio_r); - DECLARE_WRITE_LINE_MEMBER(int_enable_w); - DECLARE_WRITE_LINE_MEMBER(dsp_int_w); - DECLARE_WRITE_LINE_MEMBER(coin_counter_1_w); - DECLARE_WRITE_LINE_MEMBER(coin_counter_2_w); - DECLARE_WRITE_LINE_MEMBER(coin_lockout_1_w); - DECLARE_WRITE_LINE_MEMBER(coin_lockout_2_w); + int twincobr_bio_r(); + void int_enable_w(int state); + void dsp_int_w(int state); + void coin_counter_1_w(int state); + void coin_counter_2_w(int state); + void coin_lockout_1_w(int state); + void coin_lockout_2_w(int state); u8 twincobr_sharedram_r(offs_t offset); void twincobr_sharedram_w(offs_t offset, u8 data); void twincobr_txoffs_w(offs_t offset, u16 data, u16 mem_mask = ~0); @@ -127,12 +127,12 @@ protected: TILE_GET_INFO_MEMBER(get_fg_tile_info); TILE_GET_INFO_MEMBER(get_tx_tile_info); u32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(twincobr_vblank_irq); + void twincobr_vblank_irq(int state); void twincobr_create_tilemaps(); - DECLARE_WRITE_LINE_MEMBER(display_on_w); - DECLARE_WRITE_LINE_MEMBER(flipscreen_w); - DECLARE_WRITE_LINE_MEMBER(bg_ram_bank_w); - DECLARE_WRITE_LINE_MEMBER(fg_rom_bank_w); + void display_on_w(int state); + void flipscreen_w(int state); + void bg_ram_bank_w(int state); + void fg_rom_bank_w(int state); void log_vram(); void driver_savestate(); required_device m_maincpu; diff --git a/src/mame/toaplan/twincobr_m.cpp b/src/mame/toaplan/twincobr_m.cpp index 6448322c8ed..526ab84c746 100644 --- a/src/mame/toaplan/twincobr_m.cpp +++ b/src/mame/toaplan/twincobr_m.cpp @@ -14,7 +14,7 @@ #include "logmacro.h" -WRITE_LINE_MEMBER(twincobr_state::twincobr_vblank_irq) +void twincobr_state::twincobr_vblank_irq(int state) { if (state && m_intenable) m_maincpu->set_input_line(M68K_IRQ_4, ASSERT_LINE); @@ -167,20 +167,20 @@ void twincobr_state::fsharkbt_dsp_w(u16 data) #endif } -READ_LINE_MEMBER(twincobr_state::twincobr_bio_r) +int twincobr_state::twincobr_bio_r() { return m_dsp_bio; } -WRITE_LINE_MEMBER(twincobr_state::int_enable_w) +void twincobr_state::int_enable_w(int state) { m_intenable = state; if (!state) m_maincpu->set_input_line(M68K_IRQ_4, CLEAR_LINE); } -WRITE_LINE_MEMBER(twincobr_state::dsp_int_w) +void twincobr_state::dsp_int_w(int state) { if (state) { @@ -200,22 +200,22 @@ WRITE_LINE_MEMBER(twincobr_state::dsp_int_w) } -WRITE_LINE_MEMBER(twincobr_state::coin_counter_1_w) +void twincobr_state::coin_counter_1_w(int state) { machine().bookkeeping().coin_counter_w(0, state); } -WRITE_LINE_MEMBER(twincobr_state::coin_counter_2_w) +void twincobr_state::coin_counter_2_w(int state) { machine().bookkeeping().coin_counter_w(1, state); } -WRITE_LINE_MEMBER(twincobr_state::coin_lockout_1_w) +void twincobr_state::coin_lockout_1_w(int state) { machine().bookkeeping().coin_counter_w(0, !state); } -WRITE_LINE_MEMBER(twincobr_state::coin_lockout_2_w) +void twincobr_state::coin_lockout_2_w(int state) { machine().bookkeeping().coin_counter_w(1, !state); } diff --git a/src/mame/toaplan/twincobr_v.cpp b/src/mame/toaplan/twincobr_v.cpp index 319e46bb281..59cce687224 100644 --- a/src/mame/toaplan/twincobr_v.cpp +++ b/src/mame/toaplan/twincobr_v.cpp @@ -114,23 +114,23 @@ void twincobr_state::video_start() Video I/O interface ***************************************************************************/ -WRITE_LINE_MEMBER(twincobr_state::display_on_w) +void twincobr_state::display_on_w(int state) { m_display_on = state; } -WRITE_LINE_MEMBER(twincobr_state::flipscreen_w) +void twincobr_state::flipscreen_w(int state) { machine().tilemap().set_flip_all((state ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0)); } -WRITE_LINE_MEMBER(twincobr_state::bg_ram_bank_w) +void twincobr_state::bg_ram_bank_w(int state) { m_bg_ram_bank = state ? 0x1000 : 0x0000; m_bg_tilemap->mark_all_dirty(); } -WRITE_LINE_MEMBER(twincobr_state::fg_rom_bank_w) +void twincobr_state::fg_rom_bank_w(int state) { m_fg_rom_bank = state ? 0x1000 : 0x0000; m_fg_tilemap->mark_all_dirty(); diff --git a/src/mame/toaplan/wardner.cpp b/src/mame/toaplan/wardner.cpp index b59f06204c9..73c185211ba 100644 --- a/src/mame/toaplan/wardner.cpp +++ b/src/mame/toaplan/wardner.cpp @@ -162,8 +162,8 @@ private: void wardner_bank_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(wardner_vblank_irq); - DECLARE_WRITE_LINE_MEMBER(int_enable_w); + void wardner_vblank_irq(int state); + void int_enable_w(int state); void dsp_io_map(address_map &map); void dsp_program_map(address_map &map); @@ -175,13 +175,13 @@ private: }; -WRITE_LINE_MEMBER(wardner_state::wardner_vblank_irq) +void wardner_state::wardner_vblank_irq(int state) { if (state && m_intenable) m_maincpu->set_input_line(0, ASSERT_LINE); } -WRITE_LINE_MEMBER(wardner_state::int_enable_w) +void wardner_state::int_enable_w(int state) { m_intenable = state; if (!state) diff --git a/src/mame/tomy/tutor.cpp b/src/mame/tomy/tutor.cpp index 096ac2f4a46..3349a2a873a 100644 --- a/src/mame/tomy/tutor.cpp +++ b/src/mame/tomy/tutor.cpp @@ -237,7 +237,7 @@ private: uint8_t tutor_highmem_r(offs_t offset); TIMER_CALLBACK_MEMBER(tape_interrupt_handler); - DECLARE_WRITE_LINE_MEMBER(write_centronics_busy); + void write_centronics_busy(int state); [[maybe_unused]] void test_w(offs_t offset, uint8_t data); void pyuutajr_mem(address_map &map); @@ -469,7 +469,7 @@ void tutor_state::tutor_cassette_w(offs_t offset, uint8_t data) } } -WRITE_LINE_MEMBER( tutor_state::write_centronics_busy ) +void tutor_state::write_centronics_busy(int state) { m_centronics_busy = state; } diff --git a/src/mame/toshiba/pasopia.cpp b/src/mame/toshiba/pasopia.cpp index 73d8bb386bc..5a949a60ece 100644 --- a/src/mame/toshiba/pasopia.cpp +++ b/src/mame/toshiba/pasopia.cpp @@ -76,7 +76,7 @@ private: u8 rombank_r(); u8 keyb_r(); void mux_w(u8 data); - DECLARE_WRITE_LINE_MEMBER(speaker_w); + void speaker_w(int state); MC6845_UPDATE_ROW(crtc_update_row); TIMER_CALLBACK_MEMBER(pio_timer); @@ -309,7 +309,7 @@ void pasopia_state::portc_2_w(u8 data) m_rs232->write_txd(BIT(data, 4)); } -WRITE_LINE_MEMBER( pasopia_state::speaker_w ) +void pasopia_state::speaker_w(int state) { if (state) { diff --git a/src/mame/toshiba/pasopia7.cpp b/src/mame/toshiba/pasopia7.cpp index f0428aa654f..57fd5f98796 100644 --- a/src/mame/toshiba/pasopia7.cpp +++ b/src/mame/toshiba/pasopia7.cpp @@ -109,7 +109,7 @@ private: void nmi_reg_w(uint8_t data); uint8_t nmi_porta_r(); uint8_t nmi_portb_r(); - DECLARE_WRITE_LINE_MEMBER(speaker_w); + void speaker_w(int state); TIMER_CALLBACK_MEMBER(pio_timer); void p7_lcd_palette(palette_device &palette) const; MC6845_UPDATE_ROW(update_row); @@ -752,7 +752,7 @@ uint8_t pasopia7_state::nmi_portb_r() return 0xd9 | data | m_nmi_trap | m_nmi_reset; } -WRITE_LINE_MEMBER( pasopia7_state::speaker_w ) +void pasopia7_state::speaker_w(int state) { if (state) { diff --git a/src/mame/trainer/babbage.cpp b/src/mame/trainer/babbage.cpp index 1d20dd3a994..9ce83638936 100644 --- a/src/mame/trainer/babbage.cpp +++ b/src/mame/trainer/babbage.cpp @@ -56,9 +56,9 @@ private: uint8_t pio2_a_r(); void pio1_b_w(uint8_t data); void pio2_b_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(ctc_z0_w); - DECLARE_WRITE_LINE_MEMBER(ctc_z1_w); - DECLARE_WRITE_LINE_MEMBER(ctc_z2_w); + void ctc_z0_w(int state); + void ctc_z1_w(int state); + void ctc_z2_w(int state); TIMER_DEVICE_CALLBACK_MEMBER(keyboard_callback); void babbage_io(address_map &map); @@ -141,15 +141,15 @@ INPUT_PORTS_END /* Z80-CTC Interface */ -WRITE_LINE_MEMBER( babbage_state::ctc_z0_w ) +void babbage_state::ctc_z0_w(int state) { } -WRITE_LINE_MEMBER( babbage_state::ctc_z1_w ) +void babbage_state::ctc_z1_w(int state) { } -WRITE_LINE_MEMBER( babbage_state::ctc_z2_w ) +void babbage_state::ctc_z2_w(int state) { } diff --git a/src/mame/trainer/bob85.cpp b/src/mame/trainer/bob85.cpp index b5ea57fb2f1..1dc5cb89198 100644 --- a/src/mame/trainer/bob85.cpp +++ b/src/mame/trainer/bob85.cpp @@ -52,8 +52,8 @@ private: void mem_map(address_map &map); uint8_t bob85_keyboard_r(); void bob85_7seg_w(offs_t offset, uint8_t data); - DECLARE_WRITE_LINE_MEMBER(sod_w); - DECLARE_READ_LINE_MEMBER(sid_r); + void sod_w(int state); + int sid_r(); TIMER_DEVICE_CALLBACK_MEMBER(kansas_r); uint8_t m_prev_key = 0; uint8_t m_count_key = 0; @@ -222,12 +222,12 @@ TIMER_DEVICE_CALLBACK_MEMBER( bob85_state::kansas_r ) } } -WRITE_LINE_MEMBER( bob85_state::sod_w ) +void bob85_state::sod_w(int state) { m_cass->output(state ? +1.0 : -1.0); } -READ_LINE_MEMBER( bob85_state::sid_r ) +int bob85_state::sid_r() { return m_cassbit; } diff --git a/src/mame/trainer/dolphunk.cpp b/src/mame/trainer/dolphunk.cpp index b721397e9d4..08462ce0a98 100644 --- a/src/mame/trainer/dolphunk.cpp +++ b/src/mame/trainer/dolphunk.cpp @@ -112,7 +112,7 @@ public: void dauphin(machine_config &config); private: - DECLARE_READ_LINE_MEMBER(cass_r); + int cass_r(); u8 port07_r(); void port00_w(offs_t offset, u8 data); void port06_w(u8 data); @@ -132,7 +132,7 @@ private: required_device m_display; }; -READ_LINE_MEMBER( dauphin_state::cass_r ) +int dauphin_state::cass_r() { return (m_cass->input() > 0.03) ? 1 : 0; } diff --git a/src/mame/trainer/instruct.cpp b/src/mame/trainer/instruct.cpp index e47968cab2c..b55aec4feb8 100644 --- a/src/mame/trainer/instruct.cpp +++ b/src/mame/trainer/instruct.cpp @@ -85,8 +85,8 @@ private: uint8_t portfc_r(); uint8_t portfd_r(); uint8_t portfe_r(); - DECLARE_READ_LINE_MEMBER(sense_r); - DECLARE_WRITE_LINE_MEMBER(flag_w); + int sense_r(); + void flag_w(int state); void port_w(uint8_t data); void portf8_w(uint8_t data); void portf9_w(uint8_t data); @@ -113,7 +113,7 @@ private: }; // flag led -WRITE_LINE_MEMBER( instruct_state::flag_w ) +void instruct_state::flag_w(int state) { m_leds[8] = !state; } @@ -182,7 +182,7 @@ uint8_t instruct_state::portfe_r() // Read cassette and SENS key -READ_LINE_MEMBER( instruct_state::sense_r ) +int instruct_state::sense_r() { if (m_cassin) return (m_cass->input() > 0.03) ? 1 : 0; diff --git a/src/mame/trainer/mk14.cpp b/src/mame/trainer/mk14.cpp index 4a2908c1762..fce5172a10f 100644 --- a/src/mame/trainer/mk14.cpp +++ b/src/mame/trainer/mk14.cpp @@ -64,8 +64,8 @@ protected: uint8_t keyboard_r(offs_t offset); void display_w(offs_t offset, uint8_t data); void port_a_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(cass_w); - DECLARE_READ_LINE_MEMBER(cass_r); + void cass_w(int state); + int cass_r(); void mk14_map(address_map &map); DECLARE_QUICKLOAD_LOAD_MEMBER(quickload_cb); @@ -251,13 +251,13 @@ void mk14_state::port_a_w(uint8_t data) { } -WRITE_LINE_MEMBER(mk14_state::cass_w) +void mk14_state::cass_w(int state) { m_cass->output(state ? -1.0 : +1.0); m_dac->write(state); } -READ_LINE_MEMBER(mk14_state::cass_r) +int mk14_state::cass_r() { return (m_cass->input() > 0.03) ? 1 : 0; } diff --git a/src/mame/trs/6883sam.cpp b/src/mame/trs/6883sam.cpp index 63cc20d454c..85782868f41 100644 --- a/src/mame/trs/6883sam.cpp +++ b/src/mame/trs/6883sam.cpp @@ -482,7 +482,7 @@ void sam6883_device::horizontal_sync() // hs_w //------------------------------------------------- -WRITE_LINE_MEMBER( sam6883_device::hs_w ) +void sam6883_device::hs_w(int state) { if (state) { diff --git a/src/mame/trs/6883sam.h b/src/mame/trs/6883sam.h index 0ee558f6c72..74ecbb8ea29 100644 --- a/src/mame/trs/6883sam.h +++ b/src/mame/trs/6883sam.h @@ -117,7 +117,7 @@ public: return m_ram_space.read_byte(m_counter & m_counter_mask); } - DECLARE_WRITE_LINE_MEMBER( hs_w ); + void hs_w(int state); protected: // device-level overrides diff --git a/src/mame/trs/coco.cpp b/src/mame/trs/coco.cpp index 587f520195d..f49b88a942f 100644 --- a/src/mame/trs/coco.cpp +++ b/src/mame/trs/coco.cpp @@ -345,7 +345,7 @@ void coco_state::pia0_pb_w(uint8_t data) // pia0_ca2_w //------------------------------------------------- -WRITE_LINE_MEMBER( coco_state::pia0_ca2_w ) +void coco_state::pia0_ca2_w(int state) { update_sound(); // analog mux SEL1 is tied to PIA0 CA2 poll_keyboard(); @@ -357,7 +357,7 @@ WRITE_LINE_MEMBER( coco_state::pia0_ca2_w ) // pia0_cb2_w //------------------------------------------------- -WRITE_LINE_MEMBER( coco_state::pia0_cb2_w ) +void coco_state::pia0_cb2_w(int state) { update_sound(); // analog mux SEL2 is tied to PIA0 CB2 poll_keyboard(); @@ -469,7 +469,7 @@ void coco_state::pia1_pb_w(uint8_t data) // pia1_ca2_w //------------------------------------------------- -WRITE_LINE_MEMBER( coco_state::pia1_ca2_w ) +void coco_state::pia1_ca2_w(int state) { m_cassette->change_state( state ? CASSETTE_MOTOR_ENABLED : CASSETTE_MOTOR_DISABLED, @@ -482,7 +482,7 @@ WRITE_LINE_MEMBER( coco_state::pia1_ca2_w ) // pia1_cb2_w //------------------------------------------------- -WRITE_LINE_MEMBER( coco_state::pia1_cb2_w ) +void coco_state::pia1_cb2_w(int state) { update_sound(); // SOUND_ENABLE is connected to PIA1 CB2 } diff --git a/src/mame/trs/coco.h b/src/mame/trs/coco.h index 1eadaf276b3..e196f45dc02 100644 --- a/src/mame/trs/coco.h +++ b/src/mame/trs/coco.h @@ -97,16 +97,16 @@ public: // PIA0 void pia0_pa_w(uint8_t data); void pia0_pb_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER( pia0_ca2_w ); - DECLARE_WRITE_LINE_MEMBER( pia0_cb2_w ); + void pia0_ca2_w(int state); + void pia0_cb2_w(int state); // PIA1 uint8_t pia1_pa_r(); uint8_t pia1_pb_r(); void pia1_pa_w(uint8_t data); void pia1_pb_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER( pia1_ca2_w ); - DECLARE_WRITE_LINE_MEMBER( pia1_cb2_w ); + void pia1_ca2_w(int state); + void pia1_cb2_w(int state); // floating bus & "space" uint8_t floating_bus_r() { return floating_bus_read(); } @@ -114,7 +114,7 @@ public: void floating_space_write(offs_t offset, uint8_t data); // cartridge stuff - DECLARE_WRITE_LINE_MEMBER( cart_w ) { cart_w((bool) state); } + void cart_w(int state) { cart_w((bool) state); } virtual address_space &cartridge_space() override; // disassembly override diff --git a/src/mame/trs/coco12.h b/src/mame/trs/coco12.h index d7a1640b8e7..820084e8294 100644 --- a/src/mame/trs/coco12.h +++ b/src/mame/trs/coco12.h @@ -48,8 +48,8 @@ public: uint8_t sam_read(offs_t offset); - DECLARE_WRITE_LINE_MEMBER( horizontal_sync ); - DECLARE_WRITE_LINE_MEMBER( field_sync ); + void horizontal_sync(int state); + void field_sync(int state); void coco(machine_config &config); void cocoh(machine_config &config); diff --git a/src/mame/trs/coco12_m.cpp b/src/mame/trs/coco12_m.cpp index d217f8f5eef..e29c33526a7 100644 --- a/src/mame/trs/coco12_m.cpp +++ b/src/mame/trs/coco12_m.cpp @@ -40,7 +40,7 @@ void coco12_state::configure_sam() // horizontal_sync //------------------------------------------------- -WRITE_LINE_MEMBER( coco12_state::horizontal_sync ) +void coco12_state::horizontal_sync(int state) { pia_0().ca1_w(state); m_sam->hs_w(state); @@ -52,7 +52,7 @@ WRITE_LINE_MEMBER( coco12_state::horizontal_sync ) // field_sync //------------------------------------------------- -WRITE_LINE_MEMBER( coco12_state::field_sync ) +void coco12_state::field_sync(int state) { pia_0().cb1_w(state); } diff --git a/src/mame/trs/dgn_beta.h b/src/mame/trs/dgn_beta.h index ce9495aef36..538c5e949d6 100644 --- a/src/mame/trs/dgn_beta.h +++ b/src/mame/trs/dgn_beta.h @@ -182,24 +182,24 @@ private: void d_pia0_pa_w(uint8_t data); uint8_t d_pia0_pb_r(); void d_pia0_pb_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(d_pia0_cb2_w); - DECLARE_WRITE_LINE_MEMBER(d_pia0_irq_a); - DECLARE_WRITE_LINE_MEMBER(d_pia0_irq_b); + void d_pia0_cb2_w(int state); + void d_pia0_irq_a(int state); + void d_pia0_irq_b(int state); uint8_t d_pia1_pa_r(); void d_pia1_pa_w(uint8_t data); uint8_t d_pia1_pb_r(); void d_pia1_pb_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(d_pia1_irq_a); - DECLARE_WRITE_LINE_MEMBER(d_pia1_irq_b); + void d_pia1_irq_a(int state); + void d_pia1_irq_b(int state); uint8_t d_pia2_pa_r(); void d_pia2_pa_w(uint8_t data); uint8_t d_pia2_pb_r(); void d_pia2_pb_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(d_pia2_irq_a); - DECLARE_WRITE_LINE_MEMBER(d_pia2_irq_b); - DECLARE_WRITE_LINE_MEMBER(dgnbeta_fdc_intrq_w); - DECLARE_WRITE_LINE_MEMBER(dgnbeta_fdc_drq_w); - DECLARE_WRITE_LINE_MEMBER(dgnbeta_vsync_changed); + void d_pia2_irq_a(int state); + void d_pia2_irq_b(int state); + void dgnbeta_fdc_intrq_w(int state); + void dgnbeta_fdc_drq_w(int state); + void dgnbeta_vsync_changed(int state); /* 74HC670 4x4bit colour ram */ void dgnbeta_colour_ram_w(offs_t offset, uint8_t data); // Page IO at FE00 diff --git a/src/mame/trs/dgn_beta_m.cpp b/src/mame/trs/dgn_beta_m.cpp index 7c255ca402b..47ae666438c 100644 --- a/src/mame/trs/dgn_beta_m.cpp +++ b/src/mame/trs/dgn_beta_m.cpp @@ -391,7 +391,7 @@ void dgn_beta_state::d_pia0_pb_w(uint8_t data) m_d_pia0_pb_last=data; } -WRITE_LINE_MEMBER(dgn_beta_state::d_pia0_cb2_w) +void dgn_beta_state::d_pia0_cb2_w(int state) { int RowNo; LOGMASKED(LOG_KEYBOARD,"\nCB2 Write\n"); @@ -414,12 +414,12 @@ WRITE_LINE_MEMBER(dgn_beta_state::d_pia0_cb2_w) } -WRITE_LINE_MEMBER(dgn_beta_state::d_pia0_irq_a) +void dgn_beta_state::d_pia0_irq_a(int state) { cpu0_recalc_irq(state); } -WRITE_LINE_MEMBER(dgn_beta_state::d_pia0_irq_b) +void dgn_beta_state::d_pia0_irq_b(int state) { cpu0_recalc_firq(state); } @@ -515,12 +515,12 @@ void dgn_beta_state::d_pia1_pb_w(uint8_t data) } } -WRITE_LINE_MEMBER(dgn_beta_state::d_pia1_irq_a) +void dgn_beta_state::d_pia1_irq_a(int state) { cpu0_recalc_irq(state); } -WRITE_LINE_MEMBER(dgn_beta_state::d_pia1_irq_b) +void dgn_beta_state::d_pia1_irq_b(int state) { cpu0_recalc_irq(state); } @@ -616,12 +616,12 @@ void dgn_beta_state::d_pia2_pb_w(uint8_t data) dgnbeta_vid_set_gctrl(data); } -WRITE_LINE_MEMBER(dgn_beta_state::d_pia2_irq_a) +void dgn_beta_state::d_pia2_irq_a(int state) { cpu0_recalc_irq(state); } -WRITE_LINE_MEMBER(dgn_beta_state::d_pia2_irq_b) +void dgn_beta_state::d_pia2_irq_b(int state) { cpu0_recalc_irq(state); } @@ -674,7 +674,7 @@ void dgn_beta_state::cpu1_recalc_firq(int state) /********************************************************************************************/ /* The INTRQ line goes through pia2 ca1, in exactly the same way as DRQ from DragonDos does */ -WRITE_LINE_MEMBER( dgn_beta_state::dgnbeta_fdc_intrq_w ) +void dgn_beta_state::dgnbeta_fdc_intrq_w(int state) { LOGMASKED(LOG_DISK, "dgnbeta_fdc_intrq_w(%d)\n", state); @@ -683,7 +683,7 @@ WRITE_LINE_MEMBER( dgn_beta_state::dgnbeta_fdc_intrq_w ) } /* DRQ is routed through various logic to the FIRQ interrupt line on *BOTH* CPUs */ -WRITE_LINE_MEMBER( dgn_beta_state::dgnbeta_fdc_drq_w ) +void dgn_beta_state::dgnbeta_fdc_drq_w(int state) { LOGMASKED(LOG_DISK, "dgnbeta_fdc_drq_w(%d)\n", state); cpu1_recalc_firq(state); diff --git a/src/mame/trs/dgn_beta_v.cpp b/src/mame/trs/dgn_beta_v.cpp index 2292d0bced5..46c7a0a7da6 100644 --- a/src/mame/trs/dgn_beta_v.cpp +++ b/src/mame/trs/dgn_beta_v.cpp @@ -241,7 +241,7 @@ MC6845_UPDATE_ROW( dgn_beta_state::crtc_update_row ) } -WRITE_LINE_MEMBER(dgn_beta_state::dgnbeta_vsync_changed) +void dgn_beta_state::dgnbeta_vsync_changed(int state) { m_beta_VSync=state; if (!m_beta_VSync) diff --git a/src/mame/trs/dgnalpha.cpp b/src/mame/trs/dgnalpha.cpp index c796ea16b9a..4703334bd5d 100644 --- a/src/mame/trs/dgnalpha.cpp +++ b/src/mame/trs/dgnalpha.cpp @@ -119,8 +119,8 @@ private: void psg_porta_write(uint8_t data); /* fdc */ - DECLARE_WRITE_LINE_MEMBER( fdc_intrq_w ); - DECLARE_WRITE_LINE_MEMBER( fdc_drq_w ); + void fdc_intrq_w(int state); + void fdc_drq_w(int state); void dgnalpha_io1(address_map &map); @@ -278,7 +278,7 @@ void dragon_alpha_state::psg_porta_write(uint8_t data) // through IC16 (early PLD), and is gated by pia2 CA2 //------------------------------------------------- -WRITE_LINE_MEMBER( dragon_alpha_state::fdc_intrq_w ) +void dragon_alpha_state::fdc_intrq_w(int state) { if (state) { @@ -299,7 +299,7 @@ WRITE_LINE_MEMBER( dragon_alpha_state::fdc_intrq_w ) // does for pia1 CB1 //------------------------------------------------- -WRITE_LINE_MEMBER( dragon_alpha_state::fdc_drq_w ) +void dragon_alpha_state::fdc_drq_w(int state) { m_pia_2->cb1_w(state ? ASSERT_LINE : CLEAR_LINE); } diff --git a/src/mame/trs/max80.cpp b/src/mame/trs/max80.cpp index 2b1ec3660df..eb26af64978 100644 --- a/src/mame/trs/max80.cpp +++ b/src/mame/trs/max80.cpp @@ -127,8 +127,8 @@ private: void pio_pa_w(offs_t offset, u8 data); void pio_pb_w(offs_t offset, u8 data); - DECLARE_WRITE_LINE_MEMBER(intrq_w); - DECLARE_WRITE_LINE_MEMBER(drq_w); + void intrq_w(int state); + void drq_w(int state); MC6845_UPDATE_ROW(crtc_update_row); TIMER_DEVICE_CALLBACK_MEMBER(beep_timer); @@ -316,12 +316,12 @@ void max80_state::drive_w(offs_t offset, u8 data) } -WRITE_LINE_MEMBER(max80_state::intrq_w) +void max80_state::intrq_w(int state) { m_fdc_int = state; } -WRITE_LINE_MEMBER(max80_state::drq_w) +void max80_state::drq_w(int state) { m_fdc_drq = state; m_maincpu->set_input_line(INPUT_LINE_NMI, (state && m_allow_nmi) ? ASSERT_LINE : CLEAR_LINE); diff --git a/src/mame/trs/tandy2k.cpp b/src/mame/trs/tandy2k.cpp index e7356d7fd65..a593452f024 100644 --- a/src/mame/trs/tandy2k.cpp +++ b/src/mame/trs/tandy2k.cpp @@ -551,7 +551,7 @@ uint32_t tandy2k_state::screen_update(screen_device &screen, bitmap_rgb32 &bitma return 0; } -WRITE_LINE_MEMBER( tandy2k_state::vpac_vlt_w ) +void tandy2k_state::vpac_vlt_w(int state) { m_drb0->ren_w(state); m_drb0->clrcnt_w(state); @@ -560,31 +560,31 @@ WRITE_LINE_MEMBER( tandy2k_state::vpac_vlt_w ) m_drb1->clrcnt_w(state); } -WRITE_LINE_MEMBER( tandy2k_state::vpac_drb_w ) +void tandy2k_state::vpac_drb_w(int state) { m_drb0->tog_w(state); m_drb1->tog_w(state); } -WRITE_LINE_MEMBER( tandy2k_state::vpac_wben_w ) +void tandy2k_state::vpac_wben_w(int state) { m_drb0->wen1_w(state); m_drb1->wen1_w(state); } -WRITE_LINE_MEMBER( tandy2k_state::vpac_cblank_w ) +void tandy2k_state::vpac_cblank_w(int state) { m_cblank = state; } -WRITE_LINE_MEMBER( tandy2k_state::vpac_slg_w ) +void tandy2k_state::vpac_slg_w(int state) { m_slg = state; m_vac->slg_w(state); } -WRITE_LINE_MEMBER( tandy2k_state::vpac_sld_w ) +void tandy2k_state::vpac_sld_w(int state) { m_sld = state; @@ -691,13 +691,13 @@ TIMER_DEVICE_CALLBACK_MEMBER( tandy2k_state::vidldsh_tick ) // Intel 8251A Interface -WRITE_LINE_MEMBER( tandy2k_state::rxrdy_w ) +void tandy2k_state::rxrdy_w(int state) { m_rxrdy = state; m_pic0->ir2_w(m_rxrdy || m_txrdy); } -WRITE_LINE_MEMBER( tandy2k_state::txrdy_w ) +void tandy2k_state::txrdy_w(int state) { m_txrdy = state; m_pic0->ir2_w(m_rxrdy || m_txrdy); @@ -705,13 +705,13 @@ WRITE_LINE_MEMBER( tandy2k_state::txrdy_w ) // Intel 8253 Interface -WRITE_LINE_MEMBER( tandy2k_state::outspkr_w ) +void tandy2k_state::outspkr_w(int state) { m_outspkr = state; speaker_update(); } -WRITE_LINE_MEMBER( tandy2k_state::intbrclk_w ) +void tandy2k_state::intbrclk_w(int state) { if (!m_extclk) { @@ -720,35 +720,35 @@ WRITE_LINE_MEMBER( tandy2k_state::intbrclk_w ) } } -WRITE_LINE_MEMBER( tandy2k_state::rfrqpulse_w ) +void tandy2k_state::rfrqpulse_w(int state) { // memory refresh counter up } // Intel 8255A Interface -WRITE_LINE_MEMBER( tandy2k_state::write_centronics_ack ) +void tandy2k_state::write_centronics_ack(int state) { m_centronics_ack = state; m_i8255a->pc6_w(state); } -WRITE_LINE_MEMBER( tandy2k_state::write_centronics_busy ) +void tandy2k_state::write_centronics_busy(int state) { m_centronics_busy = state; } -WRITE_LINE_MEMBER( tandy2k_state::write_centronics_perror ) +void tandy2k_state::write_centronics_perror(int state) { m_centronics_perror = state; } -WRITE_LINE_MEMBER( tandy2k_state::write_centronics_select ) +void tandy2k_state::write_centronics_select(int state) { m_centronics_select = state; } -WRITE_LINE_MEMBER( tandy2k_state::write_centronics_fault ) +void tandy2k_state::write_centronics_fault(int state) { m_centronics_fault = state; } @@ -863,12 +863,12 @@ void tandy2k_state::ppi_pc_w(uint8_t data) // Intel 8272 Interface -WRITE_LINE_MEMBER( tandy2k_state::fdc_drq_w ) +void tandy2k_state::fdc_drq_w(int state) { dma_request(0, state); } -WRITE_LINE_MEMBER( tandy2k_state::fdc_hdl_w ) +void tandy2k_state::fdc_hdl_w(int state) { m_floppy0->mon_w(!state); m_floppy1->mon_w(!state); @@ -887,7 +887,7 @@ static void tandy2k_floppies(device_slot_interface &device) // Keyboard -WRITE_LINE_MEMBER( tandy2k_state::kbdclk_w ) +void tandy2k_state::kbdclk_w(int state) { if (!m_kbdclk && state) { @@ -898,7 +898,7 @@ WRITE_LINE_MEMBER( tandy2k_state::kbdclk_w ) m_kbdclk = state; } -WRITE_LINE_MEMBER( tandy2k_state::kbddat_w ) +void tandy2k_state::kbddat_w(int state) { if (!m_kbddat && state) { diff --git a/src/mame/trs/tandy2k.h b/src/mame/trs/tandy2k.h index bf62063651a..63a14d6335c 100644 --- a/src/mame/trs/tandy2k.h +++ b/src/mame/trs/tandy2k.h @@ -170,35 +170,35 @@ private: uint8_t fldtc_r(); void fldtc_w(uint8_t data); void addr_ctrl_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER( rxrdy_w ); - DECLARE_WRITE_LINE_MEMBER( txrdy_w ); - DECLARE_WRITE_LINE_MEMBER( outspkr_w ); - DECLARE_WRITE_LINE_MEMBER( intbrclk_w ); - DECLARE_WRITE_LINE_MEMBER( rfrqpulse_w ); + void rxrdy_w(int state); + void txrdy_w(int state); + void outspkr_w(int state); + void intbrclk_w(int state); + void rfrqpulse_w(int state); uint8_t ppi_pb_r(); void ppi_pc_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER( vpac_vlt_w ); - DECLARE_WRITE_LINE_MEMBER( vpac_drb_w ); - DECLARE_WRITE_LINE_MEMBER( vpac_wben_w ); - DECLARE_WRITE_LINE_MEMBER( vpac_cblank_w ); - DECLARE_WRITE_LINE_MEMBER( vpac_slg_w ); - DECLARE_WRITE_LINE_MEMBER( vpac_sld_w ); + void vpac_vlt_w(int state); + void vpac_drb_w(int state); + void vpac_wben_w(int state); + void vpac_cblank_w(int state); + void vpac_slg_w(int state); + void vpac_sld_w(int state); uint8_t hires_status_r(); void hires_plane_w(uint8_t data); void vidla_w(uint8_t data); void drb_attr_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER( kbdclk_w ); - DECLARE_WRITE_LINE_MEMBER( kbddat_w ); + void kbdclk_w(int state); + void kbddat_w(int state); uint8_t clkmouse_r(offs_t offset); void clkmouse_w(offs_t offset, uint8_t data); uint8_t irq_callback(offs_t offset); - DECLARE_WRITE_LINE_MEMBER( fdc_drq_w ); - DECLARE_WRITE_LINE_MEMBER( fdc_hdl_w ); - DECLARE_WRITE_LINE_MEMBER(write_centronics_ack); - DECLARE_WRITE_LINE_MEMBER(write_centronics_busy); - DECLARE_WRITE_LINE_MEMBER(write_centronics_perror); - DECLARE_WRITE_LINE_MEMBER(write_centronics_select); - DECLARE_WRITE_LINE_MEMBER(write_centronics_fault); + void fdc_drq_w(int state); + void fdc_hdl_w(int state); + void write_centronics_ack(int state); + void write_centronics_busy(int state); + void write_centronics_perror(int state); + void write_centronics_select(int state); + void write_centronics_fault(int state); CRT9021_DRAW_CHARACTER_MEMBER( vac_draw_character ); TIMER_DEVICE_CALLBACK_MEMBER( vidldsh_tick ); static void floppy_formats(format_registration &fr); diff --git a/src/mame/trs/tandy2kb.cpp b/src/mame/trs/tandy2kb.cpp index ab489ed3a2e..be56c5c96b9 100644 --- a/src/mame/trs/tandy2kb.cpp +++ b/src/mame/trs/tandy2kb.cpp @@ -250,7 +250,7 @@ void tandy2k_keyboard_device::device_reset() // power_w - //------------------------------------------------- -WRITE_LINE_MEMBER( tandy2k_keyboard_device::power_w ) +void tandy2k_keyboard_device::power_w(int state) { // TODO } @@ -260,7 +260,7 @@ WRITE_LINE_MEMBER( tandy2k_keyboard_device::power_w ) // reset_w - //------------------------------------------------- -WRITE_LINE_MEMBER( tandy2k_keyboard_device::reset_w ) +void tandy2k_keyboard_device::reset_w(int state) { if (!state) { @@ -273,7 +273,7 @@ WRITE_LINE_MEMBER( tandy2k_keyboard_device::reset_w ) // busy_w - //------------------------------------------------- -WRITE_LINE_MEMBER( tandy2k_keyboard_device::busy_w ) +void tandy2k_keyboard_device::busy_w(int state) { m_maincpu->set_input_line(MCS48_INPUT_IRQ, state ? CLEAR_LINE : ASSERT_LINE); } @@ -283,7 +283,7 @@ WRITE_LINE_MEMBER( tandy2k_keyboard_device::busy_w ) // data_r - //------------------------------------------------- -READ_LINE_MEMBER( tandy2k_keyboard_device::data_r ) +int tandy2k_keyboard_device::data_r() { return m_data; } diff --git a/src/mame/trs/tandy2kb.h b/src/mame/trs/tandy2kb.h index 09704267b10..04f7a74c376 100644 --- a/src/mame/trs/tandy2kb.h +++ b/src/mame/trs/tandy2kb.h @@ -37,10 +37,10 @@ public: auto clock_wr_callback() { return m_write_clock.bind(); } auto data_wr_callback() { return m_write_data.bind(); } - DECLARE_WRITE_LINE_MEMBER( power_w ); - DECLARE_WRITE_LINE_MEMBER( reset_w ); - DECLARE_WRITE_LINE_MEMBER( busy_w ); - DECLARE_READ_LINE_MEMBER( data_r ); + void power_w(int state); + void reset_w(int state); + void busy_w(int state); + int data_r(); protected: // device-level overrides diff --git a/src/mame/trs/trs80.h b/src/mame/trs/trs80.h index dbac92c8027..e74b021acc4 100644 --- a/src/mame/trs/trs80.h +++ b/src/mame/trs/trs80.h @@ -82,7 +82,7 @@ protected: INTERRUPT_GEN_MEMBER(rtc_interrupt); INTERRUPT_GEN_MEMBER(fdc_interrupt); TIMER_CALLBACK_MEMBER(cassette_data_callback); - DECLARE_WRITE_LINE_MEMBER(intrq_w); + void intrq_w(int state); DECLARE_QUICKLOAD_LOAD_MEMBER(quickload_cb); u8 m_irq = 0U; diff --git a/src/mame/trs/trs80_m.cpp b/src/mame/trs/trs80_m.cpp index d3d05ac9cf9..fc1d1743e64 100644 --- a/src/mame/trs/trs80_m.cpp +++ b/src/mame/trs/trs80_m.cpp @@ -209,7 +209,7 @@ INTERRUPT_GEN_MEMBER(trs80_state::rtc_interrupt) } -WRITE_LINE_MEMBER(trs80_state::intrq_w) +void trs80_state::intrq_w(int state) { if (state) { diff --git a/src/mame/trs/trs80m2.cpp b/src/mame/trs/trs80m2.cpp index 430bd5e7c98..a3cc7bc06c8 100644 --- a/src/mame/trs/trs80m2.cpp +++ b/src/mame/trs/trs80m2.cpp @@ -416,12 +416,12 @@ MC6845_UPDATE_ROW( trs80m2_state::crtc_update_row ) } } -WRITE_LINE_MEMBER( trs80m2_state::de_w ) +void trs80m2_state::de_w(int state) { m_de = state; } -WRITE_LINE_MEMBER( trs80m2_state::vsync_w ) +void trs80m2_state::vsync_w(int state) { if (state) { @@ -463,7 +463,7 @@ uint32_t trs80m2_state::screen_update(screen_device &screen, bitmap_rgb32 &bitma // TRS80M2_KEYBOARD_INTERFACE( kb_intf ) //------------------------------------------------- -WRITE_LINE_MEMBER( trs80m2_state::kb_clock_w ) +void trs80m2_state::kb_clock_w(int state) { int kbdata = m_kb->data_r(); @@ -522,17 +522,17 @@ void trs80m2_state::io_write_byte(offs_t offset, uint8_t data) // Z80PIO //------------------------------------------------- -WRITE_LINE_MEMBER( trs80m2_state::write_centronics_busy ) +void trs80m2_state::write_centronics_busy(int state) { m_centronics_busy = state; } -WRITE_LINE_MEMBER( trs80m2_state::write_centronics_fault ) +void trs80m2_state::write_centronics_fault(int state) { m_centronics_fault = state; } -WRITE_LINE_MEMBER( trs80m2_state::write_centronics_perror ) +void trs80m2_state::write_centronics_perror(int state) { m_centronics_perror = state; } @@ -598,7 +598,7 @@ void trs80m2_state::pio_pa_w(uint8_t data) m_centronics->write_init(BIT(data, 3)); } -WRITE_LINE_MEMBER( trs80m2_state::strobe_w ) +void trs80m2_state::strobe_w(int state) { m_centronics->write_strobe(!state); } diff --git a/src/mame/trs/trs80m2.h b/src/mame/trs/trs80m2.h index 094993029b2..f586b59d813 100644 --- a/src/mame/trs/trs80m2.h +++ b/src/mame/trs/trs80m2.h @@ -76,12 +76,12 @@ public: void nmi_w(uint8_t data); uint8_t fdc_r(offs_t offset); void fdc_w(offs_t offset, uint8_t data); - DECLARE_WRITE_LINE_MEMBER( de_w ); - DECLARE_WRITE_LINE_MEMBER( vsync_w ); + void de_w(int state); + void vsync_w(int state); uint8_t pio_pa_r(); void pio_pa_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER( strobe_w ); - DECLARE_WRITE_LINE_MEMBER( kb_clock_w ); + void strobe_w(int state); + void kb_clock_w(int state); void kbd_w(u8 data); MC6845_UPDATE_ROW( crtc_update_row ); @@ -89,9 +89,9 @@ public: uint8_t io_read_byte(offs_t offset); void io_write_byte(offs_t offset, uint8_t data); - DECLARE_WRITE_LINE_MEMBER(write_centronics_busy); - DECLARE_WRITE_LINE_MEMBER(write_centronics_fault); - DECLARE_WRITE_LINE_MEMBER(write_centronics_perror); + void write_centronics_busy(int state); + void write_centronics_fault(int state); + void write_centronics_perror(int state); void trs80m2(machine_config &config); void m68000_mem(address_map &map); diff --git a/src/mame/trs/trs80m2kb.cpp b/src/mame/trs/trs80m2kb.cpp index d1e4c5eb322..6bf716110b5 100644 --- a/src/mame/trs/trs80m2kb.cpp +++ b/src/mame/trs/trs80m2kb.cpp @@ -254,7 +254,7 @@ void trs80m2_keyboard_device::device_reset() // busy_w - //------------------------------------------------- -WRITE_LINE_MEMBER( trs80m2_keyboard_device::busy_w ) +void trs80m2_keyboard_device::busy_w(int state) { m_busy = state; } @@ -264,7 +264,7 @@ WRITE_LINE_MEMBER( trs80m2_keyboard_device::busy_w ) // data_r - //------------------------------------------------- -READ_LINE_MEMBER( trs80m2_keyboard_device::data_r ) +int trs80m2_keyboard_device::data_r() { return m_data; } @@ -273,7 +273,7 @@ READ_LINE_MEMBER( trs80m2_keyboard_device::data_r ) // kb_t1_r - //------------------------------------------------- -READ_LINE_MEMBER( trs80m2_keyboard_device::kb_t1_r ) +int trs80m2_keyboard_device::kb_t1_r() { return m_busy; } diff --git a/src/mame/trs/trs80m2kb.h b/src/mame/trs/trs80m2kb.h index 2a6eea1a3a9..a1b26fe1a92 100644 --- a/src/mame/trs/trs80m2kb.h +++ b/src/mame/trs/trs80m2kb.h @@ -37,8 +37,8 @@ public: auto clock_wr_callback() { return m_write_clock.bind(); } - DECLARE_WRITE_LINE_MEMBER( busy_w ); - DECLARE_READ_LINE_MEMBER( data_r ); + void busy_w(int state); + int data_r(); protected: // device-level overrides @@ -68,7 +68,7 @@ private: uint8_t m_keylatch; - DECLARE_READ_LINE_MEMBER( kb_t1_r ); + int kb_t1_r(); uint8_t kb_p0_r(); void kb_p1_w(uint8_t data); void kb_p2_w(uint8_t data); diff --git a/src/mame/trs/trs80m3.h b/src/mame/trs/trs80m3.h index 8c237ba2a44..8c03703f0e9 100644 --- a/src/mame/trs/trs80m3.h +++ b/src/mame/trs/trs80m3.h @@ -95,8 +95,8 @@ private: INTERRUPT_GEN_MEMBER(rtc_interrupt); INTERRUPT_GEN_MEMBER(fdc_interrupt); TIMER_CALLBACK_MEMBER(cassette_data_callback); - DECLARE_WRITE_LINE_MEMBER(intrq_w); - DECLARE_WRITE_LINE_MEMBER(drq_w); + void intrq_w(int state); + void drq_w(int state); DECLARE_QUICKLOAD_LOAD_MEMBER(quickload_cb); uint32_t screen_update_trs80m3(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); diff --git a/src/mame/trs/trs80m3_m.cpp b/src/mame/trs/trs80m3_m.cpp index 724170a1819..5711d1c5a38 100644 --- a/src/mame/trs/trs80m3_m.cpp +++ b/src/mame/trs/trs80m3_m.cpp @@ -473,7 +473,7 @@ INTERRUPT_GEN_MEMBER(trs80m3_state::rtc_interrupt) } // The floppy sector has been read. Enable CPU and NMI. -WRITE_LINE_MEMBER(trs80m3_state::intrq_w) +void trs80m3_state::intrq_w(int state) { m_intrq_off = state ? false : true; if (state) @@ -490,7 +490,7 @@ WRITE_LINE_MEMBER(trs80m3_state::intrq_w) } // The next byte from floppy is available. Enable CPU so it can get the byte. -WRITE_LINE_MEMBER(trs80m3_state::drq_w) +void trs80m3_state::drq_w(int state) { m_drq_off = state ? false : true; if (state) diff --git a/src/mame/tvgames/elan_ep3a19a.cpp b/src/mame/tvgames/elan_ep3a19a.cpp index 030a2842eb5..2046e3540cb 100644 --- a/src/mame/tvgames/elan_ep3a19a.cpp +++ b/src/mame/tvgames/elan_ep3a19a.cpp @@ -76,12 +76,12 @@ private: required_device m_gfxdecode; required_device m_palette; - //DECLARE_WRITE_LINE_MEMBER(sound_end0) { m_sys->generate_custom_interrupt(2); } - //DECLARE_WRITE_LINE_MEMBER(sound_end1) { m_sys->generate_custom_interrupt(3); } - //DECLARE_WRITE_LINE_MEMBER(sound_end2) { m_sys->generate_custom_interrupt(4); } - //DECLARE_WRITE_LINE_MEMBER(sound_end3) { m_sys->generate_custom_interrupt(5); } - //DECLARE_WRITE_LINE_MEMBER(sound_end4) { m_sys->generate_custom_interrupt(6); } - //DECLARE_WRITE_LINE_MEMBER(sound_end5) { m_sys->generate_custom_interrupt(7); } + //void sound_end0(int state) { m_sys->generate_custom_interrupt(2); } + //void sound_end1(int state) { m_sys->generate_custom_interrupt(3); } + //void sound_end2(int state) { m_sys->generate_custom_interrupt(4); } + //void sound_end3(int state) { m_sys->generate_custom_interrupt(5); } + //void sound_end4(int state) { m_sys->generate_custom_interrupt(6); } + //void sound_end5(int state) { m_sys->generate_custom_interrupt(7); } uint8_t nmi_vector_r(offs_t offset) { diff --git a/src/mame/tvgames/elan_eu3a05.cpp b/src/mame/tvgames/elan_eu3a05.cpp index 857e07b6336..e7ce4996745 100644 --- a/src/mame/tvgames/elan_eu3a05.cpp +++ b/src/mame/tvgames/elan_eu3a05.cpp @@ -289,12 +289,12 @@ private: required_device m_gfxdecode; required_device m_palette; - DECLARE_WRITE_LINE_MEMBER(sound_end0) { m_sys->generate_custom_interrupt(2); } - DECLARE_WRITE_LINE_MEMBER(sound_end1) { m_sys->generate_custom_interrupt(3); } - DECLARE_WRITE_LINE_MEMBER(sound_end2) { m_sys->generate_custom_interrupt(4); } - DECLARE_WRITE_LINE_MEMBER(sound_end3) { m_sys->generate_custom_interrupt(5); } - DECLARE_WRITE_LINE_MEMBER(sound_end4) { m_sys->generate_custom_interrupt(6); } - DECLARE_WRITE_LINE_MEMBER(sound_end5) { m_sys->generate_custom_interrupt(7); } + void sound_end0(int state) { m_sys->generate_custom_interrupt(2); } + void sound_end1(int state) { m_sys->generate_custom_interrupt(3); } + void sound_end2(int state) { m_sys->generate_custom_interrupt(4); } + void sound_end3(int state) { m_sys->generate_custom_interrupt(5); } + void sound_end4(int state) { m_sys->generate_custom_interrupt(6); } + void sound_end5(int state) { m_sys->generate_custom_interrupt(7); } }; class elan_eu3a05_buzztime_state : public elan_eu3a05_state diff --git a/src/mame/tvgames/elan_eu3a14.cpp b/src/mame/tvgames/elan_eu3a14.cpp index eac056fa339..8274b61bb32 100644 --- a/src/mame/tvgames/elan_eu3a14.cpp +++ b/src/mame/tvgames/elan_eu3a14.cpp @@ -149,12 +149,12 @@ private: uint8_t m_portdir[3]; - DECLARE_WRITE_LINE_MEMBER(sound_end0) { m_sys->generate_custom_interrupt(2); } - DECLARE_WRITE_LINE_MEMBER(sound_end1) { m_sys->generate_custom_interrupt(3); } - DECLARE_WRITE_LINE_MEMBER(sound_end2) { m_sys->generate_custom_interrupt(4); } - DECLARE_WRITE_LINE_MEMBER(sound_end3) { m_sys->generate_custom_interrupt(5); } - DECLARE_WRITE_LINE_MEMBER(sound_end4) { m_sys->generate_custom_interrupt(6); } - DECLARE_WRITE_LINE_MEMBER(sound_end5) { m_sys->generate_custom_interrupt(7); } + void sound_end0(int state) { m_sys->generate_custom_interrupt(2); } + void sound_end1(int state) { m_sys->generate_custom_interrupt(3); } + void sound_end2(int state) { m_sys->generate_custom_interrupt(4); } + void sound_end3(int state) { m_sys->generate_custom_interrupt(5); } + void sound_end4(int state) { m_sys->generate_custom_interrupt(6); } + void sound_end5(int state) { m_sys->generate_custom_interrupt(7); } }; diff --git a/src/mame/tvgames/generalplus_gpl162xx_lcdtype.cpp b/src/mame/tvgames/generalplus_gpl162xx_lcdtype.cpp index fc854a7006b..570ed7a518d 100644 --- a/src/mame/tvgames/generalplus_gpl162xx_lcdtype.cpp +++ b/src/mame/tvgames/generalplus_gpl162xx_lcdtype.cpp @@ -173,7 +173,7 @@ private: required_ioport m_io_in1; required_device m_menucontrol; - DECLARE_WRITE_LINE_MEMBER(screen_vblank); + void screen_vblank(int state); }; uint32_t gpl162xx_lcdtype_state::screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect) @@ -820,7 +820,7 @@ void gpl162xx_lcdtype_state::machine_reset() // m_spirom[0x16001] = (gamenum>>8) & 0xff; } -WRITE_LINE_MEMBER(gpl162xx_lcdtype_state::screen_vblank) +void gpl162xx_lcdtype_state::screen_vblank(int state) { if (state) { diff --git a/src/mame/tvgames/spg2xx_jakks_gkr.cpp b/src/mame/tvgames/spg2xx_jakks_gkr.cpp index b39d4f9820d..4fc85b99342 100644 --- a/src/mame/tvgames/spg2xx_jakks_gkr.cpp +++ b/src/mame/tvgames/spg2xx_jakks_gkr.cpp @@ -41,7 +41,7 @@ public: void jakks_gkr_wp(machine_config &config); void jakks_gkr_cb(machine_config &config); - DECLARE_READ_LINE_MEMBER(i2c_gkr_r); + int i2c_gkr_r(); protected: [[maybe_unused]] uint16_t jakks_porta_r(); @@ -67,7 +67,7 @@ private: optional_ioport m_analog_y; }; -READ_LINE_MEMBER(jakks_gkr_state::i2c_gkr_r) +int jakks_gkr_state::i2c_gkr_r() { if (m_cart && m_cart->exists()) { diff --git a/src/mame/tvgames/spg2xx_jakks_tvtouch.cpp b/src/mame/tvgames/spg2xx_jakks_tvtouch.cpp index 4b8a273c7a9..69707f2bd54 100644 --- a/src/mame/tvgames/spg2xx_jakks_tvtouch.cpp +++ b/src/mame/tvgames/spg2xx_jakks_tvtouch.cpp @@ -26,7 +26,7 @@ private: void porta_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0) override; void portb_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0) override; void portc_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0) override; - DECLARE_WRITE_LINE_MEMBER(spi_w); + void spi_w(int state); uint8_t m_spi_bit = 0; uint8_t m_spi_val = 0; @@ -234,7 +234,7 @@ void jakks_tvtouch_state::portc_w(offs_t offset, uint16_t data, uint16_t mem_mas m_i2cmem->write_sda(BIT(data, 0)); } -WRITE_LINE_MEMBER(jakks_tvtouch_state::spi_w) +void jakks_tvtouch_state::spi_w(int state) { m_spi_val |= state << m_spi_bit; if (m_spi_bit == 0) diff --git a/src/mame/tvgames/spg2xx_playvision.cpp b/src/mame/tvgames/spg2xx_playvision.cpp index c3f701b5941..1d2d2f2b232 100644 --- a/src/mame/tvgames/spg2xx_playvision.cpp +++ b/src/mame/tvgames/spg2xx_playvision.cpp @@ -24,7 +24,7 @@ public: void pvmil(machine_config &config); - DECLARE_READ_LINE_MEMBER(pvmil_p4buttons_r); + int pvmil_p4buttons_r(); protected: virtual void machine_start() override; @@ -66,7 +66,7 @@ void pvmil_state::portb_w(offs_t offset, uint16_t data, uint16_t mem_mask) } -READ_LINE_MEMBER(pvmil_state::pvmil_p4buttons_r) +int pvmil_state::pvmil_p4buttons_r() { return m_latchbit; } diff --git a/src/mame/tvgames/xavix.cpp b/src/mame/tvgames/xavix.cpp index f0ddb7093e5..1e437728ea3 100644 --- a/src/mame/tvgames/xavix.cpp +++ b/src/mame/tvgames/xavix.cpp @@ -644,7 +644,7 @@ INPUT_PORTS_END */ -READ_LINE_MEMBER( xavix_mtrk_state::mtrk_wheel_r ) +int xavix_mtrk_state::mtrk_wheel_r() { return m_wheel->read_direction(); } diff --git a/src/mame/tvgames/xavix.h b/src/mame/tvgames/xavix.h index a43413623b1..02d56642bfe 100644 --- a/src/mame/tvgames/xavix.h +++ b/src/mame/tvgames/xavix.h @@ -129,10 +129,10 @@ public: void init_xavix(); - DECLARE_WRITE_LINE_MEMBER(ioevent_trg01); - DECLARE_WRITE_LINE_MEMBER(ioevent_trg02); - DECLARE_WRITE_LINE_MEMBER(ioevent_trg04); - DECLARE_WRITE_LINE_MEMBER(ioevent_trg08); + void ioevent_trg01(int state); + void ioevent_trg02(int state); + void ioevent_trg04(int state); + void ioevent_trg08(int state); int m_rgnlen = 0; uint8_t* m_rgn = nullptr; @@ -669,7 +669,7 @@ public: : xavix_i2c_state(mconfig, type, tag) { } - DECLARE_READ_LINE_MEMBER(camera_r); + int camera_r(); protected: //virtual void write_io1(uint8_t data, uint8_t direction) override; @@ -689,7 +689,7 @@ public: void xavix_mtrk(machine_config &config); void xavix_mtrkp(machine_config &config); - DECLARE_READ_LINE_MEMBER( mtrk_wheel_r ); + int mtrk_wheel_r(); protected: required_device m_wheel; @@ -933,7 +933,7 @@ public: void xavix_cart_popira2(machine_config &config); - DECLARE_READ_LINE_MEMBER(i2c_r); + int i2c_r(); protected: virtual void write_io1(uint8_t data, uint8_t direction) override; @@ -952,7 +952,7 @@ public: : xavix_cart_state(mconfig,type,tag) { } - DECLARE_READ_LINE_MEMBER(i2c_r); + int i2c_r(); protected: virtual void write_io1(uint8_t data, uint8_t direction) override; @@ -969,8 +969,8 @@ public: m_extraiowrite(0) { } - DECLARE_READ_LINE_MEMBER(ekara_multi0_r); - DECLARE_READ_LINE_MEMBER(ekara_multi1_r); + int ekara_multi0_r(); + int ekara_multi1_r(); // void xavix_ekara(machine_config &config); diff --git a/src/mame/tvgames/xavix_2002.cpp b/src/mame/tvgames/xavix_2002.cpp index 3a1475f444c..7edb605b4ca 100644 --- a/src/mame/tvgames/xavix_2002.cpp +++ b/src/mame/tvgames/xavix_2002.cpp @@ -309,12 +309,12 @@ void xavix_i2c_jmat_state::write_extended_io2(uint8_t data) LOG("%s: io2_data_w %02x\n", machine().describe_context(), data); } -READ_LINE_MEMBER(xavix_i2c_lotr_state::camera_r) // seems to be some kind of camera status bits +int xavix_i2c_lotr_state::camera_r() // seems to be some kind of camera status bits { return machine().rand(); } -READ_LINE_MEMBER(xavix_i2c_bowl_state::camera_r) // seems to be some kind of camera status bits +int xavix_i2c_bowl_state::camera_r() // seems to be some kind of camera status bits { return machine().rand(); } diff --git a/src/mame/tvgames/xavix_2002.h b/src/mame/tvgames/xavix_2002.h index 9d7012f93e0..c60fe55373e 100644 --- a/src/mame/tvgames/xavix_2002.h +++ b/src/mame/tvgames/xavix_2002.h @@ -48,7 +48,7 @@ public: : xavix_i2c_state(mconfig, type, tag) { } - DECLARE_READ_LINE_MEMBER(camera_r); + int camera_r(); }; diff --git a/src/mame/tvgames/xavix_m.cpp b/src/mame/tvgames/xavix_m.cpp index cc8c2b02e22..db0107dacba 100644 --- a/src/mame/tvgames/xavix_m.cpp +++ b/src/mame/tvgames/xavix_m.cpp @@ -187,22 +187,22 @@ void xavix_state::process_ioevent(uint8_t bits) } } -WRITE_LINE_MEMBER(xavix_state::ioevent_trg01) +void xavix_state::ioevent_trg01(int state) { process_ioevent(0x01); } -WRITE_LINE_MEMBER(xavix_state::ioevent_trg02) +void xavix_state::ioevent_trg02(int state) { process_ioevent(0x02); } -WRITE_LINE_MEMBER(xavix_state::ioevent_trg04) +void xavix_state::ioevent_trg04(int state) { process_ioevent(0x04); } -WRITE_LINE_MEMBER(xavix_state::ioevent_trg08) +void xavix_state::ioevent_trg08(int state) { process_ioevent(0x08); } @@ -380,7 +380,7 @@ void xavix_state::dispctrl_posirq_y_w(uint8_t data) -READ_LINE_MEMBER(xavix_ekara_state::ekara_multi0_r) +int xavix_ekara_state::ekara_multi0_r() { switch (m_extraioselect & 0x7f) { @@ -398,7 +398,7 @@ READ_LINE_MEMBER(xavix_ekara_state::ekara_multi0_r) return 0x00; } -READ_LINE_MEMBER(xavix_ekara_state::ekara_multi1_r) +int xavix_ekara_state::ekara_multi1_r() { switch (m_extraioselect & 0x7f) { @@ -505,7 +505,7 @@ void xavix_ekara_state::write_io1(uint8_t data, uint8_t direction) // the cart pins Popira 2 uses for IO with cart gc0010 are not controllable by the CPU on other ekara systems -READ_LINE_MEMBER(xavix_popira2_cart_state::i2c_r) +int xavix_popira2_cart_state::i2c_r() { if (m_cartslot->has_cart()) return m_cartslot->read_sda(); @@ -522,7 +522,7 @@ void xavix_popira2_cart_state::write_io1(uint8_t data, uint8_t direction) } } -READ_LINE_MEMBER(xavix_evio_cart_state::i2c_r) +int xavix_evio_cart_state::i2c_r() { if (m_cartslot->has_cart()) return m_cartslot->read_sda(); diff --git a/src/mame/unisys/univac.cpp b/src/mame/unisys/univac.cpp index a3e9a9acc6a..55a191891d6 100644 --- a/src/mame/unisys/univac.cpp +++ b/src/mame/unisys/univac.cpp @@ -167,21 +167,21 @@ private: void bank_w(offs_t offset, u8 data); void nvram_w(offs_t offset, u8 data); - DECLARE_WRITE_LINE_MEMBER(nvram_protect_w); - DECLARE_WRITE_LINE_MEMBER(select_disp_w); - DECLARE_WRITE_LINE_MEMBER(ram_control_w); - DECLARE_WRITE_LINE_MEMBER(parity_poison_w); - DECLARE_WRITE_LINE_MEMBER(display_enable_w); - DECLARE_WRITE_LINE_MEMBER(alarm_enable_w); - DECLARE_WRITE_LINE_MEMBER(sio_loopback_w); - DECLARE_WRITE_LINE_MEMBER(sio_txda_w); - DECLARE_WRITE_LINE_MEMBER(sio_txdb_w); - DECLARE_WRITE_LINE_MEMBER(aux_rxd_w); - DECLARE_WRITE_LINE_MEMBER(sio_rtsb_w); - DECLARE_WRITE_LINE_MEMBER(sio_wrdyb_w); - DECLARE_WRITE_LINE_MEMBER(aux_dsr_w); - DECLARE_WRITE_LINE_MEMBER(loopback_rxcb_w); - DECLARE_WRITE_LINE_MEMBER(porte6_w); + void nvram_protect_w(int state); + void select_disp_w(int state); + void ram_control_w(int state); + void parity_poison_w(int state); + void display_enable_w(int state); + void alarm_enable_w(int state); + void sio_loopback_w(int state); + void sio_txda_w(int state); + void sio_txdb_w(int state); + void aux_rxd_w(int state); + void sio_rtsb_w(int state); + void sio_wrdyb_w(int state); + void aux_dsr_w(int state); + void loopback_rxcb_w(int state); + void porte6_w(int state); u32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); @@ -274,7 +274,7 @@ void univac_state::nvram_w(offs_t offset, u8 data) m_p_nvram[offset] = data | 0xf0; } -WRITE_LINE_MEMBER(univac_state::nvram_protect_w) +void univac_state::nvram_protect_w(int state) { // There seems to be some timing-based write protection related to the CTC's TRG0 input. // The present implementation is a crude approximation of a wild guess. @@ -290,27 +290,27 @@ WRITE_LINE_MEMBER(univac_state::nvram_protect_w) } } -WRITE_LINE_MEMBER(univac_state::select_disp_w) +void univac_state::select_disp_w(int state) { m_disp_mask = state ? 0x2000 : 0x0000; } -WRITE_LINE_MEMBER(univac_state::ram_control_w) +void univac_state::ram_control_w(int state) { m_bank_mask = state ? 0x2000 : 0x0000; } -WRITE_LINE_MEMBER(univac_state::parity_poison_w) +void univac_state::parity_poison_w(int state) { m_parity_poison = state; } -WRITE_LINE_MEMBER(univac_state::display_enable_w) +void univac_state::display_enable_w(int state) { m_display_enable = state; } -WRITE_LINE_MEMBER(univac_state::alarm_enable_w) +void univac_state::alarm_enable_w(int state) { m_alarm_enable = state; if (!state) @@ -320,7 +320,7 @@ WRITE_LINE_MEMBER(univac_state::alarm_enable_w) } } -WRITE_LINE_MEMBER(univac_state::sio_loopback_w) +void univac_state::sio_loopback_w(int state) { if (state) { @@ -352,14 +352,14 @@ WRITE_LINE_MEMBER(univac_state::sio_loopback_w) m_loopback_control = state; } -WRITE_LINE_MEMBER(univac_state::sio_txda_w) +void univac_state::sio_txda_w(int state) { m_sio_txda = state; if (m_loopback_control) m_sio->rxa_w(state); } -WRITE_LINE_MEMBER(univac_state::sio_txdb_w) +void univac_state::sio_txdb_w(int state) { m_sio_txdb = state; if (m_loopback_control) @@ -368,14 +368,14 @@ WRITE_LINE_MEMBER(univac_state::sio_txdb_w) m_printer->write_txd(state); } -WRITE_LINE_MEMBER(univac_state::aux_rxd_w) +void univac_state::aux_rxd_w(int state) { m_aux_rxd = state; if (!m_loopback_control) m_sio->rxb_w(state); } -WRITE_LINE_MEMBER(univac_state::sio_rtsb_w) +void univac_state::sio_rtsb_w(int state) { m_sio_rtsb = state; if (m_loopback_control) @@ -384,7 +384,7 @@ WRITE_LINE_MEMBER(univac_state::sio_rtsb_w) m_printer->write_rts(state); } -WRITE_LINE_MEMBER(univac_state::sio_wrdyb_w) +void univac_state::sio_wrdyb_w(int state) { m_sio_wrdyb = state; if (m_loopback_control) @@ -396,7 +396,7 @@ WRITE_LINE_MEMBER(univac_state::sio_wrdyb_w) m_keyboard->ready_w(state); } -WRITE_LINE_MEMBER(univac_state::aux_dsr_w) +void univac_state::aux_dsr_w(int state) { m_aux_dsr = state; if (!m_loopback_control) @@ -406,13 +406,13 @@ WRITE_LINE_MEMBER(univac_state::aux_dsr_w) } } -WRITE_LINE_MEMBER(univac_state::loopback_rxcb_w) +void univac_state::loopback_rxcb_w(int state) { if (m_loopback_control) m_sio->rxcb_w(state); } -WRITE_LINE_MEMBER(univac_state::porte6_w) +void univac_state::porte6_w(int state) { //m_beep->set_state(state); // not sure what belongs here, but it isn't the beeper } diff --git a/src/mame/universal/cheekyms.cpp b/src/mame/universal/cheekyms.cpp index c14a87a960b..63f179e5147 100644 --- a/src/mame/universal/cheekyms.cpp +++ b/src/mame/universal/cheekyms.cpp @@ -114,7 +114,7 @@ void cheekyms_state::machine_start() save_item(NAME(m_irq_mask)); } -WRITE_LINE_MEMBER(cheekyms_state::vblank_int_w) +void cheekyms_state::vblank_int_w(int state) { if (m_irq_mask) m_maincpu->set_input_line(0, ASSERT_LINE); diff --git a/src/mame/universal/cheekyms.h b/src/mame/universal/cheekyms.h index 0c1f338a090..053e3aacd51 100644 --- a/src/mame/universal/cheekyms.h +++ b/src/mame/universal/cheekyms.h @@ -44,7 +44,7 @@ private: void port_40_w(uint8_t data); void port_80_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(vblank_int_w); + void vblank_int_w(int state); TILE_GET_INFO_MEMBER(get_tile_info); diff --git a/src/mame/universal/cheekyms_a.cpp b/src/mame/universal/cheekyms_a.cpp index f5268f62b10..199d886ce96 100644 --- a/src/mame/universal/cheekyms_a.cpp +++ b/src/mame/universal/cheekyms_a.cpp @@ -26,15 +26,15 @@ cheekyms_audio_device::cheekyms_audio_device(const machine_config &mconfig, cons } -WRITE_LINE_MEMBER(cheekyms_audio_device::mute_w) { m_mute->write_line(state); } -WRITE_LINE_MEMBER(cheekyms_audio_device::cheese_w) { m_cheese->write_line(state); } -WRITE_LINE_MEMBER(cheekyms_audio_device::music_w) { m_music->write_line(state); } -WRITE_LINE_MEMBER(cheekyms_audio_device::mouse_w) { m_mouse->write_line(state); } -WRITE_LINE_MEMBER(cheekyms_audio_device::hammer_w) { m_hammer->write_line(state); } -WRITE_LINE_MEMBER(cheekyms_audio_device::pest_w) { m_pest->write_line(state); } -WRITE_LINE_MEMBER(cheekyms_audio_device::mouse_dies_w) { m_mouse_dies->write_line(state); } -WRITE_LINE_MEMBER(cheekyms_audio_device::pest_dies_w) { m_pest_dies->write_line(state); } -WRITE_LINE_MEMBER(cheekyms_audio_device::coin_extra_w) { m_coin_extra->write_line(state); } +void cheekyms_audio_device::mute_w(int state) { m_mute->write_line(state); } +void cheekyms_audio_device::cheese_w(int state) { m_cheese->write_line(state); } +void cheekyms_audio_device::music_w(int state) { m_music->write_line(state); } +void cheekyms_audio_device::mouse_w(int state) { m_mouse->write_line(state); } +void cheekyms_audio_device::hammer_w(int state) { m_hammer->write_line(state); } +void cheekyms_audio_device::pest_w(int state) { m_pest->write_line(state); } +void cheekyms_audio_device::mouse_dies_w(int state) { m_mouse_dies->write_line(state); } +void cheekyms_audio_device::pest_dies_w(int state) { m_pest_dies->write_line(state); } +void cheekyms_audio_device::coin_extra_w(int state) { m_coin_extra->write_line(state); } void cheekyms_audio_device::device_add_mconfig(machine_config &config) diff --git a/src/mame/universal/cheekyms_a.h b/src/mame/universal/cheekyms_a.h index dbc3c57cd97..def50bfa3f2 100644 --- a/src/mame/universal/cheekyms_a.h +++ b/src/mame/universal/cheekyms_a.h @@ -13,15 +13,15 @@ class cheekyms_audio_device : public device_t public: cheekyms_audio_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - DECLARE_WRITE_LINE_MEMBER(mute_w); // 15 - DECLARE_WRITE_LINE_MEMBER(cheese_w); // 13 - DECLARE_WRITE_LINE_MEMBER(music_w); // 14 - DECLARE_WRITE_LINE_MEMBER(mouse_w); // 9 - DECLARE_WRITE_LINE_MEMBER(hammer_w); // 12 - DECLARE_WRITE_LINE_MEMBER(pest_w); // 8 - DECLARE_WRITE_LINE_MEMBER(mouse_dies_w); // 11 - DECLARE_WRITE_LINE_MEMBER(pest_dies_w); // 10 - DECLARE_WRITE_LINE_MEMBER(coin_extra_w); // 16 + void mute_w(int state); // 15 + void cheese_w(int state); // 13 + void music_w(int state); // 14 + void mouse_w(int state); // 9 + void hammer_w(int state); // 12 + void pest_w(int state); // 8 + void mouse_dies_w(int state); // 11 + void pest_dies_w(int state); // 10 + void coin_extra_w(int state); // 16 protected: virtual void device_add_mconfig(machine_config &config) override; diff --git a/src/mame/universal/cosmic.cpp b/src/mame/universal/cosmic.cpp index be00eb9bbd0..9bde0b01de6 100644 --- a/src/mame/universal/cosmic.cpp +++ b/src/mame/universal/cosmic.cpp @@ -326,7 +326,7 @@ void cosmic_state::magspot_map(address_map &map) } -WRITE_LINE_MEMBER(cosmic_state::panic_coin_inserted) +void cosmic_state::panic_coin_inserted(int state) { if (m_sound_enabled && !state) m_samples->start(0, 10); /* Coin - Not triggered by software */ diff --git a/src/mame/universal/cosmic.h b/src/mame/universal/cosmic.h index 46152b56cff..d28d9ece04d 100644 --- a/src/mame/universal/cosmic.h +++ b/src/mame/universal/cosmic.h @@ -49,7 +49,7 @@ public: void init_cosmica(); void init_panic(); - DECLARE_WRITE_LINE_MEMBER(panic_coin_inserted); + void panic_coin_inserted(int state); DECLARE_INPUT_CHANGED_MEMBER(cosmica_coin_inserted); DECLARE_INPUT_CHANGED_MEMBER(coin_inserted_irq0); DECLARE_INPUT_CHANGED_MEMBER(coin_inserted_nmi); diff --git a/src/mame/universal/docastle.cpp b/src/mame/universal/docastle.cpp index f8dbdd45581..6e0618f922e 100644 --- a/src/mame/universal/docastle.cpp +++ b/src/mame/universal/docastle.cpp @@ -182,7 +182,7 @@ Dip locations verified with manual for docastle, dorunrun and dowild. /* Read/Write Handlers */ -WRITE_LINE_MEMBER(docastle_state::docastle_tint) +void docastle_state::docastle_tint(int state) { if (state) { @@ -193,7 +193,7 @@ WRITE_LINE_MEMBER(docastle_state::docastle_tint) } } -WRITE_LINE_MEMBER(docastle_state::idsoccer_adpcm_int) +void docastle_state::idsoccer_adpcm_int(int state) { if (m_adpcm_pos >= memregion("adpcm")->bytes()) { diff --git a/src/mame/universal/docastle.h b/src/mame/universal/docastle.h index 467c005f02a..903422698a4 100644 --- a/src/mame/universal/docastle.h +++ b/src/mame/universal/docastle.h @@ -89,8 +89,8 @@ private: uint32_t screen_update_docastle(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); void video_start_common( uint32_t tile_transmask ); void draw_sprites( screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect ); - DECLARE_WRITE_LINE_MEMBER(docastle_tint); - DECLARE_WRITE_LINE_MEMBER(idsoccer_adpcm_int); + void docastle_tint(int state); + void idsoccer_adpcm_int(int state); void docastle_io_map(address_map &map); void docastle_map(address_map &map); void docastle_map2(address_map &map); diff --git a/src/mame/universal/getaway.cpp b/src/mame/universal/getaway.cpp index 29a26ef8d72..ecf28ab3856 100644 --- a/src/mame/universal/getaway.cpp +++ b/src/mame/universal/getaway.cpp @@ -82,7 +82,7 @@ private: void io_map(address_map &map); u32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(vblank_irq); + void vblank_irq(int state); void io_w(offs_t offset, u8 data); u8 dsw_r(offs_t offset); @@ -141,7 +141,7 @@ u32 getaway_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, co I/O ******************************************************************************/ -WRITE_LINE_MEMBER(getaway_state::vblank_irq) +void getaway_state::vblank_irq(int state) { if (state) m_maincpu->pulse_input_line(INT_9900_INTREQ, 2 * m_maincpu->minimum_quantum_time()); diff --git a/src/mame/universal/zerohour.cpp b/src/mame/universal/zerohour.cpp index dc1b1bf5b06..c0f22c848cd 100644 --- a/src/mame/universal/zerohour.cpp +++ b/src/mame/universal/zerohour.cpp @@ -84,8 +84,8 @@ protected: void videoram_w(offs_t offset, u8 data); void irqack_w(u8 data) { m_maincpu->set_input_line(0, CLEAR_LINE); } void star_reset_w(u8 data); - template DECLARE_WRITE_LINE_MEMBER(star_w); - DECLARE_WRITE_LINE_MEMBER(sound_enable_w); + template void star_w(int state); + void sound_enable_w(int state); void palette(palette_device &palette) const; TILE_GET_INFO_MEMBER(get_fg_tile_info); @@ -111,7 +111,7 @@ protected: int m_gfxbank = 0; // redclash only private: - template DECLARE_WRITE_LINE_MEMBER(sample_w); + template void sample_w(int state); }; // redclash, adds background layer, one extra sound channel @@ -132,11 +132,11 @@ protected: virtual u32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) override; private: - DECLARE_WRITE_LINE_MEMBER(gfxbank_w); + void gfxbank_w(int state); void background_w(u8 data); void beep_freq_w(u8 data) { m_beep_freq = data; } - DECLARE_WRITE_LINE_MEMBER(sample_w); - DECLARE_WRITE_LINE_MEMBER(beep_trigger_w); + void sample_w(int state); + void beep_trigger_w(int state); TIMER_DEVICE_CALLBACK_MEMBER(beeper_off) { m_beep_clock->set_period(attotime::never); } @@ -276,7 +276,7 @@ void zerohour_state::videoram_w(offs_t offset, u8 data) m_fg_tilemap->mark_tile_dirty(offset); } -WRITE_LINE_MEMBER(redclash_state::gfxbank_w) +void redclash_state::gfxbank_w(int state) { m_gfxbank = state; } @@ -288,7 +288,7 @@ void redclash_state::background_w(u8 data) m_background = data; } -template WRITE_LINE_MEMBER(zerohour_state::star_w) +template void zerohour_state::star_w(int state) { m_stars->set_speed(state ? 1 << N : 0, 1U << N); } @@ -472,14 +472,14 @@ static const char *const redclash_sample_names[] = nullptr }; -WRITE_LINE_MEMBER(zerohour_state::sound_enable_w) +void zerohour_state::sound_enable_w(int state) { if (!state && m_samples) m_samples->stop_all(); m_sound_on = state; } -template WRITE_LINE_MEMBER(zerohour_state::sample_w) +template void zerohour_state::sample_w(int state) { int sample = N; @@ -505,14 +505,14 @@ template WRITE_LINE_MEMBER(zerohour_state::sample_w) m_samples->stop(N); } -WRITE_LINE_MEMBER(redclash_state::sample_w) +void redclash_state::sample_w(int state) { // only one sample if (m_sound_on && state) m_samples->start(0, 0); } -WRITE_LINE_MEMBER(redclash_state::beep_trigger_w) +void redclash_state::beep_trigger_w(int state) { if (state) { diff --git a/src/mame/upl/mouser.cpp b/src/mame/upl/mouser.cpp index 3d57b12bd12..7c05ca7e8e7 100644 --- a/src/mame/upl/mouser.cpp +++ b/src/mame/upl/mouser.cpp @@ -66,13 +66,13 @@ private: required_device m_palette; required_shared_ptr m_decrypted_opcodes; - DECLARE_WRITE_LINE_MEMBER(nmi_enable_w); + void nmi_enable_w(int state); void sound_nmi_clear_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(flip_screen_x_w); - DECLARE_WRITE_LINE_MEMBER(flip_screen_y_w); + void flip_screen_x_w(int state); + void flip_screen_y_w(int state); void palette(palette_device &palette) const; uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(nmi_interrupt); + void nmi_interrupt(int state); INTERRUPT_GEN_MEMBER(sound_nmi_assert); void decrypted_opcodes_map(address_map &map); void main_map(address_map &map); @@ -127,12 +127,12 @@ void mouser_state::palette(palette_device &palette) const } } -WRITE_LINE_MEMBER(mouser_state::flip_screen_x_w) +void mouser_state::flip_screen_x_w(int state) { flip_screen_x_set(!state); } -WRITE_LINE_MEMBER(mouser_state::flip_screen_y_w) +void mouser_state::flip_screen_y_w(int state) { flip_screen_y_set(!state); } @@ -237,14 +237,14 @@ uint32_t mouser_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap // machine // Mouser has external masking circuitry around the NMI input on the main CPU -WRITE_LINE_MEMBER(mouser_state::nmi_enable_w) +void mouser_state::nmi_enable_w(int state) { m_nmi_enable = state; if (!m_nmi_enable) m_maincpu->set_input_line(INPUT_LINE_NMI, CLEAR_LINE); } -WRITE_LINE_MEMBER(mouser_state::nmi_interrupt) +void mouser_state::nmi_interrupt(int state) { if (state && m_nmi_enable) m_maincpu->set_input_line(INPUT_LINE_NMI, ASSERT_LINE); diff --git a/src/mame/upl/ninjakd2.h b/src/mame/upl/ninjakd2.h index fd2dba3ac0e..1efeb9bb307 100644 --- a/src/mame/upl/ninjakd2.h +++ b/src/mame/upl/ninjakd2.h @@ -72,7 +72,7 @@ protected: TILE_GET_INFO_MEMBER(get_fg_tile_info); TILE_GET_INFO_MEMBER(ninjakd2_get_bg_tile_info); uint32_t screen_update_ninjakd2(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(screen_vblank_ninjakd2); + void screen_vblank_ninjakd2(int state); void bg_ctrl(int offset, int data, tilemap_t* tilemap); void gfx_unscramble(); diff --git a/src/mame/upl/ninjakd2_v.cpp b/src/mame/upl/ninjakd2_v.cpp index 1d45fecb827..2811c971df3 100644 --- a/src/mame/upl/ninjakd2_v.cpp +++ b/src/mame/upl/ninjakd2_v.cpp @@ -421,7 +421,7 @@ uint32_t omegaf_state::screen_update_omegaf(screen_device &screen, bitmap_ind16 } -WRITE_LINE_MEMBER(ninjakd2_state::screen_vblank_ninjakd2) +void ninjakd2_state::screen_vblank_ninjakd2(int state) { // rising edge if (state) diff --git a/src/mame/upl/xxmissio.cpp b/src/mame/upl/xxmissio.cpp index 04124c8ef51..dfe6842eb9f 100644 --- a/src/mame/upl/xxmissio.cpp +++ b/src/mame/upl/xxmissio.cpp @@ -40,7 +40,7 @@ public: void xxmissio(machine_config &config); - template DECLARE_READ_LINE_MEMBER(status_r); + template int status_r(); protected: virtual void machine_start() override; @@ -73,7 +73,7 @@ private: void scroll_x_w(uint8_t data); void scroll_y_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(interrupt_m); + void interrupt_m(int state); INTERRUPT_GEN_MEMBER(interrupt_s); TILE_GET_INFO_MEMBER(get_bg_tile_info); @@ -235,7 +235,7 @@ void xxmissio_state::bank_sel_w(uint8_t data) } template -READ_LINE_MEMBER(xxmissio_state::status_r) +int xxmissio_state::status_r() { return (m_status & Mask) ? 1 : 0; } @@ -278,7 +278,7 @@ void xxmissio_state::status_s_w(uint8_t data) } } -WRITE_LINE_MEMBER(xxmissio_state::interrupt_m) +void xxmissio_state::interrupt_m(int state) { if (state) { diff --git a/src/mame/ussr/apogee.cpp b/src/mame/ussr/apogee.cpp index 9bc7021a817..fa78910aa31 100644 --- a/src/mame/ussr/apogee.cpp +++ b/src/mame/ussr/apogee.cpp @@ -39,9 +39,9 @@ private: uint8_t m_out0 = 0U; uint8_t m_out1 = 0U; uint8_t m_out2 = 0U; - DECLARE_WRITE_LINE_MEMBER(pit8253_out0_changed); - DECLARE_WRITE_LINE_MEMBER(pit8253_out1_changed); - DECLARE_WRITE_LINE_MEMBER(pit8253_out2_changed); + void pit8253_out0_changed(int state); + void pit8253_out1_changed(int state); + void pit8253_out2_changed(int state); I8275_DRAW_CHARACTER_MEMBER(display_pixels); required_device m_speaker; @@ -158,19 +158,19 @@ INPUT_PORTS_END static const double speaker_levels[] = {-1.0, -0.33333, 0.33333, 1.0}; -WRITE_LINE_MEMBER(apogee_state::pit8253_out0_changed) +void apogee_state::pit8253_out0_changed(int state) { m_out0 = state; m_speaker->level_w(m_out0+m_out1+m_out2); } -WRITE_LINE_MEMBER(apogee_state::pit8253_out1_changed) +void apogee_state::pit8253_out1_changed(int state) { m_out1 = state; m_speaker->level_w(m_out0+m_out1+m_out2); } -WRITE_LINE_MEMBER(apogee_state::pit8253_out2_changed) +void apogee_state::pit8253_out2_changed(int state) { m_out2 = state; m_speaker->level_w(m_out0+m_out1+m_out2); diff --git a/src/mame/ussr/argo.cpp b/src/mame/ussr/argo.cpp index 027a2581379..64d157f963d 100644 --- a/src/mame/ussr/argo.cpp +++ b/src/mame/ussr/argo.cpp @@ -70,8 +70,8 @@ private: void argo_videoram_w(offs_t offset, u8 data); u8 argo_io_r(offs_t offset); void argo_io_w(offs_t offset, u8 data); - DECLARE_WRITE_LINE_MEMBER(z0_w); - DECLARE_WRITE_LINE_MEMBER(hrq_w); + void z0_w(int state); + void hrq_w(int state); void argo_palette(palette_device &palette) const; u8 dma_r(offs_t offset); I8275_DRAW_CHARACTER_MEMBER(display_pixels); @@ -223,7 +223,7 @@ TIMER_DEVICE_CALLBACK_MEMBER( argo_state::kansas_r ) } } -WRITE_LINE_MEMBER(argo_state::z0_w) +void argo_state::z0_w(int state) { // write - incoming 2400Hz m_uart->write_txc(state); @@ -243,7 +243,7 @@ u8 argo_state::dma_r(offs_t offset) return m_vram[offset & 0x7ff]; } -WRITE_LINE_MEMBER( argo_state::hrq_w ) +void argo_state::hrq_w(int state) { m_maincpu->set_input_line(INPUT_LINE_HALT, state); m_dma->hlda_w(state); diff --git a/src/mame/ussr/b2m.h b/src/mame/ussr/b2m.h index 0983c990d4d..b3ec7b18e05 100644 --- a/src/mame/ussr/b2m.h +++ b/src/mame/ussr/b2m.h @@ -48,7 +48,7 @@ private: void b2m_palette(palette_device &palette) const; uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(vblank_interrupt); - DECLARE_WRITE_LINE_MEMBER(pit_out1); + void pit_out1(int state); void ppi1_porta_w(uint8_t data); void ppi1_portb_w(uint8_t data); void ppi1_portc_w(uint8_t data); @@ -57,7 +57,7 @@ private: uint8_t romdisk_porta_r(); void romdisk_portb_w(uint8_t data); void romdisk_portc_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(fdc_drq); + void fdc_drq(int state); static void b2m_floppy_formats(format_registration &fr); void b2m_io(address_map &map); diff --git a/src/mame/ussr/b2m_m.cpp b/src/mame/ussr/b2m_m.cpp index 12693a1e881..e1b1daad3d0 100644 --- a/src/mame/ussr/b2m_m.cpp +++ b/src/mame/ussr/b2m_m.cpp @@ -92,7 +92,7 @@ void b2m_state::set_bank(int bank) } -WRITE_LINE_MEMBER(b2m_state::pit_out1) +void b2m_state::pit_out1(int state) { m_speaker->level_w(state); } @@ -119,7 +119,7 @@ uint8_t b2m_state::ppi1_portb_r() return m_video_scroll; } -WRITE_LINE_MEMBER( b2m_state::fdc_drq ) +void b2m_state::fdc_drq(int state) { /* Clears HALT state of CPU when data is ready to read */ if (state) diff --git a/src/mame/ussr/debut.cpp b/src/mame/ussr/debut.cpp index 0737f53cabb..2ed06b723a0 100644 --- a/src/mame/ussr/debut.cpp +++ b/src/mame/ussr/debut.cpp @@ -98,7 +98,7 @@ private: INTERRUPT_GEN_MEMBER(interrupt); u8 input_r(offs_t offset); void latch_w(offs_t offset, u8 data); - DECLARE_WRITE_LINE_MEMBER(lcd_update_w); + void lcd_update_w(int state); u8 m_latch[5] = { }; u8 m_dac_data = 0; @@ -166,7 +166,7 @@ void debut_state::latch_w(offs_t offset, u8 data) } } -WRITE_LINE_MEMBER(debut_state::lcd_update_w) +void debut_state::lcd_update_w(int state) { // 8086 S5 also goes to the lcd panel if (!state && m_lcd_update) diff --git a/src/mame/ussr/dvk_ksm.cpp b/src/mame/ussr/dvk_ksm.cpp index 430cacc5389..51cd6b887a1 100644 --- a/src/mame/ussr/dvk_ksm.cpp +++ b/src/mame/ussr/dvk_ksm.cpp @@ -119,11 +119,11 @@ private: TIMER_CALLBACK_MEMBER(clock_brg); - DECLARE_WRITE_LINE_MEMBER(write_keyboard_clock); + void write_keyboard_clock(int state); - DECLARE_WRITE_LINE_MEMBER(write_brga); - DECLARE_WRITE_LINE_MEMBER(write_brgb); - DECLARE_WRITE_LINE_MEMBER(write_brgc); + void write_brga(int state); + void write_brgb(int state); + void write_brgc(int state); void ksm_ppi_porta_w(uint8_t data); void ksm_ppi_portc_w(uint8_t data); @@ -256,19 +256,19 @@ void ksm_state::ksm_ppi_portc_w(uint8_t data) update_brg(brga, brgb, brgc); } -WRITE_LINE_MEMBER(ksm_state::write_keyboard_clock) +void ksm_state::write_keyboard_clock(int state) { m_i8251kbd->write_txc(state); m_i8251kbd->write_rxc(state); } -WRITE_LINE_MEMBER(ksm_state::write_brga) +void ksm_state::write_brga(int state) { brga = state; update_brg(brga, brgb, brgc); } -WRITE_LINE_MEMBER(ksm_state::write_brgb) +void ksm_state::write_brgb(int state) { brgb = state; update_brg(brga, brgb, brgc); diff --git a/src/mame/ussr/irisha.cpp b/src/mame/ussr/irisha.cpp index a74557c8e9b..004be0a59a7 100644 --- a/src/mame/ussr/irisha.cpp +++ b/src/mame/ussr/irisha.cpp @@ -58,7 +58,7 @@ private: void porta_w(uint8_t data); void portb_w(uint8_t data); void portc_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(speaker_w); + void speaker_w(int state); TIMER_CALLBACK_MEMBER(irisha_key); uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); required_shared_ptr m_p_videoram; @@ -318,7 +318,7 @@ void irisha_state::update_speaker() } -WRITE_LINE_MEMBER(irisha_state::speaker_w) +void irisha_state::speaker_w(int state) { m_sg1_line = state; update_speaker(); diff --git a/src/mame/ussr/istrebiteli.cpp b/src/mame/ussr/istrebiteli.cpp index 018d4675fab..5c7d08c4492 100644 --- a/src/mame/ussr/istrebiteli.cpp +++ b/src/mame/ussr/istrebiteli.cpp @@ -158,7 +158,7 @@ public: void istreb(machine_config &config); void motogonki(machine_config &config); - template DECLARE_READ_LINE_MEMBER(collision_r); + template int collision_r(); DECLARE_CUSTOM_INPUT_MEMBER(coin_r); DECLARE_INPUT_CHANGED_MEMBER(coin_inc); @@ -464,7 +464,7 @@ void istrebiteli_state::moto_io_map(address_map &map) } template -READ_LINE_MEMBER(istrebiteli_state::collision_r) +int istrebiteli_state::collision_r() { // piece of HACK // real hardware does per-pixel sprite collision detection diff --git a/src/mame/ussr/km035.cpp b/src/mame/ussr/km035.cpp index cd96fa9e5fa..0b9ca317a44 100644 --- a/src/mame/ussr/km035.cpp +++ b/src/mame/ussr/km035.cpp @@ -289,7 +289,7 @@ void km035_device::device_reset() } -WRITE_LINE_MEMBER(km035_device::write_rxd) +void km035_device::write_rxd(int state) { LOG("write_rxd %d\n", state); m_maincpu->set_input_line(MCS48_INPUT_IRQ, state ? CLEAR_LINE : ASSERT_LINE); diff --git a/src/mame/ussr/km035.h b/src/mame/ussr/km035.h index a665c7f81e1..c10da6f5217 100644 --- a/src/mame/ussr/km035.h +++ b/src/mame/ussr/km035.h @@ -24,7 +24,7 @@ public: auto tx_handler() { return m_tx_handler.bind(); } auto rts_handler() { return m_rts_handler.bind(); } - DECLARE_WRITE_LINE_MEMBER( write_rxd ); + void write_rxd(int state); void km035_map(address_map &map); diff --git a/src/mame/ussr/mikrosha.cpp b/src/mame/ussr/mikrosha.cpp index e4b9adca20a..71c16a914f5 100644 --- a/src/mame/ussr/mikrosha.cpp +++ b/src/mame/ussr/mikrosha.cpp @@ -34,7 +34,7 @@ public: private: void mikrosha_8255_font_page_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(mikrosha_pit_out2); + void mikrosha_pit_out2(int state); I8275_DRAW_CHARACTER_MEMBER(display_pixels); void machine_reset() override; void machine_start() override; @@ -169,7 +169,7 @@ void mikrosha_state::mikrosha_8255_font_page_w(uint8_t data) m_mikrosha_font_page = (data >> 7) & 1; } -WRITE_LINE_MEMBER(mikrosha_state::mikrosha_pit_out2) +void mikrosha_state::mikrosha_pit_out2(int state) { } diff --git a/src/mame/ussr/mk98.cpp b/src/mame/ussr/mk98.cpp index 2fde130bccd..4c575d4b0ed 100644 --- a/src/mame/ussr/mk98.cpp +++ b/src/mame/ussr/mk98.cpp @@ -88,8 +88,8 @@ protected: private: void mk98_palette(palette_device &palette) const; - DECLARE_WRITE_LINE_MEMBER(keyboard_clock_w); - DECLARE_WRITE_LINE_MEMBER(keyboard_data_w); + void keyboard_clock_w(int state); + void keyboard_data_w(int state); uint8_t keyboard_r(offs_t offset); void keyboard_w(offs_t offset, uint8_t data); uint8_t serial_r(offs_t offset); @@ -269,7 +269,7 @@ void mk98_state::keyboard_w(offs_t offset, uint8_t data) m_pic8259->ir1_w(CLEAR_LINE); } -WRITE_LINE_MEMBER(mk98_state::keyboard_clock_w) +void mk98_state::keyboard_clock_w(int state) { LOGKBD("kbd: KCLK: %d kbit: %d\n", state ? 1 : 0, m_kbit); @@ -308,7 +308,7 @@ WRITE_LINE_MEMBER(mk98_state::keyboard_clock_w) m_kclk = (state == ASSERT_LINE) ? true : false; } -WRITE_LINE_MEMBER(mk98_state::keyboard_data_w) +void mk98_state::keyboard_data_w(int state) { LOGKBD("kbd: KDATA: %d\n", state ? 1 : 0); m_kdata = (state == ASSERT_LINE) ? 0x80 : 0x00; diff --git a/src/mame/ussr/ms0515.cpp b/src/mame/ussr/ms0515.cpp index 511eec1be0f..0e4401b712e 100644 --- a/src/mame/ussr/ms0515.cpp +++ b/src/mame/ussr/ms0515.cpp @@ -92,7 +92,7 @@ protected: private: void ms0515_palette(palette_device &palette) const; uint32_t screen_update_ms0515(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(screen_vblank); + void screen_vblank(int state); void ms0515_bank_w(uint16_t data); @@ -103,17 +103,17 @@ private: uint8_t ms0515_portb_r(); void ms0515_portc_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(write_keyboard_clock); - DECLARE_WRITE_LINE_MEMBER(write_line_clock); - DECLARE_WRITE_LINE_MEMBER(pit8253_out2_changed); + void write_keyboard_clock(int state); + void write_line_clock(int state); + void pit8253_out2_changed(int state); static void floppy_formats(format_registration &fr); - DECLARE_WRITE_LINE_MEMBER(irq2_w); - DECLARE_WRITE_LINE_MEMBER(irq5_w); - DECLARE_WRITE_LINE_MEMBER(irq8_w); - DECLARE_WRITE_LINE_MEMBER(irq9_w); - DECLARE_WRITE_LINE_MEMBER(irq11_w); + void irq2_w(int state); + void irq5_w(int state); + void irq8_w(int state); + void irq9_w(int state); + void irq11_w(int state); void ms0515_mem(address_map &map); @@ -345,19 +345,19 @@ void ms0515_state::ms0515_portc_w(uint8_t data) m_sysregc = data; } -WRITE_LINE_MEMBER(ms0515_state::write_keyboard_clock) +void ms0515_state::write_keyboard_clock(int state) { m_i8251kbd->write_txc(state); m_i8251kbd->write_rxc(state); } -WRITE_LINE_MEMBER(ms0515_state::write_line_clock) +void ms0515_state::write_line_clock(int state) { m_i8251line->write_txc(state); m_i8251line->write_rxc(state); } -WRITE_LINE_MEMBER(ms0515_state::pit8253_out2_changed) +void ms0515_state::pit8253_out2_changed(int state) { m_speaker->level_w(state); } @@ -455,7 +455,7 @@ uint32_t ms0515_state::screen_update_ms0515(screen_device &screen, bitmap_ind16 return 0; } -WRITE_LINE_MEMBER(ms0515_state::screen_vblank) +void ms0515_state::screen_vblank(int state) { // irq2_w(state ? ASSERT_LINE : CLEAR_LINE); if (BIT(m_bankreg, 9)) @@ -515,27 +515,27 @@ void ms0515_state::irq_encoder(int irq, int state) * 2 HHLH 4 064 vblank */ -WRITE_LINE_MEMBER(ms0515_state::irq2_w) +void ms0515_state::irq2_w(int state) { irq_encoder(2, state); } -WRITE_LINE_MEMBER(ms0515_state::irq5_w) +void ms0515_state::irq5_w(int state) { irq_encoder(5, state); } -WRITE_LINE_MEMBER(ms0515_state::irq8_w) +void ms0515_state::irq8_w(int state) { irq_encoder(8, state); } -WRITE_LINE_MEMBER(ms0515_state::irq9_w) +void ms0515_state::irq9_w(int state) { irq_encoder(9, state); } -WRITE_LINE_MEMBER(ms0515_state::irq11_w) +void ms0515_state::irq11_w(int state) { irq_encoder(11, state); } diff --git a/src/mame/ussr/ms6102.cpp b/src/mame/ussr/ms6102.cpp index e3cd35ddea6..ba8bb022d38 100644 --- a/src/mame/ussr/ms6102.cpp +++ b/src/mame/ussr/ms6102.cpp @@ -89,13 +89,13 @@ protected: private: uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - template DECLARE_WRITE_LINE_MEMBER(irq) { m_pic->r_w(N, state ? 0 : 1); } + template void irq(int state) { m_pic->r_w(N, state ? 0 : 1); } I8275_DRAW_CHARACTER_MEMBER(display_pixels); I8275_DRAW_CHARACTER_MEMBER(display_attr); - DECLARE_WRITE_LINE_MEMBER(hrq_w); - DECLARE_WRITE_LINE_MEMBER(irq_w); + void hrq_w(int state); + void irq_w(int state); void pic_w(u8 data); IRQ_CALLBACK_MEMBER(ms6102_int_ack); @@ -164,7 +164,7 @@ static GFXDECODE_START(gfx_ms6102) GFXDECODE_END -WRITE_LINE_MEMBER(ms6102_state::hrq_w) +void ms6102_state::hrq_w(int state) { /* FIXME: this should be connected to the HOLD line of 8080 */ m_maincpu->set_input_line(INPUT_LINE_HALT, state); @@ -173,7 +173,7 @@ WRITE_LINE_MEMBER(ms6102_state::hrq_w) m_dma8257->hlda_w(state); } -WRITE_LINE_MEMBER(ms6102_state::irq_w) +void ms6102_state::irq_w(int state) { m_maincpu->set_input_line(I8085_INTR_LINE, ASSERT_LINE); } diff --git a/src/mame/ussr/pk8020.h b/src/mame/ussr/pk8020.h index d81f98473c7..10cae4c27e3 100644 --- a/src/mame/ussr/pk8020.h +++ b/src/mame/ussr/pk8020.h @@ -74,7 +74,7 @@ private: uint8_t ppi_porta_r(); void floppy_control_w(uint8_t data); void ppi_2_portc_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(pit_out0); + void pit_out0(int state); static const char *plm_select_name(uint8_t data); void log_bank_select(uint8_t bank, offs_t start, offs_t end, uint8_t rdecplm, uint8_t wdecplm); diff --git a/src/mame/ussr/pk8020_m.cpp b/src/mame/ussr/pk8020_m.cpp index 64c2986df39..35b1b5eafdb 100644 --- a/src/mame/ussr/pk8020_m.cpp +++ b/src/mame/ussr/pk8020_m.cpp @@ -135,7 +135,7 @@ void pk8020_state::ppi_2_portc_w(uint8_t data) m_printer->write_strobe(!BIT(data, 5)); } -WRITE_LINE_MEMBER(pk8020_state::pit_out0) +void pk8020_state::pit_out0(int state) { m_sound_level = state; diff --git a/src/mame/ussr/sm7238.cpp b/src/mame/ussr/sm7238.cpp index c8256721282..02fb11faad3 100644 --- a/src/mame/ussr/sm7238.cpp +++ b/src/mame/ussr/sm7238.cpp @@ -75,8 +75,8 @@ public: void sm7238(machine_config &config); private: - DECLARE_WRITE_LINE_MEMBER(write_keyboard_clock); - DECLARE_WRITE_LINE_MEMBER(write_printer_clock); + void write_keyboard_clock(int state); + void write_printer_clock(int state); void control_w(uint8_t data); void text_control_w(uint8_t data); @@ -193,13 +193,13 @@ void sm7238_state::vmem_w(offs_t offset, uint8_t data) m_p_videoram[offset + 0x1000] = data; } -WRITE_LINE_MEMBER(sm7238_state::write_keyboard_clock) +void sm7238_state::write_keyboard_clock(int state) { m_i8251kbd->write_txc(state); m_i8251kbd->write_rxc(state); } -WRITE_LINE_MEMBER(sm7238_state::write_printer_clock) +void sm7238_state::write_printer_clock(int state) { m_i8251prn->write_txc(state); m_i8251prn->write_rxc(state); diff --git a/src/mame/ussr/special.h b/src/mame/ussr/special.h index c53d4b8a30f..fcd8fdfe972 100644 --- a/src/mame/ussr/special.h +++ b/src/mame/ussr/special.h @@ -99,7 +99,7 @@ private: uint32_t screen_update_erik(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_specialp(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_specimx(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(fdc_drq); + void fdc_drq(int state); static void specimx_floppy_formats(format_registration &fr); void machine_start() override; void machine_reset() override; diff --git a/src/mame/ussr/special_m.cpp b/src/mame/ussr/special_m.cpp index f92a7d7ad0c..e8d5c824d42 100644 --- a/src/mame/ussr/special_m.cpp +++ b/src/mame/ussr/special_m.cpp @@ -188,7 +188,7 @@ uint8_t special_state::specimx_disk_ctrl_r() return 0xff; } -WRITE_LINE_MEMBER( special_state::fdc_drq ) +void special_state::fdc_drq(int state) { /* Clears HALT state of CPU when data is ready to read */ if(state) { diff --git a/src/mame/ussr/specialsound.cpp b/src/mame/ussr/specialsound.cpp index c6cdb0804ae..c4d9665958e 100644 --- a/src/mame/ussr/specialsound.cpp +++ b/src/mame/ussr/specialsound.cpp @@ -66,19 +66,19 @@ void specimx_sound_device::sound_stream_update(sound_stream &stream, std::vector // PIT callbacks //------------------------------------------------- -WRITE_LINE_MEMBER(specimx_sound_device::set_input_ch0) +void specimx_sound_device::set_input_ch0(int state) { m_mixer_channel->update(); m_specimx_input[0] = state; } -WRITE_LINE_MEMBER(specimx_sound_device::set_input_ch1) +void specimx_sound_device::set_input_ch1(int state) { m_mixer_channel->update(); m_specimx_input[1] = state; } -WRITE_LINE_MEMBER(specimx_sound_device::set_input_ch2) +void specimx_sound_device::set_input_ch2(int state) { m_mixer_channel->update(); m_specimx_input[2] = state; diff --git a/src/mame/ussr/specialsound.h b/src/mame/ussr/specialsound.h index 4b4a3b5c300..77059ed66b8 100644 --- a/src/mame/ussr/specialsound.h +++ b/src/mame/ussr/specialsound.h @@ -17,9 +17,9 @@ class specimx_sound_device : public device_t, public device_sound_interface public: specimx_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - DECLARE_WRITE_LINE_MEMBER(set_input_ch0); - DECLARE_WRITE_LINE_MEMBER(set_input_ch1); - DECLARE_WRITE_LINE_MEMBER(set_input_ch2); + void set_input_ch0(int state); + void set_input_ch1(int state); + void set_input_ch2(int state); protected: // device-level overrides diff --git a/src/mame/ussr/tiamc1.cpp b/src/mame/ussr/tiamc1.cpp index c3db9da6dbf..9b2cca03d66 100644 --- a/src/mame/ussr/tiamc1.cpp +++ b/src/mame/ussr/tiamc1.cpp @@ -145,7 +145,7 @@ void tiamc1_state::tiamc1_control_w(uint8_t data) machine().bookkeeping().coin_counter_w(0, data & 0x04); } -WRITE_LINE_MEMBER(tiamc1_state::pit8253_2_w) +void tiamc1_state::pit8253_2_w(int state) { m_speaker->level_w(state); } diff --git a/src/mame/ussr/tiamc1.h b/src/mame/ussr/tiamc1.h index 128cba669d8..228da2412c6 100644 --- a/src/mame/ussr/tiamc1.h +++ b/src/mame/ussr/tiamc1.h @@ -57,7 +57,7 @@ private: void tiamc1_palette_w(offs_t offset, uint8_t data); void kot_bankswitch_w(uint8_t data); void kot_videoram_w(offs_t offset, uint8_t data); - DECLARE_WRITE_LINE_MEMBER(pit8253_2_w); + void pit8253_2_w(int state); TILE_GET_INFO_MEMBER(get_bg1_tile_info); TILE_GET_INFO_MEMBER(get_bg2_tile_info); diff --git a/src/mame/ussr/unior.cpp b/src/mame/ussr/unior.cpp index b2cc583958a..c6be1848c16 100644 --- a/src/mame/ussr/unior.cpp +++ b/src/mame/ussr/unior.cpp @@ -83,8 +83,8 @@ private: u8 ppi1_c_r(); void ppi1_a_w(u8 data); void ppi1_c_w(u8 data); - DECLARE_WRITE_LINE_MEMBER(hrq_w); - DECLARE_WRITE_LINE_MEMBER(ctc_z1_w); + void hrq_w(int state); + void ctc_z1_w(int state); void unior_palette(palette_device &palette) const; u8 dma_r(offs_t offset); I8275_DRAW_CHARACTER_MEMBER(display_pixels); @@ -349,7 +349,7 @@ TIMER_DEVICE_CALLBACK_MEMBER( unior_state::kansas_r ) } } -WRITE_LINE_MEMBER(unior_state::ctc_z1_w) +void unior_state::ctc_z1_w(int state) { // write - incoming 2400Hz m_uart->write_txc(state); @@ -423,7 +423,7 @@ u8 unior_state::dma_r(offs_t offset) return m_vram[offset & 0x7ff]; } -WRITE_LINE_MEMBER( unior_state::hrq_w ) +void unior_state::hrq_w(int state) { m_maincpu->set_input_line(INPUT_LINE_HALT, state); m_dma->hlda_w(state); diff --git a/src/mame/ussr/vector06.h b/src/mame/ussr/vector06.h index 20d520d0ac7..0cbdcf494d6 100644 --- a/src/mame/ussr/vector06.h +++ b/src/mame/ussr/vector06.h @@ -75,7 +75,7 @@ private: void disc_w(uint8_t data); void status_callback(uint8_t data); void ramdisk_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(speaker_w); + void speaker_w(int state); void machine_start() override; void machine_reset() override; uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); diff --git a/src/mame/ussr/vector06_m.cpp b/src/mame/ussr/vector06_m.cpp index a23eb90c244..079db6c5ad9 100644 --- a/src/mame/ussr/vector06_m.cpp +++ b/src/mame/ussr/vector06_m.cpp @@ -171,7 +171,7 @@ void vector06_state::status_callback(uint8_t data) update_mem(); } -WRITE_LINE_MEMBER(vector06_state::speaker_w) +void vector06_state::speaker_w(int state) { m_speaker->level_w(state); } diff --git a/src/mame/ussr/vta2000.cpp b/src/mame/ussr/vta2000.cpp index 669e095552b..c7241f816c8 100644 --- a/src/mame/ussr/vta2000.cpp +++ b/src/mame/ussr/vta2000.cpp @@ -47,7 +47,7 @@ public: void vta2000(machine_config &config); private: void output_00(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(speaker_w); + void speaker_w(int state); uint8_t m_framecnt = 0; uint32_t screen_update_vta2000(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); @@ -68,7 +68,7 @@ void vta2000_state::output_00(uint8_t data) m_mainpit->write_gate0(BIT(data, 4)); } -WRITE_LINE_MEMBER(vta2000_state::speaker_w) +void vta2000_state::speaker_w(int state) { m_speaker->level_w(state); } diff --git a/src/mame/valadon/bagman.cpp b/src/mame/valadon/bagman.cpp index 67a1e570488..1f9facd5eb1 100644 --- a/src/mame/valadon/bagman.cpp +++ b/src/mame/valadon/bagman.cpp @@ -97,17 +97,17 @@ void bagman_state::ls259_w(offs_t offset, uint8_t data) m_tmslatch->write_bit(offset, data & 1); } -WRITE_LINE_MEMBER(bagman_state::tmsprom_bit_w) +void bagman_state::tmsprom_bit_w(int state) { m_tmsprom->bit_w(7 - ((m_tmslatch->q0_r()<<2) | (m_tmslatch->q1_r()<<1) | (m_tmslatch->q2_r()<<0))); } -WRITE_LINE_MEMBER(bagman_state::tmsprom_csq0_w) +void bagman_state::tmsprom_csq0_w(int state) { m_tmsprom->rom_csq_w(0, state); } -WRITE_LINE_MEMBER(bagman_state::tmsprom_csq1_w) +void bagman_state::tmsprom_csq1_w(int state) { // HACK: Schematics suggest that this LS259 does in fact respond to the master // reset signal, which would pull /OE active low on both 2732s at once. How @@ -116,12 +116,12 @@ WRITE_LINE_MEMBER(bagman_state::tmsprom_csq1_w) m_tmsprom->rom_csq_w(1, state); } -WRITE_LINE_MEMBER(bagman_state::coin_counter_w) +void bagman_state::coin_counter_w(int state) { machine().bookkeeping().coin_counter_w(0, state); } -WRITE_LINE_MEMBER(bagman_state::irq_mask_w) +void bagman_state::irq_mask_w(int state) { m_irq_mask = state; if (!state) @@ -465,7 +465,7 @@ template CUSTOM_INPUT_MEMBER(squaitsa_state::dial_input_r) return m_res[N]; } -WRITE_LINE_MEMBER(bagman_state::vblank_irq) +void bagman_state::vblank_irq(int state) { if (state && m_irq_mask) m_maincpu->set_input_line(0, ASSERT_LINE); diff --git a/src/mame/valadon/bagman.h b/src/mame/valadon/bagman.h index 204f86bbd84..90a8a66ceb3 100644 --- a/src/mame/valadon/bagman.h +++ b/src/mame/valadon/bagman.h @@ -36,19 +36,19 @@ public: protected: // common - DECLARE_WRITE_LINE_MEMBER(coin_counter_w); - DECLARE_WRITE_LINE_MEMBER(irq_mask_w); + void coin_counter_w(int state); + void irq_mask_w(int state); void videoram_w(offs_t offset, uint8_t data); void colorram_w(offs_t offset, uint8_t data); - DECLARE_WRITE_LINE_MEMBER(flipscreen_x_w); - DECLARE_WRITE_LINE_MEMBER(flipscreen_y_w); - DECLARE_WRITE_LINE_MEMBER(video_enable_w); + void flipscreen_x_w(int state); + void flipscreen_y_w(int state); + void video_enable_w(int state); // bagman void ls259_w(offs_t offset, uint8_t data); - DECLARE_WRITE_LINE_MEMBER(tmsprom_bit_w); - DECLARE_WRITE_LINE_MEMBER(tmsprom_csq0_w); - DECLARE_WRITE_LINE_MEMBER(tmsprom_csq1_w); + void tmsprom_bit_w(int state); + void tmsprom_csq0_w(int state); + void tmsprom_csq1_w(int state); void pal16r6_w(offs_t offset, uint8_t data); uint8_t pal16r6_r(); @@ -59,7 +59,7 @@ protected: virtual void video_start() override; void bagman_palette(palette_device &palette) const; - DECLARE_WRITE_LINE_MEMBER(vblank_irq); + void vblank_irq(int state); uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); diff --git a/src/mame/valadon/bagman_v.cpp b/src/mame/valadon/bagman_v.cpp index c434835a352..4c6e186f4fd 100644 --- a/src/mame/valadon/bagman_v.cpp +++ b/src/mame/valadon/bagman_v.cpp @@ -81,17 +81,17 @@ void bagman_state::bagman_palette(palette_device &palette) const } } -WRITE_LINE_MEMBER(bagman_state::flipscreen_x_w) +void bagman_state::flipscreen_x_w(int state) { flip_screen_x_set(state); } -WRITE_LINE_MEMBER(bagman_state::flipscreen_y_w) +void bagman_state::flipscreen_y_w(int state) { flip_screen_y_set(state); } -WRITE_LINE_MEMBER(bagman_state::video_enable_w) +void bagman_state::video_enable_w(int state) { m_video_enable = state; } diff --git a/src/mame/vectorgraphic/v4_kbd.cpp b/src/mame/vectorgraphic/v4_kbd.cpp index 0f400af7326..a9cdccf86b5 100644 --- a/src/mame/vectorgraphic/v4_kbd.cpp +++ b/src/mame/vectorgraphic/v4_kbd.cpp @@ -149,7 +149,7 @@ void vector4_keyboard_device::device_resolve_objects() m_led.resolve(); } -WRITE_LINE_MEMBER(vector4_keyboard_device::write_rxd) +void vector4_keyboard_device::write_rxd(int state) { m_mcu->set_input_line(MCS48_INPUT_IRQ, state ? CLEAR_LINE : ASSERT_LINE); } diff --git a/src/mame/vectorgraphic/v4_kbd.h b/src/mame/vectorgraphic/v4_kbd.h index 6d897184c02..2e389051ae4 100644 --- a/src/mame/vectorgraphic/v4_kbd.h +++ b/src/mame/vectorgraphic/v4_kbd.h @@ -25,7 +25,7 @@ public: auto txd_handler() { return m_txd_cb.bind(); } // serial line input - DECLARE_WRITE_LINE_MEMBER(write_rxd); + void write_rxd(int state); protected: // device-level overrides diff --git a/src/mame/vectorgraphic/vector4.cpp b/src/mame/vectorgraphic/vector4.cpp index 3ca7cbb8433..03e9eb49635 100644 --- a/src/mame/vectorgraphic/vector4.cpp +++ b/src/mame/vectorgraphic/vector4.cpp @@ -95,7 +95,7 @@ private: void msc_w(uint8_t data) { machine_reset(); } void addrmap_w(offs_t offset, uint8_t data); void ppi_pb_w(uint8_t data) { m_centronics->write_strobe(BIT(data, 0) ? ASSERT_LINE : CLEAR_LINE); } - DECLARE_WRITE_LINE_MEMBER(centronics_busy_w) { if (state) m_ppi_pc |= 1; else m_ppi_pc &= ~1; } + void centronics_busy_w(int state) { if (state) m_ppi_pc |= 1; else m_ppi_pc &= ~1; } int ppi_pc_r() { return m_ppi_pc; } uint8_t s100_r(offs_t offset) { return m_s100->sinp_r(offset+0x20); } void s100_w(offs_t offset, uint8_t data) { m_s100->sout_w(offset+0x20, data); } diff --git a/src/mame/venture/looping.cpp b/src/mame/venture/looping.cpp index 8522c8a3f6f..7737322a43e 100644 --- a/src/mame/venture/looping.cpp +++ b/src/mame/venture/looping.cpp @@ -115,29 +115,29 @@ protected: virtual void video_start() override; private: - DECLARE_WRITE_LINE_MEMBER(flip_screen_x_w); - DECLARE_WRITE_LINE_MEMBER(flip_screen_y_w); + void flip_screen_x_w(int state); + void flip_screen_y_w(int state); void videoram_w(offs_t offset, uint8_t data); void colorram_w(offs_t offset, uint8_t data); - DECLARE_WRITE_LINE_MEMBER(level2_irq_set); - DECLARE_WRITE_LINE_MEMBER(main_irq_ack_w); - DECLARE_WRITE_LINE_MEMBER(watchdog_w); - DECLARE_WRITE_LINE_MEMBER(souint_clr); - DECLARE_WRITE_LINE_MEMBER(ballon_enable_w); + void level2_irq_set(int state); + void main_irq_ack_w(int state); + void watchdog_w(int state); + void souint_clr(int state); + void ballon_enable_w(int state); void out_0_w(uint8_t data); void out_2_w(uint8_t data); uint8_t adc_r(); void adc_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(plr2_w); + void plr2_w(int state); uint8_t cop_unk_r(); - DECLARE_READ_LINE_MEMBER(cop_serial_r); + int cop_serial_r(); void cop_l_w(uint8_t data); uint8_t protection_r(); - [[maybe_unused]] DECLARE_WRITE_LINE_MEMBER(spcint); - DECLARE_WRITE_LINE_MEMBER(int_update); + [[maybe_unused]] void spcint(int state); + void int_update(int state); void sound_sw(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(ay_enable_w); - DECLARE_WRITE_LINE_MEMBER(speech_enable_w); + void ay_enable_w(int state); + void speech_enable_w(int state); TILE_GET_INFO_MEMBER(get_tile_info); void palette(palette_device &palette) const; uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); @@ -244,14 +244,14 @@ void looping_state::video_start() * *************************************/ -WRITE_LINE_MEMBER(looping_state::flip_screen_x_w) +void looping_state::flip_screen_x_w(int state) { flip_screen_x_set(!state); m_bg_tilemap->set_scrollx(0, flip_screen() ? 128 : 0); } -WRITE_LINE_MEMBER(looping_state::flip_screen_y_w) +void looping_state::flip_screen_y_w(int state) { flip_screen_y_set(!state); m_bg_tilemap->set_scrollx(0, flip_screen() ? 256 : 0); @@ -361,7 +361,7 @@ INTERRUPT_GEN_MEMBER(looping_state::interrupt) } -WRITE_LINE_MEMBER(looping_state::level2_irq_set) +void looping_state::level2_irq_set(int state) { logerror("Level 2 int = %d\n", state); if (state == 0) @@ -369,19 +369,19 @@ WRITE_LINE_MEMBER(looping_state::level2_irq_set) } -WRITE_LINE_MEMBER(looping_state::main_irq_ack_w) +void looping_state::main_irq_ack_w(int state) { if (state == 0) m_maincpu->set_input_line(INT_9995_INT1, CLEAR_LINE); } -WRITE_LINE_MEMBER(looping_state::watchdog_w) +void looping_state::watchdog_w(int state) { m_watchdog->watchdog_reset(); } -WRITE_LINE_MEMBER(looping_state::souint_clr) +void looping_state::souint_clr(int state) { logerror("Soundint clr = %d\n", state); if (state == 0) @@ -389,14 +389,14 @@ WRITE_LINE_MEMBER(looping_state::souint_clr) } -WRITE_LINE_MEMBER(looping_state::spcint) +void looping_state::spcint(int state) { logerror("Speech /int = %d\n", state == ASSERT_LINE ? 1 : 0); m_audiocpu->set_input_line(INT_9980A_LEVEL4, state == ASSERT_LINE ? CLEAR_LINE : ASSERT_LINE); } -WRITE_LINE_MEMBER(looping_state::int_update) +void looping_state::int_update(int state) { // hack necessitated by flawed input logic in TMS9980A core if (m_soundlatch->pending_r()) @@ -438,20 +438,20 @@ void looping_state::sound_sw(uint8_t data) * *************************************/ -WRITE_LINE_MEMBER(looping_state::ay_enable_w) +void looping_state::ay_enable_w(int state) { for (int output = 0; output < 3; output++) m_aysnd->set_output_gain(output, state ? 1.0 : 0.0); } -WRITE_LINE_MEMBER(looping_state::speech_enable_w) +void looping_state::speech_enable_w(int state) { m_tms->set_output_gain(0, state ? 1.0 : 0.0); } -WRITE_LINE_MEMBER(looping_state::ballon_enable_w) +void looping_state::ballon_enable_w(int state) { logerror("ballon_enable_w = %d\n", state); } @@ -470,7 +470,7 @@ void looping_state::out_2_w(uint8_t data) { osd_printf_debug("out2 = %02X\n", da uint8_t looping_state::adc_r() { osd_printf_debug("%04X:ADC read\n", m_maincpu->pc()); return 0xff; } void looping_state::adc_w(uint8_t data) { osd_printf_debug("%04X:ADC write = %02X\n", m_maincpu->pc(), data); } -WRITE_LINE_MEMBER(looping_state::plr2_w) +void looping_state::plr2_w(int state) { /* set to 1 after IDLE, cleared to 0 during processing is this an LED on the PCB? */ @@ -489,7 +489,7 @@ uint8_t looping_state::cop_unk_r() return 1; } -READ_LINE_MEMBER(looping_state::cop_serial_r) +int looping_state::cop_serial_r() { return 1; } diff --git a/src/mame/venture/spcforce.cpp b/src/mame/venture/spcforce.cpp index 9d7fd55ec5b..4b2db9e93b5 100644 --- a/src/mame/venture/spcforce.cpp +++ b/src/mame/venture/spcforce.cpp @@ -78,12 +78,12 @@ private: void sn76496_latch_w(uint8_t data); uint8_t sn76496_select_r(); void sn76496_select_w(uint8_t data); - template DECLARE_WRITE_LINE_MEMBER(write_sn_ready); - DECLARE_READ_LINE_MEMBER(t0_r); + template void write_sn_ready(int state); + int t0_r(); void soundtrigger_w(uint8_t data); void misc_outputs_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(flip_screen_w); - DECLARE_WRITE_LINE_MEMBER(unknown_w); + void flip_screen_w(int state); + void unknown_w(int state); void palette(palette_device &palette) const; @@ -112,7 +112,7 @@ private: // video -WRITE_LINE_MEMBER(spcforce_state::flip_screen_w) +void spcforce_state::flip_screen_w(int state) { flip_screen_set(!state); } @@ -165,7 +165,7 @@ void spcforce_state::sn76496_latch_w(uint8_t data) } template -WRITE_LINE_MEMBER(spcforce_state::write_sn_ready) +void spcforce_state::write_sn_ready(int state) { m_sn_ready[Which] = state; } @@ -188,7 +188,7 @@ void spcforce_state::sn76496_select_w(uint8_t data) if (!BIT(data, 4)) m_sn[2]->write(m_sn76496_latch); } -READ_LINE_MEMBER(spcforce_state::t0_r) +int spcforce_state::t0_r() { // SN76496 status according to Al - not supported by MAME?? return machine().rand() & 1; @@ -208,7 +208,7 @@ void spcforce_state::misc_outputs_w(uint8_t data) machine().bookkeeping().coin_counter_w(1, BIT(data, 3)); } -WRITE_LINE_MEMBER(spcforce_state::unknown_w) +void spcforce_state::unknown_w(int state) { // written very frequently } diff --git a/src/mame/verifone/tranz330.h b/src/mame/verifone/tranz330.h index d30346285f2..911a229aec9 100644 --- a/src/mame/verifone/tranz330.h +++ b/src/mame/verifone/tranz330.h @@ -48,10 +48,10 @@ private: virtual void machine_start() override; virtual void machine_reset() override; - DECLARE_WRITE_LINE_MEMBER(syncb_w); - DECLARE_WRITE_LINE_MEMBER(clock_w); + void syncb_w(int state); + void clock_w(int state); - DECLARE_WRITE_LINE_MEMBER(sound_w); + void sound_w(int state); void pio_a_w(uint8_t data); uint8_t pio_b_r(); diff --git a/src/mame/vidbrain/uv201.cpp b/src/mame/vidbrain/uv201.cpp index 56b670247b3..76028d6643d 100644 --- a/src/mame/vidbrain/uv201.cpp +++ b/src/mame/vidbrain/uv201.cpp @@ -450,7 +450,7 @@ void uv201_device::write(offs_t offset, uint8_t data) // ext_int_w - external interrupt write //------------------------------------------------- -WRITE_LINE_MEMBER( uv201_device::ext_int_w ) +void uv201_device::ext_int_w(int state) { if (!state && (m_cmd & COMMAND_FRZ)) { @@ -464,7 +464,7 @@ WRITE_LINE_MEMBER( uv201_device::ext_int_w ) // kbd_r - keyboard select read //------------------------------------------------- -READ_LINE_MEMBER( uv201_device::kbd_r ) +int uv201_device::kbd_r() { return (m_cmd & COMMAND_KBD) ? 1 : 0; } diff --git a/src/mame/vidbrain/uv201.h b/src/mame/vidbrain/uv201.h index cd5439b6ed0..060bb6e0426 100644 --- a/src/mame/vidbrain/uv201.h +++ b/src/mame/vidbrain/uv201.h @@ -80,8 +80,8 @@ public: uint8_t read(offs_t offset); void write(offs_t offset, uint8_t data); - DECLARE_WRITE_LINE_MEMBER( ext_int_w ); - DECLARE_READ_LINE_MEMBER( kbd_r ); + void ext_int_w(int state); + int kbd_r(); uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); diff --git a/src/mame/vidbrain/vidbrain.cpp b/src/mame/vidbrain/vidbrain.cpp index e3e8fecf120..6f37a0dc29f 100644 --- a/src/mame/vidbrain/vidbrain.cpp +++ b/src/mame/vidbrain/vidbrain.cpp @@ -320,7 +320,7 @@ INPUT_PORTS_END // DEVICE CONFIGURATION //************************************************************************** -WRITE_LINE_MEMBER( vidbrain_state::ext_int_w ) +void vidbrain_state::ext_int_w(int state) { if (state) { @@ -328,7 +328,7 @@ WRITE_LINE_MEMBER( vidbrain_state::ext_int_w ) } } -WRITE_LINE_MEMBER( vidbrain_state::hblank_w ) +void vidbrain_state::hblank_w(int state) { if (state && m_joy_enable) { diff --git a/src/mame/vidbrain/vidbrain.h b/src/mame/vidbrain/vidbrain.h index f64b7d8420b..012e3053587 100644 --- a/src/mame/vidbrain/vidbrain.h +++ b/src/mame/vidbrain/vidbrain.h @@ -59,8 +59,8 @@ private: uint8_t keyboard_r(); void sound_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER( ext_int_w ); - DECLARE_WRITE_LINE_MEMBER( hblank_w ); + void ext_int_w(int state); + void hblank_w(int state); uint8_t memory_read_byte(offs_t offset); required_device m_maincpu; diff --git a/src/mame/videoton/tvc.cpp b/src/mame/videoton/tvc.cpp index b9546f7ea7a..17c286dd394 100644 --- a/src/mame/videoton/tvc.cpp +++ b/src/mame/videoton/tvc.cpp @@ -99,8 +99,8 @@ protected: void sound_w(offs_t offset, uint8_t data); void cassette_w(uint8_t data); uint8_t _5b_r(); - DECLARE_WRITE_LINE_MEMBER(int_ff_set); - DECLARE_WRITE_LINE_MEMBER(centronics_ack); + void int_ff_set(int state); + void centronics_ack(int state); // expansions void expansion_w(offs_t offset, uint8_t data); @@ -722,7 +722,7 @@ void tvc_state::tvc_palette(palette_device &palette) const palette.set_pen_colors(0, tvc_pens); } -WRITE_LINE_MEMBER(tvc_state::int_ff_set) +void tvc_state::int_ff_set(int state) { if (state) { @@ -731,7 +731,7 @@ WRITE_LINE_MEMBER(tvc_state::int_ff_set) } } -WRITE_LINE_MEMBER(tvc_state::centronics_ack) +void tvc_state::centronics_ack(int state) { if (state) m_centronics_ff = 1; diff --git a/src/mame/virtual/vgmplay.cpp b/src/mame/virtual/vgmplay.cpp index 00285bc2c9a..24ace147747 100644 --- a/src/mame/virtual/vgmplay.cpp +++ b/src/mame/virtual/vgmplay.cpp @@ -432,7 +432,7 @@ public: template void upd7759_reset_w(uint8_t data); template void upd7759_start_w(uint8_t data); template void upd7759_data_w(uint8_t data); - template DECLARE_WRITE_LINE_MEMBER(upd7759_drq_w); + template void upd7759_drq_w(int state); template void okim6258_clock_w(offs_t offset, uint8_t data, uint8_t mem_mask = ~0); template void okim6258_divider_w(offs_t offset, uint8_t data, uint8_t mem_mask = ~0); template void okim6295_clock_w(offs_t offset, uint8_t data, uint8_t mem_mask = ~0); @@ -3154,7 +3154,7 @@ void vgmplay_state::upd7759_data_w(uint8_t data) } template -WRITE_LINE_MEMBER(vgmplay_state::upd7759_drq_w) +void vgmplay_state::upd7759_drq_w(int state) { if (m_upd7759_drq[Index] && !state) osd_printf_error("upd7759.%d underflow\n", Index); diff --git a/src/mame/visual/v100.cpp b/src/mame/visual/v100.cpp index ba7a854bc64..11de88bad6b 100644 --- a/src/mame/visual/v100.cpp +++ b/src/mame/visual/v100.cpp @@ -55,7 +55,7 @@ private: void key_row_w(u8 data); void port48_w(u8 data); void picu_w(u8 data); - template DECLARE_WRITE_LINE_MEMBER(picu_r_w); + template void picu_r_w(int state); IRQ_CALLBACK_MEMBER(irq_ack); void ppi_porta_w(u8 data); @@ -200,7 +200,7 @@ void v100_state::picu_w(u8 data) } template -WRITE_LINE_MEMBER(v100_state::picu_r_w) +void v100_state::picu_r_w(int state) { m_picu->r_w(N, state); } diff --git a/src/mame/visual/v102.cpp b/src/mame/visual/v102.cpp index 9fde6ff6492..bcb1e528abe 100644 --- a/src/mame/visual/v102.cpp +++ b/src/mame/visual/v102.cpp @@ -43,7 +43,7 @@ protected: private: u32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(hs_w); + void hs_w(int state); void io_map(address_map &map); void mem_map(address_map &map); @@ -62,7 +62,7 @@ u32 v102_state::screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const return 0; } -WRITE_LINE_MEMBER(v102_state::hs_w) +void v102_state::hs_w(int state) { if (state && !m_hs_state) { diff --git a/src/mame/visual/v102_kbd.cpp b/src/mame/visual/v102_kbd.cpp index 65580e38556..5ecf727fc37 100644 --- a/src/mame/visual/v102_kbd.cpp +++ b/src/mame/visual/v102_kbd.cpp @@ -308,7 +308,7 @@ void visual_mcs48_keyboard_device::device_start() save_item(NAME(m_key_select)); } -WRITE_LINE_MEMBER(visual_mcs48_keyboard_device::write_rxd) +void visual_mcs48_keyboard_device::write_rxd(int state) { m_kbdc->set_input_line(MCS48_INPUT_IRQ, state ? CLEAR_LINE : ASSERT_LINE); } @@ -326,7 +326,7 @@ void visual_mcs48_keyboard_device::p2_w(u8 data) m_txd_callback(BIT(data, 7)); } -WRITE_LINE_MEMBER(visual_mcs48_keyboard_device::prog_w) +void visual_mcs48_keyboard_device::prog_w(int state) { if (state && !m_prog_line) m_key_select = m_kbdc->p2_r() & 0x0f; diff --git a/src/mame/visual/v102_kbd.h b/src/mame/visual/v102_kbd.h index a0d5779b4a2..22a1cdba24a 100644 --- a/src/mame/visual/v102_kbd.h +++ b/src/mame/visual/v102_kbd.h @@ -13,7 +13,7 @@ class visual_mcs48_keyboard_device : public device_t public: auto txd_callback() { return m_txd_callback.bind(); } - DECLARE_WRITE_LINE_MEMBER(write_rxd); + void write_rxd(int state); protected: visual_mcs48_keyboard_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner); @@ -23,7 +23,7 @@ protected: u8 p1_r(); void p2_w(u8 data); - DECLARE_WRITE_LINE_MEMBER(prog_w); + void prog_w(int state); void prog_map(address_map &map); void ext_map(address_map &map); diff --git a/src/mame/visual/v1050.cpp b/src/mame/visual/v1050.cpp index 556a86d4f93..b81b4dfee96 100644 --- a/src/mame/visual/v1050.cpp +++ b/src/mame/visual/v1050.cpp @@ -405,7 +405,7 @@ void v1050_state::sasi_data_w(uint8_t data) } } -WRITE_LINE_MEMBER( v1050_state::write_sasi_io ) +void v1050_state::write_sasi_io(int state) { m_sasi_ctrl_in->write_bit4(state); @@ -644,7 +644,7 @@ INPUT_PORTS_END // 8214 Interface -WRITE_LINE_MEMBER(v1050_state::pic_int_w) +void v1050_state::pic_int_w(int state) { if (state == ASSERT_LINE) { @@ -705,12 +705,12 @@ void v1050_state::misc_ppi_pa_w(uint8_t data) m_fdc->dden_w(BIT(data, 7)); } -WRITE_LINE_MEMBER(v1050_state::write_centronics_busy) +void v1050_state::write_centronics_busy(int state) { m_centronics_busy = state; } -WRITE_LINE_MEMBER(v1050_state::write_centronics_perror) +void v1050_state::write_centronics_perror(int state) { m_centronics_perror = state; } @@ -879,33 +879,33 @@ void v1050_state::rtc_ppi_pc_w(uint8_t data) // Keyboard 8251A Interface -WRITE_LINE_MEMBER(v1050_state::write_keyboard_clock) +void v1050_state::write_keyboard_clock(int state) { m_uart_kb->write_txc(state); m_uart_kb->write_rxc(state); } -WRITE_LINE_MEMBER( v1050_state::kb_rxrdy_w ) +void v1050_state::kb_rxrdy_w(int state) { set_interrupt(INT_KEYBOARD, state); } // Serial 8251A Interface -WRITE_LINE_MEMBER(v1050_state::write_sio_clock) +void v1050_state::write_sio_clock(int state) { m_uart_sio->write_txc(state); m_uart_sio->write_rxc(state); } -WRITE_LINE_MEMBER( v1050_state::sio_rxrdy_w ) +void v1050_state::sio_rxrdy_w(int state) { m_rxrdy = state; set_interrupt(INT_RS_232, m_rxrdy || m_txrdy); } -WRITE_LINE_MEMBER( v1050_state::sio_txrdy_w ) +void v1050_state::sio_txrdy_w(int state) { m_txrdy = state; @@ -936,14 +936,14 @@ static void v1050_floppies(device_slot_interface &device) device.option_add("525qd", FLOPPY_525_QD); // Teac FD 55-FV-35-U } -WRITE_LINE_MEMBER( v1050_state::fdc_intrq_w ) +void v1050_state::fdc_intrq_w(int state) { m_fdc_irq = state; update_fdc(); } -WRITE_LINE_MEMBER( v1050_state::fdc_drq_w ) +void v1050_state::fdc_drq_w(int state) { m_fdc_drq = state; diff --git a/src/mame/visual/v1050.h b/src/mame/visual/v1050.h index a8416b12d40..4f80274a557 100644 --- a/src/mame/visual/v1050.h +++ b/src/mame/visual/v1050.h @@ -122,39 +122,39 @@ private: void rtc_ppi_pb_w(uint8_t data); uint8_t rtc_ppi_pc_r(); void rtc_ppi_pc_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER( kb_rxrdy_w ); - DECLARE_WRITE_LINE_MEMBER( sio_rxrdy_w ); - DECLARE_WRITE_LINE_MEMBER( sio_txrdy_w ); - DECLARE_WRITE_LINE_MEMBER( fdc_intrq_w ); - DECLARE_WRITE_LINE_MEMBER( fdc_drq_w ); + void kb_rxrdy_w(int state); + void sio_rxrdy_w(int state); + void sio_txrdy_w(int state); + void fdc_intrq_w(int state); + void fdc_drq_w(int state); uint8_t attr_r(); void attr_w(uint8_t data); uint8_t videoram_r(offs_t offset); void videoram_w(offs_t offset, uint8_t data); - DECLARE_WRITE_LINE_MEMBER( crtc_vs_w ); + void crtc_vs_w(int state); void sasi_data_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(write_sasi_io); + void write_sasi_io(int state); void sasi_ctrl_w(uint8_t data); - WRITE_LINE_MEMBER( rtc_ppi_pa_0_w ){ m_rtc_ppi_pa = (m_rtc_ppi_pa & ~(1 << 0)) | ((state & 1) << 0); } - WRITE_LINE_MEMBER( rtc_ppi_pa_1_w ){ m_rtc_ppi_pa = (m_rtc_ppi_pa & ~(1 << 1)) | ((state & 1) << 1); } - WRITE_LINE_MEMBER( rtc_ppi_pa_2_w ){ m_rtc_ppi_pa = (m_rtc_ppi_pa & ~(1 << 2)) | ((state & 1) << 2); } - WRITE_LINE_MEMBER( rtc_ppi_pa_3_w ){ m_rtc_ppi_pa = (m_rtc_ppi_pa & ~(1 << 3)) | ((state & 1) << 3); } - WRITE_LINE_MEMBER( rtc_ppi_pc_3_w ){ m_rtc_ppi_pc = (m_rtc_ppi_pc & ~(1 << 3)) | ((state & 1) << 3); } + void rtc_ppi_pa_0_w(int state) { m_rtc_ppi_pa = (m_rtc_ppi_pa & ~(1 << 0)) | ((state & 1) << 0); } + void rtc_ppi_pa_1_w(int state) { m_rtc_ppi_pa = (m_rtc_ppi_pa & ~(1 << 1)) | ((state & 1) << 1); } + void rtc_ppi_pa_2_w(int state) { m_rtc_ppi_pa = (m_rtc_ppi_pa & ~(1 << 2)) | ((state & 1) << 2); } + void rtc_ppi_pa_3_w(int state) { m_rtc_ppi_pa = (m_rtc_ppi_pa & ~(1 << 3)) | ((state & 1) << 3); } + void rtc_ppi_pc_3_w(int state) { m_rtc_ppi_pc = (m_rtc_ppi_pc & ~(1 << 3)) | ((state & 1) << 3); } TIMER_DEVICE_CALLBACK_MEMBER(v1050_keyboard_tick); TIMER_DEVICE_CALLBACK_MEMBER(sasi_ack_tick); TIMER_DEVICE_CALLBACK_MEMBER(sasi_rst_tick); - DECLARE_WRITE_LINE_MEMBER(write_keyboard_clock); - DECLARE_WRITE_LINE_MEMBER(write_sio_clock); - DECLARE_WRITE_LINE_MEMBER(pic_int_w); + void write_keyboard_clock(int state); + void write_sio_clock(int state); + void pic_int_w(int state); void disp_ppi_pc_w(uint8_t data); void m6502_ppi_pc_w(uint8_t data); uint8_t misc_ppi_pc_r(); IRQ_CALLBACK_MEMBER(v1050_int_ack); - DECLARE_WRITE_LINE_MEMBER(write_centronics_busy); - DECLARE_WRITE_LINE_MEMBER(write_centronics_perror); + void write_centronics_busy(int state); + void write_centronics_perror(int state); MC6845_UPDATE_ROW(crtc_update_row); diff --git a/src/mame/visual/v1050_v.cpp b/src/mame/visual/v1050_v.cpp index 7d2ea5f2aef..cd66f790171 100644 --- a/src/mame/visual/v1050_v.cpp +++ b/src/mame/visual/v1050_v.cpp @@ -87,7 +87,7 @@ MC6845_UPDATE_ROW( v1050_state::crtc_update_row ) } } -WRITE_LINE_MEMBER( v1050_state::crtc_vs_w ) +void v1050_state::crtc_vs_w(int state) { m_subcpu->set_input_line(INPUT_LINE_IRQ0, state ? ASSERT_LINE : CLEAR_LINE); diff --git a/src/mame/visual/v1050kb.cpp b/src/mame/visual/v1050kb.cpp index e488b6b602c..6d2ed33d7a3 100644 --- a/src/mame/visual/v1050kb.cpp +++ b/src/mame/visual/v1050kb.cpp @@ -323,7 +323,7 @@ void v1050_keyboard_device::device_reset() // si_w - //------------------------------------------------- -WRITE_LINE_MEMBER( v1050_keyboard_device::si_w ) +void v1050_keyboard_device::si_w(int state) { m_maincpu->set_input_line(MCS48_INPUT_IRQ, state ? CLEAR_LINE : ASSERT_LINE); } diff --git a/src/mame/visual/v1050kb.h b/src/mame/visual/v1050kb.h index 28dce014e9f..c1179088247 100644 --- a/src/mame/visual/v1050kb.h +++ b/src/mame/visual/v1050kb.h @@ -32,7 +32,7 @@ public: auto out_tx_handler() { return m_out_tx_handler.bind(); } - DECLARE_WRITE_LINE_MEMBER( si_w ); + void si_w(int state); protected: // device-level overrides diff --git a/src/mame/votrax/votrhv.cpp b/src/mame/votrax/votrhv.cpp index 89a8b4c3614..66a38396c9f 100644 --- a/src/mame/votrax/votrhv.cpp +++ b/src/mame/votrax/votrhv.cpp @@ -96,9 +96,9 @@ public: void votrhv(machine_config &config); void hc110(machine_config &config); - DECLARE_WRITE_LINE_MEMBER(reset_counter); - DECLARE_WRITE_LINE_MEMBER(key_pressed); - DECLARE_WRITE_LINE_MEMBER(pho_done); + void reset_counter(int state); + void key_pressed(int state); + void pho_done(int state); protected: virtual void machine_start() override; @@ -442,7 +442,7 @@ void hc120_state::machine_reset() Driver specific functions ******************************************************************************/ -WRITE_LINE_MEMBER( votrhv_state::reset_counter ) +void votrhv_state::reset_counter(int state) { if (state == CLEAR_LINE) { @@ -458,7 +458,7 @@ WRITE_LINE_MEMBER( votrhv_state::reset_counter ) } } -WRITE_LINE_MEMBER( votrhv_state::key_pressed ) +void votrhv_state::key_pressed(int state) { // If we got called here, a key was pressed or released somewhere on the keyboard, and we don't know where. // If, regardless of whether a key was pressed or released, our currently selected column has a non-zero @@ -467,7 +467,7 @@ WRITE_LINE_MEMBER( votrhv_state::key_pressed ) key_check(); } -WRITE_LINE_MEMBER( votrhv_state::pho_done ) +void votrhv_state::pho_done(int state) { bool rising_edge = (!m_latcha_in && (state == ASSERT_LINE)); m_latcha_in = (state == ASSERT_LINE); diff --git a/src/mame/votrax/votrpss.cpp b/src/mame/votrax/votrpss.cpp index ee36434795b..186c872c5c6 100644 --- a/src/mame/votrax/votrpss.cpp +++ b/src/mame/votrax/votrpss.cpp @@ -402,7 +402,7 @@ private: void ppi_pb_w(uint8_t data); void ppi_pc_w(uint8_t data); TIMER_DEVICE_CALLBACK_MEMBER(irq_timer); - DECLARE_WRITE_LINE_MEMBER(write_uart_clock); + void write_uart_clock(int state); IRQ_CALLBACK_MEMBER(irq_ack); void io_map(address_map &map); diff --git a/src/mame/vsystem/fromanc2.cpp b/src/mame/vsystem/fromanc2.cpp index d5ce7d9c502..48f4cd59e14 100644 --- a/src/mame/vsystem/fromanc2.cpp +++ b/src/mame/vsystem/fromanc2.cpp @@ -68,17 +68,17 @@ uint16_t fromanc2_state::keymatrix_r() return ret; } -READ_LINE_MEMBER(fromanc2_state::subcpu_int_r) +int fromanc2_state::subcpu_int_r() { return m_subcpu_int_flag & 0x01; } -READ_LINE_MEMBER(fromanc2_state::sndcpu_nmi_r) +int fromanc2_state::sndcpu_nmi_r() { return m_sndcpu_nmi_flag & 0x01; } -READ_LINE_MEMBER(fromanc2_state::subcpu_nmi_r) +int fromanc2_state::subcpu_nmi_r() { return m_subcpu_nmi_flag & 0x01; } diff --git a/src/mame/vsystem/fromanc2.h b/src/mame/vsystem/fromanc2.h index efca9d2db8d..ada03a0ff37 100644 --- a/src/mame/vsystem/fromanc2.h +++ b/src/mame/vsystem/fromanc2.h @@ -35,9 +35,9 @@ public: void init_fromanc4(); void init_fromanc2(); - DECLARE_READ_LINE_MEMBER(subcpu_int_r); - DECLARE_READ_LINE_MEMBER(sndcpu_nmi_r); - DECLARE_READ_LINE_MEMBER(subcpu_nmi_r); + int subcpu_int_r(); + int sndcpu_nmi_r(); + int subcpu_nmi_r(); protected: virtual void machine_reset() override; diff --git a/src/mame/vsystem/fromance.cpp b/src/mame/vsystem/fromance.cpp index 85ef29fc359..ab7fb1a1267 100644 --- a/src/mame/vsystem/fromance.cpp +++ b/src/mame/vsystem/fromance.cpp @@ -153,7 +153,7 @@ void fromance_state::fromance_adpcm_w(uint8_t data) } -WRITE_LINE_MEMBER(fromance_state::fromance_adpcm_int) +void fromance_state::fromance_adpcm_int(int state) { /* skip if we're reset */ if (!m_adpcm_reset) diff --git a/src/mame/vsystem/fromance.h b/src/mame/vsystem/fromance.h index a4e7e80dc75..46c3d87fed5 100644 --- a/src/mame/vsystem/fromance.h +++ b/src/mame/vsystem/fromance.h @@ -112,7 +112,7 @@ private: inline void get_fromance_tile_info(tile_data &tileinfo, int tile_index, int layer); inline void get_nekkyoku_tile_info(tile_data &tileinfo, int tile_index, int layer); void crtc_refresh(); - DECLARE_WRITE_LINE_MEMBER(fromance_adpcm_int); + void fromance_adpcm_int(int state); void fromance_main_map(address_map &map); void fromance_sub_io_map(address_map &map); void fromance_sub_map(address_map &map); diff --git a/src/mame/vsystem/gstriker.cpp b/src/mame/vsystem/gstriker.cpp index 83866fa5103..aac65c42f10 100644 --- a/src/mame/vsystem/gstriker.cpp +++ b/src/mame/vsystem/gstriker.cpp @@ -283,7 +283,7 @@ private: void vbl_toggle_w(uint16_t data); uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(screen_vblank); + void screen_vblank(int state); void mcu_init(); void gstriker_map(address_map &map); @@ -306,7 +306,7 @@ void gstriker_state::video_start() m_bg->set_transparent_pen(0xf); } -WRITE_LINE_MEMBER(gstriker_state::screen_vblank) +void gstriker_state::screen_vblank(int state) { // sprites are two frames ahead // TODO: probably all Video System games are (Aero Fighters definitely desyncs wrt background) diff --git a/src/mame/vsystem/inufuku.cpp b/src/mame/vsystem/inufuku.cpp index 0750a65a272..182daa7aac4 100644 --- a/src/mame/vsystem/inufuku.cpp +++ b/src/mame/vsystem/inufuku.cpp @@ -115,7 +115,7 @@ public: void inufuku(machine_config &config); void _3on3dunk(machine_config &config); - DECLARE_READ_LINE_MEMBER(soundflag_r); + int soundflag_r(); protected: virtual void machine_start() override; @@ -335,7 +335,7 @@ void inufuku_state::soundrombank_w(u8 data) ******************************************************************************/ -READ_LINE_MEMBER(inufuku_state::soundflag_r) +int inufuku_state::soundflag_r() { return m_soundlatch->pending_r() ? 0 : 1; } diff --git a/src/mame/vsystem/ojankohs.cpp b/src/mame/vsystem/ojankohs.cpp index a67379dfef7..6d9d003d88a 100644 --- a/src/mame/vsystem/ojankohs.cpp +++ b/src/mame/vsystem/ojankohs.cpp @@ -66,7 +66,7 @@ void ojankohs_state::msm5205_w(uint8_t data) m_vclk_left = 2; } -WRITE_LINE_MEMBER(ojankohs_state::adpcm_int) +void ojankohs_state::adpcm_int(int state) { // skip if we're reset if (!m_adpcm_reset) diff --git a/src/mame/vsystem/ojankohs.h b/src/mame/vsystem/ojankohs.h index c5d4dcbd5a3..4dc0f5483f9 100644 --- a/src/mame/vsystem/ojankohs.h +++ b/src/mame/vsystem/ojankohs.h @@ -99,7 +99,7 @@ protected: void adpcm_reset_w(uint8_t data); TILE_GET_INFO_MEMBER(get_tile_info); uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(adpcm_int); + void adpcm_int(int state); private: void palette_w(offs_t offset, uint8_t data); diff --git a/src/mame/vsystem/taotaido.cpp b/src/mame/vsystem/taotaido.cpp index 40724c9ea43..b49b4d9b895 100644 --- a/src/mame/vsystem/taotaido.cpp +++ b/src/mame/vsystem/taotaido.cpp @@ -157,7 +157,7 @@ private: TILEMAP_MAPPER_MEMBER(tilemap_scan_rows); uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(screen_vblank); + void screen_vblank(int state); uint32_t tile_callback(uint32_t code); void main_map(address_map &map); void sound_map(address_map &map); @@ -272,7 +272,7 @@ uint32_t taotaido_state::screen_update(screen_device &screen, bitmap_ind16 &bitm return 0; } -WRITE_LINE_MEMBER(taotaido_state::screen_vblank) +void taotaido_state::screen_vblank(int state) { // rising edge if (state) diff --git a/src/mame/vtech/crvision.cpp b/src/mame/vtech/crvision.cpp index 86dede84006..636172cfb37 100644 --- a/src/mame/vtech/crvision.cpp +++ b/src/mame/vtech/crvision.cpp @@ -703,36 +703,36 @@ void laser2001_state::pia_pb_w(uint8_t data) m_cent_data_out->write(data); } -READ_LINE_MEMBER( laser2001_state::pia_ca1_r ) +int laser2001_state::pia_ca1_r() { return (m_cassette->input() > 0.16) ? 0 : 1; } -WRITE_LINE_MEMBER( laser2001_state::pia_ca2_w ) +void laser2001_state::pia_ca2_w(int state) { m_cassette->output(state ? +1.0 : -1.0); } -WRITE_LINE_MEMBER(laser2001_state::write_centronics_busy) +void laser2001_state::write_centronics_busy(int state) { m_centronics_busy = state; m_pia->cb1_w(pia_cb1_r()); } -WRITE_LINE_MEMBER(laser2001_state::write_psg_ready) +void laser2001_state::write_psg_ready(int state) { m_psg_ready = state; m_pia->cb1_w(pia_cb1_r()); } -READ_LINE_MEMBER( laser2001_state::pia_cb1_r ) +int laser2001_state::pia_cb1_r() { /* actually this is a diode-AND (READY & _BUSY), but ctronics.c returns busy status if no device is mounted -> Manager won't boot */ return m_psg_ready && (!m_centronics_busy || m_pia->ca2_output_z()); } -WRITE_LINE_MEMBER( laser2001_state::pia_cb2_w ) +void laser2001_state::pia_cb2_w(int state) { if (m_pia->ca2_output_z()) { diff --git a/src/mame/vtech/crvision.h b/src/mame/vtech/crvision.h index a0be2d5d507..b41faa75c74 100644 --- a/src/mame/vtech/crvision.h +++ b/src/mame/vtech/crvision.h @@ -98,16 +98,16 @@ private: int m_centronics_busy = 0; int m_psg_ready = 0; - DECLARE_WRITE_LINE_MEMBER( write_centronics_busy ); - DECLARE_WRITE_LINE_MEMBER( write_psg_ready ); + void write_centronics_busy(int state); + void write_psg_ready(int state); uint8_t pia_pa_r(); void pia_pa_w(uint8_t data); uint8_t pia_pb_r(); void pia_pb_w(uint8_t data); - DECLARE_READ_LINE_MEMBER( pia_ca1_r ); - DECLARE_WRITE_LINE_MEMBER( pia_ca2_w ); - DECLARE_READ_LINE_MEMBER( pia_cb1_r ); - DECLARE_WRITE_LINE_MEMBER( pia_cb2_w ); + int pia_ca1_r(); + void pia_ca2_w(int state); + int pia_cb1_r(); + void pia_cb2_w(int state); void lasr2001_map(address_map &map); virtual void machine_start() override; diff --git a/src/mame/vtech/inteladv.cpp b/src/mame/vtech/inteladv.cpp index 0e9fae0b2f5..46a83e46d6a 100644 --- a/src/mame/vtech/inteladv.cpp +++ b/src/mame/vtech/inteladv.cpp @@ -25,8 +25,8 @@ public: void inteladv(machine_config &config); void dyndesk(machine_config &config); - DECLARE_WRITE_LINE_MEMBER(st2205u_power_w); - DECLARE_WRITE_LINE_MEMBER(st2202_power_w); + void st2205u_power_w(int state); + void st2202_power_w(int state); private: void inteladv_map(address_map &map); @@ -46,13 +46,13 @@ void inteladv_state::dyndesk_map(address_map &map) map(0x800000, 0x807fff).ram(); } -WRITE_LINE_MEMBER(inteladv_state::st2205u_power_w) +void inteladv_state::st2205u_power_w(int state) { if (!state) m_maincpu->set_state_int(st2xxx_device::ST_IREQ, m_maincpu->state_int(st2xxx_device::ST_IREQ) | 0x0020); } -WRITE_LINE_MEMBER(inteladv_state::st2202_power_w) +void inteladv_state::st2202_power_w(int state) { if (!state) m_maincpu->set_state_int(st2xxx_device::ST_IREQ, m_maincpu->state_int(st2xxx_device::ST_IREQ) | 0x0010); diff --git a/src/mame/vtech/laser3k.cpp b/src/mame/vtech/laser3k.cpp index 2199fcd14ca..97087fbf7b0 100644 --- a/src/mame/vtech/laser3k.cpp +++ b/src/mame/vtech/laser3k.cpp @@ -110,9 +110,9 @@ private: void hgr_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int beginrow, int endrow); void dhgr_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int beginrow, int endrow); - DECLARE_READ_LINE_MEMBER(ay3600_shift_r); - DECLARE_READ_LINE_MEMBER(ay3600_control_r); - DECLARE_WRITE_LINE_MEMBER(ay3600_data_ready_w); + int ay3600_shift_r(); + int ay3600_control_r(); + void ay3600_data_ready_w(int state); void banks_map(address_map &map); void laser3k_map(address_map &map); @@ -712,7 +712,7 @@ uint32_t laser3k_state::screen_update(screen_device &screen, bitmap_ind16 &bitma return 0; } -READ_LINE_MEMBER(laser3k_state::ay3600_shift_r) +int laser3k_state::ay3600_shift_r() { // either shift key if (m_kbspecial->read() & 0x06) @@ -723,7 +723,7 @@ READ_LINE_MEMBER(laser3k_state::ay3600_shift_r) return CLEAR_LINE; } -READ_LINE_MEMBER(laser3k_state::ay3600_control_r) +int laser3k_state::ay3600_control_r() { if (m_kbspecial->read() & 0x08) { @@ -788,7 +788,7 @@ static const uint8_t key_remap[0x32][4] = { 0x0d,0x0d,0x0d,0x0d }, /* Enter 31 */ }; -WRITE_LINE_MEMBER(laser3k_state::ay3600_data_ready_w) +void laser3k_state::ay3600_data_ready_w(int state) { if (state == ASSERT_LINE) { diff --git a/src/mame/vtech/vsmile.cpp b/src/mame/vtech/vsmile.cpp index 80e6d650b52..46e4a2fcd5a 100644 --- a/src/mame/vtech/vsmile.cpp +++ b/src/mame/vtech/vsmile.cpp @@ -80,7 +80,7 @@ void vsmile_state::ctrl_tx_w(uint8_t data) m_maincpu->uart_rx(data); } -template WRITE_LINE_MEMBER(vsmile_state::ctrl_rts_w) +template void vsmile_state::ctrl_rts_w(int state) { //printf("Ctrl%d RTS: %d\n", Which, state); m_ctrl_rts[Which] = state; diff --git a/src/mame/vtech/vsmile.h b/src/mame/vtech/vsmile.h index e6898f7867a..57ec39e39e7 100644 --- a/src/mame/vtech/vsmile.h +++ b/src/mame/vtech/vsmile.h @@ -85,7 +85,7 @@ private: void banked_map(address_map &map); void ctrl_tx_w(uint8_t data); - template DECLARE_WRITE_LINE_MEMBER(ctrl_rts_w); + template void ctrl_rts_w(int state); uint16_t portb_r(); void portb_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); diff --git a/src/mame/vtech/vtech_eu3a12.cpp b/src/mame/vtech/vtech_eu3a12.cpp index 006901176b3..8921c871e58 100644 --- a/src/mame/vtech/vtech_eu3a12.cpp +++ b/src/mame/vtech/vtech_eu3a12.cpp @@ -25,8 +25,8 @@ public: void vreadere(machine_config &config); - DECLARE_WRITE_LINE_MEMBER(power_on_w); - DECLARE_WRITE_LINE_MEMBER(power_off_w); + void power_on_w(int state); + void power_off_w(int state); protected: virtual void machine_start() override; @@ -89,12 +89,12 @@ EPL43102_UPDATE_CB(vreadere_state::lcd_update) return 0; } -WRITE_LINE_MEMBER(vreadere_state::power_on_w) +void vreadere_state::power_on_w(int state) { m_maincpu->set_input_line(riscii_series_device::PA6_LINE, state ? CLEAR_LINE : ASSERT_LINE); } -WRITE_LINE_MEMBER(vreadere_state::power_off_w) +void vreadere_state::power_off_w(int state) { m_maincpu->set_input_line(riscii_series_device::PA7_LINE, state ? CLEAR_LINE : ASSERT_LINE); } diff --git a/src/mame/wang/wangpc.cpp b/src/mame/wang/wangpc.cpp index 6c10bec49cd..943fe92fcd2 100644 --- a/src/mame/wang/wangpc.cpp +++ b/src/mame/wang/wangpc.cpp @@ -159,33 +159,33 @@ private: void parity_nmi_clr_w(uint8_t data); uint8_t option_id_r(); - DECLARE_WRITE_LINE_MEMBER( hrq_w ); - DECLARE_WRITE_LINE_MEMBER( eop_w ); + void hrq_w(int state); + void eop_w(int state); uint8_t memr_r(offs_t offset); void memw_w(offs_t offset, uint8_t data); uint8_t ior2_r(); void iow2_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER( dack0_w ); - DECLARE_WRITE_LINE_MEMBER( dack1_w ); - DECLARE_WRITE_LINE_MEMBER( dack2_w ); - DECLARE_WRITE_LINE_MEMBER( dack3_w ); + void dack0_w(int state); + void dack1_w(int state); + void dack2_w(int state); + void dack3_w(int state); uint8_t ppi_pa_r(); uint8_t ppi_pb_r(); uint8_t ppi_pc_r(); void ppi_pc_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER( pit0_w ); - DECLARE_WRITE_LINE_MEMBER( pit2_w ); - DECLARE_WRITE_LINE_MEMBER( uart_dr_w ); - DECLARE_WRITE_LINE_MEMBER( uart_tbre_w ); - DECLARE_WRITE_LINE_MEMBER( epci_irq_w ); - DECLARE_WRITE_LINE_MEMBER( write_centronics_ack ); - DECLARE_WRITE_LINE_MEMBER( write_centronics_busy ); - DECLARE_WRITE_LINE_MEMBER( write_centronics_fault ); - DECLARE_WRITE_LINE_MEMBER( write_centronics_perror ); - DECLARE_WRITE_LINE_MEMBER( bus_irq2_w ); - - DECLARE_WRITE_LINE_MEMBER( fdc_irq ); - DECLARE_WRITE_LINE_MEMBER( fdc_drq ); + void pit0_w(int state); + void pit2_w(int state); + void uart_dr_w(int state); + void uart_tbre_w(int state); + void epci_irq_w(int state); + void write_centronics_ack(int state); + void write_centronics_busy(int state); + void write_centronics_fault(int state); + void write_centronics_perror(int state); + void bus_irq2_w(int state); + + void fdc_irq(int state); + void fdc_drq(int state); void on_disk0_load(floppy_image_device *image); void on_disk0_unload(floppy_image_device *image); @@ -799,14 +799,14 @@ void wangpc_state::update_fdc_tc() m_fdc->tc_w(0); } -WRITE_LINE_MEMBER( wangpc_state::hrq_w ) +void wangpc_state::hrq_w(int state) { m_maincpu->set_input_line(INPUT_LINE_HALT, state ? ASSERT_LINE : CLEAR_LINE); m_dmac->hack_w(state); } -WRITE_LINE_MEMBER( wangpc_state::eop_w ) +void wangpc_state::eop_w(int state) { if (m_dack == 2) { @@ -857,22 +857,22 @@ void wangpc_state::iow2_w(uint8_t data) m_fdc->dma_w(data); } -WRITE_LINE_MEMBER( wangpc_state::dack0_w ) +void wangpc_state::dack0_w(int state) { if (!state) m_dack = 0; } -WRITE_LINE_MEMBER( wangpc_state::dack1_w ) +void wangpc_state::dack1_w(int state) { if (!state) m_dack = 1; } -WRITE_LINE_MEMBER( wangpc_state::dack2_w ) +void wangpc_state::dack2_w(int state) { if (!state) m_dack = 2; } -WRITE_LINE_MEMBER( wangpc_state::dack3_w ) +void wangpc_state::dack3_w(int state) { if (!state) m_dack = 3; } @@ -1013,13 +1013,13 @@ void wangpc_state::ppi_pc_w(uint8_t data) m_centronics->write_init(BIT(data, 2)); } -WRITE_LINE_MEMBER( wangpc_state::pit0_w ) +void wangpc_state::pit0_w(int state) { if (state) m_pic->ir0_w(1); } -WRITE_LINE_MEMBER( wangpc_state::pit2_w ) +void wangpc_state::pit2_w(int state) { if (state) { @@ -1032,7 +1032,7 @@ WRITE_LINE_MEMBER( wangpc_state::pit2_w ) // IM6402_INTERFACE( uart_intf ) //------------------------------------------------- -WRITE_LINE_MEMBER( wangpc_state::uart_dr_w ) +void wangpc_state::uart_dr_w(int state) { if (state) { @@ -1043,7 +1043,7 @@ WRITE_LINE_MEMBER( wangpc_state::uart_dr_w ) } } -WRITE_LINE_MEMBER( wangpc_state::uart_tbre_w ) +void wangpc_state::uart_tbre_w(int state) { if (state) { @@ -1059,7 +1059,7 @@ WRITE_LINE_MEMBER( wangpc_state::uart_tbre_w ) // SCN2661_INTERFACE( epci_intf ) //------------------------------------------------- -WRITE_LINE_MEMBER( wangpc_state::epci_irq_w ) +void wangpc_state::epci_irq_w(int state) { check_level1_interrupts(); } @@ -1074,14 +1074,14 @@ static void wangpc_floppies(device_slot_interface &device) device.option_add("525dd", FLOPPY_525_DD); } -WRITE_LINE_MEMBER( wangpc_state::fdc_irq ) +void wangpc_state::fdc_irq(int state) { if (LOG) logerror("FDC INT %u\n", state); check_level2_interrupts(); } -WRITE_LINE_MEMBER( wangpc_state::fdc_drq ) +void wangpc_state::fdc_drq(int state) { if (LOG) logerror("FDC DRQ %u\n", state); @@ -1102,7 +1102,7 @@ void wangpc_state::update_fdc_drq() // centronics_interface centronics_intf //------------------------------------------------- -WRITE_LINE_MEMBER( wangpc_state::write_centronics_ack ) +void wangpc_state::write_centronics_ack(int state) { if (LOG) logerror("ACKNLG %u\n", state); @@ -1111,7 +1111,7 @@ WRITE_LINE_MEMBER( wangpc_state::write_centronics_ack ) check_level1_interrupts(); } -WRITE_LINE_MEMBER( wangpc_state::write_centronics_busy ) +void wangpc_state::write_centronics_busy(int state) { if (LOG) logerror("BUSY %u\n", state); @@ -1120,12 +1120,12 @@ WRITE_LINE_MEMBER( wangpc_state::write_centronics_busy ) check_level1_interrupts(); } -WRITE_LINE_MEMBER( wangpc_state::write_centronics_fault ) +void wangpc_state::write_centronics_fault(int state) { m_centronics_fault = state; } -WRITE_LINE_MEMBER( wangpc_state::write_centronics_perror ) +void wangpc_state::write_centronics_perror(int state) { m_centronics_perror = state; } @@ -1134,7 +1134,7 @@ WRITE_LINE_MEMBER( wangpc_state::write_centronics_perror ) // WANGPC_BUS_INTERFACE( kb_intf ) //------------------------------------------------- -WRITE_LINE_MEMBER( wangpc_state::bus_irq2_w ) +void wangpc_state::bus_irq2_w(int state) { if (LOG) logerror("Bus IRQ2 %u\n", state); diff --git a/src/mame/wang/wangpckb.cpp b/src/mame/wang/wangpckb.cpp index 8faba3f7954..de2ad5027d2 100644 --- a/src/mame/wang/wangpckb.cpp +++ b/src/mame/wang/wangpckb.cpp @@ -405,7 +405,7 @@ void wangpc_keyboard_device::device_reset() // write_rxd - //------------------------------------------------- -WRITE_LINE_MEMBER(wangpc_keyboard_device::write_rxd) +void wangpc_keyboard_device::write_rxd(int state) { m_rxd = state; } diff --git a/src/mame/wang/wangpckb.h b/src/mame/wang/wangpckb.h index 9a095b9a4f0..3a99b3c538c 100644 --- a/src/mame/wang/wangpckb.h +++ b/src/mame/wang/wangpckb.h @@ -30,7 +30,7 @@ public: auto txd_handler() { return m_txd_handler.bind(); } - DECLARE_WRITE_LINE_MEMBER( write_rxd ); + void write_rxd(int state); void wangpc_keyboard_io(address_map &map); diff --git a/src/mame/wavemate/bullet.cpp b/src/mame/wavemate/bullet.cpp index 58b141abc89..d18e269f7bd 100644 --- a/src/mame/wavemate/bullet.cpp +++ b/src/mame/wavemate/bullet.cpp @@ -732,7 +732,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(bullet_state::ctc_tick) m_ctc->trg2(0); } -WRITE_LINE_MEMBER( bullet_state::dart_rxtxca_w ) +void bullet_state::dart_rxtxca_w(int state) { m_dart->txca_w(state); m_dart->rxca_w(state); @@ -742,13 +742,13 @@ WRITE_LINE_MEMBER( bullet_state::dart_rxtxca_w ) // Z80DART //------------------------------------------------- -WRITE_LINE_MEMBER( bullet_state::dartardy_w ) +void bullet_state::dartardy_w(int state) { m_dartardy = state; update_dma_rdy(); } -WRITE_LINE_MEMBER( bullet_state::dartbrdy_w ) +void bullet_state::dartbrdy_w(int state) { m_dartbrdy = state; update_dma_rdy(); @@ -858,22 +858,22 @@ void bulletf_state::dma_mreq_w(offs_t offset, uint8_t data) // Z80PIO //------------------------------------------------- -DECLARE_WRITE_LINE_MEMBER( bullet_state::write_centronics_busy ) +void bullet_state::write_centronics_busy(int state) { m_centronics_busy = state; } -DECLARE_WRITE_LINE_MEMBER( bullet_state::write_centronics_perror ) +void bullet_state::write_centronics_perror(int state) { m_centronics_perror = state; } -DECLARE_WRITE_LINE_MEMBER( bullet_state::write_centronics_select ) +void bullet_state::write_centronics_select(int state) { m_centronics_select = state; } -DECLARE_WRITE_LINE_MEMBER( bullet_state::write_centronics_fault ) +void bullet_state::write_centronics_fault(int state) { m_centronics_fault = state; } @@ -929,7 +929,7 @@ void bulletf_state::pio_pa_w(uint8_t data) m_scsibus->write_sel(BIT(data, 2)); } -WRITE_LINE_MEMBER( bulletf_state::cstrb_w ) +void bulletf_state::cstrb_w(int state) { m_centronics->write_strobe(!state); } @@ -952,13 +952,13 @@ static void bullet_35_floppies(device_slot_interface &device) device.option_add("35dd", FLOPPY_35_DD); } -WRITE_LINE_MEMBER( bullet_state::fdc_drq_w ) +void bullet_state::fdc_drq_w(int state) { m_fdrdy = !state; update_dma_rdy(); } -WRITE_LINE_MEMBER( bulletf_state::req_w ) +void bulletf_state::req_w(int state) { if (!state) { diff --git a/src/mame/wavemate/bullet.h b/src/mame/wavemate/bullet.h index fcde12c230a..c13c127e9e3 100644 --- a/src/mame/wavemate/bullet.h +++ b/src/mame/wavemate/bullet.h @@ -71,16 +71,16 @@ public: uint8_t dma_mreq_r(offs_t offset); void dma_mreq_w(offs_t offset, uint8_t data); uint8_t pio_pb_r(); - DECLARE_WRITE_LINE_MEMBER( dartardy_w ); - DECLARE_WRITE_LINE_MEMBER( dartbrdy_w ); - DECLARE_WRITE_LINE_MEMBER( write_centronics_busy ); - DECLARE_WRITE_LINE_MEMBER( write_centronics_perror ); - DECLARE_WRITE_LINE_MEMBER( write_centronics_select ); - DECLARE_WRITE_LINE_MEMBER( write_centronics_fault ); - DECLARE_WRITE_LINE_MEMBER( fdc_drq_w ); + void dartardy_w(int state); + void dartbrdy_w(int state); + void write_centronics_busy(int state); + void write_centronics_perror(int state); + void write_centronics_select(int state); + void write_centronics_fault(int state); + void fdc_drq_w(int state); TIMER_DEVICE_CALLBACK_MEMBER(ctc_tick); - DECLARE_WRITE_LINE_MEMBER(dart_rxtxca_w); + void dart_rxtxca_w(int state); uint8_t io_read_byte(offs_t offset); void io_write_byte(offs_t offset, uint8_t data); @@ -163,8 +163,8 @@ private: uint8_t dma_mreq_r(offs_t offset); void dma_mreq_w(offs_t offset, uint8_t data); void pio_pa_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER( cstrb_w ); - DECLARE_WRITE_LINE_MEMBER( req_w ); + void cstrb_w(int state); + void req_w(int state); void bulletf_io(address_map &map); void bulletf_mem(address_map &map); diff --git a/src/mame/wing/lucky74.cpp b/src/mame/wing/lucky74.cpp index 8624bfd0377..d389a33cf55 100644 --- a/src/mame/wing/lucky74.cpp +++ b/src/mame/wing/lucky74.cpp @@ -1426,7 +1426,7 @@ void lucky74_state::sound_start() m_adpcm_busy_line = 0x01; // free and ready } -WRITE_LINE_MEMBER(lucky74_state::adpcm_int) +void lucky74_state::adpcm_int(int state) { if (m_adpcm_reg[05] == 0x01) // register 0x05 (bit 0 activated), trigger the sample { diff --git a/src/mame/wing/lucky74.h b/src/mame/wing/lucky74.h index 1db311b4937..1a77e7caa3a 100644 --- a/src/mame/wing/lucky74.h +++ b/src/mame/wing/lucky74.h @@ -51,7 +51,7 @@ private: void palette(palette_device &palette) const; uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(nmi_interrupt); - DECLARE_WRITE_LINE_MEMBER(adpcm_int); + void adpcm_int(int state); void prg_map(address_map &map); void portmap(address_map &map); diff --git a/src/mame/wing/slotcarn.cpp b/src/mame/wing/slotcarn.cpp index d32bb00fba6..ed41892a50c 100644 --- a/src/mame/wing/slotcarn.cpp +++ b/src/mame/wing/slotcarn.cpp @@ -59,7 +59,7 @@ private: std::unique_ptr m_ram_palette; uint8_t palette_r(offs_t offset); void palette_w(offs_t offset, uint8_t data); - DECLARE_WRITE_LINE_MEMBER(hsync_changed); + void hsync_changed(int state); MC6845_BEGIN_UPDATE(crtc_begin_update); MC6845_UPDATE_ROW(crtc_update_row); virtual void machine_start() override; @@ -156,7 +156,7 @@ MC6845_UPDATE_ROW( slotcarn_state::crtc_update_row ) } -WRITE_LINE_MEMBER(slotcarn_state::hsync_changed) +void slotcarn_state::hsync_changed(int state) { /* update any video up to the current scanline */ // m_screen->update_now(); diff --git a/src/mame/wing/superwng.cpp b/src/mame/wing/superwng.cpp index b638c767327..3ea9adade43 100644 --- a/src/mame/wing/superwng.cpp +++ b/src/mame/wing/superwng.cpp @@ -108,7 +108,7 @@ private: template TILE_GET_INFO_MEMBER(get_tile_info); void palette(palette_device &palette) const; uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(main_nmi_interrupt); + void main_nmi_interrupt(int state); INTERRUPT_GEN_MEMBER(sound_nmi_assert); void main_map(address_map &map); @@ -234,7 +234,7 @@ void superwng_state::nmi_enable_w(uint8_t data) m_nmi_enable = data; } -WRITE_LINE_MEMBER(superwng_state::main_nmi_interrupt) +void superwng_state::main_nmi_interrupt(int state) { if (state && BIT(m_nmi_enable, 0)) m_maincpu->pulse_input_line(INPUT_LINE_NMI, attotime::zero); diff --git a/src/mame/wyse/wy100.cpp b/src/mame/wyse/wy100.cpp index 0757ff0d18b..cce4252f411 100644 --- a/src/mame/wyse/wy100.cpp +++ b/src/mame/wyse/wy100.cpp @@ -53,8 +53,8 @@ protected: private: I8275_DRAW_CHARACTER_MEMBER(draw_character); - DECLARE_WRITE_LINE_MEMBER(brdy_w); - DECLARE_WRITE_LINE_MEMBER(txd_w); + void brdy_w(int state); + void txd_w(int state); void p2_w(u8 data); u8 memory_r(offs_t offset); void memory_w(offs_t offset, u8 data); @@ -91,7 +91,7 @@ void wy100_state::machine_start() save_item(NAME(m_printer_select)); } -WRITE_LINE_MEMBER(wy100_state::brdy_w) +void wy100_state::brdy_w(int state) { m_brdy = state; } @@ -117,7 +117,7 @@ I8275_DRAW_CHARACTER_MEMBER(wy100_state::draw_character) bitmap.pix(y, x + i) = BIT(dots, i < 1 || i > 8 ? 7 : 8 - i) ? fg : bg; } -WRITE_LINE_MEMBER(wy100_state::txd_w) +void wy100_state::txd_w(int state) { m_txd = state; if (m_printer_select) diff --git a/src/mame/wyse/wy50.cpp b/src/mame/wyse/wy50.cpp index cbfa407e92f..36be3402e0b 100644 --- a/src/mame/wyse/wy50.cpp +++ b/src/mame/wyse/wy50.cpp @@ -67,7 +67,7 @@ protected: private: u8 pvtc_videoram_r(offs_t offset); SCN2672_DRAW_CHARACTER_MEMBER(draw_character); - DECLARE_WRITE_LINE_MEMBER(mbc_attr_clock_w); + void mbc_attr_clock_w(int state); u8 pvtc_r(offs_t offset); void pvtc_w(offs_t offset, u8 data); @@ -176,7 +176,7 @@ SCN2672_DRAW_CHARACTER_MEMBER(wy50_state::draw_character) bitmap.pix(y, x++) = BIT(dots, 9) ? fg : rgb_t::black(); } -WRITE_LINE_MEMBER(wy50_state::mbc_attr_clock_w) +void wy50_state::mbc_attr_clock_w(int state) { if (state) m_last_row_attr = m_cur_attr; diff --git a/src/mame/wyse/wy50kb.cpp b/src/mame/wyse/wy50kb.cpp index 0a7533fa7c2..24c5e07e6e7 100644 --- a/src/mame/wyse/wy50kb.cpp +++ b/src/mame/wyse/wy50kb.cpp @@ -423,7 +423,7 @@ void wyse_parallel_keyboard_device::scan_w(u8 address) m_address = address; } -READ_LINE_MEMBER(wyse_parallel_keyboard_device::sense_r) +int wyse_parallel_keyboard_device::sense_r() { return BIT(m_key_matrix[(m_address >> 3) & 15].read_safe(0xff), m_address & 7); } diff --git a/src/mame/wyse/wy50kb.h b/src/mame/wyse/wy50kb.h index faa63c23b6c..dac00c9c0f2 100644 --- a/src/mame/wyse/wy50kb.h +++ b/src/mame/wyse/wy50kb.h @@ -10,7 +10,7 @@ class wyse_parallel_keyboard_device : public device_t { public: void scan_w(u8 address); - DECLARE_READ_LINE_MEMBER(sense_r); + int sense_r(); protected: wyse_parallel_keyboard_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner); diff --git a/src/mame/wyse/wy60.cpp b/src/mame/wyse/wy60.cpp index efd55d5c856..ee1d5dd298a 100644 --- a/src/mame/wyse/wy60.cpp +++ b/src/mame/wyse/wy60.cpp @@ -48,7 +48,7 @@ protected: private: SCN2672_DRAW_CHARACTER_MEMBER(draw_character); - DECLARE_WRITE_LINE_MEMBER(mbc_attr_clock_w); + void mbc_attr_clock_w(int state); u8 mbc_char_r(offs_t offset); u8 mbc_attr_r(offs_t offset); @@ -59,7 +59,7 @@ private: void p1_w(u8 data); u8 p1_r(); - DECLARE_WRITE_LINE_MEMBER(ea_w); + void ea_w(int state); void prog_map(address_map &map); void ext_map(address_map &map); @@ -137,7 +137,7 @@ SCN2672_DRAW_CHARACTER_MEMBER(wy60_state::draw_character) std::fill_n(&bitmap.pix(y, x), m_is_132 ? 2 : 3, BIT(dots, 7) ? fg : rgb_t::black()); } -WRITE_LINE_MEMBER(wy60_state::mbc_attr_clock_w) +void wy60_state::mbc_attr_clock_w(int state) { if (state) m_last_row_attr = m_cur_attr; @@ -208,7 +208,7 @@ u8 wy60_state::p1_r() return (m_eeprom->read_sda() << 1) | (m_keyboard->data_r() ? 0 : 0x40) | 0xad; } -WRITE_LINE_MEMBER(wy60_state::ea_w) +void wy60_state::ea_w(int state) { if (state) m_internal_view.select(0); diff --git a/src/mame/xerox/bigbord2.cpp b/src/mame/xerox/bigbord2.cpp index 03a7d60a47d..29480e2cf5b 100644 --- a/src/mame/xerox/bigbord2.cpp +++ b/src/mame/xerox/bigbord2.cpp @@ -121,21 +121,21 @@ public: void init_bigbord2(); private: - DECLARE_WRITE_LINE_MEMBER(side_select_w); - DECLARE_WRITE_LINE_MEMBER(smc1_w); - DECLARE_WRITE_LINE_MEMBER(smc2_w); - DECLARE_WRITE_LINE_MEMBER(head_load_w); - DECLARE_WRITE_LINE_MEMBER(disk_motor_w); + void side_select_w(int state); + void smc1_w(int state); + void smc2_w(int state); + void head_load_w(int state); + void disk_motor_w(int state); void syslatch2_w(u8 data); u8 status_port_r(); u8 kbd_r(); void kbd_put(u8 data); - DECLARE_WRITE_LINE_MEMBER(clock_w); - DECLARE_WRITE_LINE_MEMBER(busreq_w); - DECLARE_WRITE_LINE_MEMBER(ctc_z1_w); - DECLARE_WRITE_LINE_MEMBER(sio_wrdya_w); - DECLARE_WRITE_LINE_MEMBER(sio_wrdyb_w); - DECLARE_WRITE_LINE_MEMBER(fdc_drq_w); + void clock_w(int state); + void busreq_w(int state); + void ctc_z1_w(int state); + void sio_wrdya_w(int state); + void sio_wrdyb_w(int state); + void fdc_drq_w(int state); u8 memory_read_byte(offs_t offset); void memory_write_byte(offs_t offset, u8 data); u8 io_read_byte(offs_t offset); @@ -214,17 +214,17 @@ void bigbord2_state::kbd_put(u8 data) } } -WRITE_LINE_MEMBER( bigbord2_state::sio_wrdya_w ) +void bigbord2_state::sio_wrdya_w(int state) { m_cc[0] = state; } -WRITE_LINE_MEMBER( bigbord2_state::sio_wrdyb_w ) +void bigbord2_state::sio_wrdyb_w(int state) { m_cc[1] = state; } -WRITE_LINE_MEMBER( bigbord2_state::fdc_drq_w ) +void bigbord2_state::fdc_drq_w(int state) { m_cc[2] = state; } @@ -233,7 +233,7 @@ WRITE_LINE_MEMBER( bigbord2_state::fdc_drq_w ) /* Z80 DMA */ -WRITE_LINE_MEMBER( bigbord2_state::busreq_w ) +void bigbord2_state::busreq_w(int state) { // since our Z80 has no support for BUSACK, we assume it is granted immediately m_maincpu->set_input_line(Z80_INPUT_LINE_BUSRQ, state); @@ -263,28 +263,28 @@ void bigbord2_state::io_write_byte(offs_t offset, u8 data) /* Read/Write Handlers */ -WRITE_LINE_MEMBER(bigbord2_state::side_select_w) +void bigbord2_state::side_select_w(int state) { if (m_floppy) m_floppy->ss_w(state); } -WRITE_LINE_MEMBER(bigbord2_state::smc1_w) +void bigbord2_state::smc1_w(int state) { // connects to "U6 (FDC9216B)" which drives the fdc "rawread" and "rclk" pins } -WRITE_LINE_MEMBER(bigbord2_state::smc2_w) +void bigbord2_state::smc2_w(int state) { // connects to "U6 (FDC9216B)" which drives the fdc "rawread" and "rclk" pins } -WRITE_LINE_MEMBER(bigbord2_state::head_load_w) +void bigbord2_state::head_load_w(int state) { // connects to HLD pin on floppy drive } -WRITE_LINE_MEMBER(bigbord2_state::disk_motor_w) +void bigbord2_state::disk_motor_w(int state) { // motor on if (m_floppy) @@ -389,7 +389,7 @@ INPUT_PORTS_END /* Z80 CTC */ -WRITE_LINE_MEMBER( bigbord2_state::clock_w ) +void bigbord2_state::clock_w(int state) { m_ctc2->trg0(state); m_ctc2->trg1(state); @@ -398,7 +398,7 @@ WRITE_LINE_MEMBER( bigbord2_state::clock_w ) } // there's a multitude of optional jumpers in this area, but this will do -WRITE_LINE_MEMBER( bigbord2_state::ctc_z1_w ) +void bigbord2_state::ctc_z1_w(int state) { m_sio->rxca_w(state); m_sio->txca_w(state); diff --git a/src/mame/xerox/x820kb.cpp b/src/mame/xerox/x820kb.cpp index de9a11e356c..5c542657aa4 100644 --- a/src/mame/xerox/x820kb.cpp +++ b/src/mame/xerox/x820kb.cpp @@ -331,7 +331,7 @@ uint8_t xerox_820_keyboard_device::kb_p2_r() // kb_t0_r - //------------------------------------------------- -READ_LINE_MEMBER( xerox_820_keyboard_device::kb_t0_r ) +int xerox_820_keyboard_device::kb_t0_r() { uint8_t data = 1; @@ -349,7 +349,7 @@ READ_LINE_MEMBER( xerox_820_keyboard_device::kb_t0_r ) // kb_t1_r - //------------------------------------------------- -READ_LINE_MEMBER( xerox_820_keyboard_device::kb_t1_r ) +int xerox_820_keyboard_device::kb_t1_r() { return 1; // ??? if 0, toggle P17 } diff --git a/src/mame/xerox/x820kb.h b/src/mame/xerox/x820kb.h index 8456085faf4..8b6a1749e43 100644 --- a/src/mame/xerox/x820kb.h +++ b/src/mame/xerox/x820kb.h @@ -53,8 +53,8 @@ private: uint8_t kb_p1_r(); void kb_p1_w(uint8_t data); uint8_t kb_p2_r(); - DECLARE_READ_LINE_MEMBER( kb_t0_r ); - DECLARE_READ_LINE_MEMBER( kb_t1_r ); + int kb_t0_r(); + int kb_t1_r(); void kb_bus_w(uint8_t data); }; diff --git a/src/mame/xerox/xerox820.cpp b/src/mame/xerox/xerox820.cpp index b56a102205c..53fef45fdeb 100644 --- a/src/mame/xerox/xerox820.cpp +++ b/src/mame/xerox/xerox820.cpp @@ -339,7 +339,7 @@ void xerox820ii_state::rdpio_pb_w(uint8_t data) // TODO: LS74 Q } -WRITE_LINE_MEMBER( xerox820ii_state::rdpio_pardy_w ) +void xerox820ii_state::rdpio_pardy_w(int state) { // TODO } @@ -433,14 +433,14 @@ void xerox820_state::update_nmi() m_maincpu->set_input_line(INPUT_LINE_NMI, state); } -WRITE_LINE_MEMBER( xerox820_state::fdc_intrq_w ) +void xerox820_state::fdc_intrq_w(int state) { m_fdc_irq = state; update_nmi(); } -WRITE_LINE_MEMBER( xerox820_state::fdc_drq_w ) +void xerox820_state::fdc_drq_w(int state) { m_fdc_drq = state; diff --git a/src/mame/xerox/xerox820.h b/src/mame/xerox/xerox820.h index 05e8f2ffea4..bcb897e7d5b 100644 --- a/src/mame/xerox/xerox820.h +++ b/src/mame/xerox/xerox820.h @@ -84,8 +84,8 @@ public: uint8_t kbpio_pa_r(); void kbpio_pa_w(uint8_t data); uint8_t kbpio_pb_r(); - DECLARE_WRITE_LINE_MEMBER( fdc_intrq_w ); - DECLARE_WRITE_LINE_MEMBER( fdc_drq_w ); + void fdc_intrq_w(int state); + void fdc_drq_w(int state); protected: uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); @@ -172,7 +172,7 @@ public: void sync_w(offs_t offset, uint8_t data); void rdpio_pb_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER( rdpio_pardy_w ); + void rdpio_pardy_w(int state); void xerox168(machine_config &config); void xerox820ii(machine_config &config); diff --git a/src/mame/yamaha/fb01.cpp b/src/mame/yamaha/fb01.cpp index 963b6ede7b4..bb4a37ef83d 100644 --- a/src/mame/yamaha/fb01.cpp +++ b/src/mame/yamaha/fb01.cpp @@ -45,9 +45,9 @@ protected: virtual void machine_reset() override; private: - DECLARE_WRITE_LINE_MEMBER(ym2164_irq_w); - DECLARE_WRITE_LINE_MEMBER(upd71051_txrdy_w); - DECLARE_WRITE_LINE_MEMBER(upd71051_rxrdy_w); + void ym2164_irq_w(int state); + void upd71051_txrdy_w(int state); + void upd71051_rxrdy_w(int state); void fb01_palette(palette_device &palette) const; HD44780_PIXEL_UPDATE(fb01_pixel_update); @@ -119,21 +119,21 @@ void fb01_state::machine_reset() } -WRITE_LINE_MEMBER(fb01_state::ym2164_irq_w) +void fb01_state::ym2164_irq_w(int state) { m_ym2164_irq = state; update_int(); } -WRITE_LINE_MEMBER(fb01_state::upd71051_txrdy_w) +void fb01_state::upd71051_txrdy_w(int state) { m_upd71051_txrdy = state; update_int(); } -WRITE_LINE_MEMBER(fb01_state::upd71051_rxrdy_w) +void fb01_state::upd71051_rxrdy_w(int state) { m_upd71051_rxrdy = state; update_int(); diff --git a/src/mame/yamaha/mulcd.cpp b/src/mame/yamaha/mulcd.cpp index 00de220db7d..ae7b6f34262 100644 --- a/src/mame/yamaha/mulcd.cpp +++ b/src/mame/yamaha/mulcd.cpp @@ -59,7 +59,7 @@ void mulcd_device::set_leds(u8 leds) m_led_outputs[x] = (leds >> x) & 1; } -WRITE_LINE_MEMBER(mulcd_device::render_w) +void mulcd_device::render_w(int state) { if(!state) return; diff --git a/src/mame/yamaha/mulcd.h b/src/mame/yamaha/mulcd.h index 551bfa9e16b..645369f0fa4 100644 --- a/src/mame/yamaha/mulcd.h +++ b/src/mame/yamaha/mulcd.h @@ -36,7 +36,7 @@ private: output_finder<> m_contrast; output_finder<6> m_led_outputs; - DECLARE_WRITE_LINE_MEMBER(render_w); + void render_w(int state); }; DECLARE_DEVICE_TYPE(MULCD, mulcd_device) diff --git a/src/mame/yamaha/ymdx100.cpp b/src/mame/yamaha/ymdx100.cpp index cf790922198..a8081881704 100644 --- a/src/mame/yamaha/ymdx100.cpp +++ b/src/mame/yamaha/ymdx100.cpp @@ -272,7 +272,7 @@ public: void dx100(machine_config &config); - DECLARE_WRITE_LINE_MEMBER(led_w) { m_led = state; } + void led_w(int state) { m_led = state; } DECLARE_CUSTOM_INPUT_MEMBER(midi_in_r) { return m_midi_in; } protected: @@ -284,7 +284,7 @@ private: HD44780_PIXEL_UPDATE(lcd_pixel_update); void palette_init(palette_device &palette); - DECLARE_WRITE_LINE_MEMBER(p22_w); + void p22_w(int state); void mem_map(address_map &map); @@ -331,7 +331,7 @@ void yamaha_dx100_state::palette_init(palette_device &palette) palette.set_pen_color(2, rgb_t(0xe7, 0xe7, 0xe7)); // lcd pixel off } -WRITE_LINE_MEMBER(yamaha_dx100_state::p22_w) +void yamaha_dx100_state::p22_w(int state) { if (state) m_maincpu->m6801_clock_serial(); diff --git a/src/mame/yamaha/ymdx9.cpp b/src/mame/yamaha/ymdx9.cpp index 6a1d35d27f5..f1f19a9abcf 100644 --- a/src/mame/yamaha/ymdx9.cpp +++ b/src/mame/yamaha/ymdx9.cpp @@ -133,9 +133,9 @@ private: void mem_map(address_map &map); - WRITE_LINE_MEMBER(midi_r) { m_rx_data = state; } + void midi_r(int state) { m_rx_data = state; } - WRITE_LINE_MEMBER(midiclock_w) { if (state) m_maincpu->m6801_clock_serial(); } + void midiclock_w(int state) { if (state) m_maincpu->m6801_clock_serial(); } /** * @brief Handle a write to the synth's IO Port 1. diff --git a/src/mame/yamaha/ymmu5.cpp b/src/mame/yamaha/ymmu5.cpp index 52eff332643..6737ad81ac3 100644 --- a/src/mame/yamaha/ymmu5.cpp +++ b/src/mame/yamaha/ymmu5.cpp @@ -59,7 +59,7 @@ private: void lcd_data_w(u16 data); u16 lcd_data_r(); - DECLARE_WRITE_LINE_MEMBER(render_w); + void render_w(int state); u8 m_matrixsel; u8 matrix_r(); @@ -157,7 +157,7 @@ u16 mu5_state::lcd_data_r() return m_lcd_data; } -WRITE_LINE_MEMBER(mu5_state::render_w) +void mu5_state::render_w(int state) { if(!state) return; diff --git a/src/mame/yamaha/ympsr150.cpp b/src/mame/yamaha/ympsr150.cpp index 1341a4bf00c..1413424f733 100644 --- a/src/mame/yamaha/ympsr150.cpp +++ b/src/mame/yamaha/ympsr150.cpp @@ -93,30 +93,30 @@ public: // most of these keyboards have key matrix rows & columns split across multiple ports each, // so use templates to be able to generate multiple r/w methods as appropriate template - DECLARE_WRITE_LINE_MEMBER(keys_w); + void keys_w(int state); template DECLARE_CUSTOM_INPUT_MEMBER(keys_r); DECLARE_INPUT_CHANGED_MEMBER(switch_w); DECLARE_CUSTOM_INPUT_MEMBER(switch_r) { return m_switch; } - DECLARE_WRITE_LINE_MEMBER(apo_w) { if (state) m_maincpu->set_input_line(INPUT_LINE_RESET, ASSERT_LINE); } + void apo_w(int state) { if (state) m_maincpu->set_input_line(INPUT_LINE_RESET, ASSERT_LINE); } DECLARE_INPUT_CHANGED_MEMBER(power_w) { if (!newval) m_maincpu->set_input_line(INPUT_LINE_RESET, CLEAR_LINE); } template - DECLARE_WRITE_LINE_MEMBER(led_w) { m_led[Num] = (state ? 1 : 0); } + void led_w(int state) { m_led[Num] = (state ? 1 : 0); } - DECLARE_WRITE_LINE_MEMBER(pwm_row_w); + void pwm_row_w(int state); template - DECLARE_WRITE_LINE_MEMBER(pwm_col_w); + void pwm_col_w(int state); DECLARE_CUSTOM_INPUT_MEMBER(lcd_r) { return m_lcdc->db_r() >> 4; } - DECLARE_WRITE_LINE_MEMBER(lcd_w) { m_lcdc->db_w(state << 4); } + void lcd_w(int state) { m_lcdc->db_w(state << 4); } private: virtual void driver_start() override; - DECLARE_WRITE_LINE_MEMBER(render_w); + void render_w(int state); required_device m_maincpu; optional_device m_pwm; @@ -141,7 +141,7 @@ void psr150_state::port_pullup_w(offs_t offset, u8 data, u8 mem_mask) } template -WRITE_LINE_MEMBER(psr150_state::keys_w) +void psr150_state::keys_w(int state) { constexpr auto mask = make_bitmask(Count); @@ -166,13 +166,13 @@ INPUT_CHANGED_MEMBER(psr150_state::switch_w) m_switch = param; } -WRITE_LINE_MEMBER(psr150_state::pwm_row_w) +void psr150_state::pwm_row_w(int state) { m_pwm->matrix(state, m_pwm_col); } template -WRITE_LINE_MEMBER(psr150_state::pwm_col_w) +void psr150_state::pwm_col_w(int state) { keys_w<11 + Bit, 1>(state); m_pwm_col = m_key_sel >> 11; @@ -181,7 +181,7 @@ WRITE_LINE_MEMBER(psr150_state::pwm_col_w) m_pwm->write_mx(m_pwm_col); } -WRITE_LINE_MEMBER(psr150_state::render_w) +void psr150_state::render_w(int state) { if (!state) return; diff --git a/src/mame/yamaha/ympsr340.cpp b/src/mame/yamaha/ympsr340.cpp index fda1c8d2efa..03eed1741b3 100644 --- a/src/mame/yamaha/ympsr340.cpp +++ b/src/mame/yamaha/ympsr340.cpp @@ -61,7 +61,7 @@ private: void lcd_ctrl_w(u8 data); void lcd_data_w(u8 data); - DECLARE_WRITE_LINE_MEMBER(render_w); + void render_w(int state); u8 m_matrixsel = 0U; u8 matrix_r(); @@ -126,7 +126,7 @@ void psr340_state::machine_reset() { } -WRITE_LINE_MEMBER(psr340_state::render_w) +void psr340_state::render_w(int state) { if(!state) return; diff --git a/src/mame/yamaha/ympsr60.cpp b/src/mame/yamaha/ympsr60.cpp index 7ee7f6ec7d2..fe38f3f248b 100644 --- a/src/mame/yamaha/ympsr60.cpp +++ b/src/mame/yamaha/ympsr60.cpp @@ -153,10 +153,10 @@ private: u8 m_drvif_select; u8 m_sustain_fuzz; - WRITE_LINE_MEMBER(write_acia_clock) { m_acia->write_txc(state); m_acia->write_rxc(state); } - WRITE_LINE_MEMBER(acia_irq_w) { m_acia_irq = state; recalc_irqs(); } - WRITE_LINE_MEMBER(ym_irq_w) { m_ym_irq = state; recalc_irqs(); } - WRITE_LINE_MEMBER(ryp4_irq_w) { m_ym2154_irq = state; recalc_irqs(); } + void write_acia_clock(int state) { m_acia->write_txc(state); m_acia->write_rxc(state); } + void acia_irq_w(int state) { m_acia_irq = state; recalc_irqs(); } + void ym_irq_w(int state) { m_ym_irq = state; recalc_irqs(); } + void ryp4_irq_w(int state) { m_ym2154_irq = state; recalc_irqs(); } u8 ryp4_an_r(offs_t offset); void ryp4_out_w(u8 data); diff --git a/src/mame/yamaha/ymtx81z.cpp b/src/mame/yamaha/ymtx81z.cpp index 95b28fd83f1..eb7ca909118 100644 --- a/src/mame/yamaha/ymtx81z.cpp +++ b/src/mame/yamaha/ymtx81z.cpp @@ -48,8 +48,8 @@ private: void mem_map(address_map &map); u8 p2_r(); - WRITE_LINE_MEMBER(midi_rx_r) { m_rx_data = state; } - WRITE_LINE_MEMBER(midiclock_w) { if (state) m_maincpu->m6801_clock_serial(); } + void midi_rx_r(int state) { m_rx_data = state; } + void midiclock_w(int state) { if (state) m_maincpu->m6801_clock_serial(); } required_device m_maincpu; required_ioport m_port2; diff --git a/src/mame/yunsung/yunsung8.cpp b/src/mame/yunsung/yunsung8.cpp index 73ad419d871..246df8f6c2e 100644 --- a/src/mame/yunsung/yunsung8.cpp +++ b/src/mame/yunsung/yunsung8.cpp @@ -104,7 +104,7 @@ private: template void paletteram_w(offs_t offset, uint8_t data); void flipscreen_w(uint8_t data); void sound_bankswitch_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(adpcm_int); + void adpcm_int(int state); TILE_GET_INFO_MEMBER(get_bg_tile_info); TILE_GET_INFO_MEMBER(get_fg_tile_info); @@ -560,7 +560,7 @@ GFXDECODE_END ***************************************************************************/ -WRITE_LINE_MEMBER(yunsung8_state::adpcm_int) +void yunsung8_state::adpcm_int(int state) { if (!state) return; diff --git a/src/mame/zaccaria/zaccaria.cpp b/src/mame/zaccaria/zaccaria.cpp index e7475a6e757..d5945250e77 100644 --- a/src/mame/zaccaria/zaccaria.cpp +++ b/src/mame/zaccaria/zaccaria.cpp @@ -137,12 +137,12 @@ uint8_t zaccaria_state::prot2_r(offs_t offset) } -WRITE_LINE_MEMBER(zaccaria_state::coin_w) +void zaccaria_state::coin_w(int state) { machine().bookkeeping().coin_counter_w(0, state); } -WRITE_LINE_MEMBER(zaccaria_state::nmi_mask_w) +void zaccaria_state::nmi_mask_w(int state) { m_nmi_mask = state; if (!m_nmi_mask) @@ -327,7 +327,7 @@ static GFXDECODE_START( gfx_zaccaria ) GFXDECODE_END -WRITE_LINE_MEMBER(zaccaria_state::vblank_irq) +void zaccaria_state::vblank_irq(int state) { if (state && m_nmi_mask) m_maincpu->set_input_line(INPUT_LINE_NMI, ASSERT_LINE); diff --git a/src/mame/zaccaria/zaccaria.h b/src/mame/zaccaria/zaccaria.h index a0775862a02..1afc88ff158 100644 --- a/src/mame/zaccaria/zaccaria.h +++ b/src/mame/zaccaria/zaccaria.h @@ -36,19 +36,19 @@ private: uint8_t dsw_r(); uint8_t prot1_r(offs_t offset); uint8_t prot2_r(offs_t offset); - DECLARE_WRITE_LINE_MEMBER(coin_w); - DECLARE_WRITE_LINE_MEMBER(nmi_mask_w); + void coin_w(int state); + void nmi_mask_w(int state); void videoram_w(offs_t offset, uint8_t data); void attributes_w(offs_t offset, uint8_t data); uint8_t read_attr(offs_t offset, int which); void update_colscroll(); - DECLARE_WRITE_LINE_MEMBER(flip_screen_x_w); - DECLARE_WRITE_LINE_MEMBER(flip_screen_y_w); + void flip_screen_x_w(int state); + void flip_screen_y_w(int state); void dsw_sel_w(uint8_t data); TILE_GET_INFO_MEMBER(get_tile_info); void palette(palette_device &palette) const; uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(vblank_irq); + void vblank_irq(int state); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect, uint8_t *spriteram, int color, int section); void main_map(address_map &map); diff --git a/src/mame/zaccaria/zaccaria_a.cpp b/src/mame/zaccaria/zaccaria_a.cpp index 080b00741e4..93daa8d524b 100644 --- a/src/mame/zaccaria/zaccaria_a.cpp +++ b/src/mame/zaccaria/zaccaria_a.cpp @@ -277,7 +277,7 @@ void zac1b11107_audio_device::sound_w(u8 data) m_melody_command = data | 0xc0; } -WRITE_LINE_MEMBER(zac1b11107_audio_device::reset_w) +void zac1b11107_audio_device::reset_w(int state) { // TODO: there is a pulse-stretching network attached that should be simulated m_melodycpu->set_input_line(INPUT_LINE_RESET, state); @@ -347,12 +347,12 @@ void zac1b11142_audio_device::hs_w(u8 data) m_audiocpu->set_input_line(INPUT_LINE_IRQ0, (data & 0x80) ? CLEAR_LINE : ASSERT_LINE); } -READ_LINE_MEMBER(zac1b11142_audio_device::acs_r) +int zac1b11142_audio_device::acs_r() { return (~m_pia_1i->b_output() >> 3) & 0x01; } -WRITE_LINE_MEMBER(zac1b11142_audio_device::ressound_w) +void zac1b11142_audio_device::ressound_w(int state) { // TODO: there is a pulse-stretching network attached that should be simulated m_melodycpu->set_input_line(INPUT_LINE_RESET, state); diff --git a/src/mame/zaccaria/zaccaria_a.h b/src/mame/zaccaria/zaccaria_a.h index 311a69e4051..7204322926e 100644 --- a/src/mame/zaccaria/zaccaria_a.h +++ b/src/mame/zaccaria/zaccaria_a.h @@ -59,7 +59,7 @@ public: // host interface void sound_w(u8 data); - DECLARE_WRITE_LINE_MEMBER(reset_w); + void reset_w(int state); void zac1b11107_melody_map(address_map &map); protected: @@ -80,8 +80,8 @@ public: // host interface void hs_w(u8 data); - DECLARE_READ_LINE_MEMBER(acs_r); - DECLARE_WRITE_LINE_MEMBER(ressound_w); + int acs_r(); + void ressound_w(int state); // master audio section handlers u8 host_command_r(); diff --git a/src/mame/zaccaria/zaccaria_v.cpp b/src/mame/zaccaria/zaccaria_v.cpp index 0790855ef39..df7c2e413bf 100644 --- a/src/mame/zaccaria/zaccaria_v.cpp +++ b/src/mame/zaccaria/zaccaria_v.cpp @@ -177,13 +177,13 @@ void zaccaria_state::update_colscroll() m_bg_tilemap->set_scrolly(i, read_attr(i, 0)); } -WRITE_LINE_MEMBER(zaccaria_state::flip_screen_x_w) +void zaccaria_state::flip_screen_x_w(int state) { flip_screen_x_set(state); update_colscroll(); } -WRITE_LINE_MEMBER(zaccaria_state::flip_screen_y_w) +void zaccaria_state::flip_screen_y_w(int state) { flip_screen_y_set(state); } diff --git a/src/mame/zenith/mdt60.cpp b/src/mame/zenith/mdt60.cpp index 3e2f3f894b8..039ee3f02b0 100644 --- a/src/mame/zenith/mdt60.cpp +++ b/src/mame/zenith/mdt60.cpp @@ -54,7 +54,7 @@ private: MC6845_ON_UPDATE_ADDR_CHANGED(update_cb); TIMER_CALLBACK_MEMBER(baud_timer); - DECLARE_WRITE_LINE_MEMBER(keyin_w); + void keyin_w(int state); u8 dip0_r(offs_t offset); void reg_w(u8 data); @@ -141,7 +141,7 @@ MC6845_ON_UPDATE_ADDR_CHANGED(mdt60_state::update_cb) } -WRITE_LINE_MEMBER(mdt60_state::keyin_w) +void mdt60_state::keyin_w(int state) { m_keyin = state; m_maincpu->set_input_line(m6502_device::IRQ_LINE, state ? ASSERT_LINE : CLEAR_LINE); diff --git a/src/mame/zenith/z100.cpp b/src/mame/zenith/z100.cpp index 1d18da1f9d2..15a2e247bdc 100644 --- a/src/mame/zenith/z100.cpp +++ b/src/mame/zenith/z100.cpp @@ -208,22 +208,22 @@ private: void z100_vram_w(offs_t offset, uint8_t data); void kbd_col_w(uint8_t data); uint8_t kbd_rows_r(); - DECLARE_READ_LINE_MEMBER(kbd_shift_row_r); - DECLARE_WRITE_LINE_MEMBER(beep_update); + int kbd_shift_row_r(); + void beep_update(int state); void floppy_select_w(uint8_t data); void floppy_motor_w(uint8_t data); uint8_t tmr_status_r(); void tmr_status_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(timer_flipflop0_w); - DECLARE_WRITE_LINE_MEMBER(timer_flipflop1_w); - DECLARE_WRITE_LINE_MEMBER(vidint_w); - DECLARE_WRITE_LINE_MEMBER(vidint_enable_w); + void timer_flipflop0_w(int state); + void timer_flipflop1_w(int state); + void vidint_w(int state); + void vidint_enable_w(int state); u8 get_slave_ack(offs_t offset); void video_pia_A_w(u8 data); void video_pia_B_w(u8 data); - DECLARE_WRITE_LINE_MEMBER(video_pia_CA2_w); - DECLARE_WRITE_LINE_MEMBER(video_pia_CB2_w); + void video_pia_CA2_w(int state); + void video_pia_CB2_w(int state); MC6845_UPDATE_ROW(update_row); @@ -395,7 +395,7 @@ uint8_t z100_state::kbd_rows_r() return 0xff; } -READ_LINE_MEMBER(z100_state::kbd_shift_row_r) +int z100_state::kbd_shift_row_r() { if ((m_kbd_col & 0x0c) == 0x0c) return m_keys[m_kbd_col]->read(); @@ -403,7 +403,7 @@ READ_LINE_MEMBER(z100_state::kbd_shift_row_r) return 1; } -WRITE_LINE_MEMBER(z100_state::beep_update) +void z100_state::beep_update(int state) { m_beeper->set_state(m_keyclick->q_r() | m_keybeep->q_r()); } @@ -434,7 +434,7 @@ void z100_state::tmr_status_w(uint8_t data) m_picm->ir2_w(0); } -WRITE_LINE_MEMBER(z100_state::timer_flipflop0_w) +void z100_state::timer_flipflop0_w(int state) { if (state) { @@ -443,7 +443,7 @@ WRITE_LINE_MEMBER(z100_state::timer_flipflop0_w) } } -WRITE_LINE_MEMBER(z100_state::timer_flipflop1_w) +void z100_state::timer_flipflop1_w(int state) { if (state) { @@ -452,7 +452,7 @@ WRITE_LINE_MEMBER(z100_state::timer_flipflop1_w) } } -WRITE_LINE_MEMBER(z100_state::vidint_w) +void z100_state::vidint_w(int state) { m_pia[1]->pa4_w(state); @@ -460,7 +460,7 @@ WRITE_LINE_MEMBER(z100_state::vidint_w) m_pia[1]->ca2_w(1); } -WRITE_LINE_MEMBER(z100_state::vidint_enable_w) +void z100_state::vidint_enable_w(int state) { m_vidint_enable = state; if (!m_vidint_enable) @@ -720,7 +720,7 @@ void z100_state::video_pia_B_w(u8 data) } /* clear screen */ -WRITE_LINE_MEMBER( z100_state::video_pia_CA2_w ) +void z100_state::video_pia_CA2_w(int state) { int i; @@ -728,7 +728,7 @@ WRITE_LINE_MEMBER( z100_state::video_pia_CA2_w ) m_gvram[i] = m_clr_val; } -WRITE_LINE_MEMBER( z100_state::video_pia_CB2_w ) +void z100_state::video_pia_CB2_w(int state) { m_clr_val = (state & 1) ? 0x00 : 0xff; } diff --git a/src/mame/zenith/z22.cpp b/src/mame/zenith/z22.cpp index cb7b7b7cdd1..a9fcab693f1 100644 --- a/src/mame/zenith/z22.cpp +++ b/src/mame/zenith/z22.cpp @@ -53,7 +53,7 @@ private: u8 status_r(); void control_w(u8 data); - DECLARE_WRITE_LINE_MEMBER(eeprom_clock_w); + void eeprom_clock_w(int state); void mem_map(address_map &map); @@ -128,7 +128,7 @@ void z22_state::control_w(u8 data) //m_keyboard->keyout_w(BIT(data, 0)); } -WRITE_LINE_MEMBER(z22_state::eeprom_clock_w) +void z22_state::eeprom_clock_w(int state) { m_eeprom_clk = state; if (state) diff --git a/src/mame/zenith/z29.cpp b/src/mame/zenith/z29.cpp index 7fe2ec9f229..5400529100a 100644 --- a/src/mame/zenith/z29.cpp +++ b/src/mame/zenith/z29.cpp @@ -40,7 +40,7 @@ protected: virtual void machine_start() override; private: - DECLARE_WRITE_LINE_MEMBER(keyin_w); + void keyin_w(int state); u8 p1_r(); void p3_w(u8 data); u8 bs_24k_r(offs_t offset); @@ -69,7 +69,7 @@ void z29_state::machine_start() save_item(NAME(m_keyin)); } -WRITE_LINE_MEMBER(z29_state::keyin_w) +void z29_state::keyin_w(int state) { m_keyin = state; } diff --git a/src/mame/zvt/pp01.h b/src/mame/zvt/pp01.h index fd2c82465bf..7b77fd47d35 100644 --- a/src/mame/zvt/pp01.h +++ b/src/mame/zvt/pp01.h @@ -64,7 +64,7 @@ private: TIMER_DEVICE_CALLBACK_MEMBER(kansas_r); void pp01_palette(palette_device &palette) const; uint32_t screen_update_pp01(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(z2_w); + void z2_w(int state); uint8_t ppi1_porta_r(); void ppi1_porta_w(uint8_t data); uint8_t ppi1_portb_r(); diff --git a/src/mame/zvt/pp01_m.cpp b/src/mame/zvt/pp01_m.cpp index 62eba4b7a43..7df4f3fdcea 100644 --- a/src/mame/zvt/pp01_m.cpp +++ b/src/mame/zvt/pp01_m.cpp @@ -200,7 +200,7 @@ TIMER_DEVICE_CALLBACK_MEMBER( pp01_state::kansas_r ) } } -WRITE_LINE_MEMBER(pp01_state::z2_w) +void pp01_state::z2_w(int state) { // incoming 1200Hz m_uart->write_txc(state); -- cgit v1.2.3