summaryrefslogtreecommitdiffstats
path: root/src/devices
diff options
context:
space:
mode:
Diffstat (limited to 'src/devices')
-rw-r--r--src/devices/bus/a1bus/a1cffa.cpp8
-rw-r--r--src/devices/bus/a2bus/a2cffa.cpp10
-rw-r--r--src/devices/bus/a2bus/a2diskii.cpp15
-rw-r--r--src/devices/bus/a2bus/a2diskii.h10
-rw-r--r--src/devices/bus/a2bus/a2eramworks3.cpp5
-rw-r--r--src/devices/bus/a2bus/a2iwm.cpp138
-rw-r--r--src/devices/bus/a2bus/a2iwm.h75
-rw-r--r--src/devices/bus/a2bus/a2mockingboard.cpp12
-rw-r--r--src/devices/bus/a2bus/a2mockingboard.h12
-rw-r--r--src/devices/bus/a2bus/a2vulcan.cpp12
-rw-r--r--src/devices/bus/a2bus/a2zipdrive.cpp20
-rw-r--r--src/devices/bus/a2bus/agat7ports.cpp4
-rw-r--r--src/devices/bus/a2bus/agat7ports.h4
-rw-r--r--src/devices/bus/a2bus/agat840k_hle.cpp10
-rw-r--r--src/devices/bus/a2bus/agat840k_hle.h12
-rw-r--r--src/devices/bus/a2bus/agat_fdc.cpp10
-rw-r--r--src/devices/bus/a2bus/agat_fdc.h12
-rw-r--r--src/devices/bus/a2bus/mouse.cpp16
-rw-r--r--src/devices/bus/a2bus/mouse.h14
-rw-r--r--src/devices/bus/a2bus/pc_xporter.cpp18
-rw-r--r--src/devices/bus/a2bus/pc_xporter.h18
-rw-r--r--src/devices/bus/a2bus/timemasterho.cpp4
-rw-r--r--src/devices/bus/a2bus/timemasterho.h4
-rw-r--r--src/devices/bus/a2gameio/gameio.cpp1
-rw-r--r--src/devices/bus/a7800/a78_slot.cpp32
-rw-r--r--src/devices/bus/a7800/a78_slot.h32
-rw-r--r--src/devices/bus/a7800/cpuwiz.cpp6
-rw-r--r--src/devices/bus/a7800/cpuwiz.h10
-rw-r--r--src/devices/bus/a7800/hiscore.cpp22
-rw-r--r--src/devices/bus/a7800/hiscore.h14
-rw-r--r--src/devices/bus/a7800/rom.cpp34
-rw-r--r--src/devices/bus/a7800/rom.h50
-rw-r--r--src/devices/bus/a7800/xboard.cpp30
-rw-r--r--src/devices/bus/a7800/xboard.h18
-rw-r--r--src/devices/bus/a800/a800_slot.cpp16
-rw-r--r--src/devices/bus/a800/a800_slot.h16
-rw-r--r--src/devices/bus/a800/a8sio.cpp2
-rw-r--r--src/devices/bus/a800/a8sio.h2
-rw-r--r--src/devices/bus/a800/oss.cpp16
-rw-r--r--src/devices/bus/a800/oss.h16
-rw-r--r--src/devices/bus/a800/rom.cpp40
-rw-r--r--src/devices/bus/a800/rom.h42
-rw-r--r--src/devices/bus/a800/sparta.cpp4
-rw-r--r--src/devices/bus/a800/sparta.h4
-rw-r--r--src/devices/bus/abcbus/abcbus.cpp12
-rw-r--r--src/devices/bus/abcbus/abcbus.h20
-rw-r--r--src/devices/bus/abcbus/fd2.cpp10
-rw-r--r--src/devices/bus/abcbus/fd2.h10
-rw-r--r--src/devices/bus/abcbus/lux10828.cpp19
-rw-r--r--src/devices/bus/abcbus/lux10828.h16
-rw-r--r--src/devices/bus/abcbus/lux21046.cpp29
-rw-r--r--src/devices/bus/abcbus/lux21046.h20
-rw-r--r--src/devices/bus/abcbus/lux21056.cpp56
-rw-r--r--src/devices/bus/abcbus/lux21056.h33
-rw-r--r--src/devices/bus/abcbus/lux4105.cpp282
-rw-r--r--src/devices/bus/abcbus/lux4105.h18
-rw-r--r--src/devices/bus/abckb/abc77.cpp4
-rw-r--r--src/devices/bus/abckb/abc77.h4
-rw-r--r--src/devices/bus/abckb/abc800kb.cpp6
-rw-r--r--src/devices/bus/abckb/abc800kb.h6
-rw-r--r--src/devices/bus/abckb/abc99.cpp12
-rw-r--r--src/devices/bus/abckb/abc99.h12
-rw-r--r--src/devices/bus/adam/ide.cpp10
-rw-r--r--src/devices/bus/adamnet/ddp.cpp8
-rw-r--r--src/devices/bus/adamnet/ddp.h8
-rw-r--r--src/devices/bus/adamnet/fdc.cpp8
-rw-r--r--src/devices/bus/adamnet/fdc.h8
-rw-r--r--src/devices/bus/adamnet/kb.cpp14
-rw-r--r--src/devices/bus/adamnet/kb.h14
-rw-r--r--src/devices/bus/adamnet/printer.cpp12
-rw-r--r--src/devices/bus/adamnet/printer.h12
-rw-r--r--src/devices/bus/adamnet/spi.cpp4
-rw-r--r--src/devices/bus/adamnet/spi.h4
-rw-r--r--src/devices/bus/amiga/keyboard/a1200.cpp8
-rw-r--r--src/devices/bus/amiga/keyboard/a1200.h8
-rw-r--r--src/devices/bus/amiga/keyboard/a2000.cpp6
-rw-r--r--src/devices/bus/amiga/keyboard/a2000.h6
-rw-r--r--src/devices/bus/amiga/keyboard/keyboard.cpp4
-rw-r--r--src/devices/bus/amiga/keyboard/keyboard.h4
-rw-r--r--src/devices/bus/amiga/keyboard/matrix.cpp1
-rw-r--r--src/devices/bus/amiga/keyboard/mitsumi.cpp2
-rw-r--r--src/devices/bus/amiga/zorro/a2065.cpp4
-rw-r--r--src/devices/bus/amiga/zorro/a2065.h4
-rw-r--r--src/devices/bus/amiga/zorro/a2232.cpp6
-rw-r--r--src/devices/bus/amiga/zorro/a2232.h6
-rw-r--r--src/devices/bus/amiga/zorro/a590.cpp4
-rw-r--r--src/devices/bus/amiga/zorro/a590.h4
-rw-r--r--src/devices/bus/amiga/zorro/buddha.cpp16
-rw-r--r--src/devices/bus/apf/rom.cpp8
-rw-r--r--src/devices/bus/apf/rom.h8
-rw-r--r--src/devices/bus/apf/slot.cpp16
-rw-r--r--src/devices/bus/apf/slot.h16
-rw-r--r--src/devices/bus/arcadia/rom.cpp4
-rw-r--r--src/devices/bus/arcadia/rom.h4
-rw-r--r--src/devices/bus/arcadia/slot.cpp8
-rw-r--r--src/devices/bus/arcadia/slot.h8
-rw-r--r--src/devices/bus/astrocde/exp.cpp16
-rw-r--r--src/devices/bus/astrocde/exp.h16
-rw-r--r--src/devices/bus/astrocde/ram.cpp20
-rw-r--r--src/devices/bus/astrocde/ram.h20
-rw-r--r--src/devices/bus/astrocde/rom.cpp8
-rw-r--r--src/devices/bus/astrocde/rom.h8
-rw-r--r--src/devices/bus/astrocde/slot.cpp4
-rw-r--r--src/devices/bus/astrocde/slot.h4
-rw-r--r--src/devices/bus/ata/ataintf.h13
-rw-r--r--src/devices/bus/bbc/1mhzbus/datacentre.cpp15
-rw-r--r--src/devices/bus/bbc/1mhzbus/ide.cpp16
-rw-r--r--src/devices/bus/bbc/internal/cumana68k.cpp4
-rw-r--r--src/devices/bus/bbc/internal/cumana68k.h4
-rw-r--r--src/devices/bus/bbc/userport/palette.cpp12
-rw-r--r--src/devices/bus/bml3/bml3kanji.cpp6
-rw-r--r--src/devices/bus/bml3/bml3kanji.h4
-rw-r--r--src/devices/bus/bml3/bml3mp1802.cpp6
-rw-r--r--src/devices/bus/bml3/bml3mp1802.h4
-rw-r--r--src/devices/bus/bml3/bml3mp1805.cpp6
-rw-r--r--src/devices/bus/bml3/bml3mp1805.h4
-rw-r--r--src/devices/bus/bml3/bml3rtc.cpp6
-rw-r--r--src/devices/bus/bml3/bml3rtc.h4
-rw-r--r--src/devices/bus/c64/buscard.cpp10
-rw-r--r--src/devices/bus/c64/buscard.h10
-rw-r--r--src/devices/bus/c64/ide64.cpp8
-rw-r--r--src/devices/bus/c64/ieee488.cpp8
-rw-r--r--src/devices/bus/c64/ieee488.h8
-rw-r--r--src/devices/bus/c64/magic_formel.cpp4
-rw-r--r--src/devices/bus/c64/magic_formel.h4
-rw-r--r--src/devices/bus/c64/magic_voice.cpp8
-rw-r--r--src/devices/bus/c64/magic_voice.h8
-rw-r--r--src/devices/bus/cbmiec/c1541.cpp20
-rw-r--r--src/devices/bus/cbmiec/c1541.h21
-rw-r--r--src/devices/bus/cbmiec/c1571.cpp26
-rw-r--r--src/devices/bus/cbmiec/c1571.h26
-rw-r--r--src/devices/bus/cbmiec/c1581.cpp8
-rw-r--r--src/devices/bus/cbmiec/c1581.h8
-rw-r--r--src/devices/bus/cbmiec/fd2000.cpp8
-rw-r--r--src/devices/bus/cbmiec/fd2000.h8
-rw-r--r--src/devices/bus/cbus/pc9801_amd98.cpp4
-rw-r--r--src/devices/bus/cbus/pc9801_amd98.h4
-rw-r--r--src/devices/bus/cbus/pc9801_snd.cpp4
-rw-r--r--src/devices/bus/cbus/pc9801_snd.h4
-rw-r--r--src/devices/bus/centronics/epson_ex800.cpp14
-rw-r--r--src/devices/bus/centronics/epson_ex800.h14
-rw-r--r--src/devices/bus/centronics/epson_lx800.cpp12
-rw-r--r--src/devices/bus/centronics/epson_lx800.h12
-rw-r--r--src/devices/bus/centronics/epson_lx810l.cpp34
-rw-r--r--src/devices/bus/centronics/epson_lx810l.h34
-rw-r--r--src/devices/bus/cgenie/expansion/floppy.cpp14
-rw-r--r--src/devices/bus/cgenie/expansion/floppy.h6
-rw-r--r--src/devices/bus/cgenie/parallel/parallel.cpp8
-rw-r--r--src/devices/bus/cgenie/parallel/parallel.h8
-rw-r--r--src/devices/bus/chanf/rom.cpp10
-rw-r--r--src/devices/bus/chanf/rom.h30
-rw-r--r--src/devices/bus/chanf/slot.cpp16
-rw-r--r--src/devices/bus/chanf/slot.h16
-rw-r--r--src/devices/bus/coco/coco_fdc.cpp269
-rw-r--r--src/devices/bus/coco/coco_multi.cpp3
-rw-r--r--src/devices/bus/coco/coco_ram.cpp183
-rw-r--r--src/devices/bus/coco/coco_ram.h14
-rw-r--r--src/devices/bus/coco/coco_ssc.cpp24
-rw-r--r--src/devices/bus/coco/coco_t4426.cpp4
-rw-r--r--src/devices/bus/coco/cococart.cpp2
-rw-r--r--src/devices/bus/comx35/exp.cpp2
-rw-r--r--src/devices/bus/comx35/exp.h2
-rw-r--r--src/devices/bus/cpc/magicsound.cpp4
-rw-r--r--src/devices/bus/cpc/magicsound.h4
-rw-r--r--src/devices/bus/cpc/symbfac2.cpp10
-rw-r--r--src/devices/bus/crvision/rom.cpp20
-rw-r--r--src/devices/bus/crvision/rom.h20
-rw-r--r--src/devices/bus/crvision/slot.cpp8
-rw-r--r--src/devices/bus/crvision/slot.h8
-rw-r--r--src/devices/bus/dmv/k210.cpp12
-rw-r--r--src/devices/bus/dmv/k210.h12
-rw-r--r--src/devices/bus/dmv/k220.cpp4
-rw-r--r--src/devices/bus/dmv/k220.h4
-rw-r--r--src/devices/bus/dmv/k230.cpp12
-rw-r--r--src/devices/bus/dmv/k230.h8
-rw-r--r--src/devices/bus/dmv/k806.cpp4
-rw-r--r--src/devices/bus/dmv/k806.h4
-rw-r--r--src/devices/bus/ecbbus/ecbbus.cpp8
-rw-r--r--src/devices/bus/ecbbus/ecbbus.h8
-rw-r--r--src/devices/bus/ecbbus/grip.cpp46
-rw-r--r--src/devices/bus/ecbbus/grip.h32
-rw-r--r--src/devices/bus/econet/e01.cpp44
-rw-r--r--src/devices/bus/econet/e01.h32
-rw-r--r--src/devices/bus/einstein/pipe/silicon_disc.cpp12
-rw-r--r--src/devices/bus/einstein/pipe/silicon_disc.h8
-rw-r--r--src/devices/bus/einstein/pipe/speculator.cpp22
-rw-r--r--src/devices/bus/einstein/pipe/speculator.h8
-rw-r--r--src/devices/bus/einstein/pipe/tk02.cpp8
-rw-r--r--src/devices/bus/einstein/pipe/tk02.h6
-rw-r--r--src/devices/bus/einstein/userport/userport.cpp4
-rw-r--r--src/devices/bus/einstein/userport/userport.h4
-rw-r--r--src/devices/bus/ekara/rom.cpp34
-rw-r--r--src/devices/bus/ekara/rom.h26
-rw-r--r--src/devices/bus/ekara/slot.cpp20
-rw-r--r--src/devices/bus/ekara/slot.h32
-rw-r--r--src/devices/bus/epson_sio/pf10.cpp8
-rw-r--r--src/devices/bus/epson_sio/pf10.h8
-rw-r--r--src/devices/bus/gamate/rom.cpp20
-rw-r--r--src/devices/bus/gamate/rom.h16
-rw-r--r--src/devices/bus/gamate/slot.cpp8
-rw-r--r--src/devices/bus/gamate/slot.h8
-rw-r--r--src/devices/bus/hexbus/hx5102.cpp4
-rw-r--r--src/devices/bus/hexbus/hx5102.h4
-rw-r--r--src/devices/bus/hp80_io/82900.cpp2
-rw-r--r--src/devices/bus/hp80_io/82900.h2
-rw-r--r--src/devices/bus/hp80_io/82937.cpp12
-rw-r--r--src/devices/bus/hp80_io/82937.h8
-rw-r--r--src/devices/bus/hp80_io/82939.cpp6
-rw-r--r--src/devices/bus/hp80_io/82939.h6
-rw-r--r--src/devices/bus/hp9845_io/98034.cpp14
-rw-r--r--src/devices/bus/hp9845_io/98034.h7
-rw-r--r--src/devices/bus/hp9845_io/98035.cpp2
-rw-r--r--src/devices/bus/hp9845_io/98035.h2
-rw-r--r--src/devices/bus/hp9845_io/98046.cpp4
-rw-r--r--src/devices/bus/hp9845_io/98046.h4
-rw-r--r--src/devices/bus/hp_dio/hp98550.cpp2
-rw-r--r--src/devices/bus/hp_dio/hp98550.h2
-rw-r--r--src/devices/bus/hp_dio/hp98643.cpp4
-rw-r--r--src/devices/bus/hp_dio/hp98643.h4
-rw-r--r--src/devices/bus/hp_dio/human_interface.cpp16
-rw-r--r--src/devices/bus/hp_dio/human_interface.h10
-rw-r--r--src/devices/bus/hp_hil/hp_hil.cpp4
-rw-r--r--src/devices/bus/hp_hil/hp_hil.h4
-rw-r--r--src/devices/bus/ieee488/c2031.cpp14
-rw-r--r--src/devices/bus/ieee488/c2031.h12
-rw-r--r--src/devices/bus/ieee488/c2040.cpp16
-rw-r--r--src/devices/bus/ieee488/c2040.h14
-rw-r--r--src/devices/bus/ieee488/c2040fdc.cpp4
-rw-r--r--src/devices/bus/ieee488/c2040fdc.h4
-rw-r--r--src/devices/bus/ieee488/c8050.cpp16
-rw-r--r--src/devices/bus/ieee488/c8050.h14
-rw-r--r--src/devices/bus/ieee488/c8050fdc.cpp4
-rw-r--r--src/devices/bus/ieee488/c8050fdc.h4
-rw-r--r--src/devices/bus/ieee488/c8280.cpp14
-rw-r--r--src/devices/bus/ieee488/c8280.h12
-rw-r--r--src/devices/bus/ieee488/d9060.cpp18
-rw-r--r--src/devices/bus/ieee488/d9060.h16
-rw-r--r--src/devices/bus/ieee488/grid2102.cpp315
-rw-r--r--src/devices/bus/ieee488/grid2102.h114
-rw-r--r--src/devices/bus/ieee488/hardbox.cpp16
-rw-r--r--src/devices/bus/ieee488/hardbox.h16
-rw-r--r--src/devices/bus/ieee488/hp9122c.cpp6
-rw-r--r--src/devices/bus/ieee488/hp9122c.h4
-rw-r--r--src/devices/bus/ieee488/hp9895.cpp10
-rw-r--r--src/devices/bus/ieee488/hp9895.h6
-rw-r--r--src/devices/bus/ieee488/ieee488.cpp15
-rw-r--r--src/devices/bus/ieee488/ieee488.h7
-rw-r--r--src/devices/bus/ieee488/remote488.cpp10
-rw-r--r--src/devices/bus/ieee488/softbox.cpp14
-rw-r--r--src/devices/bus/ieee488/softbox.h12
-rw-r--r--src/devices/bus/imi7000/imi5000h.cpp24
-rw-r--r--src/devices/bus/imi7000/imi5000h.h28
-rw-r--r--src/devices/bus/interpro/keyboard/lle.cpp8
-rw-r--r--src/devices/bus/interpro/keyboard/lle.h8
-rw-r--r--src/devices/bus/interpro/sr/gt.cpp2
-rw-r--r--src/devices/bus/interpro/sr/gt.h2
-rw-r--r--src/devices/bus/intv/slot.cpp2
-rw-r--r--src/devices/bus/iq151/grafik.cpp6
-rw-r--r--src/devices/bus/iq151/grafik.h6
-rw-r--r--src/devices/bus/iq151/staper.cpp6
-rw-r--r--src/devices/bus/iq151/staper.h6
-rw-r--r--src/devices/bus/isa/3c503.cpp28
-rw-r--r--src/devices/bus/isa/3c503.h10
-rw-r--r--src/devices/bus/isa/adlib.cpp6
-rw-r--r--src/devices/bus/isa/adlib.h4
-rw-r--r--src/devices/bus/isa/aga.cpp36
-rw-r--r--src/devices/bus/isa/aga.h20
-rw-r--r--src/devices/bus/isa/aha1542c.cpp8
-rw-r--r--src/devices/bus/isa/aha1542c.h4
-rw-r--r--src/devices/bus/isa/bblue2.cpp8
-rw-r--r--src/devices/bus/isa/bblue2.h8
-rw-r--r--src/devices/bus/isa/cga.cpp118
-rw-r--r--src/devices/bus/isa/cga.h46
-rw-r--r--src/devices/bus/isa/chessmdr.cpp6
-rw-r--r--src/devices/bus/isa/chessmdr.h4
-rw-r--r--src/devices/bus/isa/chessmsr.cpp8
-rw-r--r--src/devices/bus/isa/chessmsr.h4
-rw-r--r--src/devices/bus/isa/dectalk.cpp16
-rw-r--r--src/devices/bus/isa/dectalk.h8
-rw-r--r--src/devices/bus/isa/ega.cpp42
-rw-r--r--src/devices/bus/isa/ega.h20
-rw-r--r--src/devices/bus/isa/eis_hgb107x.cpp15
-rw-r--r--src/devices/bus/isa/eis_hgb107x.h8
-rw-r--r--src/devices/bus/isa/eis_sad8852.cpp8
-rw-r--r--src/devices/bus/isa/eis_sad8852.h4
-rw-r--r--src/devices/bus/isa/eis_twib.cpp8
-rw-r--r--src/devices/bus/isa/eis_twib.h4
-rw-r--r--src/devices/bus/isa/fdc.cpp204
-rw-r--r--src/devices/bus/isa/fdc.h55
-rw-r--r--src/devices/bus/isa/finalchs.cpp6
-rw-r--r--src/devices/bus/isa/finalchs.h4
-rw-r--r--src/devices/bus/isa/gblaster.cpp16
-rw-r--r--src/devices/bus/isa/gblaster.h10
-rw-r--r--src/devices/bus/isa/gus.cpp107
-rw-r--r--src/devices/bus/isa/gus.h50
-rw-r--r--src/devices/bus/isa/hdc.cpp6
-rw-r--r--src/devices/bus/isa/hdc.h4
-rw-r--r--src/devices/bus/isa/ibm_mfc.cpp20
-rw-r--r--src/devices/bus/isa/ibm_mfc.h18
-rw-r--r--src/devices/bus/isa/ide.cpp4
-rw-r--r--src/devices/bus/isa/ide.h4
-rw-r--r--src/devices/bus/isa/isa.cpp51
-rw-r--r--src/devices/bus/isa/isa.h25
-rw-r--r--src/devices/bus/isa/mach32.h4
-rw-r--r--src/devices/bus/isa/mc1502_fdc.cpp51
-rw-r--r--src/devices/bus/isa/mc1502_fdc.h9
-rw-r--r--src/devices/bus/isa/mcd.cpp32
-rw-r--r--src/devices/bus/isa/mcd.h8
-rw-r--r--src/devices/bus/isa/mda.cpp36
-rw-r--r--src/devices/bus/isa/mda.h18
-rw-r--r--src/devices/bus/isa/mufdc.cpp4
-rw-r--r--src/devices/bus/isa/mufdc.h4
-rw-r--r--src/devices/bus/isa/myb3k_com.cpp8
-rw-r--r--src/devices/bus/isa/myb3k_com.h4
-rw-r--r--src/devices/bus/isa/myb3k_fdc.cpp16
-rw-r--r--src/devices/bus/isa/myb3k_fdc.h12
-rw-r--r--src/devices/bus/isa/ne1000.cpp18
-rw-r--r--src/devices/bus/isa/ne1000.h8
-rw-r--r--src/devices/bus/isa/ne2000.cpp16
-rw-r--r--src/devices/bus/isa/ne2000.h4
-rw-r--r--src/devices/bus/isa/num9rev.cpp36
-rw-r--r--src/devices/bus/isa/num9rev.h24
-rw-r--r--src/devices/bus/isa/omti8621.cpp109
-rw-r--r--src/devices/bus/isa/omti8621.h22
-rw-r--r--src/devices/bus/isa/p1_fdc.cpp6
-rw-r--r--src/devices/bus/isa/p1_fdc.h4
-rw-r--r--src/devices/bus/isa/p1_hdc.cpp6
-rw-r--r--src/devices/bus/isa/p1_hdc.h4
-rw-r--r--src/devices/bus/isa/p1_sound.cpp32
-rw-r--r--src/devices/bus/isa/p1_sound.h18
-rw-r--r--src/devices/bus/isa/pc1640_iga.cpp6
-rw-r--r--src/devices/bus/isa/pds.cpp6
-rw-r--r--src/devices/bus/isa/pds.h4
-rw-r--r--src/devices/bus/isa/pgc.cpp33
-rw-r--r--src/devices/bus/isa/pgc.h14
-rw-r--r--src/devices/bus/isa/s3virge.cpp36
-rw-r--r--src/devices/bus/isa/s3virge.h22
-rw-r--r--src/devices/bus/isa/sb16.cpp121
-rw-r--r--src/devices/bus/isa/sb16.h81
-rw-r--r--src/devices/bus/isa/sblaster.cpp62
-rw-r--r--src/devices/bus/isa/sblaster.h34
-rw-r--r--src/devices/bus/isa/sc499.cpp6
-rw-r--r--src/devices/bus/isa/sc499.h4
-rw-r--r--src/devices/bus/isa/side116.cpp18
-rw-r--r--src/devices/bus/isa/side116.h4
-rw-r--r--src/devices/bus/isa/stereo_fx.cpp52
-rw-r--r--src/devices/bus/isa/stereo_fx.h32
-rw-r--r--src/devices/bus/isa/svga_cirrus.cpp20
-rw-r--r--src/devices/bus/isa/svga_cirrus.h4
-rw-r--r--src/devices/bus/isa/svga_s3.cpp42
-rw-r--r--src/devices/bus/isa/svga_s3.h8
-rw-r--r--src/devices/bus/isa/svga_trident.cpp20
-rw-r--r--src/devices/bus/isa/svga_trident.h2
-rw-r--r--src/devices/bus/isa/svga_tseng.cpp10
-rw-r--r--src/devices/bus/isa/svga_tseng.h2
-rw-r--r--src/devices/bus/isa/trident.cpp60
-rw-r--r--src/devices/bus/isa/trident.h32
-rw-r--r--src/devices/bus/isa/vga.cpp10
-rw-r--r--src/devices/bus/isa/vga.h2
-rw-r--r--src/devices/bus/isa/vga_ati.cpp42
-rw-r--r--src/devices/bus/isa/vga_ati.h6
-rw-r--r--src/devices/bus/isa/wdxt_gen.cpp14
-rw-r--r--src/devices/bus/isa/wdxt_gen.h14
-rw-r--r--src/devices/bus/isa/xtide.cpp18
-rw-r--r--src/devices/bus/isa/xtide.h4
-rw-r--r--src/devices/bus/jakks_gamekey/rom.cpp24
-rw-r--r--src/devices/bus/jakks_gamekey/rom.h16
-rw-r--r--src/devices/bus/jakks_gamekey/slot.cpp12
-rw-r--r--src/devices/bus/jakks_gamekey/slot.h12
-rw-r--r--src/devices/bus/kc/d004.cpp8
-rw-r--r--src/devices/bus/lpci/i82439tx.cpp4
-rw-r--r--src/devices/bus/lpci/southbridge.cpp38
-rw-r--r--src/devices/bus/lpci/southbridge.h38
-rw-r--r--src/devices/bus/m5/rom.cpp6
-rw-r--r--src/devices/bus/m5/rom.h6
-rw-r--r--src/devices/bus/m5/slot.cpp12
-rw-r--r--src/devices/bus/m5/slot.h12
-rw-r--r--src/devices/bus/macpds/hyperdrive.cpp4
-rw-r--r--src/devices/bus/macpds/hyperdrive.h4
-rw-r--r--src/devices/bus/megadrive/jcart.cpp2
-rw-r--r--src/devices/bus/msx_cart/hfox.cpp2
-rw-r--r--src/devices/bus/msx_cart/super_swangi.cpp2
-rw-r--r--src/devices/bus/mtx/sdx.cpp14
-rw-r--r--src/devices/bus/mtx/sdx.h8
-rw-r--r--src/devices/bus/multibus/isbc202.cpp7
-rw-r--r--src/devices/bus/multibus/isbc202.h4
-rw-r--r--src/devices/bus/nasbus/avc.cpp10
-rw-r--r--src/devices/bus/nasbus/avc.h6
-rw-r--r--src/devices/bus/nasbus/floppy.cpp10
-rw-r--r--src/devices/bus/nasbus/floppy.h6
-rw-r--r--src/devices/bus/neogeo/boot_misc.cpp19
-rw-r--r--src/devices/bus/neogeo/boot_misc.h16
-rw-r--r--src/devices/bus/neogeo/boot_svc.h8
-rw-r--r--src/devices/bus/neogeo/carts.cpp1
-rw-r--r--src/devices/bus/neogeo/prot_misc.cpp28
-rw-r--r--src/devices/bus/neogeo/prot_misc.h5
-rw-r--r--src/devices/bus/neogeo/prot_pvc.cpp4
-rw-r--r--src/devices/bus/neogeo/prot_pvc.h4
-rw-r--r--src/devices/bus/neogeo/pvc.h4
-rw-r--r--src/devices/bus/neogeo/slot.cpp1
-rw-r--r--src/devices/bus/neogeo/slot.h1
-rw-r--r--src/devices/bus/newbrain/eim.cpp8
-rw-r--r--src/devices/bus/newbrain/eim.h8
-rw-r--r--src/devices/bus/nscsi/cd.cpp15
-rw-r--r--src/devices/bus/nscsi/s1410.cpp8
-rw-r--r--src/devices/bus/nubus/nubus_asntmc3b.cpp12
-rw-r--r--src/devices/bus/nubus/nubus_asntmc3b.h4
-rw-r--r--src/devices/bus/odyssey2/rom.cpp12
-rw-r--r--src/devices/bus/odyssey2/rom.h12
-rw-r--r--src/devices/bus/odyssey2/slot.cpp12
-rw-r--r--src/devices/bus/odyssey2/slot.h12
-rw-r--r--src/devices/bus/odyssey2/voice.cpp2
-rw-r--r--src/devices/bus/odyssey2/voice.h6
-rw-r--r--src/devices/bus/oricext/microdisc.cpp6
-rw-r--r--src/devices/bus/oricext/microdisc.h6
-rw-r--r--src/devices/bus/pasopia/pac2.cpp159
-rw-r--r--src/devices/bus/pasopia/pac2.h83
-rw-r--r--src/devices/bus/pasopia/pac2exp.cpp92
-rw-r--r--src/devices/bus/pasopia/pac2exp.h44
-rw-r--r--src/devices/bus/pasopia/rampac2.cpp149
-rw-r--r--src/devices/bus/pasopia/rampac2.h76
-rw-r--r--src/devices/bus/pasopia/rompac2.cpp98
-rw-r--r--src/devices/bus/pasopia/rompac2.h44
-rw-r--r--src/devices/bus/pc_kbd/ec1841.cpp8
-rw-r--r--src/devices/bus/pc_kbd/ec1841.h8
-rw-r--r--src/devices/bus/pc_kbd/iskr1030.cpp10
-rw-r--r--src/devices/bus/pc_kbd/iskr1030.h10
-rw-r--r--src/devices/bus/pc_kbd/keytro.cpp16
-rw-r--r--src/devices/bus/pc_kbd/keytro.h16
-rw-r--r--src/devices/bus/pc_kbd/msnat.cpp12
-rw-r--r--src/devices/bus/pc_kbd/msnat.h12
-rw-r--r--src/devices/bus/pc_kbd/pc83.cpp6
-rw-r--r--src/devices/bus/pc_kbd/pc83.h6
-rw-r--r--src/devices/bus/pc_kbd/pcat84.cpp10
-rw-r--r--src/devices/bus/pc_kbd/pcat84.h10
-rw-r--r--src/devices/bus/pc_kbd/pcxt83.cpp10
-rw-r--r--src/devices/bus/pc_kbd/pcxt83.h8
-rw-r--r--src/devices/bus/pce/pce_rom.cpp18
-rw-r--r--src/devices/bus/pce/pce_rom.h18
-rw-r--r--src/devices/bus/pce/pce_slot.cpp8
-rw-r--r--src/devices/bus/pce/pce_slot.h8
-rw-r--r--src/devices/bus/pet/superpet.cpp4
-rw-r--r--src/devices/bus/plus4/sid.cpp2
-rw-r--r--src/devices/bus/psi_kbd/hle.cpp2
-rw-r--r--src/devices/bus/psi_kbd/psi_kbd.h2
-rw-r--r--src/devices/bus/psx/gamebooster.cpp4
-rw-r--r--src/devices/bus/psx/gamebooster.h4
-rw-r--r--src/devices/bus/psx/parallel.cpp8
-rw-r--r--src/devices/bus/psx/parallel.h8
-rw-r--r--src/devices/bus/qbus/pc11.cpp231
-rw-r--r--src/devices/bus/qbus/pc11.h92
-rw-r--r--src/devices/bus/qbus/qbus.cpp178
-rw-r--r--src/devices/bus/qbus/qbus.h168
-rw-r--r--src/devices/bus/ql/qubide.cpp14
-rw-r--r--src/devices/bus/rs232/null_modem.cpp35
-rw-r--r--src/devices/bus/rs232/null_modem.h1
-rw-r--r--src/devices/bus/scsi/s1410.cpp3
-rw-r--r--src/devices/bus/scv/rom.cpp26
-rw-r--r--src/devices/bus/scv/rom.h26
-rw-r--r--src/devices/bus/scv/slot.cpp12
-rw-r--r--src/devices/bus/scv/slot.h12
-rw-r--r--src/devices/bus/sega8/ccatch.cpp6
-rw-r--r--src/devices/bus/sega8/ccatch.h6
-rw-r--r--src/devices/bus/sega8/mgear.h6
-rw-r--r--src/devices/bus/sega8/rom.cpp108
-rw-r--r--src/devices/bus/sega8/rom.h130
-rw-r--r--src/devices/bus/sega8/sega8_slot.cpp28
-rw-r--r--src/devices/bus/sega8/sega8_slot.h28
-rw-r--r--src/devices/bus/sg1000_exp/fm_unit.cpp4
-rw-r--r--src/devices/bus/sg1000_exp/fm_unit.h4
-rw-r--r--src/devices/bus/sg1000_exp/sg1000exp.cpp8
-rw-r--r--src/devices/bus/sg1000_exp/sg1000exp.h8
-rw-r--r--src/devices/bus/sg1000_exp/sk1100.cpp14
-rw-r--r--src/devices/bus/sg1000_exp/sk1100.h10
-rw-r--r--src/devices/bus/sms_exp/gender.cpp20
-rw-r--r--src/devices/bus/sms_exp/gender.h10
-rw-r--r--src/devices/bus/sms_exp/smsexp.h20
-rw-r--r--src/devices/bus/spc1000/exp.cpp8
-rw-r--r--src/devices/bus/spc1000/exp.h8
-rw-r--r--src/devices/bus/spc1000/fdd.cpp25
-rw-r--r--src/devices/bus/spc1000/fdd.h14
-rw-r--r--src/devices/bus/spc1000/vdp.cpp4
-rw-r--r--src/devices/bus/spc1000/vdp.h4
-rw-r--r--src/devices/bus/spectrum/beta.cpp155
-rw-r--r--src/devices/bus/spectrum/beta.h9
-rw-r--r--src/devices/bus/spectrum/beta128.cpp105
-rw-r--r--src/devices/bus/spectrum/beta128.h5
-rw-r--r--src/devices/bus/spectrum/opus.cpp4
-rw-r--r--src/devices/bus/spectrum/opus.h4
-rw-r--r--src/devices/bus/ss50/mpt.cpp8
-rw-r--r--src/devices/bus/ss50/piaide.cpp16
-rw-r--r--src/devices/bus/tanbus/mpvdu.cpp2
-rw-r--r--src/devices/bus/tanbus/mpvdu.h2
-rw-r--r--src/devices/bus/tanbus/ravdu.cpp2
-rw-r--r--src/devices/bus/tanbus/ravdu.h2
-rw-r--r--src/devices/bus/tanbus/tanex.cpp10
-rw-r--r--src/devices/bus/tanbus/tanex.h10
-rw-r--r--src/devices/bus/ti99/internal/buffram.cpp61
-rw-r--r--src/devices/bus/ti99/internal/buffram.h50
-rw-r--r--src/devices/bus/ti99/peb/cc_fdc.cpp2
-rw-r--r--src/devices/bus/ti99/peb/cc_fdc.h2
-rw-r--r--src/devices/bus/ti99/peb/peribox.cpp3
-rw-r--r--src/devices/bus/ti99/peb/pgram.cpp564
-rw-r--r--src/devices/bus/ti99/peb/pgram.h87
-rw-r--r--src/devices/bus/ti99/peb/tn_ide.cpp813
-rw-r--r--src/devices/bus/ti99/peb/tn_ide.h73
-rw-r--r--src/devices/bus/tvc/hbf.cpp8
-rw-r--r--src/devices/bus/tvc/hbf.h8
-rw-r--r--src/devices/bus/tvc/tvc.cpp16
-rw-r--r--src/devices/bus/tvc/tvc.h22
-rw-r--r--src/devices/bus/vcs_ctrl/ctrl.h3
-rw-r--r--src/devices/bus/vectrex/rom.cpp8
-rw-r--r--src/devices/bus/vectrex/rom.h8
-rw-r--r--src/devices/bus/vectrex/slot.cpp12
-rw-r--r--src/devices/bus/vectrex/slot.h12
-rw-r--r--src/devices/bus/vic20/vic1112.cpp4
-rw-r--r--src/devices/bus/vic20/vic1112.h4
-rw-r--r--src/devices/bus/vme/vme_fccpu20.cpp6
-rw-r--r--src/devices/bus/vme/vme_fccpu20.h6
-rw-r--r--src/devices/bus/vme/vme_fcisio.cpp2
-rw-r--r--src/devices/bus/vme/vme_fcisio.h2
-rw-r--r--src/devices/bus/vme/vme_fcscsi.cpp6
-rw-r--r--src/devices/bus/vme/vme_fcscsi.h6
-rw-r--r--src/devices/bus/vsmile/rom.cpp6
-rw-r--r--src/devices/bus/vsmile/rom.h12
-rw-r--r--src/devices/bus/vsmile/vsmile_slot.cpp32
-rw-r--r--src/devices/bus/vsmile/vsmile_slot.h32
-rw-r--r--src/devices/bus/vtech/ioexp/joystick.cpp4
-rw-r--r--src/devices/bus/vtech/ioexp/joystick.h2
-rw-r--r--src/devices/bus/vtech/ioexp/printer.cpp8
-rw-r--r--src/devices/bus/vtech/ioexp/printer.h4
-rw-r--r--src/devices/bus/vtech/memexp/floppy.cpp17
-rw-r--r--src/devices/bus/vtech/memexp/floppy.h8
-rw-r--r--src/devices/bus/vtech/memexp/memory.cpp4
-rw-r--r--src/devices/bus/vtech/memexp/memory.h2
-rw-r--r--src/devices/bus/vtech/memexp/rs232.cpp8
-rw-r--r--src/devices/bus/vtech/memexp/rs232.h4
-rw-r--r--src/devices/bus/vtech/memexp/rtty.cpp12
-rw-r--r--src/devices/bus/vtech/memexp/rtty.h6
-rw-r--r--src/devices/bus/x68k/x68k_neptunex.cpp16
-rw-r--r--src/devices/bus/x68k/x68k_neptunex.h4
-rw-r--r--src/devices/bus/z29_kbd/he191_3425.cpp239
-rw-r--r--src/devices/bus/z29_kbd/he191_3425.h58
-rw-r--r--src/devices/bus/z29_kbd/keyboard.cpp117
-rw-r--r--src/devices/bus/z29_kbd/keyboard.h104
-rw-r--r--src/devices/bus/z29_kbd/md_kbd.cpp277
-rw-r--r--src/devices/bus/z29_kbd/md_kbd.h61
-rw-r--r--src/devices/bus/z88/flash.cpp4
-rw-r--r--src/devices/bus/z88/flash.h4
-rw-r--r--src/devices/bus/z88/ram.cpp4
-rw-r--r--src/devices/bus/z88/ram.h4
-rw-r--r--src/devices/bus/z88/rom.cpp2
-rw-r--r--src/devices/bus/z88/rom.h2
-rw-r--r--src/devices/bus/z88/z88.cpp8
-rw-r--r--src/devices/bus/z88/z88.h10
-rw-r--r--src/devices/cpu/8x300/8x300.cpp12
-rw-r--r--src/devices/cpu/8x300/8x300.h6
-rw-r--r--src/devices/cpu/adsp2100/adsp2100.cpp23
-rw-r--r--src/devices/cpu/adsp2100/adsp2100.h8
-rw-r--r--src/devices/cpu/alph8201/8201dasm.cpp404
-rw-r--r--src/devices/cpu/alph8201/8201dasm.h51
-rw-r--r--src/devices/cpu/alph8201/alph8201.cpp698
-rw-r--r--src/devices/cpu/alph8201/alph8201.h415
-rw-r--r--src/devices/cpu/am29000/am29000.cpp15
-rw-r--r--src/devices/cpu/am29000/am29000.h11
-rw-r--r--src/devices/cpu/am29000/am29ops.h10
-rw-r--r--src/devices/cpu/arm/arm.cpp8
-rw-r--r--src/devices/cpu/arm/arm.h2
-rw-r--r--src/devices/cpu/arm7/arm7.cpp12
-rw-r--r--src/devices/cpu/arm7/arm7.h2
-rw-r--r--src/devices/cpu/asap/asap.cpp40
-rw-r--r--src/devices/cpu/asap/asap.h4
-rw-r--r--src/devices/cpu/avr8/avr8.cpp58
-rw-r--r--src/devices/cpu/avr8/avr8.h13
-rw-r--r--src/devices/cpu/avr8/avr8ops.hxx6
-rw-r--r--src/devices/cpu/bcp/dp8344.cpp27
-rw-r--r--src/devices/cpu/bcp/dp8344.h6
-rw-r--r--src/devices/cpu/capricorn/capricorn.cpp17
-rw-r--r--src/devices/cpu/capricorn/capricorn.h8
-rw-r--r--src/devices/cpu/ccpu/ccpu.cpp18
-rw-r--r--src/devices/cpu/ccpu/ccpu.h8
-rw-r--r--src/devices/cpu/clipper/clipper.cpp2
-rw-r--r--src/devices/cpu/clipper/clipper.h4
-rw-r--r--src/devices/cpu/cop400/cop400.cpp15
-rw-r--r--src/devices/cpu/cop400/cop400.h7
-rw-r--r--src/devices/cpu/cosmac/cosmac.cpp21
-rw-r--r--src/devices/cpu/cosmac/cosmac.h6
-rw-r--r--src/devices/cpu/cp1610/cp1610.cpp127
-rw-r--r--src/devices/cpu/cp1610/cp1610.h20
-rw-r--r--src/devices/cpu/cr16b/cr16b.cpp6
-rw-r--r--src/devices/cpu/cr16b/cr16b.h4
-rw-r--r--src/devices/cpu/cubeqcpu/cubeqcpu.cpp18
-rw-r--r--src/devices/cpu/cubeqcpu/cubeqcpu.h13
-rw-r--r--src/devices/cpu/diablo/diablo1300.cpp21
-rw-r--r--src/devices/cpu/diablo/diablo1300.h6
-rw-r--r--src/devices/cpu/dsp16/dsp16.cpp28
-rw-r--r--src/devices/cpu/dsp16/dsp16.h2
-rw-r--r--src/devices/cpu/dsp16/dsp16fe.cpp6
-rw-r--r--src/devices/cpu/dsp16/dsp16fe.h8
-rw-r--r--src/devices/cpu/dsp32/dsp32.cpp20
-rw-r--r--src/devices/cpu/dsp32/dsp32.h4
-rw-r--r--src/devices/cpu/dsp56156/dsp56156.cpp10
-rw-r--r--src/devices/cpu/dsp56156/dsp56156.h6
-rw-r--r--src/devices/cpu/dsp56156/dsp56ops.hxx46
-rw-r--r--src/devices/cpu/dsp56156/dsp56pcu.cpp6
-rw-r--r--src/devices/cpu/dspp/dspp.cpp25
-rw-r--r--src/devices/cpu/dspp/dspp.h8
-rw-r--r--src/devices/cpu/dspp/dsppdrc.cpp8
-rw-r--r--src/devices/cpu/e132xs/e132xs.cpp18
-rw-r--r--src/devices/cpu/e132xs/e132xs.h3
-rw-r--r--src/devices/cpu/e132xs/e132xsop.hxx4
-rw-r--r--src/devices/cpu/esrip/esrip.cpp16
-rw-r--r--src/devices/cpu/esrip/esrip.h4
-rw-r--r--src/devices/cpu/f2mc16/f2mc16dasm.cpp549
-rw-r--r--src/devices/cpu/f8/f8.cpp147
-rw-r--r--src/devices/cpu/f8/f8.h7
-rw-r--r--src/devices/cpu/fr/fr.cpp8
-rw-r--r--src/devices/cpu/fr/fr.h4
-rw-r--r--src/devices/cpu/g65816/g65816.cpp34
-rw-r--r--src/devices/cpu/g65816/g65816.h15
-rw-r--r--src/devices/cpu/g65816/g65816cm.h8
-rw-r--r--src/devices/cpu/g65816/g65816op.h2
-rw-r--r--src/devices/cpu/h6280/h6280.cpp40
-rw-r--r--src/devices/cpu/h6280/h6280.h6
-rw-r--r--src/devices/cpu/h8/h8.cpp18
-rw-r--r--src/devices/cpu/h8/h8.h5
-rw-r--r--src/devices/cpu/h8500/h8500.cpp149
-rw-r--r--src/devices/cpu/h8500/h8500.h70
-rw-r--r--src/devices/cpu/h8500/h8500dasm.cpp608
-rw-r--r--src/devices/cpu/h8500/h8500dasm.h46
-rw-r--r--src/devices/cpu/h8500/h8510.cpp112
-rw-r--r--src/devices/cpu/h8500/h8510.h29
-rw-r--r--src/devices/cpu/h8500/h8520.cpp108
-rw-r--r--src/devices/cpu/h8500/h8520.h29
-rw-r--r--src/devices/cpu/h8500/h8532.cpp120
-rw-r--r--src/devices/cpu/h8500/h8532.h29
-rw-r--r--src/devices/cpu/h8500/h8534.cpp134
-rw-r--r--src/devices/cpu/h8500/h8534.h29
-rw-r--r--src/devices/cpu/hmcs40/hmcs40.cpp71
-rw-r--r--src/devices/cpu/hmcs40/hmcs40.h10
-rw-r--r--src/devices/cpu/hmcs40/hmcs40op.cpp29
-rw-r--r--src/devices/cpu/hphybrid/hphybrid.cpp26
-rw-r--r--src/devices/cpu/hphybrid/hphybrid.h10
-rw-r--r--src/devices/cpu/i386/athlon.cpp54
-rw-r--r--src/devices/cpu/i386/athlon.h6
-rw-r--r--src/devices/cpu/i386/i386.cpp25
-rw-r--r--src/devices/cpu/i386/i386.h27
-rw-r--r--src/devices/cpu/i386/i386segs.hxx2
-rw-r--r--src/devices/cpu/i386/x87ops.hxx1
-rw-r--r--src/devices/cpu/i8008/i8008.cpp20
-rw-r--r--src/devices/cpu/i8008/i8008.h6
-rw-r--r--src/devices/cpu/i8085/i8085.cpp96
-rw-r--r--src/devices/cpu/i8085/i8085.h13
-rw-r--r--src/devices/cpu/i8089/i8089_dasm.cpp2
-rw-r--r--src/devices/cpu/i8089/i8089_dasm.h2
-rw-r--r--src/devices/cpu/i86/i186.cpp3
-rw-r--r--src/devices/cpu/i86/i286.cpp14
-rw-r--r--src/devices/cpu/i86/i286.h10
-rw-r--r--src/devices/cpu/i86/i86.cpp31
-rw-r--r--src/devices/cpu/i86/i86.h4
-rw-r--r--src/devices/cpu/i960/i960.cpp147
-rw-r--r--src/devices/cpu/i960/i960.h4
-rw-r--r--src/devices/cpu/i960/i960dis.cpp692
-rw-r--r--src/devices/cpu/i960/i960dis.h14
-rw-r--r--src/devices/cpu/ie15/ie15.cpp19
-rw-r--r--src/devices/cpu/ie15/ie15.h6
-rw-r--r--src/devices/cpu/jaguar/jaguar.cpp601
-rw-r--r--src/devices/cpu/jaguar/jaguar.h131
-rw-r--r--src/devices/cpu/ks0164/ks0164.cpp82
-rw-r--r--src/devices/cpu/ks0164/ks0164.h4
-rw-r--r--src/devices/cpu/lc8670/lc8670.cpp34
-rw-r--r--src/devices/cpu/lc8670/lc8670.h8
-rw-r--r--src/devices/cpu/lh5801/5801tbl.hxx342
-rw-r--r--src/devices/cpu/lh5801/lh5801.cpp14
-rw-r--r--src/devices/cpu/lh5801/lh5801.h8
-rw-r--r--src/devices/cpu/lr35902/lr35902.cpp2
-rw-r--r--src/devices/cpu/lr35902/lr35902.h1
-rw-r--r--src/devices/cpu/m37710/m37710.cpp114
-rw-r--r--src/devices/cpu/m37710/m37710.h35
-rw-r--r--src/devices/cpu/m37710/m37710cm.h18
-rw-r--r--src/devices/cpu/m37710/m37710il.h26
-rw-r--r--src/devices/cpu/m37710/m37710op.h174
-rw-r--r--src/devices/cpu/m37710/m7700ds.cpp16
-rw-r--r--src/devices/cpu/m6502/m4510.cpp10
-rw-r--r--src/devices/cpu/m6502/m6500_1.cpp10
-rw-r--r--src/devices/cpu/m6502/m6500_1.h2
-rw-r--r--src/devices/cpu/m6502/m6502.cpp40
-rw-r--r--src/devices/cpu/m6502/m6502.h22
-rw-r--r--src/devices/cpu/m6502/m6504.cpp29
-rw-r--r--src/devices/cpu/m6502/m6504.h12
-rw-r--r--src/devices/cpu/m6502/m6507.cpp29
-rw-r--r--src/devices/cpu/m6502/m6507.h12
-rw-r--r--src/devices/cpu/m6502/m6509.cpp14
-rw-r--r--src/devices/cpu/m6502/m6510.cpp20
-rw-r--r--src/devices/cpu/m6502/m6510t.cpp2
-rw-r--r--src/devices/cpu/m6502/m65c02.cpp4
-rw-r--r--src/devices/cpu/m6502/m65c02.h2
-rw-r--r--src/devices/cpu/m6502/m65ce02.cpp2
-rw-r--r--src/devices/cpu/m6502/m65sc02.cpp2
-rw-r--r--src/devices/cpu/m6502/m8502.cpp2
-rw-r--r--src/devices/cpu/m6502/n2a03.cpp4
-rw-r--r--src/devices/cpu/m6502/n2a03.h2
-rw-r--r--src/devices/cpu/m6502/r65c19.cpp24
-rw-r--r--src/devices/cpu/m6502/r65c19.h6
-rw-r--r--src/devices/cpu/m6502/st2204.cpp27
-rw-r--r--src/devices/cpu/m6502/st2205u.cpp30
-rw-r--r--src/devices/cpu/m6502/st2xxx.h4
-rw-r--r--src/devices/cpu/m6502/xavix.cpp4
-rw-r--r--src/devices/cpu/m6800/6800ops.hxx7
-rw-r--r--src/devices/cpu/m6800/6800tbl.hxx95
-rw-r--r--src/devices/cpu/m6800/m6800.cpp95
-rw-r--r--src/devices/cpu/m6800/m6800.h4
-rw-r--r--src/devices/cpu/m6800/m6801.cpp68
-rw-r--r--src/devices/cpu/m6800/m6801.h5
-rw-r--r--src/devices/cpu/m68000/m68000.h14
-rw-r--r--src/devices/cpu/m68000/m68k_in.lst4
-rw-r--r--src/devices/cpu/m68000/m68kcpu.cpp194
-rw-r--r--src/devices/cpu/m68000/m68kcpu.h28
-rw-r--r--src/devices/cpu/m68000/m68kfpu.hxx10
-rwxr-xr-xsrc/devices/cpu/m68000/m68kmake.py2
-rw-r--r--src/devices/cpu/m68000/m68kmmu.h7
-rw-r--r--src/devices/cpu/m68000/m68kops.cpp48
-rw-r--r--src/devices/cpu/m6805/6805ops.hxx66
-rw-r--r--src/devices/cpu/m6805/m6805.cpp221
-rw-r--r--src/devices/cpu/m6805/m6805.h224
-rw-r--r--src/devices/cpu/m6805/m6805defs.h54
-rw-r--r--src/devices/cpu/m6805/m68705.cpp48
-rw-r--r--src/devices/cpu/m6805/m68705.h16
-rw-r--r--src/devices/cpu/m6805/m68hc05.cpp45
-rw-r--r--src/devices/cpu/m6809/hd6309.ops11
-rw-r--r--src/devices/cpu/m6809/konami.ops4
-rw-r--r--src/devices/cpu/m6809/m6809.cpp16
-rw-r--r--src/devices/cpu/m6809/m6809.h4
-rw-r--r--src/devices/cpu/m88000/m88000.cpp6
-rw-r--r--src/devices/cpu/m88000/m88000.h4
-rw-r--r--src/devices/cpu/mb86233/mb86233.cpp59
-rw-r--r--src/devices/cpu/mb86233/mb86233.h8
-rw-r--r--src/devices/cpu/mb86235/mb86235.cpp10
-rw-r--r--src/devices/cpu/mb86235/mb86235.h9
-rw-r--r--src/devices/cpu/mb86235/mb86235fe.cpp2
-rw-r--r--src/devices/cpu/mb86235/mb86235ops.cpp16
-rw-r--r--src/devices/cpu/mb88xx/mb88xx.cpp18
-rw-r--r--src/devices/cpu/mb88xx/mb88xx.h7
-rw-r--r--src/devices/cpu/mc68hc11/mc68hc11.cpp24
-rw-r--r--src/devices/cpu/mc68hc11/mc68hc11.h8
-rw-r--r--src/devices/cpu/mcs40/mcs40.cpp7
-rw-r--r--src/devices/cpu/mcs40/mcs40.h2
-rw-r--r--src/devices/cpu/mcs48/mcs48.cpp14
-rw-r--r--src/devices/cpu/mcs48/mcs48.h17
-rw-r--r--src/devices/cpu/mcs51/mcs51.cpp47
-rw-r--r--src/devices/cpu/mcs51/mcs51.h7
-rw-r--r--src/devices/cpu/mcs96/i8x9x.cpp115
-rw-r--r--src/devices/cpu/mcs96/i8x9x.h18
-rw-r--r--src/devices/cpu/mcs96/mcs96.cpp26
-rw-r--r--src/devices/cpu/mcs96/mcs96.h8
-rw-r--r--src/devices/cpu/mcs96/mcs96d.cpp4
-rw-r--r--src/devices/cpu/mips/mips3.cpp24
-rw-r--r--src/devices/cpu/mips/mips3.h5
-rw-r--r--src/devices/cpu/mips/r4000.cpp4
-rw-r--r--src/devices/cpu/nanoprocessor/nanoprocessor.cpp19
-rw-r--r--src/devices/cpu/nanoprocessor/nanoprocessor.h11
-rw-r--r--src/devices/cpu/nec/nec.cpp95
-rw-r--r--src/devices/cpu/nec/nec.h262
-rw-r--r--src/devices/cpu/nec/nec80inst.hxx260
-rw-r--r--src/devices/cpu/nec/necdasm.cpp282
-rw-r--r--src/devices/cpu/nec/necdasm.h10
-rw-r--r--src/devices/cpu/nec/necinstr.h260
-rw-r--r--src/devices/cpu/nec/necinstr.hxx2
-rw-r--r--src/devices/cpu/nec/necmacro.h16
-rw-r--r--src/devices/cpu/nec/necpriv.h6
-rw-r--r--src/devices/cpu/nec/v25.cpp175
-rw-r--r--src/devices/cpu/nec/v25.h14
-rw-r--r--src/devices/cpu/nec/v25priv.h1
-rw-r--r--src/devices/cpu/pace/pace.cpp26
-rw-r--r--src/devices/cpu/pace/pace.h4
-rw-r--r--src/devices/cpu/pic16c5x/pic16c5x.cpp13
-rw-r--r--src/devices/cpu/pic16c5x/pic16c5x.h5
-rw-r--r--src/devices/cpu/pic16c62x/pic16c62x.cpp22
-rw-r--r--src/devices/cpu/pic16c62x/pic16c62x.h8
-rw-r--r--src/devices/cpu/pic17/pic17.cpp1103
-rw-r--r--src/devices/cpu/pic17/pic17.h181
-rw-r--r--src/devices/cpu/pic17/pic17c4x.cpp537
-rw-r--r--src/devices/cpu/pic17/pic17c4x.h181
-rw-r--r--src/devices/cpu/pic17/pic17d.cpp239
-rw-r--r--src/devices/cpu/pic17/pic17d.h36
-rw-r--r--src/devices/cpu/powerpc/ppc.h2
-rw-r--r--src/devices/cpu/powerpc/ppccom.cpp18
-rw-r--r--src/devices/cpu/pps4/pps4.cpp25
-rw-r--r--src/devices/cpu/pps4/pps4.h8
-rw-r--r--src/devices/cpu/psx/psx.cpp35
-rw-r--r--src/devices/cpu/psx/psx.h3
-rw-r--r--src/devices/cpu/rii/riscii.cpp121
-rw-r--r--src/devices/cpu/rii/riscii.h6
-rw-r--r--src/devices/cpu/rsp/rsp.cpp32
-rw-r--r--src/devices/cpu/rsp/rsp.h4
-rw-r--r--src/devices/cpu/rsp/rspdrc.cpp12
-rw-r--r--src/devices/cpu/rsp/rspfe.cpp2
-rw-r--r--src/devices/cpu/rx01/rx01.cpp103
-rw-r--r--src/devices/cpu/rx01/rx01.h16
-rw-r--r--src/devices/cpu/s2650/s2650.cpp35
-rw-r--r--src/devices/cpu/s2650/s2650.h7
-rw-r--r--src/devices/cpu/saturn/satops.ipp8
-rw-r--r--src/devices/cpu/saturn/saturn.cpp5
-rw-r--r--src/devices/cpu/saturn/saturn.h4
-rw-r--r--src/devices/cpu/sc61860/sc61860.cpp4
-rw-r--r--src/devices/cpu/sc61860/sc61860.h5
-rw-r--r--src/devices/cpu/sc61860/scops.hxx12
-rw-r--r--src/devices/cpu/scmp/scmp.cpp19
-rw-r--r--src/devices/cpu/scmp/scmp.h6
-rw-r--r--src/devices/cpu/score/score.cpp18
-rw-r--r--src/devices/cpu/score/score.h4
-rw-r--r--src/devices/cpu/se3208/se3208.cpp121
-rw-r--r--src/devices/cpu/se3208/se3208.h16
-rw-r--r--src/devices/cpu/sh/sh.h3
-rw-r--r--src/devices/cpu/sh/sh2.cpp12
-rw-r--r--src/devices/cpu/sh/sh2.h2
-rw-r--r--src/devices/cpu/sh/sh4.cpp24
-rw-r--r--src/devices/cpu/sparc/sparc.cpp514
-rw-r--r--src/devices/cpu/sparc/sparc.h13
-rw-r--r--src/devices/cpu/sparc/sparc_intf.h2
-rw-r--r--src/devices/cpu/sparc/sparcdefs.h4
-rw-r--r--src/devices/cpu/sparc/sparcv7v8.cpp4738
-rw-r--r--src/devices/cpu/spc700/spc700.cpp9
-rw-r--r--src/devices/cpu/spc700/spc700.h6
-rw-r--r--src/devices/cpu/ssp1601/ssp1601.cpp14
-rw-r--r--src/devices/cpu/ssp1601/ssp1601.h6
-rw-r--r--src/devices/cpu/t11/t11.cpp202
-rw-r--r--src/devices/cpu/t11/t11.h57
-rw-r--r--src/devices/cpu/tms1000/tms0980.cpp4
-rw-r--r--src/devices/cpu/tms1000/tms1000.cpp2
-rw-r--r--src/devices/cpu/tms1000/tms1k_base.cpp2
-rw-r--r--src/devices/cpu/tms1000/tms1k_base.h6
-rw-r--r--src/devices/cpu/tms32010/tms32010.cpp24
-rw-r--r--src/devices/cpu/tms32010/tms32010.h8
-rw-r--r--src/devices/cpu/tms32025/tms32025.cpp140
-rw-r--r--src/devices/cpu/tms32025/tms32025.h8
-rw-r--r--src/devices/cpu/tms32031/32031ops.hxx4
-rw-r--r--src/devices/cpu/tms32031/dis32031.cpp4
-rw-r--r--src/devices/cpu/tms32031/dis32031.h4
-rw-r--r--src/devices/cpu/tms32031/tms32031.cpp149
-rw-r--r--src/devices/cpu/tms32031/tms32031.h8
-rw-r--r--src/devices/cpu/tms32051/32051ops.hxx2
-rw-r--r--src/devices/cpu/tms32051/tms32051.cpp22
-rw-r--r--src/devices/cpu/tms32051/tms32051.h8
-rw-r--r--src/devices/cpu/tms32082/mp_ops.cpp54
-rw-r--r--src/devices/cpu/tms32082/tms32082.cpp54
-rw-r--r--src/devices/cpu/tms32082/tms32082.h14
-rw-r--r--src/devices/cpu/tms34010/34010gfx.hxx96
-rw-r--r--src/devices/cpu/tms34010/34010ops.h16
-rw-r--r--src/devices/cpu/tms34010/34010ops.hxx6
-rw-r--r--src/devices/cpu/tms34010/tms34010.cpp20
-rw-r--r--src/devices/cpu/tms34010/tms34010.h26
-rw-r--r--src/devices/cpu/tms7000/tms7000.cpp24
-rw-r--r--src/devices/cpu/tms7000/tms7000.h46
-rw-r--r--src/devices/cpu/tms9900/tms9995.cpp4
-rw-r--r--src/devices/cpu/tms9900/tms9995.h2
-rw-r--r--src/devices/cpu/ucom4/ucom4.cpp4
-rw-r--r--src/devices/cpu/ucom4/ucom4.h2
-rw-r--r--src/devices/cpu/unsp/unsp.cpp19
-rw-r--r--src/devices/cpu/unsp/unsp.h22
-rw-r--r--src/devices/cpu/unsp/unsp_extended.cpp83
-rw-r--r--src/devices/cpu/unsp/unsp_exxx.cpp187
-rw-r--r--src/devices/cpu/unsp/unsp_fxxx.cpp36
-rw-r--r--src/devices/cpu/unsp/unspdasm_exxx.cpp4
-rw-r--r--src/devices/cpu/unsp/unspdrc.cpp12
-rw-r--r--src/devices/cpu/unsp/unspfe.cpp2
-rw-r--r--src/devices/cpu/upd177x/upd177xd.cpp299
-rw-r--r--src/devices/cpu/upd177x/upd177xd.h41
-rw-r--r--src/devices/cpu/upd7725/upd7725.cpp15
-rw-r--r--src/devices/cpu/upd7725/upd7725.h5
-rw-r--r--src/devices/cpu/upd7810/upd7810.cpp4
-rw-r--r--src/devices/cpu/upd7810/upd7810.h4
-rw-r--r--src/devices/cpu/upd7810/upd7810_macros.h8
-rw-r--r--src/devices/cpu/upd78k/upd78k0.cpp14
-rw-r--r--src/devices/cpu/upd78k/upd78k0.h8
-rw-r--r--src/devices/cpu/upd78k/upd78k1d.cpp2
-rw-r--r--src/devices/cpu/upd78k/upd78k2.cpp14
-rw-r--r--src/devices/cpu/upd78k/upd78k2.h8
-rw-r--r--src/devices/cpu/upd78k/upd78k3.cpp14
-rw-r--r--src/devices/cpu/upd78k/upd78k3.h9
-rw-r--r--src/devices/cpu/v30mz/v30mz.cpp26
-rw-r--r--src/devices/cpu/v30mz/v30mz.h10
-rw-r--r--src/devices/cpu/v60/v60.cpp16
-rw-r--r--src/devices/cpu/v60/v60.h3
-rw-r--r--src/devices/cpu/v810/v810.cpp32
-rw-r--r--src/devices/cpu/v810/v810.h6
-rw-r--r--src/devices/cpu/vt50/vt50.cpp24
-rw-r--r--src/devices/cpu/vt50/vt50.h4
-rw-r--r--src/devices/cpu/vt61/vt61.cpp9
-rw-r--r--src/devices/cpu/vt61/vt61.h6
-rw-r--r--src/devices/cpu/we32000/we32100.cpp14
-rw-r--r--src/devices/cpu/we32000/we32100.h4
-rw-r--r--src/devices/cpu/we32000/we32100d.cpp2
-rw-r--r--src/devices/cpu/xavix2/xavix2.cpp108
-rw-r--r--src/devices/cpu/xavix2/xavix2.h4
-rw-r--r--src/devices/cpu/z180/z180.cpp25
-rw-r--r--src/devices/cpu/z180/z180.h8
-rw-r--r--src/devices/cpu/z180/z180dd.hxx2
-rw-r--r--src/devices/cpu/z180/z180ed.hxx2
-rw-r--r--src/devices/cpu/z180/z180ops.h10
-rw-r--r--src/devices/cpu/z8/z8.cpp28
-rw-r--r--src/devices/cpu/z8/z8.h20
-rw-r--r--src/devices/cpu/z8/z8ops.hxx36
-rw-r--r--src/devices/cpu/z80/z80.cpp27
-rw-r--r--src/devices/cpu/z80/z80.h10
-rw-r--r--src/devices/cpu/z8000/z8000.cpp281
-rw-r--r--src/devices/cpu/z8000/z8000.h96
-rw-r--r--src/devices/cpu/z8000/z8000cpu.h5
-rw-r--r--src/devices/cpu/z8000/z8000ops.hxx370
-rw-r--r--src/devices/machine/6522via.cpp55
-rw-r--r--src/devices/machine/68307.cpp19
-rw-r--r--src/devices/machine/68307.h4
-rw-r--r--src/devices/machine/6850acia.cpp37
-rw-r--r--src/devices/machine/74145.cpp2
-rw-r--r--src/devices/machine/74145.h2
-rw-r--r--src/devices/machine/74161.cpp43
-rw-r--r--src/devices/machine/74161.h8
-rw-r--r--src/devices/machine/74543.cpp120
-rw-r--r--src/devices/machine/74543.h124
-rw-r--r--src/devices/machine/7474.cpp8
-rw-r--r--src/devices/machine/8364_paula.cpp2
-rw-r--r--src/devices/machine/8364_paula.h2
-rw-r--r--src/devices/machine/akiko.cpp16
-rw-r--r--src/devices/machine/akiko.h6
-rw-r--r--src/devices/machine/am2901b.cpp228
-rw-r--r--src/devices/machine/am2901b.h105
-rw-r--r--src/devices/machine/am79c30.cpp12
-rw-r--r--src/devices/machine/am9517a.cpp35
-rw-r--r--src/devices/machine/applefdc.cpp10
-rw-r--r--src/devices/machine/applefdc.h12
-rwxr-xr-xsrc/devices/machine/applefdintf.cpp73
-rwxr-xr-xsrc/devices/machine/applefdintf.h103
-rw-r--r--src/devices/machine/bq4847.cpp530
-rw-r--r--src/devices/machine/bq4847.h115
-rw-r--r--src/devices/machine/bq48x2.cpp551
-rw-r--r--src/devices/machine/bq48x2.h128
-rw-r--r--src/devices/machine/cr511b.cpp2
-rw-r--r--src/devices/machine/cr511b.h2
-rw-r--r--src/devices/machine/cs4031.cpp2
-rw-r--r--src/devices/machine/cs4031.h2
-rw-r--r--src/devices/machine/cxd1185.cpp73
-rw-r--r--src/devices/machine/dp8390.cpp4
-rw-r--r--src/devices/machine/dp8390.h4
-rw-r--r--src/devices/machine/ds1994.cpp1
-rw-r--r--src/devices/machine/e05a03.cpp2
-rw-r--r--src/devices/machine/e05a03.h2
-rw-r--r--src/devices/machine/fdc37c93x.cpp2
-rw-r--r--src/devices/machine/fdc37c93x.h2
-rw-r--r--src/devices/machine/gayle.cpp8
-rw-r--r--src/devices/machine/generalplus_gpl16250soc.cpp (renamed from src/devices/machine/sunplus_gcm394.cpp)218
-rw-r--r--src/devices/machine/generalplus_gpl16250soc.h (renamed from src/devices/machine/sunplus_gcm394.h)71
-rw-r--r--src/devices/machine/generalplus_gpl16250soc_video.cpp (renamed from src/devices/machine/sunplus_gcm394_video.cpp)422
-rw-r--r--src/devices/machine/generalplus_gpl16250soc_video.h (renamed from src/devices/machine/sunplus_gcm394_video.h)45
-rw-r--r--src/devices/machine/genpc.cpp2
-rw-r--r--src/devices/machine/i2cmem.cpp85
-rw-r--r--src/devices/machine/i2cmem.h31
-rw-r--r--src/devices/machine/i80130.cpp16
-rw-r--r--src/devices/machine/i80130.h2
-rw-r--r--src/devices/machine/i8087.cpp5
-rw-r--r--src/devices/machine/i8087.h4
-rw-r--r--src/devices/machine/i8155.cpp2
-rw-r--r--src/devices/machine/i82357.cpp4
-rw-r--r--src/devices/machine/i82371sb.cpp38
-rw-r--r--src/devices/machine/i82371sb.h38
-rw-r--r--src/devices/machine/i8279.cpp177
-rw-r--r--src/devices/machine/i8279.h6
-rw-r--r--src/devices/machine/icm7170.cpp54
-rw-r--r--src/devices/machine/icm7170.h2
-rw-r--r--src/devices/machine/ie15.cpp2
-rw-r--r--src/devices/machine/ie15.h2
-rw-r--r--src/devices/machine/ins8154.cpp2
-rw-r--r--src/devices/machine/ins8154.h2
-rw-r--r--src/devices/machine/intelfsh.cpp8
-rw-r--r--src/devices/machine/iwm.cpp439
-rw-r--r--src/devices/machine/iwm.h88
-rw-r--r--src/devices/machine/k056230.cpp20
-rw-r--r--src/devices/machine/k056230.h8
-rw-r--r--src/devices/machine/keyboard.cpp2
-rw-r--r--src/devices/machine/lpci.cpp16
-rw-r--r--src/devices/machine/lpci.h8
-rw-r--r--src/devices/machine/m3002.cpp507
-rw-r--r--src/devices/machine/m3002.h113
-rw-r--r--src/devices/machine/mb89371.cpp18
-rw-r--r--src/devices/machine/mc68328.cpp3
-rw-r--r--src/devices/machine/mcf5206e.h1
-rw-r--r--src/devices/machine/mm58174.cpp304
-rw-r--r--src/devices/machine/mm58174.h64
-rw-r--r--src/devices/machine/mm74c922.cpp4
-rw-r--r--src/devices/machine/mos6551.cpp22
-rw-r--r--src/devices/machine/msm58321.cpp4
-rw-r--r--src/devices/machine/myb3k_kbd.cpp2
-rw-r--r--src/devices/machine/ncr5380n.cpp898
-rw-r--r--src/devices/machine/ncr5380n.h335
-rw-r--r--src/devices/machine/netlist.cpp825
-rw-r--r--src/devices/machine/netlist.h81
-rw-r--r--src/devices/machine/nscsi_bus.cpp5
-rw-r--r--src/devices/machine/pc_fdc.cpp31
-rw-r--r--src/devices/machine/pc_fdc.h20
-rw-r--r--src/devices/machine/pci.cpp7
-rw-r--r--src/devices/machine/pdc.cpp4
-rw-r--r--src/devices/machine/phi.cpp12
-rw-r--r--src/devices/machine/phi.h10
-rw-r--r--src/devices/machine/pic8259.cpp126
-rw-r--r--src/devices/machine/pic8259.h5
-rw-r--r--src/devices/machine/pla.cpp21
-rw-r--r--src/devices/machine/pla.h3
-rw-r--r--src/devices/machine/pxa255.cpp18
-rw-r--r--src/devices/machine/rescap.h15
-rw-r--r--src/devices/machine/ripple_counter.cpp2
-rw-r--r--src/devices/machine/ripple_counter.h6
-rw-r--r--src/devices/machine/rtc65271.cpp4
-rw-r--r--src/devices/machine/rtc65271.h7
-rw-r--r--src/devices/machine/s3c2400.cpp2
-rw-r--r--src/devices/machine/s3c2400.h7
-rw-r--r--src/devices/machine/s3c2410.cpp2
-rw-r--r--src/devices/machine/s3c2410.h7
-rw-r--r--src/devices/machine/s3c2440.cpp2
-rw-r--r--src/devices/machine/s3c2440.h7
-rw-r--r--src/devices/machine/s3c24xx.hxx34
-rw-r--r--src/devices/machine/s3c44b0.cpp14
-rw-r--r--src/devices/machine/s3c44b0.h2
-rw-r--r--src/devices/machine/s_smp.cpp320
-rw-r--r--src/devices/machine/s_smp.h90
-rw-r--r--src/devices/machine/scc68070.cpp162
-rw-r--r--src/devices/machine/scc68070.h16
-rw-r--r--src/devices/machine/scn_pci.cpp4
-rw-r--r--src/devices/machine/sega_scu.cpp4
-rw-r--r--src/devices/machine/sega_scu.h4
-rw-r--r--src/devices/machine/sis85c496.cpp38
-rw-r--r--src/devices/machine/sis85c496.h38
-rw-r--r--src/devices/machine/smc91c9x.cpp4
-rw-r--r--src/devices/machine/smc91c9x.h4
-rw-r--r--src/devices/machine/smpc.cpp38
-rw-r--r--src/devices/machine/spg110.cpp2
-rw-r--r--src/devices/machine/spg110.h20
-rw-r--r--src/devices/machine/spg2xx.cpp8
-rw-r--r--src/devices/machine/spg2xx.h34
-rw-r--r--src/devices/machine/spg2xx_video.cpp693
-rw-r--r--src/devices/machine/spg2xx_video.h66
-rw-r--r--src/devices/machine/spg_renderer.cpp526
-rw-r--r--src/devices/machine/spg_renderer.h93
-rw-r--r--src/devices/machine/stvcd.cpp3134
-rw-r--r--src/devices/machine/stvcd.h94
-rw-r--r--src/devices/machine/sun4c_mmu.cpp694
-rw-r--r--src/devices/machine/sun4c_mmu.h73
-rw-r--r--src/devices/machine/swim1.cpp173
-rw-r--r--src/devices/machine/swim1.h48
-rw-r--r--src/devices/machine/swim2.cpp175
-rw-r--r--src/devices/machine/swim2.h48
-rw-r--r--src/devices/machine/swim3.cpp173
-rw-r--r--src/devices/machine/swim3.h48
-rw-r--r--src/devices/machine/tc009xlvc.cpp282
-rw-r--r--src/devices/machine/tc009xlvc.h50
-rw-r--r--src/devices/machine/tdc1008.cpp12
-rw-r--r--src/devices/machine/tdc1008.h12
-rw-r--r--src/devices/machine/timer.h5
-rw-r--r--src/devices/machine/tms1024.h1
-rw-r--r--src/devices/machine/tms9914.cpp146
-rw-r--r--src/devices/machine/tms9914.h2
-rw-r--r--src/devices/machine/upd765.cpp269
-rw-r--r--src/devices/machine/upd765.h82
-rw-r--r--src/devices/machine/vrender0.cpp2
-rw-r--r--src/devices/machine/vrender0.h2
-rw-r--r--src/devices/machine/wd1010.cpp2
-rw-r--r--src/devices/machine/wd1010.h2
-rw-r--r--src/devices/machine/wd_fdc.cpp193
-rw-r--r--src/devices/machine/wd_fdc.h8
-rw-r--r--src/devices/machine/z80scc.cpp9
-rw-r--r--src/devices/sound/2608intf.cpp2
-rw-r--r--src/devices/sound/2608intf.h3
-rw-r--r--src/devices/sound/8950intf.cpp2
-rw-r--r--src/devices/sound/8950intf.h5
-rw-r--r--src/devices/sound/aica.cpp25
-rw-r--r--src/devices/sound/aica.h4
-rw-r--r--src/devices/sound/aicadsp.cpp10
-rw-r--r--src/devices/sound/aicadsp.h4
-rw-r--r--src/devices/sound/asc.cpp11
-rw-r--r--src/devices/sound/bsmt2000.cpp2
-rw-r--r--src/devices/sound/bsmt2000.h3
-rw-r--r--src/devices/sound/c140.cpp651
-rw-r--r--src/devices/sound/c140.h102
-rw-r--r--src/devices/sound/c352.cpp142
-rw-r--r--src/devices/sound/c352.h45
-rw-r--r--src/devices/sound/dac.h12
-rw-r--r--src/devices/sound/dac76.cpp4
-rw-r--r--src/devices/sound/dac76.h4
-rw-r--r--src/devices/sound/disc_flt.hxx96
-rw-r--r--src/devices/sound/es5503.cpp2
-rw-r--r--src/devices/sound/es5503.h6
-rw-r--r--src/devices/sound/es8712.cpp2
-rw-r--r--src/devices/sound/es8712.h3
-rw-r--r--src/devices/sound/gaelco.cpp2
-rw-r--r--src/devices/sound/gaelco.h5
-rw-r--r--src/devices/sound/iremga20.cpp2
-rw-r--r--src/devices/sound/iremga20.h3
-rw-r--r--src/devices/sound/k053260.cpp59
-rw-r--r--src/devices/sound/k053260.h21
-rw-r--r--src/devices/sound/k054539.cpp2
-rw-r--r--src/devices/sound/k054539.h6
-rw-r--r--src/devices/sound/ks0164.cpp133
-rw-r--r--src/devices/sound/ks0164.h8
-rw-r--r--src/devices/sound/l7a1045_l6028_dsp_a.cpp24
-rw-r--r--src/devices/sound/l7a1045_l6028_dsp_a.h20
-rw-r--r--src/devices/sound/mm5837.cpp4
-rw-r--r--src/devices/sound/mm5837.h4
-rw-r--r--src/devices/sound/mos7360.cpp4
-rw-r--r--src/devices/sound/mos7360.h4
-rw-r--r--src/devices/sound/multipcm.cpp2
-rw-r--r--src/devices/sound/multipcm.h4
-rw-r--r--src/devices/sound/nes_apu.cpp39
-rw-r--r--src/devices/sound/nes_apu.h1
-rw-r--r--src/devices/sound/nes_defs.h6
-rw-r--r--src/devices/sound/okim6258.cpp1
-rw-r--r--src/devices/sound/okim6295.cpp2
-rw-r--r--src/devices/sound/okim6295.h3
-rw-r--r--src/devices/sound/okim6376.cpp3
-rw-r--r--src/devices/sound/okim6376.h4
-rw-r--r--src/devices/sound/okim9810.cpp2
-rw-r--r--src/devices/sound/okim9810.h3
-rw-r--r--src/devices/sound/pokey.cpp15
-rw-r--r--src/devices/sound/pokey.h2
-rw-r--r--src/devices/sound/qs1000.cpp2
-rw-r--r--src/devices/sound/qs1000.h3
-rw-r--r--src/devices/sound/qsound.cpp6
-rw-r--r--src/devices/sound/qsound.h7
-rw-r--r--src/devices/sound/qsoundhle.cpp2
-rw-r--r--src/devices/sound/qsoundhle.h3
-rw-r--r--src/devices/sound/rf5c400.cpp2
-rw-r--r--src/devices/sound/rf5c400.h6
-rw-r--r--src/devices/sound/rf5c68.cpp38
-rw-r--r--src/devices/sound/rf5c68.h15
-rw-r--r--src/devices/sound/rolandpcm.cpp45
-rw-r--r--src/devices/sound/rolandpcm.h14
-rw-r--r--src/devices/sound/s14001a.cpp32
-rw-r--r--src/devices/sound/s_dsp.cpp1080
-rw-r--r--src/devices/sound/s_dsp.h116
-rw-r--r--src/devices/sound/scsp.cpp2
-rw-r--r--src/devices/sound/scsp.h3
-rw-r--r--src/devices/sound/segapcm.cpp2
-rw-r--r--src/devices/sound/segapcm.h3
-rw-r--r--src/devices/sound/spu.cpp4
-rw-r--r--src/devices/sound/spu.h4
-rw-r--r--src/devices/sound/swp00.cpp2
-rw-r--r--src/devices/sound/swp00.h3
-rw-r--r--src/devices/sound/swp20.cpp2
-rw-r--r--src/devices/sound/swp20.h4
-rw-r--r--src/devices/sound/swp30.cpp2
-rw-r--r--src/devices/sound/swp30.h3
-rw-r--r--src/devices/sound/tms36xx.cpp2
-rw-r--r--src/devices/sound/upd7759.cpp2
-rw-r--r--src/devices/sound/upd7759.h4
-rw-r--r--src/devices/sound/vgm_visualizer.cpp250
-rw-r--r--src/devices/sound/vgm_visualizer.h30
-rw-r--r--src/devices/sound/vlm5030.cpp2
-rw-r--r--src/devices/sound/vlm5030.h4
-rw-r--r--src/devices/sound/volt_reg.cpp6
-rw-r--r--src/devices/sound/vrender0.cpp12
-rw-r--r--src/devices/sound/vrender0.h8
-rw-r--r--src/devices/sound/x1_010.cpp2
-rw-r--r--src/devices/sound/x1_010.h4
-rw-r--r--src/devices/sound/ym2151.cpp85
-rw-r--r--src/devices/sound/ymf271.cpp2
-rw-r--r--src/devices/sound/ymf271.h3
-rw-r--r--src/devices/sound/ymf278b.cpp2
-rw-r--r--src/devices/sound/ymf278b.h3
-rw-r--r--src/devices/sound/ymz280b.cpp2
-rw-r--r--src/devices/sound/ymz280b.h3
-rw-r--r--src/devices/video/clgd542x.cpp36
-rw-r--r--src/devices/video/clgd542x.h16
-rw-r--r--src/devices/video/decsfb.cpp8
-rw-r--r--src/devices/video/decsfb.h8
-rw-r--r--src/devices/video/dl1416.cpp2
-rw-r--r--src/devices/video/dl1416.h2
-rw-r--r--src/devices/video/ef9369.cpp2
-rw-r--r--src/devices/video/ef9369.h2
-rw-r--r--src/devices/video/gba_lcd.cpp16
-rw-r--r--src/devices/video/gba_lcd.h16
-rw-r--r--src/devices/video/gf4500.cpp4
-rw-r--r--src/devices/video/gf4500.h4
-rw-r--r--src/devices/video/hd44780.cpp14
-rw-r--r--src/devices/video/hd44780.h11
-rw-r--r--src/devices/video/hd63484.cpp130
-rw-r--r--src/devices/video/hd63484.h16
-rw-r--r--src/devices/video/hlcd0488.cpp104
-rw-r--r--src/devices/video/hlcd0488.h78
-rw-r--r--src/devices/video/hlcd0515.cpp5
-rw-r--r--src/devices/video/hlcd0538.cpp22
-rw-r--r--src/devices/video/hlcd0538.h11
-rw-r--r--src/devices/video/huc6272.cpp10
-rw-r--r--src/devices/video/huc6272.h10
-rw-r--r--src/devices/video/i82730.cpp2
-rw-r--r--src/devices/video/i82730.h2
-rw-r--r--src/devices/video/lc7582.cpp1
-rw-r--r--src/devices/video/lc7582.h2
-rw-r--r--src/devices/video/mc6845.cpp32
-rw-r--r--src/devices/video/mc6845.h11
-rw-r--r--src/devices/video/pc_vga.cpp256
-rw-r--r--src/devices/video/pc_vga.h88
-rw-r--r--src/devices/video/pcf2100.cpp119
-rw-r--r--src/devices/video/pcf2100.h94
-rw-r--r--src/devices/video/ppu2c0x_sh6578.cpp3
-rw-r--r--src/devices/video/ps2gif.cpp8
-rw-r--r--src/devices/video/ps2gif.h4
-rw-r--r--src/devices/video/ps2gs.cpp20
-rw-r--r--src/devices/video/ps2gs.h14
-rw-r--r--src/devices/video/psx.cpp4
-rw-r--r--src/devices/video/psx.h4
-rw-r--r--src/devices/video/scn2674.cpp33
-rw-r--r--src/devices/video/scn2674.h2
-rw-r--r--src/devices/video/sed1330.cpp6
-rw-r--r--src/devices/video/sed1330.h2
-rw-r--r--src/devices/video/sed1500.cpp116
-rw-r--r--src/devices/video/sed1500.h85
-rw-r--r--src/devices/video/snes_ppu.cpp8
-rw-r--r--src/devices/video/snes_ppu.h4
-rw-r--r--src/devices/video/t6963c.cpp2
-rw-r--r--src/devices/video/tea1002.cpp2
-rw-r--r--src/devices/video/tea1002.h2
-rw-r--r--src/devices/video/tms3556.cpp112
-rw-r--r--src/devices/video/tms3556.h7
-rw-r--r--src/devices/video/virge_pci.cpp58
-rw-r--r--src/devices/video/virge_pci.h4
-rw-r--r--src/devices/video/voodoo_pci.cpp12
-rw-r--r--src/devices/video/voodoo_pci.h8
1224 files changed, 34807 insertions, 21047 deletions
diff --git a/src/devices/bus/a1bus/a1cffa.cpp b/src/devices/bus/a1bus/a1cffa.cpp
index 8c68e818531..ff1668a8eb9 100644
--- a/src/devices/bus/a1bus/a1cffa.cpp
+++ b/src/devices/bus/a1bus/a1cffa.cpp
@@ -97,7 +97,7 @@ READ8_MEMBER(a1bus_cffa_device::cffa_r)
break;
case 0x8:
- m_lastdata = m_ata->read_cs0((offset & 0xf) - 8, 0xff);
+ m_lastdata = m_ata->cs0_r((offset & 0xf) - 8, 0xff);
return m_lastdata & 0x00ff;
case 0x9:
@@ -107,7 +107,7 @@ READ8_MEMBER(a1bus_cffa_device::cffa_r)
case 0xd:
case 0xe:
case 0xf:
- return m_ata->read_cs0((offset & 0xf) - 8, 0xff);
+ return m_ata->cs0_r((offset & 0xf) - 8, 0xff);
}
return 0xff;
@@ -132,7 +132,7 @@ WRITE8_MEMBER(a1bus_cffa_device::cffa_w)
case 0x8:
- m_ata->write_cs0((offset & 0xf) - 8, data, 0xff);
+ m_ata->cs0_w((offset & 0xf) - 8, data, 0xff);
break;
case 0x9:
@@ -142,7 +142,7 @@ WRITE8_MEMBER(a1bus_cffa_device::cffa_w)
case 0xd:
case 0xe:
case 0xf:
- m_ata->write_cs0((offset & 0xf) - 8, data, 0xff);
+ m_ata->cs0_w((offset & 0xf) - 8, data, 0xff);
break;
}
diff --git a/src/devices/bus/a2bus/a2cffa.cpp b/src/devices/bus/a2bus/a2cffa.cpp
index 8dd57c376e4..7f6104310be 100644
--- a/src/devices/bus/a2bus/a2cffa.cpp
+++ b/src/devices/bus/a2bus/a2cffa.cpp
@@ -52,7 +52,7 @@ ROM_END
void a2bus_cffa2000_device::device_add_mconfig(machine_config &config)
{
- ATA_INTERFACE(config, m_ata).options(ata_devices, "hdd", nullptr, false);
+ ATA_INTERFACE(config, m_ata).options(ata_devices, "hdd", "hdd", false);
// not yet, the core explodes
// SOFTWARE_LIST(config, "hdd_list").set_original("apple2gs_hdd");
@@ -145,7 +145,7 @@ uint8_t a2bus_cffa2000_device::read_c0nx(uint8_t offset)
// Apple /// driver uses sta $c080,x when writing, which causes spurious reads of c088
if (!m_inwritecycle)
{
- m_lastreaddata = m_ata->read_cs0(offset - 8);
+ m_lastreaddata = m_ata->cs0_r(offset - 8);
}
return m_lastreaddata & 0xff;
@@ -156,7 +156,7 @@ uint8_t a2bus_cffa2000_device::read_c0nx(uint8_t offset)
case 0xd:
case 0xe:
case 0xf:
- return m_ata->read_cs0(offset-8, 0xff);
+ return m_ata->cs0_r(offset-8, 0xff);
}
return 0xff;
@@ -192,7 +192,7 @@ void a2bus_cffa2000_device::write_c0nx(uint8_t offset, uint8_t data)
m_lastdata &= 0xff00;
m_lastdata |= data;
// printf("%02x to 8, m_lastdata = %x\n", data, m_lastdata);
- m_ata->write_cs0(offset-8, m_lastdata);
+ m_ata->cs0_w(offset-8, m_lastdata);
break;
case 9:
@@ -202,7 +202,7 @@ void a2bus_cffa2000_device::write_c0nx(uint8_t offset, uint8_t data)
case 0xd:
case 0xe:
case 0xf:
- m_ata->write_cs0(offset-8, data, 0xff);
+ m_ata->cs0_w(offset-8, data, 0xff);
break;
}
}
diff --git a/src/devices/bus/a2bus/a2diskii.cpp b/src/devices/bus/a2bus/a2diskii.cpp
index c67eb306837..2c06ee5136f 100644
--- a/src/devices/bus/a2bus/a2diskii.cpp
+++ b/src/devices/bus/a2bus/a2diskii.cpp
@@ -24,7 +24,6 @@
//**************************************************************************
DEFINE_DEVICE_TYPE(A2BUS_DISKII, a2bus_diskii_device, "a2diskii", "Apple Disk II controller")
-DEFINE_DEVICE_TYPE(A2BUS_IWM_FDC, a2bus_iwmflop_device, "a2iwm_flop", "Apple IWM floppy card")
DEFINE_DEVICE_TYPE(A2BUS_AGAT7_FDC, a2bus_agat7flop_device, "agat7_flop", "Agat-7 140K floppy card")
DEFINE_DEVICE_TYPE(A2BUS_AGAT9_FDC, a2bus_agat9flop_device, "agat9_flop", "Agat-9 140K floppy card")
@@ -69,14 +68,7 @@ ROM_END
void a2bus_floppy_device::device_add_mconfig(machine_config &config)
{
- APPLEFDC(config, m_fdc, &fdc_interface);
- FLOPPY_APPLE(config, FLOPPY_0, &floppy_interface, 15, 16);
- FLOPPY_APPLE(config, FLOPPY_1, &floppy_interface, 15, 16);
-}
-
-void a2bus_iwmflop_device::device_add_mconfig(machine_config &config)
-{
- IWM(config, m_fdc, &fdc_interface);
+ LEGACY_APPLEFDC(config, m_fdc, &fdc_interface);
FLOPPY_APPLE(config, FLOPPY_0, &floppy_interface, 15, 16);
FLOPPY_APPLE(config, FLOPPY_1, &floppy_interface, 15, 16);
}
@@ -116,11 +108,6 @@ a2bus_diskii_device::a2bus_diskii_device(const machine_config &mconfig, const ch
{
}
-a2bus_iwmflop_device::a2bus_iwmflop_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- a2bus_floppy_device(mconfig, A2BUS_IWM_FDC, tag, owner, clock)
-{
-}
-
a2bus_agat7flop_device::a2bus_agat7flop_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
a2bus_floppy_device(mconfig, A2BUS_AGAT7_FDC, tag, owner, clock)
{
diff --git a/src/devices/bus/a2bus/a2diskii.h b/src/devices/bus/a2bus/a2diskii.h
index 879744e8950..a196d148f78 100644
--- a/src/devices/bus/a2bus/a2diskii.h
+++ b/src/devices/bus/a2bus/a2diskii.h
@@ -50,15 +50,6 @@ public:
a2bus_diskii_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
};
-class a2bus_iwmflop_device: public a2bus_floppy_device
-{
-public:
- a2bus_iwmflop_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
-
-protected:
- virtual void device_add_mconfig(machine_config &config) override;
-};
-
class a2bus_agat7flop_device: public a2bus_floppy_device
{
public:
@@ -77,7 +68,6 @@ public:
// device type definition
DECLARE_DEVICE_TYPE(A2BUS_DISKII, a2bus_diskii_device)
-DECLARE_DEVICE_TYPE(A2BUS_IWM_FDC, a2bus_iwmflop_device)
DECLARE_DEVICE_TYPE(A2BUS_AGAT7_FDC, a2bus_agat7flop_device)
DECLARE_DEVICE_TYPE(A2BUS_AGAT9_FDC, a2bus_agat9flop_device)
diff --git a/src/devices/bus/a2bus/a2eramworks3.cpp b/src/devices/bus/a2bus/a2eramworks3.cpp
index 46ada4066a1..fa47c749e61 100644
--- a/src/devices/bus/a2bus/a2eramworks3.cpp
+++ b/src/devices/bus/a2bus/a2eramworks3.cpp
@@ -6,6 +6,7 @@
Applied Engineering RamWorks III
+ The AE RamWorks patent is US 4601018.
*********************************************************************/
@@ -89,8 +90,8 @@ uint8_t *a2eaux_ramworks3_device::get_auxbank_ptr()
*/
void a2eaux_ramworks3_device::write_c07x(uint8_t offset, uint8_t data)
{
- // write to C073?
- if (offset == 3)
+ // write to C071/3/5/7?
+ if ((offset & 0x9) == 1)
{
m_bank = 0x10000 * (data & 0x7f);
}
diff --git a/src/devices/bus/a2bus/a2iwm.cpp b/src/devices/bus/a2bus/a2iwm.cpp
new file mode 100644
index 00000000000..bcc975aeefc
--- /dev/null
+++ b/src/devices/bus/a2bus/a2iwm.cpp
@@ -0,0 +1,138 @@
+// license:BSD-3-Clause
+// copyright-holders:R. Belmont, O. Galibert
+/*********************************************************************
+
+ a2iwm.c
+
+ Implementation of the Apple II IWM controller card
+
+ WANTED: there are no ROM dumps from this card in any form
+ (the IWM card, the UniDisk )
+
+*********************************************************************/
+
+#include "emu.h"
+#include "formats/ap2_dsk.h"
+#include "machine/applefdintf.h"
+#include "a2iwm.h"
+
+//**************************************************************************
+// GLOBAL VARIABLES
+//**************************************************************************
+
+DEFINE_DEVICE_TYPE(A2BUS_IWM, a2bus_iwm_int_device, "a2iwmint", "Apple IWM controller")
+DEFINE_DEVICE_TYPE(A2BUS_IWM_CARD, a2bus_iwm_card_device, "a2iwm", "Apple Disk II IWM controller")
+
+#define DISKII_ROM_REGION "diskii_rom"
+
+ROM_START( iwm )
+ ROM_REGION(0x100, DISKII_ROM_REGION, 0)
+ ROM_LOAD( "341-0027-a.p5", 0x000000, 0x000100, CRC(ce7144f6) SHA1(d4181c9f046aafc3fb326b381baac809d9e38d16) )
+ROM_END
+
+//-------------------------------------------------
+// device_add_mconfig - add device configuration
+//-------------------------------------------------
+
+void a2bus_iwm_device::device_add_mconfig(machine_config &config)
+{
+ IWM(config, m_iwm, clock(), 1021800*2);
+ m_iwm->phases_cb().set(FUNC(a2bus_iwm_device::phases_w));
+ m_iwm->devsel_cb().set(FUNC(a2bus_iwm_device::devsel_w));
+ applefdintf_device::add_525(config, m_floppy[0]);
+ applefdintf_device::add_525(config, m_floppy[1]);
+}
+
+//-------------------------------------------------
+// rom_region - device-specific ROM region
+//-------------------------------------------------
+
+const tiny_rom_entry *a2bus_iwm_card_device::device_rom_region() const
+{
+ return ROM_NAME( iwm );
+}
+
+//**************************************************************************
+// LIVE DEVICE
+//**************************************************************************
+
+a2bus_iwm_device::a2bus_iwm_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) :
+ device_t(mconfig, type, tag, owner, clock),
+ device_a2bus_card_interface(mconfig, *this),
+ m_iwm(*this, "iwm"),
+ m_floppy(*this, "%u", 0U)
+{
+}
+
+a2bus_iwm_int_device::a2bus_iwm_int_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+ a2bus_iwm_device(mconfig, A2BUS_IWM, tag, owner, clock)
+{
+}
+
+a2bus_iwm_card_device::a2bus_iwm_card_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+ a2bus_iwm_device(mconfig, A2BUS_IWM_CARD, tag, owner, clock)
+{
+}
+
+//-------------------------------------------------
+// device_start - device-specific startup
+//-------------------------------------------------
+
+void a2bus_iwm_device::device_start()
+{
+}
+
+void a2bus_iwm_card_device::device_start()
+{
+ a2bus_iwm_device::device_start();
+ m_rom = device().machine().root_device().memregion(this->subtag(DISKII_ROM_REGION).c_str())->base();
+}
+
+void a2bus_iwm_device::device_reset()
+{
+}
+
+/*-------------------------------------------------
+ read_c0nx - called for reads from this card's c0nx space
+-------------------------------------------------*/
+
+uint8_t a2bus_iwm_device::read_c0nx(u8 offset)
+{
+ return m_iwm->read(offset);
+}
+
+
+/*-------------------------------------------------
+ write_c0nx - called for writes to this card's c0nx space
+-------------------------------------------------*/
+
+void a2bus_iwm_device::write_c0nx(u8 offset, u8 data)
+{
+ m_iwm->write(offset, data);
+}
+
+/*-------------------------------------------------
+ read_cnxx - called for reads from this card's c0nx space
+-------------------------------------------------*/
+
+uint8_t a2bus_iwm_card_device::read_cnxx(uint8_t offset)
+{
+ return m_rom[offset];
+}
+
+void a2bus_iwm_device::devsel_w(u8 data)
+{
+ if(data & 1)
+ m_iwm->set_floppy(m_floppy[0]->get_device());
+ else if(data & 2)
+ m_iwm->set_floppy(m_floppy[1]->get_device());
+ else
+ m_iwm->set_floppy(nullptr);
+}
+
+void a2bus_iwm_device::phases_w(u8 data)
+{
+ auto flp = m_iwm->get_floppy();
+ if(flp)
+ flp->seek_phase_w(data);
+}
diff --git a/src/devices/bus/a2bus/a2iwm.h b/src/devices/bus/a2bus/a2iwm.h
new file mode 100644
index 00000000000..89e89926eeb
--- /dev/null
+++ b/src/devices/bus/a2bus/a2iwm.h
@@ -0,0 +1,75 @@
+// license:BSD-3-Clause
+// copyright-holders:R. Belmont, O. Galibert
+/*********************************************************************
+
+ a2iwm.h
+
+ Apple II IWM Controller Card, new floppy
+
+*********************************************************************/
+
+#ifndef MAME_BUS_A2BUS_A2IWM_H
+#define MAME_BUS_A2BUS_A2IWM_H
+
+#pragma once
+
+#include "a2bus.h"
+#include "imagedev/floppy.h"
+#include "formats/flopimg.h"
+#include "machine/iwm.h"
+
+//**************************************************************************
+// TYPE DEFINITIONS
+//**************************************************************************
+
+
+class a2bus_iwm_device:
+ public device_t,
+ public device_a2bus_card_interface
+{
+public:
+ // construction/destruction
+ a2bus_iwm_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+
+protected:
+ virtual void device_start() override;
+ virtual void device_reset() override;
+ virtual void device_add_mconfig(machine_config &config) override;
+
+ // overrides of standard a2bus slot functions
+ virtual uint8_t read_c0nx(u8 offset) override;
+ virtual void write_c0nx(u8 offset, u8 data) override;
+
+ required_device<iwm_device> m_iwm;
+ required_device_array<floppy_connector, 2> m_floppy;
+
+private:
+ void devsel_w(u8 data);
+ void phases_w(u8 data);
+};
+
+class a2bus_iwm_int_device: public a2bus_iwm_device
+{
+public:
+ a2bus_iwm_int_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+};
+
+class a2bus_iwm_card_device: public a2bus_iwm_device
+{
+public:
+ a2bus_iwm_card_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+
+ virtual void device_start() override;
+ virtual const tiny_rom_entry *device_rom_region() const override;
+
+ virtual uint8_t read_cnxx(uint8_t offset) override;
+
+private:
+ uint8_t *m_rom;
+};
+
+// device type definition
+DECLARE_DEVICE_TYPE(A2BUS_IWM, a2bus_iwm_int_device)
+DECLARE_DEVICE_TYPE(A2BUS_IWM_CARD, a2bus_iwm_card_device)
+
+#endif // MAME_BUS_A2BUS_A2IWM_H
diff --git a/src/devices/bus/a2bus/a2mockingboard.cpp b/src/devices/bus/a2bus/a2mockingboard.cpp
index 98b106e1f79..93d8ba084c9 100644
--- a/src/devices/bus/a2bus/a2mockingboard.cpp
+++ b/src/devices/bus/a2bus/a2mockingboard.cpp
@@ -229,12 +229,12 @@ WRITE_LINE_MEMBER( a2bus_ayboard_device::via2_irq_w )
lower_slot_irq();
}
-WRITE8_MEMBER( a2bus_ayboard_device::via1_out_a )
+void a2bus_ayboard_device::via1_out_a(uint8_t data)
{
m_porta1 = data;
}
-WRITE8_MEMBER( a2bus_ayboard_device::via1_out_b )
+void a2bus_ayboard_device::via1_out_b(uint8_t data)
{
if (!BIT(data, 2))
{
@@ -262,7 +262,7 @@ WRITE8_MEMBER( a2bus_ayboard_device::via1_out_b )
}
}
-WRITE8_MEMBER( a2bus_phasor_device::via1_out_b )
+void a2bus_phasor_device::via1_out_b(uint8_t data)
{
if (!(data & 4))
{
@@ -311,12 +311,12 @@ WRITE8_MEMBER( a2bus_phasor_device::via1_out_b )
}
}
-WRITE8_MEMBER( a2bus_ayboard_device::via2_out_a )
+void a2bus_ayboard_device::via2_out_a(uint8_t data)
{
m_porta2 = data;
}
-WRITE8_MEMBER( a2bus_ayboard_device::via2_out_b )
+void a2bus_ayboard_device::via2_out_b(uint8_t data)
{
if (!BIT(data, 2))
{
@@ -344,7 +344,7 @@ WRITE8_MEMBER( a2bus_ayboard_device::via2_out_b )
}
}
-WRITE8_MEMBER( a2bus_phasor_device::via2_out_b )
+void a2bus_phasor_device::via2_out_b(uint8_t data)
{
if (!BIT(data, 2))
{
diff --git a/src/devices/bus/a2bus/a2mockingboard.h b/src/devices/bus/a2bus/a2mockingboard.h
index b7d6b7f3b97..a7287f8e734 100644
--- a/src/devices/bus/a2bus/a2mockingboard.h
+++ b/src/devices/bus/a2bus/a2mockingboard.h
@@ -27,10 +27,10 @@ class a2bus_ayboard_device:
public:
DECLARE_WRITE_LINE_MEMBER( via1_irq_w );
DECLARE_WRITE_LINE_MEMBER( via2_irq_w );
- DECLARE_WRITE8_MEMBER(via1_out_a);
- virtual DECLARE_WRITE8_MEMBER(via1_out_b);
- DECLARE_WRITE8_MEMBER(via2_out_a);
- virtual DECLARE_WRITE8_MEMBER(via2_out_b);
+ void via1_out_a(uint8_t data);
+ virtual void via1_out_b(uint8_t data);
+ void via2_out_a(uint8_t data);
+ virtual void via2_out_b(uint8_t data);
protected:
// construction/destruction
@@ -68,8 +68,8 @@ class a2bus_phasor_device : public a2bus_ayboard_device
public:
a2bus_phasor_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- DECLARE_WRITE8_MEMBER(via1_out_b) override;
- DECLARE_WRITE8_MEMBER(via2_out_b) override;
+ void via1_out_b(uint8_t data) override;
+ void via2_out_b(uint8_t data) override;
protected:
virtual void device_add_mconfig(machine_config &config) override;
diff --git a/src/devices/bus/a2bus/a2vulcan.cpp b/src/devices/bus/a2bus/a2vulcan.cpp
index 6bb4beaaf0a..dcc8e454a73 100644
--- a/src/devices/bus/a2bus/a2vulcan.cpp
+++ b/src/devices/bus/a2bus/a2vulcan.cpp
@@ -191,7 +191,7 @@ uint8_t a2bus_vulcanbase_device::read_c0nx(uint8_t offset)
switch (offset)
{
case 0:
- m_lastdata = m_ata->read_cs0(offset);
+ m_lastdata = m_ata->cs0_r(offset);
// printf("IDE: read %04x\n", m_lastdata);
m_last_read_was_0 = true;
return m_lastdata&0xff;
@@ -204,7 +204,7 @@ uint8_t a2bus_vulcanbase_device::read_c0nx(uint8_t offset)
}
else
{
- return m_ata->read_cs0(offset, 0xff);
+ return m_ata->cs0_r(offset, 0xff);
}
case 2:
@@ -213,7 +213,7 @@ uint8_t a2bus_vulcanbase_device::read_c0nx(uint8_t offset)
case 5:
case 6:
case 7:
- return m_ata->read_cs0(offset, 0xff);
+ return m_ata->cs0_r(offset, 0xff);
default:
logerror("a2vulcan: unknown read @ C0n%x\n", offset);
@@ -245,11 +245,11 @@ void a2bus_vulcanbase_device::write_c0nx(uint8_t offset, uint8_t data)
m_lastdata &= 0x00ff;
m_lastdata |= (data << 8);
// printf("IDE: write %04x\n", m_lastdata);
- m_ata->write_cs0(0, m_lastdata);
+ m_ata->cs0_w(0, m_lastdata);
}
else
{
- m_ata->write_cs0(offset, data, 0xff);
+ m_ata->cs0_w(offset, data, 0xff);
}
break;
@@ -260,7 +260,7 @@ void a2bus_vulcanbase_device::write_c0nx(uint8_t offset, uint8_t data)
case 6:
case 7:
// printf("%02x to IDE controller @ %x\n", data, offset);
- m_ata->write_cs0(offset, data, 0xff);
+ m_ata->cs0_w(offset, data, 0xff);
break;
case 9: // ROM bank
diff --git a/src/devices/bus/a2bus/a2zipdrive.cpp b/src/devices/bus/a2bus/a2zipdrive.cpp
index 6f76de550b0..fc06cb2a737 100644
--- a/src/devices/bus/a2bus/a2zipdrive.cpp
+++ b/src/devices/bus/a2bus/a2zipdrive.cpp
@@ -175,10 +175,10 @@ uint8_t a2bus_zipdrivebase_device::read_c0nx(uint8_t offset)
case 5:
case 6:
case 7:
- return m_ata->read_cs0(offset, 0xff);
+ return m_ata->cs0_r(offset, 0xff);
case 8: // data port
- m_lastdata = m_ata->read_cs0(0, 0xffff);
+ m_lastdata = m_ata->cs0_r(0, 0xffff);
// printf("%04x @ IDE data\n", m_lastdata);
return m_lastdata&0xff;
@@ -205,10 +205,10 @@ uint8_t a2bus_focusdrive_device::read_c0nx(uint8_t offset)
case 0xd:
case 0xe:
case 0xf:
- return m_ata->read_cs0(offset&7, 0xff);
+ return m_ata->cs0_r(offset&7, 0xff);
case 0: // data port
- m_lastdata = m_ata->read_cs0(0, 0xffff);
+ m_lastdata = m_ata->cs0_r(0, 0xffff);
//printf("%04x @ IDE data\n", m_lastdata);
return m_lastdata&0xff;
@@ -240,7 +240,7 @@ void a2bus_zipdrivebase_device::write_c0nx(uint8_t offset, uint8_t data)
case 6:
case 7:
// printf("%02x to IDE controller @ %x\n", data, offset);
- m_ata->write_cs0(offset, data, 0xff);
+ m_ata->cs0_w(offset, data, 0xff);
break;
case 8:
@@ -252,7 +252,7 @@ void a2bus_zipdrivebase_device::write_c0nx(uint8_t offset, uint8_t data)
// printf("%02x to IDE data hi\n", data);
m_lastdata &= 0x00ff;
m_lastdata |= (data << 8);
- m_ata->write_cs0(0, m_lastdata, 0xffff);
+ m_ata->cs0_w(0, m_lastdata, 0xffff);
break;
default:
@@ -275,14 +275,14 @@ void a2bus_focusdrive_device::write_c0nx(uint8_t offset, uint8_t data)
case 0xf:
// due to a bug in the 6502 firmware, eat data if DRQ is set
#if 0
- while (m_ata->read_cs0(7, 0xff) & 0x08)
+ while (m_ata->cs0_r(7, 0xff) & 0x08)
{
- m_ata->read_cs0(0, 0xffff);
+ m_ata->cs0_r(0, 0xffff);
printf("eating 2 bytes to clear DRQ\n");
}
#endif
// printf("%02x to IDE controller @ %x\n", data, offset);
- m_ata->write_cs0(offset & 7, data, 0xff);
+ m_ata->cs0_w(offset & 7, data, 0xff);
break;
case 0:
@@ -294,7 +294,7 @@ void a2bus_focusdrive_device::write_c0nx(uint8_t offset, uint8_t data)
// printf("%02x to IDE data hi\n", data);
m_lastdata &= 0x00ff;
m_lastdata |= (data << 8);
- m_ata->write_cs0(0, m_lastdata, 0xffff);
+ m_ata->cs0_w(0, m_lastdata, 0xffff);
break;
default:
diff --git a/src/devices/bus/a2bus/agat7ports.cpp b/src/devices/bus/a2bus/agat7ports.cpp
index d284ad2a935..afd196d6549 100644
--- a/src/devices/bus/a2bus/agat7ports.cpp
+++ b/src/devices/bus/a2bus/agat7ports.cpp
@@ -158,7 +158,7 @@ void a2bus_agat7_ports_device::write_c0nx(uint8_t offset, uint8_t data)
* 6 /INIT
* 7 /STROBE
*/
-WRITE8_MEMBER(a2bus_agat7_ports_device::write_portb)
+void a2bus_agat7_ports_device::write_portb(uint8_t data)
{
m_centronics->write_strobe(BIT(data, 5));
m_centronics->write_init(BIT(data, 4));
@@ -173,7 +173,7 @@ WRITE8_MEMBER(a2bus_agat7_ports_device::write_portb)
* 6 dip ABRLEV (0: BUSY, /ACK. 1: READY, ACK)
* 7 ready signal from device
*/
-READ8_MEMBER(a2bus_agat7_ports_device::read_portc)
+uint8_t a2bus_agat7_ports_device::read_portc()
{
return (m_centronics_busy << 7) | m_printer_cfg->read();
}
diff --git a/src/devices/bus/a2bus/agat7ports.h b/src/devices/bus/a2bus/agat7ports.h
index 6b96ee0d783..2ee4f38b4dd 100644
--- a/src/devices/bus/a2bus/agat7ports.h
+++ b/src/devices/bus/a2bus/agat7ports.h
@@ -50,8 +50,8 @@ protected:
required_device<i8251_device> m_d10;
required_device<centronics_device> m_centronics;
- DECLARE_WRITE8_MEMBER(write_portb);
- DECLARE_READ8_MEMBER(read_portc);
+ void write_portb(uint8_t data);
+ uint8_t read_portc();
DECLARE_WRITE_LINE_MEMBER(write_centronics_busy);
private:
diff --git a/src/devices/bus/a2bus/agat840k_hle.cpp b/src/devices/bus/a2bus/agat840k_hle.cpp
index 2a2e74d98ef..f46d9ae7251 100644
--- a/src/devices/bus/a2bus/agat840k_hle.cpp
+++ b/src/devices/bus/a2bus/agat840k_hle.cpp
@@ -336,7 +336,7 @@ uint8_t a2bus_agat840k_hle_device::read_cnxx(uint8_t offset)
*
* C0x1
*/
-READ8_MEMBER(a2bus_agat840k_hle_device::d14_i_b)
+uint8_t a2bus_agat840k_hle_device::d14_i_b()
{
u8 data = 0x3;
@@ -366,7 +366,7 @@ READ8_MEMBER(a2bus_agat840k_hle_device::d14_i_b)
*
* C0x2
*/
-WRITE8_MEMBER(a2bus_agat840k_hle_device::d14_o_c)
+void a2bus_agat840k_hle_device::d14_o_c(uint8_t data)
{
m_unit = BIT(data, 3);
m_floppy = m_floppy_image[m_unit].target();
@@ -399,7 +399,7 @@ WRITE8_MEMBER(a2bus_agat840k_hle_device::d14_o_c)
// C0x4
//
// data are latched in by write to PC4
-READ8_MEMBER(a2bus_agat840k_hle_device::d15_i_a)
+uint8_t a2bus_agat840k_hle_device::d15_i_a()
{
const u16 data = m_tracks[(2 * m_floppy->floppy_drive_get_current_track()) + m_side][m_count_read];
LOG("sector data: %02x @ %4d (head %d track %2d)%s\n", data & 0xff, m_count_read,
@@ -413,7 +413,7 @@ READ8_MEMBER(a2bus_agat840k_hle_device::d15_i_a)
//
// b6 AL desync detected
// b7 AH read or write data ready
-READ8_MEMBER(a2bus_agat840k_hle_device::d15_i_c)
+uint8_t a2bus_agat840k_hle_device::d15_i_c()
{
LOG("status B: @ %4d %s %s (%s)\n", m_count_read,
BIT(m_mxcs, 7) ? "ready" : "READY", BIT(m_mxcs, 6) ? "SYNC" : "sync",
@@ -428,7 +428,7 @@ READ8_MEMBER(a2bus_agat840k_hle_device::d15_i_c)
// b2 AH b7 = ready for write data
// b3 -- connected to b7, set if m_intr[PORT_A]
// b4 AH b7 = read data ready
-WRITE8_MEMBER(a2bus_agat840k_hle_device::d15_o_c)
+void a2bus_agat840k_hle_device::d15_o_c(uint8_t data)
{
if (BIT(data, 0) || BIT(data, 3))
{
diff --git a/src/devices/bus/a2bus/agat840k_hle.h b/src/devices/bus/a2bus/agat840k_hle.h
index 2d95599bcff..f5aba6818dc 100644
--- a/src/devices/bus/a2bus/agat840k_hle.h
+++ b/src/devices/bus/a2bus/agat840k_hle.h
@@ -37,12 +37,12 @@ public:
// construction/destruction
a2bus_agat840k_hle_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- DECLARE_READ8_MEMBER(d14_i_b);
- DECLARE_READ8_MEMBER(d15_i_a);
- DECLARE_READ8_MEMBER(d15_i_c);
- DECLARE_WRITE8_MEMBER(d14_o_c);
- DECLARE_WRITE8_MEMBER(d15_o_b);
- DECLARE_WRITE8_MEMBER(d15_o_c);
+ uint8_t d14_i_b();
+ uint8_t d15_i_a();
+ uint8_t d15_i_c();
+ void d14_o_c(uint8_t data);
+ 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);
diff --git a/src/devices/bus/a2bus/agat_fdc.cpp b/src/devices/bus/a2bus/agat_fdc.cpp
index 4a9737aecbe..bc995dde0bb 100644
--- a/src/devices/bus/a2bus/agat_fdc.cpp
+++ b/src/devices/bus/a2bus/agat_fdc.cpp
@@ -382,7 +382,7 @@ uint8_t a2bus_agat_fdc_device::read_cnxx(uint8_t offset)
*
* C0x1
*/
-READ8_MEMBER(a2bus_agat_fdc_device::d14_i_b)
+uint8_t a2bus_agat_fdc_device::d14_i_b()
{
u8 data = 0x3;
@@ -417,7 +417,7 @@ READ8_MEMBER(a2bus_agat_fdc_device::d14_i_b)
*
* C0x2
*/
-WRITE8_MEMBER(a2bus_agat_fdc_device::d14_o_c)
+void a2bus_agat_fdc_device::d14_o_c(uint8_t data)
{
m_unit = BIT(data, 3);
@@ -451,7 +451,7 @@ WRITE8_MEMBER(a2bus_agat_fdc_device::d14_o_c)
}
// data are latched in by write to PC4
-READ8_MEMBER(a2bus_agat_fdc_device::d15_i_a)
+uint8_t a2bus_agat_fdc_device::d15_i_a()
{
return data_reg;
}
@@ -460,7 +460,7 @@ READ8_MEMBER(a2bus_agat_fdc_device::d15_i_a)
//
// b6 AL desync detected
// b7 AH read or write data ready
-READ8_MEMBER(a2bus_agat_fdc_device::d15_i_c)
+uint8_t a2bus_agat_fdc_device::d15_i_c()
{
LOG("status B: @ %4d %s %s\n", 0,
BIT(m_mxcs, 7) ? "ready" : "READY", BIT(m_mxcs, 6) ? "SYNC" : "sync");
@@ -474,7 +474,7 @@ READ8_MEMBER(a2bus_agat_fdc_device::d15_i_c)
// b2 AH b7 = ready for write data
// b3 -- connected to b7, set if m_intr[PORT_A]
// b4 AH b7 = read data ready
-WRITE8_MEMBER(a2bus_agat_fdc_device::d15_o_c)
+void a2bus_agat_fdc_device::d15_o_c(uint8_t data)
{
if (BIT(data, 0) || BIT(data, 3))
{
diff --git a/src/devices/bus/a2bus/agat_fdc.h b/src/devices/bus/a2bus/agat_fdc.h
index 7ba7d4c3752..fe2b787655b 100644
--- a/src/devices/bus/a2bus/agat_fdc.h
+++ b/src/devices/bus/a2bus/agat_fdc.h
@@ -34,12 +34,12 @@ public:
// construction/destruction
a2bus_agat_fdc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- DECLARE_READ8_MEMBER(d14_i_b);
- DECLARE_READ8_MEMBER(d15_i_a);
- DECLARE_READ8_MEMBER(d15_i_c);
- DECLARE_WRITE8_MEMBER(d14_o_c);
- DECLARE_WRITE8_MEMBER(d15_o_b);
- DECLARE_WRITE8_MEMBER(d15_o_c);
+ uint8_t d14_i_b();
+ uint8_t d15_i_a();
+ uint8_t d15_i_c();
+ void d14_o_c(uint8_t data);
+ void d15_o_b(uint8_t data);
+ void d15_o_c(uint8_t data);
DECLARE_FLOPPY_FORMATS(floppy_formats);
diff --git a/src/devices/bus/a2bus/mouse.cpp b/src/devices/bus/a2bus/mouse.cpp
index 99a0f4c3bbd..03b219cf72e 100644
--- a/src/devices/bus/a2bus/mouse.cpp
+++ b/src/devices/bus/a2bus/mouse.cpp
@@ -224,14 +224,14 @@ uint8_t a2bus_mouse_device::read_cnxx(uint8_t offset)
return m_rom[offset+m_rom_bank];
}
-WRITE8_MEMBER(a2bus_mouse_device::pia_out_a)
+void a2bus_mouse_device::pia_out_a(uint8_t data)
{
m_port_a_in = data;
}
-WRITE8_MEMBER(a2bus_mouse_device::pia_out_b)
+void a2bus_mouse_device::pia_out_b(uint8_t data)
{
- m_mcu->pc_w(space, 0, 0xf0 | ((data >> 4) & 0x0f));
+ m_mcu->pc_w(0xf0 | ((data >> 4) & 0x0f));
m_rom_bank = (data & 0xe) << 7;
}
@@ -244,17 +244,17 @@ WRITE_LINE_MEMBER(a2bus_mouse_device::pia_irqb_w)
{
}
-READ8_MEMBER(a2bus_mouse_device::mcu_port_a_r)
+uint8_t a2bus_mouse_device::mcu_port_a_r()
{
return m_port_a_in;
}
-WRITE8_MEMBER(a2bus_mouse_device::mcu_port_a_w)
+void a2bus_mouse_device::mcu_port_a_w(uint8_t data)
{
m_pia->set_a_input(data);
}
-READ8_MEMBER(a2bus_mouse_device::mcu_port_b_r)
+uint8_t a2bus_mouse_device::mcu_port_b_r()
{
enum { XAXIS, YAXIS };
constexpr u8 BUTTON = 0x80;
@@ -280,7 +280,7 @@ READ8_MEMBER(a2bus_mouse_device::mcu_port_b_r)
return m_port_b_in;
}
-WRITE8_MEMBER(a2bus_mouse_device::mcu_port_b_w)
+void a2bus_mouse_device::mcu_port_b_w(uint8_t data)
{
if (!BIT(data, 6))
{
@@ -292,7 +292,7 @@ WRITE8_MEMBER(a2bus_mouse_device::mcu_port_b_w)
}
}
-WRITE8_MEMBER(a2bus_mouse_device::mcu_port_c_w)
+void a2bus_mouse_device::mcu_port_c_w(uint8_t data)
{
m_pia->portb_w(data << 4);
}
diff --git a/src/devices/bus/a2bus/mouse.h b/src/devices/bus/a2bus/mouse.h
index 1afca2d948f..7dc0e4c984d 100644
--- a/src/devices/bus/a2bus/mouse.h
+++ b/src/devices/bus/a2bus/mouse.h
@@ -45,16 +45,16 @@ protected:
virtual void write_c0nx(uint8_t offset, uint8_t data) override;
virtual uint8_t read_cnxx(uint8_t offset) override;
- DECLARE_WRITE8_MEMBER(pia_out_a);
- DECLARE_WRITE8_MEMBER(pia_out_b);
+ 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);
- DECLARE_READ8_MEMBER(mcu_port_a_r);
- DECLARE_READ8_MEMBER(mcu_port_b_r);
- DECLARE_WRITE8_MEMBER(mcu_port_a_w);
- DECLARE_WRITE8_MEMBER(mcu_port_b_w);
- DECLARE_WRITE8_MEMBER(mcu_port_c_w);
+ uint8_t mcu_port_a_r();
+ uint8_t mcu_port_b_r();
+ void mcu_port_a_w(uint8_t data);
+ void mcu_port_b_w(uint8_t data);
+ void mcu_port_c_w(uint8_t data);
required_device<pia6821_device> m_pia;
required_device<m68705p_device> m_mcu;
diff --git a/src/devices/bus/a2bus/pc_xporter.cpp b/src/devices/bus/a2bus/pc_xporter.cpp
index 305da9aa868..8550f5cd6b1 100644
--- a/src/devices/bus/a2bus/pc_xporter.cpp
+++ b/src/devices/bus/a2bus/pc_xporter.cpp
@@ -489,7 +489,7 @@ WRITE_LINE_MEMBER( a2bus_pcxporter_device::pc_dma_hrq_changed )
}
-READ8_MEMBER( a2bus_pcxporter_device::pc_dma_read_byte )
+uint8_t a2bus_pcxporter_device::pc_dma_read_byte(offs_t offset)
{
if(m_dma_channel == -1)
return 0xff;
@@ -499,7 +499,7 @@ READ8_MEMBER( a2bus_pcxporter_device::pc_dma_read_byte )
}
-WRITE8_MEMBER( a2bus_pcxporter_device::pc_dma_write_byte )
+void a2bus_pcxporter_device::pc_dma_write_byte(offs_t offset, uint8_t data)
{
if(m_dma_channel == -1)
return;
@@ -510,41 +510,41 @@ WRITE8_MEMBER( a2bus_pcxporter_device::pc_dma_write_byte )
}
-READ8_MEMBER( a2bus_pcxporter_device::pc_dma8237_1_dack_r )
+uint8_t a2bus_pcxporter_device::pc_dma8237_1_dack_r()
{
return m_isabus->dack_r(1);
}
-READ8_MEMBER( a2bus_pcxporter_device::pc_dma8237_2_dack_r )
+uint8_t a2bus_pcxporter_device::pc_dma8237_2_dack_r()
{
return m_isabus->dack_r(2);
}
-READ8_MEMBER( a2bus_pcxporter_device::pc_dma8237_3_dack_r )
+uint8_t a2bus_pcxporter_device::pc_dma8237_3_dack_r()
{
return m_isabus->dack_r(3);
}
-WRITE8_MEMBER( a2bus_pcxporter_device::pc_dma8237_1_dack_w )
+void a2bus_pcxporter_device::pc_dma8237_1_dack_w(uint8_t data)
{
m_isabus->dack_w(1,data);
}
-WRITE8_MEMBER( a2bus_pcxporter_device::pc_dma8237_2_dack_w )
+void a2bus_pcxporter_device::pc_dma8237_2_dack_w(uint8_t data)
{
m_isabus->dack_w(2,data);
}
-WRITE8_MEMBER( a2bus_pcxporter_device::pc_dma8237_3_dack_w )
+void a2bus_pcxporter_device::pc_dma8237_3_dack_w(uint8_t data)
{
m_isabus->dack_w(3,data);
}
-WRITE8_MEMBER( a2bus_pcxporter_device::pc_dma8237_0_dack_w )
+void a2bus_pcxporter_device::pc_dma8237_0_dack_w(uint8_t data)
{
m_u73_q2 = 0;
m_dma8237->dreq0_w( m_u73_q2 );
diff --git a/src/devices/bus/a2bus/pc_xporter.h b/src/devices/bus/a2bus/pc_xporter.h
index 2a449ed4019..354a98b0037 100644
--- a/src/devices/bus/a2bus/pc_xporter.h
+++ b/src/devices/bus/a2bus/pc_xporter.h
@@ -92,15 +92,15 @@ private:
DECLARE_WRITE_LINE_MEMBER( pc_dma_hrq_changed );
DECLARE_WRITE_LINE_MEMBER( pc_dma8237_out_eop );
- DECLARE_READ8_MEMBER( pc_dma_read_byte );
- DECLARE_WRITE8_MEMBER( pc_dma_write_byte );
- DECLARE_READ8_MEMBER( pc_dma8237_1_dack_r );
- DECLARE_READ8_MEMBER( pc_dma8237_2_dack_r );
- DECLARE_READ8_MEMBER( pc_dma8237_3_dack_r );
- DECLARE_WRITE8_MEMBER( pc_dma8237_1_dack_w );
- DECLARE_WRITE8_MEMBER( pc_dma8237_2_dack_w );
- DECLARE_WRITE8_MEMBER( pc_dma8237_3_dack_w );
- DECLARE_WRITE8_MEMBER( pc_dma8237_0_dack_w );
+ 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();
+ uint8_t pc_dma8237_2_dack_r();
+ uint8_t pc_dma8237_3_dack_r();
+ void pc_dma8237_1_dack_w(uint8_t data);
+ 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 );
diff --git a/src/devices/bus/a2bus/timemasterho.cpp b/src/devices/bus/a2bus/timemasterho.cpp
index 6bab78c845e..abf1b2e8695 100644
--- a/src/devices/bus/a2bus/timemasterho.cpp
+++ b/src/devices/bus/a2bus/timemasterho.cpp
@@ -203,12 +203,12 @@ uint8_t a2bus_timemasterho_device::read_c800(uint16_t offset)
return m_rom[offset+0xc00];
}
-WRITE8_MEMBER(a2bus_timemasterho_device::pia_out_a)
+void a2bus_timemasterho_device::pia_out_a(uint8_t data)
{
// port A appears to be input only
}
-WRITE8_MEMBER(a2bus_timemasterho_device::pia_out_b)
+void a2bus_timemasterho_device::pia_out_b(uint8_t data)
{
m_msm5832->address_w(data & 0xf);
m_msm5832->hold_w((data>>4) & 1 ? ASSERT_LINE : CLEAR_LINE);
diff --git a/src/devices/bus/a2bus/timemasterho.h b/src/devices/bus/a2bus/timemasterho.h
index fcc71d6194f..47f5ba84ae7 100644
--- a/src/devices/bus/a2bus/timemasterho.h
+++ b/src/devices/bus/a2bus/timemasterho.h
@@ -50,8 +50,8 @@ protected:
private:
void update_irqs();
- DECLARE_WRITE8_MEMBER(pia_out_a);
- DECLARE_WRITE8_MEMBER(pia_out_b);
+ 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);
diff --git a/src/devices/bus/a2gameio/gameio.cpp b/src/devices/bus/a2gameio/gameio.cpp
index f16bf0ee030..523176d6184 100644
--- a/src/devices/bus/a2gameio/gameio.cpp
+++ b/src/devices/bus/a2gameio/gameio.cpp
@@ -66,6 +66,7 @@ apple2_gameio_device::apple2_gameio_device(const machine_config &mconfig, const
: device_t(mconfig, APPLE2_GAMEIO, tag, owner, clock)
, device_single_card_slot_interface<device_a2gameio_interface>(mconfig, *this)
, m_intf(nullptr)
+ , m_sw_pullups(false)
{
}
diff --git a/src/devices/bus/a7800/a78_slot.cpp b/src/devices/bus/a7800/a78_slot.cpp
index 0d2182a5e84..1103c177822 100644
--- a/src/devices/bus/a7800/a78_slot.cpp
+++ b/src/devices/bus/a7800/a78_slot.cpp
@@ -573,34 +573,34 @@ std::string a78_cart_slot_device::get_default_card_software(get_default_card_sof
read
-------------------------------------------------*/
-READ8_MEMBER(a78_cart_slot_device::read_04xx)
+uint8_t a78_cart_slot_device::read_04xx(offs_t offset)
{
if (m_cart)
- return m_cart->read_04xx(space, offset, mem_mask);
+ return m_cart->read_04xx(offset);
else
return 0xff;
}
-READ8_MEMBER(a78_cart_slot_device::read_10xx)
+uint8_t a78_cart_slot_device::read_10xx(offs_t offset)
{
if (m_cart)
- return m_cart->read_10xx(space, offset, mem_mask);
+ return m_cart->read_10xx(offset);
else
return 0xff;
}
-READ8_MEMBER(a78_cart_slot_device::read_30xx)
+uint8_t a78_cart_slot_device::read_30xx(offs_t offset)
{
if (m_cart)
- return m_cart->read_30xx(space, offset, mem_mask);
+ return m_cart->read_30xx(offset);
else
return 0xff;
}
-READ8_MEMBER(a78_cart_slot_device::read_40xx)
+uint8_t a78_cart_slot_device::read_40xx(offs_t offset)
{
if (m_cart)
- return m_cart->read_40xx(space, offset, mem_mask);
+ return m_cart->read_40xx(offset);
else
return 0xff;
}
@@ -610,28 +610,28 @@ READ8_MEMBER(a78_cart_slot_device::read_40xx)
write
-------------------------------------------------*/
-WRITE8_MEMBER(a78_cart_slot_device::write_04xx)
+void a78_cart_slot_device::write_04xx(offs_t offset, uint8_t data)
{
if (m_cart)
- m_cart->write_04xx(space, offset, data, mem_mask);
+ m_cart->write_04xx(offset, data);
}
-WRITE8_MEMBER(a78_cart_slot_device::write_10xx)
+void a78_cart_slot_device::write_10xx(offs_t offset, uint8_t data)
{
if (m_cart)
- m_cart->write_10xx(space, offset, data, mem_mask);
+ m_cart->write_10xx(offset, data);
}
-WRITE8_MEMBER(a78_cart_slot_device::write_30xx)
+void a78_cart_slot_device::write_30xx(offs_t offset, uint8_t data)
{
if (m_cart)
- m_cart->write_30xx(space, offset, data, mem_mask);
+ m_cart->write_30xx(offset, data);
}
-WRITE8_MEMBER(a78_cart_slot_device::write_40xx)
+void a78_cart_slot_device::write_40xx(offs_t offset, uint8_t data)
{
if (m_cart)
- m_cart->write_40xx(space, offset, data, mem_mask);
+ m_cart->write_40xx(offset, data);
}
diff --git a/src/devices/bus/a7800/a78_slot.h b/src/devices/bus/a7800/a78_slot.h
index 52c201c5a6e..6b379e72609 100644
--- a/src/devices/bus/a7800/a78_slot.h
+++ b/src/devices/bus/a7800/a78_slot.h
@@ -49,14 +49,14 @@ public:
virtual ~device_a78_cart_interface();
// memory accessor
- virtual DECLARE_READ8_MEMBER(read_04xx) { return 0xff; }
- virtual DECLARE_READ8_MEMBER(read_10xx) { return 0xff; }
- virtual DECLARE_READ8_MEMBER(read_30xx) { return 0xff; }
- virtual DECLARE_READ8_MEMBER(read_40xx) { return 0xff; }
- virtual DECLARE_WRITE8_MEMBER(write_04xx) {}
- virtual DECLARE_WRITE8_MEMBER(write_10xx) {}
- virtual DECLARE_WRITE8_MEMBER(write_30xx) {}
- virtual DECLARE_WRITE8_MEMBER(write_40xx) {}
+ virtual uint8_t read_04xx(offs_t offset) { return 0xff; }
+ virtual uint8_t read_10xx(offs_t offset) { return 0xff; }
+ virtual uint8_t read_30xx(offs_t offset) { return 0xff; }
+ virtual uint8_t read_40xx(offs_t offset) { return 0xff; }
+ virtual void write_04xx(offs_t offset, uint8_t data) {}
+ virtual void write_10xx(offs_t offset, uint8_t data) {}
+ virtual void write_30xx(offs_t offset, uint8_t data) {}
+ virtual void write_40xx(offs_t offset, uint8_t data) {}
void rom_alloc(uint32_t size, const char *tag);
void ram_alloc(uint32_t size);
@@ -123,14 +123,14 @@ public:
bool has_cart() { return m_cart != nullptr; }
// reading and writing
- virtual DECLARE_READ8_MEMBER(read_04xx);
- virtual DECLARE_READ8_MEMBER(read_10xx);
- virtual DECLARE_READ8_MEMBER(read_30xx);
- virtual DECLARE_READ8_MEMBER(read_40xx);
- virtual DECLARE_WRITE8_MEMBER(write_04xx);
- virtual DECLARE_WRITE8_MEMBER(write_10xx);
- virtual DECLARE_WRITE8_MEMBER(write_30xx);
- virtual DECLARE_WRITE8_MEMBER(write_40xx);
+ uint8_t read_04xx(offs_t offset);
+ uint8_t read_10xx(offs_t offset);
+ uint8_t read_30xx(offs_t offset);
+ uint8_t read_40xx(offs_t offset);
+ void write_04xx(offs_t offset, uint8_t data);
+ void write_10xx(offs_t offset, uint8_t data);
+ void write_30xx(offs_t offset, uint8_t data);
+ void write_40xx(offs_t offset, uint8_t data);
private:
// device-level overrides
diff --git a/src/devices/bus/a7800/cpuwiz.cpp b/src/devices/bus/a7800/cpuwiz.cpp
index 0b76f7b2233..3a8c3cc1546 100644
--- a/src/devices/bus/a7800/cpuwiz.cpp
+++ b/src/devices/bus/a7800/cpuwiz.cpp
@@ -80,7 +80,7 @@ void a78_versaboard_device::device_reset()
// VersaBoard
-READ8_MEMBER(a78_versaboard_device::read_40xx)
+uint8_t a78_versaboard_device::read_40xx(offs_t offset)
{
if (offset < 0x4000)
return m_ram[offset + (m_ram_bank * 0x4000)];
@@ -90,7 +90,7 @@ READ8_MEMBER(a78_versaboard_device::read_40xx)
return m_rom[(offset & 0x3fff) + (m_bank_mask * 0x4000)]; // last bank
}
-WRITE8_MEMBER(a78_versaboard_device::write_40xx)
+void a78_versaboard_device::write_40xx(offs_t offset, uint8_t data)
{
if (offset < 0x4000)
m_ram[offset + (m_ram_bank * 0x4000)] = data;
@@ -105,7 +105,7 @@ WRITE8_MEMBER(a78_versaboard_device::write_40xx)
// MegaCart+
-WRITE8_MEMBER(a78_megacart_device::write_40xx)
+void a78_megacart_device::write_40xx(offs_t offset, uint8_t data)
{
if (offset < 0x4000)
m_ram[offset + (m_ram_bank * 0x4000)] = data;
diff --git a/src/devices/bus/a7800/cpuwiz.h b/src/devices/bus/a7800/cpuwiz.h
index e9f52a24d4f..e55c637592f 100644
--- a/src/devices/bus/a7800/cpuwiz.h
+++ b/src/devices/bus/a7800/cpuwiz.h
@@ -22,8 +22,8 @@ public:
virtual void device_reset() override;
// reading and writing
- virtual DECLARE_READ8_MEMBER(read_40xx) override;
- virtual DECLARE_WRITE8_MEMBER(write_40xx) override;
+ virtual uint8_t read_40xx(offs_t offset) override;
+ virtual void write_40xx(offs_t offset, uint8_t data) override;
protected:
a78_versaboard_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
@@ -41,7 +41,7 @@ public:
a78_megacart_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// reading and writing
- virtual DECLARE_WRITE8_MEMBER(write_40xx) override;
+ virtual void write_40xx(offs_t offset, uint8_t data) override;
};
@@ -56,8 +56,8 @@ public:
a78_rom_p450_vb_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// reading and writing
- virtual DECLARE_READ8_MEMBER(read_04xx) override { if (offset >= 0x50 && offset < 0x60) return m_pokey450->read(offset & 0x0f); else return 0xff; }
- virtual DECLARE_WRITE8_MEMBER(write_04xx) override { if (offset >= 0x50 && offset < 0x60) m_pokey450->write(offset & 0x0f, data); }
+ virtual uint8_t read_04xx(offs_t offset) override { if (offset >= 0x50 && offset < 0x60) return m_pokey450->read(offset & 0x0f); else return 0xff; }
+ virtual void write_04xx(offs_t offset, uint8_t data) override { if (offset >= 0x50 && offset < 0x60) m_pokey450->write(offset & 0x0f, data); }
protected:
virtual void device_add_mconfig(machine_config &config) override;
diff --git a/src/devices/bus/a7800/hiscore.cpp b/src/devices/bus/a7800/hiscore.cpp
index 62630842e5c..a0c821552d8 100644
--- a/src/devices/bus/a7800/hiscore.cpp
+++ b/src/devices/bus/a7800/hiscore.cpp
@@ -37,37 +37,37 @@ void a78_hiscore_device::device_add_mconfig(machine_config &config)
mapper specific handlers
-------------------------------------------------*/
-READ8_MEMBER(a78_hiscore_device::read_10xx)
+uint8_t a78_hiscore_device::read_10xx(offs_t offset)
{
return m_nvram[offset];
}
-WRITE8_MEMBER(a78_hiscore_device::write_10xx)
+void a78_hiscore_device::write_10xx(offs_t offset, uint8_t data)
{
m_nvram[offset] = data;
}
-READ8_MEMBER(a78_hiscore_device::read_30xx)
+uint8_t a78_hiscore_device::read_30xx(offs_t offset)
{
return m_rom[offset];
}
-READ8_MEMBER(a78_hiscore_device::read_04xx)
+uint8_t a78_hiscore_device::read_04xx(offs_t offset)
{
- return m_hscslot->read_04xx(space, offset);
+ return m_hscslot->read_04xx(offset);
}
-WRITE8_MEMBER(a78_hiscore_device::write_04xx)
+void a78_hiscore_device::write_04xx(offs_t offset, uint8_t data)
{
- m_hscslot->write_04xx(space, offset, data);
+ m_hscslot->write_04xx(offset, data);
}
-READ8_MEMBER(a78_hiscore_device::read_40xx)
+uint8_t a78_hiscore_device::read_40xx(offs_t offset)
{
- return m_hscslot->read_40xx(space, offset);
+ return m_hscslot->read_40xx(offset);
}
-WRITE8_MEMBER(a78_hiscore_device::write_40xx)
+void a78_hiscore_device::write_40xx(offs_t offset, uint8_t data)
{
- m_hscslot->write_40xx(space, offset, data);
+ m_hscslot->write_40xx(offset, data);
}
diff --git a/src/devices/bus/a7800/hiscore.h b/src/devices/bus/a7800/hiscore.h
index b26bea473db..b9dc9674212 100644
--- a/src/devices/bus/a7800/hiscore.h
+++ b/src/devices/bus/a7800/hiscore.h
@@ -18,13 +18,13 @@ public:
a78_hiscore_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// reading and writing
- virtual DECLARE_READ8_MEMBER(read_04xx) override;
- virtual DECLARE_WRITE8_MEMBER(write_04xx) override;
- virtual DECLARE_READ8_MEMBER(read_10xx) override;
- virtual DECLARE_WRITE8_MEMBER(write_10xx) override;
- virtual DECLARE_READ8_MEMBER(read_30xx) override;
- virtual DECLARE_READ8_MEMBER(read_40xx) override;
- virtual DECLARE_WRITE8_MEMBER(write_40xx) override;
+ virtual uint8_t read_04xx(offs_t offset) override;
+ virtual void write_04xx(offs_t offset, uint8_t data) override;
+ virtual uint8_t read_10xx(offs_t offset) override;
+ virtual void write_10xx(offs_t offset, uint8_t data) override;
+ virtual uint8_t read_30xx(offs_t offset) override;
+ virtual uint8_t read_40xx(offs_t offset) override;
+ virtual void write_40xx(offs_t offset, uint8_t data) override;
protected:
virtual void device_add_mconfig(machine_config &config) override;
diff --git a/src/devices/bus/a7800/rom.cpp b/src/devices/bus/a7800/rom.cpp
index 362902dbe51..9e715ddcf2c 100644
--- a/src/devices/bus/a7800/rom.cpp
+++ b/src/devices/bus/a7800/rom.cpp
@@ -208,7 +208,7 @@ void a78_rom_act_device::device_reset()
-------------------------------------------------*/
-READ8_MEMBER(a78_rom_device::read_40xx)
+uint8_t a78_rom_device::read_40xx(offs_t offset)
{
if (offset + 0x4000 < m_base_rom)
return 0xff;
@@ -226,7 +226,7 @@ READ8_MEMBER(a78_rom_device::read_40xx)
-------------------------------------------------*/
-READ8_MEMBER(a78_rom_pokey_device::read_40xx)
+uint8_t a78_rom_pokey_device::read_40xx(offs_t offset)
{
if (offset < 0x4000)
return m_pokey->read(offset & 0x0f);
@@ -237,7 +237,7 @@ READ8_MEMBER(a78_rom_pokey_device::read_40xx)
return m_rom[offset + 0x4000 - m_base_rom];
}
-WRITE8_MEMBER(a78_rom_pokey_device::write_40xx)
+void a78_rom_pokey_device::write_40xx(offs_t offset, uint8_t data)
{
if (offset < 0x4000)
m_pokey->write(offset & 0x0f, data);
@@ -264,7 +264,7 @@ void a78_rom_pokey_device::device_add_mconfig(machine_config &config)
-------------------------------------------------*/
-READ8_MEMBER(a78_rom_mram_device::read_40xx)
+uint8_t a78_rom_mram_device::read_40xx(offs_t offset)
{
if (offset < 0x4000)
return m_ram[offset & 0xfeff];
@@ -274,7 +274,7 @@ READ8_MEMBER(a78_rom_mram_device::read_40xx)
return m_rom[offset + 0x4000 - m_base_rom];
}
-WRITE8_MEMBER(a78_rom_mram_device::write_40xx)
+void a78_rom_mram_device::write_40xx(offs_t offset, uint8_t data)
{
if (offset < 0x4000)
m_ram[offset&0xfeff] = data;
@@ -298,7 +298,7 @@ WRITE8_MEMBER(a78_rom_mram_device::write_40xx)
-------------------------------------------------*/
-READ8_MEMBER(a78_rom_sg_device::read_40xx)
+uint8_t a78_rom_sg_device::read_40xx(offs_t offset)
{
if (offset < 0x4000)
return m_rom[(offset & 0x3fff) + ((m_bank_mask - 1) * 0x4000)]; // second to last bank (is this always ok?!?)
@@ -308,7 +308,7 @@ READ8_MEMBER(a78_rom_sg_device::read_40xx)
return m_rom[(offset & 0x3fff) + (m_bank_mask * 0x4000)]; // last bank
}
-WRITE8_MEMBER(a78_rom_sg_device::write_40xx)
+void a78_rom_sg_device::write_40xx(offs_t offset, uint8_t data)
{
if (offset >= 0x4000 && offset < 0x8000)
m_bank = data & m_bank_mask;
@@ -324,7 +324,7 @@ WRITE8_MEMBER(a78_rom_sg_device::write_40xx)
-------------------------------------------------*/
-READ8_MEMBER(a78_rom_sg_pokey_device::read_40xx)
+uint8_t a78_rom_sg_pokey_device::read_40xx(offs_t offset)
{
if (offset < 0x4000)
return m_pokey->read(offset & 0x0f);
@@ -334,7 +334,7 @@ READ8_MEMBER(a78_rom_sg_pokey_device::read_40xx)
return m_rom[(offset & 0x3fff) + (m_bank_mask * 0x4000)]; // last bank
}
-WRITE8_MEMBER(a78_rom_sg_pokey_device::write_40xx)
+void a78_rom_sg_pokey_device::write_40xx(offs_t offset, uint8_t data)
{
if (offset < 0x4000)
m_pokey->write(offset & 0x0f, data);
@@ -361,7 +361,7 @@ void a78_rom_sg_pokey_device::device_add_mconfig(machine_config &config)
-------------------------------------------------*/
-READ8_MEMBER(a78_rom_sg_ram_device::read_40xx)
+uint8_t a78_rom_sg_ram_device::read_40xx(offs_t offset)
{
if (offset < 0x4000)
return m_ram[offset];
@@ -371,7 +371,7 @@ READ8_MEMBER(a78_rom_sg_ram_device::read_40xx)
return m_rom[(offset & 0x3fff) + (m_bank_mask * 0x4000)]; // last bank
}
-WRITE8_MEMBER(a78_rom_sg_ram_device::write_40xx)
+void a78_rom_sg_ram_device::write_40xx(offs_t offset, uint8_t data)
{
if (offset < 0x4000)
m_ram[offset] = data;
@@ -392,7 +392,7 @@ WRITE8_MEMBER(a78_rom_sg_ram_device::write_40xx)
-------------------------------------------------*/
-READ8_MEMBER(a78_rom_sg9_device::read_40xx)
+uint8_t a78_rom_sg9_device::read_40xx(offs_t offset)
{
if (offset < 0x4000)
return m_rom[(offset & 0x3fff)];
@@ -402,7 +402,7 @@ READ8_MEMBER(a78_rom_sg9_device::read_40xx)
return m_rom[(offset & 0x3fff) + ((m_bank_mask + 1) * 0x4000)]; // last bank
}
-WRITE8_MEMBER(a78_rom_sg9_device::write_40xx)
+void a78_rom_sg9_device::write_40xx(offs_t offset, uint8_t data)
{
if (offset >= 0x4000 && offset < 0x8000)
m_bank = (data & m_bank_mask) + 1;
@@ -419,7 +419,7 @@ WRITE8_MEMBER(a78_rom_sg9_device::write_40xx)
-------------------------------------------------*/
-READ8_MEMBER(a78_rom_abs_device::read_40xx)
+uint8_t a78_rom_abs_device::read_40xx(offs_t offset)
{
if (offset < 0x4000)
return m_rom[(offset & 0x3fff) + (m_bank * 0x4000)];
@@ -430,7 +430,7 @@ READ8_MEMBER(a78_rom_abs_device::read_40xx)
}
}
-WRITE8_MEMBER(a78_rom_abs_device::write_40xx)
+void a78_rom_abs_device::write_40xx(offs_t offset, uint8_t data)
{
if (offset == 0x4000)
{
@@ -457,7 +457,7 @@ WRITE8_MEMBER(a78_rom_abs_device::write_40xx)
-------------------------------------------------*/
-READ8_MEMBER(a78_rom_act_device::read_40xx)
+uint8_t a78_rom_act_device::read_40xx(offs_t offset)
{
uint8_t data = 0xff;
uint16_t addr = offset & 0x1fff;
@@ -488,7 +488,7 @@ READ8_MEMBER(a78_rom_act_device::read_40xx)
return data;
}
-WRITE8_MEMBER(a78_rom_act_device::write_40xx)
+void a78_rom_act_device::write_40xx(offs_t offset, uint8_t data)
{
if (offset >= 0xbf80 && offset <= 0xbf8f)
m_bank = offset & 7;
diff --git a/src/devices/bus/a7800/rom.h b/src/devices/bus/a7800/rom.h
index 1ad27663b6f..8237b07c8ac 100644
--- a/src/devices/bus/a7800/rom.h
+++ b/src/devices/bus/a7800/rom.h
@@ -19,7 +19,7 @@ public:
a78_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// reading and writing
- virtual DECLARE_READ8_MEMBER(read_40xx) override;
+ virtual uint8_t read_40xx(offs_t offset) override;
protected:
a78_rom_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
@@ -39,8 +39,8 @@ public:
a78_rom_pokey_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// reading and writing
- virtual DECLARE_READ8_MEMBER(read_40xx) override;
- virtual DECLARE_WRITE8_MEMBER(write_40xx) override;
+ virtual uint8_t read_40xx(offs_t offset) override;
+ virtual void write_40xx(offs_t offset, uint8_t data) override;
protected:
a78_rom_pokey_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
@@ -60,8 +60,8 @@ public:
a78_rom_mram_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// reading and writing
- virtual DECLARE_READ8_MEMBER(read_40xx) override;
- virtual DECLARE_WRITE8_MEMBER(write_40xx) override;
+ virtual uint8_t read_40xx(offs_t offset) override;
+ virtual void write_40xx(offs_t offset, uint8_t data) override;
protected:
a78_rom_mram_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
@@ -77,8 +77,8 @@ public:
a78_rom_sg_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// reading and writing
- virtual DECLARE_READ8_MEMBER(read_40xx) override;
- virtual DECLARE_WRITE8_MEMBER(write_40xx) override;
+ virtual uint8_t read_40xx(offs_t offset) override;
+ virtual void write_40xx(offs_t offset, uint8_t data) override;
protected:
a78_rom_sg_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
@@ -100,8 +100,8 @@ public:
a78_rom_sg_pokey_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// reading and writing
- virtual DECLARE_READ8_MEMBER(read_40xx) override;
- virtual DECLARE_WRITE8_MEMBER(write_40xx) override;
+ virtual uint8_t read_40xx(offs_t offset) override;
+ virtual void write_40xx(offs_t offset, uint8_t data) override;
protected:
virtual void device_add_mconfig(machine_config &config) override;
@@ -119,8 +119,8 @@ public:
a78_rom_sg_ram_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// reading and writing
- virtual DECLARE_READ8_MEMBER(read_40xx) override;
- virtual DECLARE_WRITE8_MEMBER(write_40xx) override;
+ virtual uint8_t read_40xx(offs_t offset) override;
+ virtual void write_40xx(offs_t offset, uint8_t data) override;
protected:
a78_rom_sg_ram_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
@@ -136,8 +136,8 @@ public:
a78_rom_sg9_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// reading and writing
- virtual DECLARE_READ8_MEMBER(read_40xx) override;
- virtual DECLARE_WRITE8_MEMBER(write_40xx) override;
+ virtual uint8_t read_40xx(offs_t offset) override;
+ virtual void write_40xx(offs_t offset, uint8_t data) override;
protected:
a78_rom_sg9_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
@@ -153,8 +153,8 @@ public:
a78_rom_abs_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// reading and writing
- virtual DECLARE_READ8_MEMBER(read_40xx) override;
- virtual DECLARE_WRITE8_MEMBER(write_40xx) override;
+ virtual uint8_t read_40xx(offs_t offset) override;
+ virtual void write_40xx(offs_t offset, uint8_t data) override;
protected:
// device-level overrides
@@ -174,8 +174,8 @@ public:
a78_rom_act_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// reading and writing
- virtual DECLARE_READ8_MEMBER(read_40xx) override;
- virtual DECLARE_WRITE8_MEMBER(write_40xx) override;
+ virtual uint8_t read_40xx(offs_t offset) override;
+ virtual void write_40xx(offs_t offset, uint8_t data) override;
protected:
// device-level overrides
@@ -197,8 +197,8 @@ public:
a78_rom_p450_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// reading and writing
- virtual DECLARE_READ8_MEMBER(read_04xx) override { if (offset >= 0x50 && offset < 0x60) return m_pokey450->read(offset & 0x0f); else return 0xff; }
- virtual DECLARE_WRITE8_MEMBER(write_04xx) override { if (offset >= 0x50 && offset < 0x60) m_pokey450->write(offset & 0x0f, data); }
+ virtual uint8_t read_04xx(offs_t offset) override { if (offset >= 0x50 && offset < 0x60) return m_pokey450->read(offset & 0x0f); else return 0xff; }
+ virtual void write_04xx(offs_t offset, uint8_t data) override { if (offset >= 0x50 && offset < 0x60) m_pokey450->write(offset & 0x0f, data); }
protected:
virtual void device_add_mconfig(machine_config &config) override;
@@ -216,8 +216,8 @@ public:
a78_rom_p450_pokey_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// reading and writing
- virtual DECLARE_READ8_MEMBER(read_04xx) override { if (offset >= 0x50 && offset < 0x60) return m_pokey450->read(offset & 0x0f); else return 0xff; }
- virtual DECLARE_WRITE8_MEMBER(write_04xx) override { if (offset >= 0x50 && offset < 0x60) m_pokey450->write(offset & 0x0f, data); }
+ virtual uint8_t read_04xx(offs_t offset) override { if (offset >= 0x50 && offset < 0x60) return m_pokey450->read(offset & 0x0f); else return 0xff; }
+ virtual void write_04xx(offs_t offset, uint8_t data) override { if (offset >= 0x50 && offset < 0x60) m_pokey450->write(offset & 0x0f, data); }
protected:
virtual void device_add_mconfig(machine_config &config) override;
@@ -235,8 +235,8 @@ public:
a78_rom_p450_sg_ram_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// reading and writing
- virtual DECLARE_READ8_MEMBER(read_04xx) override { if (offset >= 0x50 && offset < 0x60) return m_pokey450->read(offset & 0x0f); else return 0xff; }
- virtual DECLARE_WRITE8_MEMBER(write_04xx) override { if (offset >= 0x50 && offset < 0x60) m_pokey450->write(offset & 0x0f, data); }
+ virtual uint8_t read_04xx(offs_t offset) override { if (offset >= 0x50 && offset < 0x60) return m_pokey450->read(offset & 0x0f); else return 0xff; }
+ virtual void write_04xx(offs_t offset, uint8_t data) override { if (offset >= 0x50 && offset < 0x60) m_pokey450->write(offset & 0x0f, data); }
protected:
virtual void device_add_mconfig(machine_config &config) override;
@@ -254,8 +254,8 @@ public:
a78_rom_p450_sg9_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// reading and writing
- virtual DECLARE_READ8_MEMBER(read_04xx) override { if (offset >= 0x50 && offset < 0x60) return m_pokey450->read(offset & 0x0f); else return 0xff; }
- virtual DECLARE_WRITE8_MEMBER(write_04xx) override { if (offset >= 0x50 && offset < 0x60) m_pokey450->write(offset & 0x0f, data); }
+ virtual uint8_t read_04xx(offs_t offset) override { if (offset >= 0x50 && offset < 0x60) return m_pokey450->read(offset & 0x0f); else return 0xff; }
+ virtual void write_04xx(offs_t offset, uint8_t data) override { if (offset >= 0x50 && offset < 0x60) m_pokey450->write(offset & 0x0f, data); }
protected:
virtual void device_add_mconfig(machine_config &config) override;
diff --git a/src/devices/bus/a7800/xboard.cpp b/src/devices/bus/a7800/xboard.cpp
index 0005e595a88..bee85d76c98 100644
--- a/src/devices/bus/a7800/xboard.cpp
+++ b/src/devices/bus/a7800/xboard.cpp
@@ -139,38 +139,38 @@ void a78_xm_device::device_add_mconfig(machine_config &config)
-------------------------------------------------*/
-READ8_MEMBER(a78_xboard_device::read_40xx)
+uint8_t a78_xboard_device::read_40xx(offs_t offset)
{
if (BIT(m_reg, 3) && offset < 0x4000)
return m_ram[offset + (m_ram_bank * 0x4000)];
else
- return m_xbslot->read_40xx(space, offset);
+ return m_xbslot->read_40xx(offset);
}
-WRITE8_MEMBER(a78_xboard_device::write_40xx)
+void a78_xboard_device::write_40xx(offs_t offset, uint8_t data)
{
if (BIT(m_reg, 3) && offset < 0x4000)
m_ram[offset + (m_ram_bank * 0x4000)] = data;
else
- m_xbslot->write_40xx(space, offset, data);
+ m_xbslot->write_40xx(offset, data);
}
-READ8_MEMBER(a78_xboard_device::read_04xx)
+uint8_t a78_xboard_device::read_04xx(offs_t offset)
{
if (BIT(m_reg, 4) && offset >= 0x50 && offset < 0x60)
return m_pokey->read(offset & 0x0f);
else if (BIT(m_reg, 4) && offset >= 0x60 && offset < 0x70)
- return m_xbslot->read_04xx(space, offset - 0x10); // access second POKEY
+ return m_xbslot->read_04xx(offset - 0x10); // access second POKEY
else
return 0xff;
}
-WRITE8_MEMBER(a78_xboard_device::write_04xx)
+void a78_xboard_device::write_04xx(offs_t offset, uint8_t data)
{
if (BIT(m_reg, 4) && offset >= 0x50 && offset < 0x60)
m_pokey->write(offset & 0x0f, data);
else if (BIT(m_reg, 4) && offset >= 0x60 && offset < 0x70)
- m_xbslot->write_04xx(space, offset - 0x10, data); // access second POKEY
+ m_xbslot->write_04xx(offset - 0x10, data); // access second POKEY
else if (offset >= 0x70 && offset < 0x80)
{
m_reg = data;
@@ -185,41 +185,41 @@ WRITE8_MEMBER(a78_xboard_device::write_04xx)
-------------------------------------------------*/
-READ8_MEMBER(a78_xm_device::read_10xx)
+uint8_t a78_xm_device::read_10xx(offs_t offset)
{
return m_nvram[offset];
}
-WRITE8_MEMBER(a78_xm_device::write_10xx)
+void a78_xm_device::write_10xx(offs_t offset, uint8_t data)
{
m_nvram[offset] = data;
}
-READ8_MEMBER(a78_xm_device::read_30xx)
+uint8_t a78_xm_device::read_30xx(offs_t offset)
{
return m_rom[offset];
}
-READ8_MEMBER(a78_xm_device::read_04xx)
+uint8_t a78_xm_device::read_04xx(offs_t offset)
{
if (BIT(m_reg, 4) && offset >= 0x50 && offset < 0x60)
return m_pokey->read(offset & 0x0f);
else if (m_ym_enabled && offset >= 0x60 && offset <= 0x61)
return m_ym->read(offset & 1);
else if (BIT(m_reg, 4) && offset >= 0x60 && offset < 0x70)
- return m_xbslot->read_04xx(space, offset - 0x10); // access second POKEY
+ return m_xbslot->read_04xx(offset - 0x10); // access second POKEY
else
return 0xff;
}
-WRITE8_MEMBER(a78_xm_device::write_04xx)
+void a78_xm_device::write_04xx(offs_t offset, uint8_t data)
{
if (BIT(m_reg, 4) && offset >= 0x50 && offset < 0x60)
m_pokey->write(offset & 0x0f, data);
else if (m_ym_enabled && offset >= 0x60 && offset <= 0x61)
m_ym->write(offset & 1, data);
else if (BIT(m_reg, 4) && offset >= 0x60 && offset < 0x70)
- m_xbslot->write_04xx(space, offset - 0x10, data); // access second POKEY
+ m_xbslot->write_04xx(offset - 0x10, data); // access second POKEY
else if (offset >= 0x70 && offset < 0x80)
{
//printf("regs 0x%X\n", data);
diff --git a/src/devices/bus/a7800/xboard.h b/src/devices/bus/a7800/xboard.h
index 476d9a18aba..8c0c6002ddb 100644
--- a/src/devices/bus/a7800/xboard.h
+++ b/src/devices/bus/a7800/xboard.h
@@ -20,10 +20,10 @@ public:
a78_xboard_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// reading and writing
- virtual DECLARE_READ8_MEMBER(read_04xx) override;
- virtual DECLARE_WRITE8_MEMBER(write_04xx) override;
- virtual DECLARE_READ8_MEMBER(read_40xx) override;
- virtual DECLARE_WRITE8_MEMBER(write_40xx) override;
+ virtual uint8_t read_04xx(offs_t offset) override;
+ virtual void write_04xx(offs_t offset, uint8_t data) override;
+ virtual uint8_t read_40xx(offs_t offset) override;
+ virtual void write_40xx(offs_t offset, uint8_t data) override;
protected:
a78_xboard_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
@@ -47,11 +47,11 @@ public:
a78_xm_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// reading and writing
- virtual DECLARE_READ8_MEMBER(read_04xx) override;
- virtual DECLARE_WRITE8_MEMBER(write_04xx) override;
- virtual DECLARE_READ8_MEMBER(read_10xx) override;
- virtual DECLARE_WRITE8_MEMBER(write_10xx) override;
- virtual DECLARE_READ8_MEMBER(read_30xx) override;
+ virtual uint8_t read_04xx(offs_t offset) override;
+ virtual void write_04xx(offs_t offset, uint8_t data) override;
+ virtual uint8_t read_10xx(offs_t offset) override;
+ virtual void write_10xx(offs_t offset, uint8_t data) override;
+ virtual uint8_t read_30xx(offs_t offset) override;
protected:
virtual void device_start() override;
diff --git a/src/devices/bus/a800/a800_slot.cpp b/src/devices/bus/a800/a800_slot.cpp
index dbb587ae9f7..a6a2867f874 100644
--- a/src/devices/bus/a800/a800_slot.cpp
+++ b/src/devices/bus/a800/a800_slot.cpp
@@ -494,18 +494,18 @@ std::string xegs_cart_slot_device::get_default_card_software(get_default_card_so
read
-------------------------------------------------*/
-READ8_MEMBER(a800_cart_slot_device::read_80xx)
+uint8_t a800_cart_slot_device::read_80xx(offs_t offset)
{
if (m_cart)
- return m_cart->read_80xx(space, offset, mem_mask);
+ return m_cart->read_80xx(offset);
else
return 0xff;
}
-READ8_MEMBER(a800_cart_slot_device::read_d5xx)
+uint8_t a800_cart_slot_device::read_d5xx(offs_t offset)
{
if (m_cart)
- return m_cart->read_d5xx(space, offset, mem_mask);
+ return m_cart->read_d5xx(offset);
else
return 0xff;
}
@@ -515,14 +515,14 @@ READ8_MEMBER(a800_cart_slot_device::read_d5xx)
write
-------------------------------------------------*/
-WRITE8_MEMBER(a800_cart_slot_device::write_80xx)
+void a800_cart_slot_device::write_80xx(offs_t offset, uint8_t data)
{
if (m_cart)
- m_cart->write_80xx(space, offset, data, mem_mask);
+ m_cart->write_80xx(offset, data);
}
-WRITE8_MEMBER(a800_cart_slot_device::write_d5xx)
+void a800_cart_slot_device::write_d5xx(offs_t offset, uint8_t data)
{
if (m_cart)
- m_cart->write_d5xx(space, offset, data, mem_mask);
+ m_cart->write_d5xx(offset, data);
}
diff --git a/src/devices/bus/a800/a800_slot.h b/src/devices/bus/a800/a800_slot.h
index 8a21b8e896f..0951c4a2c3d 100644
--- a/src/devices/bus/a800/a800_slot.h
+++ b/src/devices/bus/a800/a800_slot.h
@@ -55,10 +55,10 @@ public:
virtual ~device_a800_cart_interface();
// memory accessor
- virtual DECLARE_READ8_MEMBER(read_80xx) { return 0xff; }
- virtual DECLARE_READ8_MEMBER(read_d5xx) { return 0xff; }
- virtual DECLARE_WRITE8_MEMBER(write_80xx) {}
- virtual DECLARE_WRITE8_MEMBER(write_d5xx) {}
+ virtual uint8_t read_80xx(offs_t offset) { return 0xff; }
+ virtual uint8_t read_d5xx(offs_t offset) { return 0xff; }
+ virtual void write_80xx(offs_t offset, uint8_t data) {}
+ virtual void write_d5xx(offs_t offset, uint8_t data) {}
void rom_alloc(uint32_t size, const char *tag);
void ram_alloc(uint32_t size);
@@ -124,10 +124,10 @@ public:
bool has_cart() { return m_cart != nullptr; }
// reading and writing
- virtual DECLARE_READ8_MEMBER(read_80xx);
- virtual DECLARE_READ8_MEMBER(read_d5xx);
- virtual DECLARE_WRITE8_MEMBER(write_80xx);
- virtual DECLARE_WRITE8_MEMBER(write_d5xx);
+ uint8_t read_80xx(offs_t offset);
+ uint8_t read_d5xx(offs_t offset);
+ void write_80xx(offs_t offset, uint8_t data);
+ void write_d5xx(offs_t offset, uint8_t data);
protected:
a800_cart_slot_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
diff --git a/src/devices/bus/a800/a8sio.cpp b/src/devices/bus/a800/a8sio.cpp
index cf975d7b50a..41fb3f863e5 100644
--- a/src/devices/bus/a800/a8sio.cpp
+++ b/src/devices/bus/a800/a8sio.cpp
@@ -143,7 +143,7 @@ WRITE_LINE_MEMBER( a8sio_device::proceed_w )
m_out_proceed_cb(state);
}
-WRITE8_MEMBER( a8sio_device::audio_in_w )
+void a8sio_device::audio_in_w(uint8_t data)
{
m_out_audio_in_cb(data);
}
diff --git a/src/devices/bus/a800/a8sio.h b/src/devices/bus/a800/a8sio.h
index eaf2a7a7784..643dffe19a5 100644
--- a/src/devices/bus/a800/a8sio.h
+++ b/src/devices/bus/a800/a8sio.h
@@ -69,7 +69,7 @@ public:
DECLARE_WRITE_LINE_MEMBER( command_w ); // pin 7
DECLARE_WRITE_LINE_MEMBER( motor_w ); // pin 8
DECLARE_WRITE_LINE_MEMBER( proceed_w ); // pin 9
- DECLARE_WRITE8_MEMBER( audio_in_w ); // pin 11
+ void audio_in_w(uint8_t data); // pin 11
DECLARE_WRITE_LINE_MEMBER( interrupt_w ); // pin 13
protected:
diff --git a/src/devices/bus/a800/oss.cpp b/src/devices/bus/a800/oss.cpp
index 70a9375ef28..f25dfcce130 100644
--- a/src/devices/bus/a800/oss.cpp
+++ b/src/devices/bus/a800/oss.cpp
@@ -102,7 +102,7 @@ void a800_rom_oss91_device::device_reset()
-------------------------------------------------*/
-READ8_MEMBER(a800_rom_oss8k_device::read_80xx)
+uint8_t a800_rom_oss8k_device::read_80xx(offs_t offset)
{
if (offset >= 0x1000)
return m_rom[offset & 0xfff];
@@ -110,7 +110,7 @@ READ8_MEMBER(a800_rom_oss8k_device::read_80xx)
return m_rom[(offset & 0xfff) + (m_bank * 0x1000)];
}
-WRITE8_MEMBER(a800_rom_oss8k_device::write_d5xx)
+void a800_rom_oss8k_device::write_d5xx(offs_t offset, uint8_t data)
{
switch (offset & 0x09)
{
@@ -136,7 +136,7 @@ WRITE8_MEMBER(a800_rom_oss8k_device::write_d5xx)
-------------------------------------------------*/
-READ8_MEMBER(a800_rom_oss34_device::read_80xx)
+uint8_t a800_rom_oss34_device::read_80xx(offs_t offset)
{
if (offset >= 0x1000)
return m_rom[(offset & 0xfff) + 0x3000];
@@ -146,7 +146,7 @@ READ8_MEMBER(a800_rom_oss34_device::read_80xx)
return m_rom[(offset & 0xfff) + (m_bank * 0x1000)];
}
-WRITE8_MEMBER(a800_rom_oss34_device::write_d5xx)
+void a800_rom_oss34_device::write_d5xx(offs_t offset, uint8_t data)
{
switch (offset & 0x0f)
{
@@ -180,7 +180,7 @@ WRITE8_MEMBER(a800_rom_oss34_device::write_d5xx)
-------------------------------------------------*/
-READ8_MEMBER(a800_rom_oss43_device::read_80xx)
+uint8_t a800_rom_oss43_device::read_80xx(offs_t offset)
{
if (offset >= 0x1000)
return m_rom[(offset & 0xfff) + 0x3000];
@@ -190,7 +190,7 @@ READ8_MEMBER(a800_rom_oss43_device::read_80xx)
return m_rom[(offset & 0xfff) + (m_bank * 0x1000)];
}
-WRITE8_MEMBER(a800_rom_oss43_device::write_d5xx)
+void a800_rom_oss43_device::write_d5xx(offs_t offset, uint8_t data)
{
switch (offset & 0x0f)
{
@@ -225,7 +225,7 @@ WRITE8_MEMBER(a800_rom_oss43_device::write_d5xx)
-------------------------------------------------*/
-READ8_MEMBER(a800_rom_oss91_device::read_80xx)
+uint8_t a800_rom_oss91_device::read_80xx(offs_t offset)
{
if (offset >= 0x1000)
return m_rom[offset & 0xfff];
@@ -233,7 +233,7 @@ READ8_MEMBER(a800_rom_oss91_device::read_80xx)
return m_rom[(offset & 0xfff) + (m_bank * 0x1000)];
}
-WRITE8_MEMBER(a800_rom_oss91_device::write_d5xx)
+void a800_rom_oss91_device::write_d5xx(offs_t offset, uint8_t data)
{
switch (offset & 0x09)
{
diff --git a/src/devices/bus/a800/oss.h b/src/devices/bus/a800/oss.h
index 367bd4f8f8d..65527039825 100644
--- a/src/devices/bus/a800/oss.h
+++ b/src/devices/bus/a800/oss.h
@@ -16,8 +16,8 @@ public:
// construction/destruction
a800_rom_oss8k_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- virtual DECLARE_READ8_MEMBER(read_80xx) override;
- virtual DECLARE_WRITE8_MEMBER(write_d5xx) override;
+ virtual uint8_t read_80xx(offs_t offset) override;
+ virtual void write_d5xx(offs_t offset, uint8_t data) override;
protected:
// device-level overrides
@@ -36,8 +36,8 @@ public:
// construction/destruction
a800_rom_oss34_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- virtual DECLARE_READ8_MEMBER(read_80xx) override;
- virtual DECLARE_WRITE8_MEMBER(write_d5xx) override;
+ virtual uint8_t read_80xx(offs_t offset) override;
+ virtual void write_d5xx(offs_t offset, uint8_t data) override;
protected:
// device-level overrides
@@ -56,8 +56,8 @@ public:
// construction/destruction
a800_rom_oss43_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- virtual DECLARE_READ8_MEMBER(read_80xx) override;
- virtual DECLARE_WRITE8_MEMBER(write_d5xx) override;
+ virtual uint8_t read_80xx(offs_t offset) override;
+ virtual void write_d5xx(offs_t offset, uint8_t data) override;
protected:
// device-level overrides
@@ -76,8 +76,8 @@ public:
// construction/destruction
a800_rom_oss91_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- virtual DECLARE_READ8_MEMBER(read_80xx) override;
- virtual DECLARE_WRITE8_MEMBER(write_d5xx) override;
+ virtual uint8_t read_80xx(offs_t offset) override;
+ virtual void write_d5xx(offs_t offset, uint8_t data) override;
protected:
// device-level overrides
diff --git a/src/devices/bus/a800/rom.cpp b/src/devices/bus/a800/rom.cpp
index f33c8776d52..f6db2cb1cf1 100644
--- a/src/devices/bus/a800/rom.cpp
+++ b/src/devices/bus/a800/rom.cpp
@@ -206,7 +206,7 @@ void a5200_rom_bbsb_device::device_reset()
-------------------------------------------------*/
-READ8_MEMBER(a800_rom_device::read_80xx)
+uint8_t a800_rom_device::read_80xx(offs_t offset)
{
return m_rom[offset & (m_rom_size - 1)];
}
@@ -226,7 +226,7 @@ READ8_MEMBER(a800_rom_device::read_80xx)
-------------------------------------------------*/
-READ8_MEMBER(a800_rom_bbsb_device::read_80xx)
+uint8_t a800_rom_bbsb_device::read_80xx(offs_t offset)
{
if (offset < 0x1000)
return m_rom[(offset & 0xfff) + (m_banks[0] * 0x1000) + 0];
@@ -236,7 +236,7 @@ READ8_MEMBER(a800_rom_bbsb_device::read_80xx)
return m_rom[(offset & 0x1fff) + 0x8000];
}
-WRITE8_MEMBER(a800_rom_bbsb_device::write_80xx)
+void a800_rom_bbsb_device::write_80xx(offs_t offset, uint8_t data)
{
uint16_t addr = offset & 0xfff;
if (addr >= 0xff6 && addr <= 0xff9)
@@ -252,7 +252,7 @@ WRITE8_MEMBER(a800_rom_bbsb_device::write_80xx)
-------------------------------------------------*/
-READ8_MEMBER(xegs_rom_device::read_80xx)
+uint8_t xegs_rom_device::read_80xx(offs_t offset)
{
if (offset < 0x2000)
return m_rom[(offset & 0x1fff) + (m_bank * 0x2000)];
@@ -261,7 +261,7 @@ READ8_MEMBER(xegs_rom_device::read_80xx)
}
-WRITE8_MEMBER(xegs_rom_device::write_d5xx)
+void xegs_rom_device::write_d5xx(offs_t offset, uint8_t data)
{
m_bank = data & m_bank_mask;
}
@@ -280,12 +280,12 @@ WRITE8_MEMBER(xegs_rom_device::write_d5xx)
-------------------------------------------------*/
-READ8_MEMBER(a800_rom_williams_device::read_80xx)
+uint8_t a800_rom_williams_device::read_80xx(offs_t offset)
{
return m_rom[(offset & 0x1fff) + (m_bank * 0x2000)];
}
-WRITE8_MEMBER(a800_rom_williams_device::write_d5xx)
+void a800_rom_williams_device::write_d5xx(offs_t offset, uint8_t data)
{
m_bank = (offset & 0x07);
}
@@ -303,12 +303,12 @@ WRITE8_MEMBER(a800_rom_williams_device::write_d5xx)
-------------------------------------------------*/
-READ8_MEMBER(a800_rom_express_device::read_80xx)
+uint8_t a800_rom_express_device::read_80xx(offs_t offset)
{
return m_rom[(offset & 0x1fff) + (m_bank * 0x2000)];
}
-WRITE8_MEMBER(a800_rom_express_device::write_d5xx)
+void a800_rom_express_device::write_d5xx(offs_t offset, uint8_t data)
{
m_bank = (offset ^ 0x07) & 0x0f;
}
@@ -321,12 +321,12 @@ WRITE8_MEMBER(a800_rom_express_device::write_d5xx)
-------------------------------------------------*/
-READ8_MEMBER(a800_rom_turbo_device::read_80xx)
+uint8_t a800_rom_turbo_device::read_80xx(offs_t offset)
{
return m_rom[(offset & 0x1fff) + (m_bank * 0x2000)];
}
-WRITE8_MEMBER(a800_rom_turbo_device::write_d5xx)
+void a800_rom_turbo_device::write_d5xx(offs_t offset, uint8_t data)
{
m_bank = offset & m_bank_mask;
}
@@ -339,7 +339,7 @@ WRITE8_MEMBER(a800_rom_turbo_device::write_d5xx)
-------------------------------------------------*/
-READ8_MEMBER(a800_rom_telelink2_device::read_80xx)
+uint8_t a800_rom_telelink2_device::read_80xx(offs_t offset)
{
if (offset >= 0x2000)
return m_rom[offset & 0x1fff];
@@ -349,18 +349,18 @@ READ8_MEMBER(a800_rom_telelink2_device::read_80xx)
return 0xff;
}
-WRITE8_MEMBER(a800_rom_telelink2_device::write_80xx)
+void a800_rom_telelink2_device::write_80xx(offs_t offset, uint8_t data)
{
m_nvram[offset & 0xff] = data | 0xf0; // low 4bits only
}
-READ8_MEMBER(a800_rom_telelink2_device::read_d5xx)
+uint8_t a800_rom_telelink2_device::read_d5xx(offs_t offset)
{
// this should affect NVRAM enable / save
return 0xff;
}
-WRITE8_MEMBER(a800_rom_telelink2_device::write_d5xx)
+void a800_rom_telelink2_device::write_d5xx(offs_t offset, uint8_t data)
{
// this should affect NVRAM enable / save
}
@@ -374,12 +374,12 @@ WRITE8_MEMBER(a800_rom_telelink2_device::write_d5xx)
-------------------------------------------------*/
-READ8_MEMBER(a800_rom_microcalc_device::read_80xx)
+uint8_t a800_rom_microcalc_device::read_80xx(offs_t offset)
{
return m_rom[(offset & 0x1fff) + (m_bank * 0x2000)];
}
-WRITE8_MEMBER(a800_rom_microcalc_device::write_d5xx)
+void a800_rom_microcalc_device::write_d5xx(offs_t offset, uint8_t data)
{
m_bank = data;
}
@@ -407,7 +407,7 @@ WRITE8_MEMBER(a800_rom_microcalc_device::write_d5xx)
-------------------------------------------------*/
-READ8_MEMBER(a5200_rom_2chips_device::read_80xx)
+uint8_t a5200_rom_2chips_device::read_80xx(offs_t offset)
{
if (offset < 0x4000)
return m_rom[offset & 0x1fff];
@@ -431,7 +431,7 @@ READ8_MEMBER(a5200_rom_2chips_device::read_80xx)
-------------------------------------------------*/
-READ8_MEMBER(a5200_rom_bbsb_device::read_80xx)
+uint8_t a5200_rom_bbsb_device::read_80xx(offs_t offset)
{
if (offset < 0x1000)
return m_rom[(offset & 0xfff) + (m_banks[0] * 0x1000) + 0];
@@ -443,7 +443,7 @@ READ8_MEMBER(a5200_rom_bbsb_device::read_80xx)
return 0;
}
-WRITE8_MEMBER(a5200_rom_bbsb_device::write_80xx)
+void a5200_rom_bbsb_device::write_80xx(offs_t offset, uint8_t data)
{
uint16_t addr = offset & 0xfff;
if (addr >= 0xff6 && addr <= 0xff9)
diff --git a/src/devices/bus/a800/rom.h b/src/devices/bus/a800/rom.h
index 9ba329b3113..e48b4a4ed7c 100644
--- a/src/devices/bus/a800/rom.h
+++ b/src/devices/bus/a800/rom.h
@@ -17,7 +17,7 @@ public:
// construction/destruction
a800_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- virtual DECLARE_READ8_MEMBER(read_80xx) override;
+ virtual uint8_t read_80xx(offs_t offset) override;
protected:
a800_rom_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
@@ -36,8 +36,8 @@ public:
// construction/destruction
a800_rom_bbsb_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- virtual DECLARE_READ8_MEMBER(read_80xx) override;
- virtual DECLARE_WRITE8_MEMBER(write_80xx) override;
+ virtual uint8_t read_80xx(offs_t offset) override;
+ virtual void write_80xx(offs_t offset, uint8_t data) override;
protected:
// device-level overrides
@@ -56,8 +56,8 @@ public:
// construction/destruction
a800_rom_williams_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- virtual DECLARE_READ8_MEMBER(read_80xx) override;
- virtual DECLARE_WRITE8_MEMBER(write_d5xx) override;
+ virtual uint8_t read_80xx(offs_t offset) override;
+ virtual void write_d5xx(offs_t offset, uint8_t data) override;
protected:
// device-level overrides
@@ -76,8 +76,8 @@ public:
// construction/destruction
a800_rom_express_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- virtual DECLARE_READ8_MEMBER(read_80xx) override;
- virtual DECLARE_WRITE8_MEMBER(write_d5xx) override;
+ virtual uint8_t read_80xx(offs_t offset) override;
+ virtual void write_d5xx(offs_t offset, uint8_t data) override;
protected:
// device-level overrides
@@ -96,7 +96,7 @@ public:
// construction/destruction
a800_rom_blizzard_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- virtual DECLARE_READ8_MEMBER(read_80xx) override;
+ virtual uint8_t read_80xx(offs_t offset) override;
protected:
// device-level overrides
@@ -113,8 +113,8 @@ public:
// construction/destruction
a800_rom_turbo_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- virtual DECLARE_READ8_MEMBER(read_80xx) override;
- virtual DECLARE_WRITE8_MEMBER(write_d5xx) override;
+ virtual uint8_t read_80xx(offs_t offset) override;
+ virtual void write_d5xx(offs_t offset, uint8_t data) override;
protected:
// device-level overrides
@@ -133,10 +133,10 @@ public:
// construction/destruction
a800_rom_telelink2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- virtual DECLARE_READ8_MEMBER(read_80xx) override;
- virtual DECLARE_WRITE8_MEMBER(write_80xx) override;
- virtual DECLARE_READ8_MEMBER(read_d5xx) override;
- virtual DECLARE_WRITE8_MEMBER(write_d5xx) override;
+ virtual uint8_t read_80xx(offs_t offset) override;
+ virtual void write_80xx(offs_t offset, uint8_t data) override;
+ virtual uint8_t read_d5xx(offs_t offset) override;
+ virtual void write_d5xx(offs_t offset, uint8_t data) override;
};
@@ -148,8 +148,8 @@ public:
// construction/destruction
a800_rom_microcalc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- virtual DECLARE_READ8_MEMBER(read_80xx) override;
- virtual DECLARE_WRITE8_MEMBER(write_d5xx) override;
+ virtual uint8_t read_80xx(offs_t offset) override;
+ virtual void write_d5xx(offs_t offset, uint8_t data) override;
protected:
// device-level overrides
@@ -172,8 +172,8 @@ public:
virtual void device_start() override;
virtual void device_reset() override;
- virtual DECLARE_READ8_MEMBER(read_80xx) override;
- virtual DECLARE_WRITE8_MEMBER(write_d5xx) override;
+ virtual uint8_t read_80xx(offs_t offset) override;
+ virtual void write_d5xx(offs_t offset, uint8_t data) override;
protected:
int m_bank;
@@ -188,7 +188,7 @@ public:
// construction/destruction
a5200_rom_2chips_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- virtual DECLARE_READ8_MEMBER(read_80xx) override;
+ virtual uint8_t read_80xx(offs_t offset) override;
};
@@ -200,8 +200,8 @@ public:
// construction/destruction
a5200_rom_bbsb_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- virtual DECLARE_READ8_MEMBER(read_80xx) override;
- virtual DECLARE_WRITE8_MEMBER(write_80xx) override;
+ virtual uint8_t read_80xx(offs_t offset) override;
+ virtual void write_80xx(offs_t offset, uint8_t data) override;
protected:
// device-level overrides
diff --git a/src/devices/bus/a800/sparta.cpp b/src/devices/bus/a800/sparta.cpp
index 30d76eecc38..8b8242d8dad 100644
--- a/src/devices/bus/a800/sparta.cpp
+++ b/src/devices/bus/a800/sparta.cpp
@@ -55,7 +55,7 @@ void a800_rom_spartados_device::device_reset()
-------------------------------------------------*/
-READ8_MEMBER(a800_rom_spartados_device::read_80xx)
+uint8_t a800_rom_spartados_device::read_80xx(offs_t offset)
{
if (!m_subslot_enabled)
return m_rom[(offset & 0x1fff) + (m_bank * 0x2000)];
@@ -63,7 +63,7 @@ READ8_MEMBER(a800_rom_spartados_device::read_80xx)
return 0xff; // subslot, currently not implemented
}
-WRITE8_MEMBER(a800_rom_spartados_device::write_d5xx)
+void a800_rom_spartados_device::write_d5xx(offs_t offset, uint8_t data)
{
if (offset & 0x08)
m_subslot_enabled = !BIT(offset, 2);
diff --git a/src/devices/bus/a800/sparta.h b/src/devices/bus/a800/sparta.h
index 614ce86571c..ea211472f31 100644
--- a/src/devices/bus/a800/sparta.h
+++ b/src/devices/bus/a800/sparta.h
@@ -16,8 +16,8 @@ public:
// construction/destruction
a800_rom_spartados_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- virtual DECLARE_READ8_MEMBER(read_80xx) override;
- virtual DECLARE_WRITE8_MEMBER(write_d5xx) override;
+ virtual uint8_t read_80xx(offs_t offset) override;
+ virtual void write_d5xx(offs_t offset, uint8_t data) override;
protected:
// device-level overrides
diff --git a/src/devices/bus/abcbus/abcbus.cpp b/src/devices/bus/abcbus/abcbus.cpp
index e0ce60ef990..714c4608975 100644
--- a/src/devices/bus/abcbus/abcbus.cpp
+++ b/src/devices/bus/abcbus/abcbus.cpp
@@ -50,8 +50,16 @@ abcbus_slot_device::abcbus_slot_device(const machine_config &mconfig, const char
m_write_xint2(*this),
m_write_xint3(*this),
m_write_xint4(*this),
- m_write_xint5(*this), m_card(nullptr), m_irq(0), m_nmi(0), m_pren(0),
- m_trrq(0), m_xint2(0), m_xint3(0), m_xint4(0), m_xint5(0)
+ m_write_xint5(*this),
+ m_card(nullptr),
+ m_irq(CLEAR_LINE),
+ m_nmi(CLEAR_LINE),
+ m_pren(1),
+ m_trrq(1),
+ m_xint2(CLEAR_LINE),
+ m_xint3(CLEAR_LINE),
+ m_xint4(CLEAR_LINE),
+ m_xint5(CLEAR_LINE)
{
}
diff --git a/src/devices/bus/abcbus/abcbus.h b/src/devices/bus/abcbus/abcbus.h
index 716a177248d..402f1325136 100644
--- a/src/devices/bus/abcbus/abcbus.h
+++ b/src/devices/bus/abcbus/abcbus.h
@@ -201,17 +201,15 @@ public:
DECLARE_WRITE_LINE_MEMBER( tren_w ) { if (m_card) m_card->abcbus_tren(state); }
DECLARE_WRITE_LINE_MEMBER( prac_w ) { if (m_card) m_card->abcbus_prac(state); }
- DECLARE_WRITE8_MEMBER( cs_w ) { write_cs(data); }
- DECLARE_READ8_MEMBER( rst_r ) { return read_rst(); }
- DECLARE_READ8_MEMBER( inp_r ) { return read_inp(); }
- DECLARE_WRITE8_MEMBER( out_w ) { write_out(data); }
- DECLARE_READ8_MEMBER( stat_r ) { return read_stat(); }
- DECLARE_WRITE8_MEMBER( c1_w ) { write_c1(data); }
- DECLARE_WRITE8_MEMBER( c2_w ) { write_c2(data); }
- DECLARE_WRITE8_MEMBER( c3_w ) { write_c3(data); }
- DECLARE_WRITE8_MEMBER( c4_w ) { write_c4(data); }
- DECLARE_READ8_MEMBER( xmemfl_r ) { return xmemfl_r(offset); }
- DECLARE_WRITE8_MEMBER( xmemw_w ) { xmemw_w(offset, data); }
+ void cs_w(uint8_t data) { write_cs(data); }
+ uint8_t rst_r() { return read_rst(); }
+ uint8_t inp_r() { return read_inp(); }
+ void out_w(uint8_t data) { write_out(data); }
+ uint8_t stat_r() { return read_stat(); }
+ void c1_w(uint8_t data) { write_c1(data); }
+ void c2_w(uint8_t data) { write_c2(data); }
+ 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; }
diff --git a/src/devices/bus/abcbus/fd2.cpp b/src/devices/bus/abcbus/fd2.cpp
index 12607f51699..59734f69fff 100644
--- a/src/devices/bus/abcbus/fd2.cpp
+++ b/src/devices/bus/abcbus/fd2.cpp
@@ -86,7 +86,7 @@ const tiny_rom_entry *abc_fd2_device::device_rom_region() const
// status_w -
//-------------------------------------------------
-WRITE8_MEMBER( abc_fd2_device::status_w )
+void abc_fd2_device::status_w(uint8_t data)
{
/*
@@ -138,17 +138,17 @@ void abc_fd2_device::abc_fd2_io(address_map &map)
// Z80PIO
//-------------------------------------------------
-READ8_MEMBER( abc_fd2_device::pio_pa_r )
+uint8_t abc_fd2_device::pio_pa_r()
{
return m_data;
}
-WRITE8_MEMBER( abc_fd2_device::pio_pa_w )
+void abc_fd2_device::pio_pa_w(uint8_t data)
{
m_data = data;
}
-READ8_MEMBER( abc_fd2_device::pio_pb_r )
+uint8_t abc_fd2_device::pio_pb_r()
{
/*
@@ -174,7 +174,7 @@ READ8_MEMBER( abc_fd2_device::pio_pb_r )
return data;
}
-WRITE8_MEMBER( abc_fd2_device::pio_pb_w )
+void abc_fd2_device::pio_pb_w(uint8_t data)
{
/*
diff --git a/src/devices/bus/abcbus/fd2.h b/src/devices/bus/abcbus/fd2.h
index ff635575472..0c587f0c776 100644
--- a/src/devices/bus/abcbus/fd2.h
+++ b/src/devices/bus/abcbus/fd2.h
@@ -53,12 +53,12 @@ protected:
virtual uint8_t abcbus_xmemfl(offs_t offset) override;
private:
- DECLARE_READ8_MEMBER( pio_pa_r );
- DECLARE_WRITE8_MEMBER( pio_pa_w );
- DECLARE_READ8_MEMBER( pio_pb_r );
- DECLARE_WRITE8_MEMBER( pio_pb_w );
+ uint8_t pio_pa_r();
+ void pio_pa_w(uint8_t data);
+ uint8_t pio_pb_r();
+ void pio_pb_w(uint8_t data);
- DECLARE_WRITE8_MEMBER( status_w );
+ void status_w(uint8_t data);
DECLARE_FLOPPY_FORMATS( floppy_formats );
diff --git a/src/devices/bus/abcbus/lux10828.cpp b/src/devices/bus/abcbus/lux10828.cpp
index 28b44388d27..6db3b9d2196 100644
--- a/src/devices/bus/abcbus/lux10828.cpp
+++ b/src/devices/bus/abcbus/lux10828.cpp
@@ -197,17 +197,17 @@ void luxor_55_10828_device::luxor_55_10828_io(address_map &map)
// Z80PIO
//-------------------------------------------------
-READ8_MEMBER( luxor_55_10828_device::pio_pa_r )
+uint8_t luxor_55_10828_device::pio_pa_r()
{
return m_data;
}
-WRITE8_MEMBER( luxor_55_10828_device::pio_pa_w )
+void luxor_55_10828_device::pio_pa_w(uint8_t data)
{
m_data = data;
}
-READ8_MEMBER( luxor_55_10828_device::pio_pb_r )
+uint8_t luxor_55_10828_device::pio_pb_r()
{
/*
@@ -252,7 +252,7 @@ READ8_MEMBER( luxor_55_10828_device::pio_pb_r )
return data;
}
-WRITE8_MEMBER( luxor_55_10828_device::pio_pb_w )
+void luxor_55_10828_device::pio_pb_w(uint8_t data)
{
/*
@@ -455,8 +455,7 @@ void luxor_55_10828_device::device_reset()
{
m_cs = false;
- address_space &space = m_maincpu->space(AS_PROGRAM);
- ctrl_w(space, 0, 0);
+ ctrl_w(0);
m_data = 0;
}
@@ -574,7 +573,7 @@ void luxor_55_10828_device::abcbus_c3(uint8_t data)
// ctrl_w -
//-------------------------------------------------
-WRITE8_MEMBER( luxor_55_10828_device::ctrl_w )
+void luxor_55_10828_device::ctrl_w(uint8_t data)
{
/*
@@ -626,7 +625,7 @@ WRITE8_MEMBER( luxor_55_10828_device::ctrl_w )
// status_w -
//-------------------------------------------------
-WRITE8_MEMBER( luxor_55_10828_device::status_w )
+void luxor_55_10828_device::status_w(uint8_t data)
{
/*
@@ -657,7 +656,7 @@ WRITE8_MEMBER( luxor_55_10828_device::status_w )
// fdc_r -
//-------------------------------------------------
-READ8_MEMBER( luxor_55_10828_device::fdc_r )
+uint8_t luxor_55_10828_device::fdc_r(offs_t offset)
{
if (machine().side_effects_disabled())
return 0xff;
@@ -685,7 +684,7 @@ READ8_MEMBER( luxor_55_10828_device::fdc_r )
// fdc_w -
//-------------------------------------------------
-WRITE8_MEMBER( luxor_55_10828_device::fdc_w )
+void luxor_55_10828_device::fdc_w(offs_t offset, uint8_t data)
{
if (machine().side_effects_disabled())
return;
diff --git a/src/devices/bus/abcbus/lux10828.h b/src/devices/bus/abcbus/lux10828.h
index 97ecb787880..3e8499a2e64 100644
--- a/src/devices/bus/abcbus/lux10828.h
+++ b/src/devices/bus/abcbus/lux10828.h
@@ -75,18 +75,18 @@ protected:
virtual void abcbus_c3(uint8_t data) override;
private:
- DECLARE_READ8_MEMBER( pio_pa_r );
- DECLARE_WRITE8_MEMBER( pio_pa_w );
- DECLARE_READ8_MEMBER( pio_pb_r );
- DECLARE_WRITE8_MEMBER( pio_pb_w );
+ uint8_t pio_pa_r();
+ void pio_pa_w(uint8_t data);
+ 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 );
- DECLARE_WRITE8_MEMBER( ctrl_w );
- DECLARE_WRITE8_MEMBER( status_w );
- DECLARE_READ8_MEMBER( fdc_r );
- DECLARE_WRITE8_MEMBER( fdc_w );
+ void ctrl_w(uint8_t data);
+ void status_w(uint8_t data);
+ uint8_t fdc_r(offs_t offset);
+ void fdc_w(offs_t offset, uint8_t data);
DECLARE_FLOPPY_FORMATS( floppy_formats );
diff --git a/src/devices/bus/abcbus/lux21046.cpp b/src/devices/bus/abcbus/lux21046.cpp
index 3ec543ead6a..c305f2bfc63 100644
--- a/src/devices/bus/abcbus/lux21046.cpp
+++ b/src/devices/bus/abcbus/lux21046.cpp
@@ -232,22 +232,22 @@ WRITE_LINE_MEMBER( luxor_55_21046_device::dma_int_w )
m_maincpu->set_input_line(INPUT_LINE_IRQ0, m_fdc_irq || m_dma_irq);
}
-READ8_MEMBER( luxor_55_21046_device::memory_read_byte )
+uint8_t luxor_55_21046_device::memory_read_byte(offs_t offset)
{
return m_maincpu->space(AS_PROGRAM).read_byte(offset);
}
-WRITE8_MEMBER( luxor_55_21046_device::memory_write_byte )
+void luxor_55_21046_device::memory_write_byte(offs_t offset, uint8_t data)
{
return m_maincpu->space(AS_PROGRAM).write_byte(offset, data);
}
-READ8_MEMBER( luxor_55_21046_device::io_read_byte )
+uint8_t luxor_55_21046_device::io_read_byte(offs_t offset)
{
return m_maincpu->space(AS_IO).read_byte(offset);
}
-WRITE8_MEMBER( luxor_55_21046_device::io_write_byte )
+void luxor_55_21046_device::io_write_byte(offs_t offset, uint8_t data)
{
return m_maincpu->space(AS_IO).write_byte(offset, data);
}
@@ -789,10 +789,9 @@ void luxor_55_21046_device::device_reset()
m_maincpu->reset();
- address_space &space = m_maincpu->space(AS_PROGRAM);
- _4b_w(space, 0, 0);
- _9b_w(space, 0, 0);
- _8a_w(space, 0, 0);
+ _4b_w(0);
+ _9b_w(0);
+ _8a_w(0);
}
@@ -932,9 +931,9 @@ void luxor_55_21046_device::abcbus_c4(uint8_t data)
// 3d_r -
//-------------------------------------------------
-READ8_MEMBER( luxor_55_21046_device::out_r )
+uint8_t luxor_55_21046_device::out_r()
{
- if (m_busy)
+ if (m_busy && !machine().side_effects_disabled())
{
m_busy = 0;
}
@@ -947,7 +946,7 @@ READ8_MEMBER( luxor_55_21046_device::out_r )
// 4d_w -
//-------------------------------------------------
-WRITE8_MEMBER( luxor_55_21046_device::inp_w )
+void luxor_55_21046_device::inp_w(uint8_t data)
{
if (m_busy)
{
@@ -962,7 +961,7 @@ WRITE8_MEMBER( luxor_55_21046_device::inp_w )
// 4b_w -
//-------------------------------------------------
-WRITE8_MEMBER( luxor_55_21046_device::_4b_w )
+void luxor_55_21046_device::_4b_w(uint8_t data)
{
/*
@@ -993,7 +992,7 @@ WRITE8_MEMBER( luxor_55_21046_device::_4b_w )
// 9b_w -
//-------------------------------------------------
-WRITE8_MEMBER( luxor_55_21046_device::_9b_w )
+void luxor_55_21046_device::_9b_w(uint8_t data)
{
/*
@@ -1033,7 +1032,7 @@ WRITE8_MEMBER( luxor_55_21046_device::_9b_w )
// 8a_w -
//-------------------------------------------------
-WRITE8_MEMBER( luxor_55_21046_device::_8a_w )
+void luxor_55_21046_device::_8a_w(uint8_t data)
{
/*
@@ -1066,7 +1065,7 @@ WRITE8_MEMBER( luxor_55_21046_device::_8a_w )
// 9a_r -
//-------------------------------------------------
-READ8_MEMBER( luxor_55_21046_device::_9a_r )
+uint8_t luxor_55_21046_device::_9a_r(offs_t offset)
{
/*
diff --git a/src/devices/bus/abcbus/lux21046.h b/src/devices/bus/abcbus/lux21046.h
index 703c419e776..c7e13962b0b 100644
--- a/src/devices/bus/abcbus/lux21046.h
+++ b/src/devices/bus/abcbus/lux21046.h
@@ -85,19 +85,19 @@ protected:
private:
DECLARE_WRITE_LINE_MEMBER( dma_int_w );
- DECLARE_READ8_MEMBER(memory_read_byte);
- DECLARE_WRITE8_MEMBER(memory_write_byte);
- DECLARE_READ8_MEMBER(io_read_byte);
- DECLARE_WRITE8_MEMBER(io_write_byte);
+ 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 );
- DECLARE_READ8_MEMBER( out_r );
- DECLARE_WRITE8_MEMBER( inp_w );
- DECLARE_WRITE8_MEMBER( _4b_w );
- DECLARE_WRITE8_MEMBER( _9b_w );
- DECLARE_WRITE8_MEMBER( _8a_w );
- DECLARE_READ8_MEMBER( _9a_r );
+ uint8_t out_r();
+ void inp_w(uint8_t data);
+ void _4b_w(uint8_t data);
+ void _9b_w(uint8_t data);
+ void _8a_w(uint8_t data);
+ uint8_t _9a_r(offs_t offset);
void luxor_55_21046_io(address_map &map);
void luxor_55_21046_mem(address_map &map);
diff --git a/src/devices/bus/abcbus/lux21056.cpp b/src/devices/bus/abcbus/lux21056.cpp
index c5acc016e98..74a7abd5c9f 100644
--- a/src/devices/bus/abcbus/lux21056.cpp
+++ b/src/devices/bus/abcbus/lux21056.cpp
@@ -177,22 +177,22 @@ static const z80_daisy_config daisy_chain[] =
// Z80DMA
//-------------------------------------------------
-READ8_MEMBER( luxor_55_21056_device::memory_read_byte )
+uint8_t luxor_55_21056_device::memory_read_byte(offs_t offset)
{
return m_maincpu->space(AS_PROGRAM).read_byte(offset);
}
-WRITE8_MEMBER( luxor_55_21056_device::memory_write_byte )
+void luxor_55_21056_device::memory_write_byte(offs_t offset, uint8_t data)
{
return m_maincpu->space(AS_PROGRAM).write_byte(offset, data);
}
-READ8_MEMBER( luxor_55_21056_device::io_read_byte )
+uint8_t luxor_55_21056_device::io_read_byte(offs_t offset)
{
return m_maincpu->space(AS_IO).read_byte(offset);
}
-WRITE8_MEMBER( luxor_55_21056_device::io_write_byte )
+void luxor_55_21056_device::io_write_byte(offs_t offset, uint8_t data)
{
return m_maincpu->space(AS_IO).write_byte(offset, data);
}
@@ -204,7 +204,7 @@ WRITE_LINE_MEMBER( luxor_55_21056_device::write_sasi_bsy )
if (m_sasi_bsy)
{
- m_sasibus->write_sel(!m_sasi_bsy);
+ m_sasibus->write_sel(0);
}
}
@@ -228,7 +228,8 @@ WRITE_LINE_MEMBER( luxor_55_21056_device::write_sasi_req )
if (m_sasi_req)
{
- m_sasibus->write_ack(!m_sasi_req);
+ m_req = 0;
+ m_sasibus->write_ack(!m_req);
}
}
@@ -490,7 +491,7 @@ void luxor_55_21056_device::abcbus_c3(uint8_t data)
// sasi_status_r -
//-------------------------------------------------
-READ8_MEMBER( luxor_55_21056_device::sasi_status_r )
+uint8_t luxor_55_21056_device::sasi_status_r()
{
/*
@@ -511,8 +512,8 @@ READ8_MEMBER( luxor_55_21056_device::sasi_status_r )
data |= m_rdy ^ STAT_DIR;
- data |= !m_sasi_req << 1;
- data |= !m_sasi_io << 2;
+ data |= (m_req || m_sasi_req) << 1;
+ data |= m_sasi_io << 2;
data |= !m_sasi_cd << 3;
data |= !m_sasi_msg << 4;
data |= !m_sasi_bsy << 5;
@@ -525,7 +526,7 @@ READ8_MEMBER( luxor_55_21056_device::sasi_status_r )
// stat_w -
//-------------------------------------------------
-WRITE8_MEMBER( luxor_55_21056_device::stat_w )
+void luxor_55_21056_device::stat_w(uint8_t data)
{
m_stat = data;
@@ -537,7 +538,7 @@ WRITE8_MEMBER( luxor_55_21056_device::stat_w )
// out_r -
//-------------------------------------------------
-READ8_MEMBER( luxor_55_21056_device::out_r )
+uint8_t luxor_55_21056_device::out_r()
{
uint8_t data = m_out;
@@ -551,7 +552,7 @@ READ8_MEMBER( luxor_55_21056_device::out_r )
// inp_w -
//-------------------------------------------------
-WRITE8_MEMBER( luxor_55_21056_device::inp_w )
+void luxor_55_21056_device::inp_w(uint8_t data)
{
m_inp = data;
@@ -563,11 +564,12 @@ WRITE8_MEMBER( luxor_55_21056_device::inp_w )
// sasi_data_r -
//-------------------------------------------------
-READ8_MEMBER( luxor_55_21056_device::sasi_data_r )
+uint8_t luxor_55_21056_device::sasi_data_r()
{
uint8_t data = m_sasi_data_in->read();
- m_sasibus->write_ack(!m_sasi_req);
+ m_req = !m_sasi_req;
+ m_sasibus->write_ack(!m_req);
return data;
}
@@ -577,7 +579,7 @@ READ8_MEMBER( luxor_55_21056_device::sasi_data_r )
// sasi_data_w -
//-------------------------------------------------
-WRITE8_MEMBER( luxor_55_21056_device::sasi_data_w )
+void luxor_55_21056_device::sasi_data_w(uint8_t data)
{
m_sasi_data = data;
@@ -586,7 +588,8 @@ WRITE8_MEMBER( luxor_55_21056_device::sasi_data_w )
m_sasi_data_out->write(m_sasi_data);
}
- m_sasibus->write_ack(!m_sasi_req);
+ m_req = !m_sasi_req;
+ m_sasibus->write_ack(!m_req);
}
@@ -594,9 +597,10 @@ WRITE8_MEMBER( luxor_55_21056_device::sasi_data_w )
// rdy_reset_r -
//-------------------------------------------------
-READ8_MEMBER( luxor_55_21056_device::rdy_reset_r )
+uint8_t luxor_55_21056_device::rdy_reset_r()
{
- rdy_reset_w(space, offset, 0xff);
+ if (!machine().side_effects_disabled())
+ rdy_reset_w(0xff);
return 0xff;
}
@@ -606,7 +610,7 @@ READ8_MEMBER( luxor_55_21056_device::rdy_reset_r )
// rdy_reset_w -
//-------------------------------------------------
-WRITE8_MEMBER( luxor_55_21056_device::rdy_reset_w )
+void luxor_55_21056_device::rdy_reset_w(uint8_t data)
{
set_rdy(0);
}
@@ -616,9 +620,10 @@ WRITE8_MEMBER( luxor_55_21056_device::rdy_reset_w )
// sasi_sel_r -
//-------------------------------------------------
-READ8_MEMBER( luxor_55_21056_device::sasi_sel_r )
+uint8_t luxor_55_21056_device::sasi_sel_r()
{
- sasi_sel_w(space, offset, 0xff);
+ if (!machine().side_effects_disabled())
+ sasi_sel_w(0xff);
return 0xff;
}
@@ -628,7 +633,7 @@ READ8_MEMBER( luxor_55_21056_device::sasi_sel_r )
// sasi_sel_w -
//-------------------------------------------------
-WRITE8_MEMBER( luxor_55_21056_device::sasi_sel_w )
+void luxor_55_21056_device::sasi_sel_w(uint8_t data)
{
m_sasibus->write_sel(!m_sasi_bsy);
}
@@ -638,9 +643,10 @@ WRITE8_MEMBER( luxor_55_21056_device::sasi_sel_w )
// sasi_rst_r -
//-------------------------------------------------
-READ8_MEMBER( luxor_55_21056_device::sasi_rst_r )
+uint8_t luxor_55_21056_device::sasi_rst_r()
{
- sasi_rst_w(space, offset, 0xff);
+ if (!machine().side_effects_disabled())
+ sasi_rst_w(0xff);
return 0xff;
}
@@ -650,7 +656,7 @@ READ8_MEMBER( luxor_55_21056_device::sasi_rst_r )
// sasi_rst_w -
//-------------------------------------------------
-WRITE8_MEMBER( luxor_55_21056_device::sasi_rst_w )
+void luxor_55_21056_device::sasi_rst_w(uint8_t data)
{
m_sasibus->write_rst(1);
m_sasibus->write_rst(0);
diff --git a/src/devices/bus/abcbus/lux21056.h b/src/devices/bus/abcbus/lux21056.h
index 7103fa5ba9c..812bb8325a3 100644
--- a/src/devices/bus/abcbus/lux21056.h
+++ b/src/devices/bus/abcbus/lux21056.h
@@ -53,10 +53,10 @@ protected:
private:
void set_rdy(int state);
- DECLARE_READ8_MEMBER( memory_read_byte );
- DECLARE_WRITE8_MEMBER( memory_write_byte );
- DECLARE_READ8_MEMBER( io_read_byte );
- DECLARE_WRITE8_MEMBER( io_write_byte );
+ 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( write_sasi_req );
DECLARE_WRITE_LINE_MEMBER( write_sasi_io );
@@ -64,18 +64,18 @@ private:
DECLARE_WRITE_LINE_MEMBER( write_sasi_msg );
DECLARE_WRITE_LINE_MEMBER( write_sasi_bsy );
- DECLARE_READ8_MEMBER( sasi_status_r );
- DECLARE_WRITE8_MEMBER( stat_w );
- DECLARE_READ8_MEMBER( out_r );
- DECLARE_WRITE8_MEMBER( inp_w );
- DECLARE_READ8_MEMBER( sasi_data_r );
- DECLARE_WRITE8_MEMBER( sasi_data_w );
- DECLARE_READ8_MEMBER( rdy_reset_r );
- DECLARE_WRITE8_MEMBER( rdy_reset_w );
- DECLARE_READ8_MEMBER( sasi_sel_r );
- DECLARE_WRITE8_MEMBER( sasi_sel_w );
- DECLARE_READ8_MEMBER( sasi_rst_r );
- DECLARE_WRITE8_MEMBER( sasi_rst_w );
+ uint8_t sasi_status_r();
+ void stat_w(uint8_t data);
+ uint8_t out_r();
+ void inp_w(uint8_t data);
+ uint8_t sasi_data_r();
+ void sasi_data_w(uint8_t data);
+ uint8_t rdy_reset_r();
+ void rdy_reset_w(uint8_t data);
+ uint8_t sasi_sel_r();
+ void sasi_sel_w(uint8_t data);
+ uint8_t sasi_rst_r();
+ void sasi_rst_w(uint8_t data);
void luxor_55_21056_io(address_map &map);
void luxor_55_21056_mem(address_map &map);
@@ -89,6 +89,7 @@ private:
int m_cs;
int m_rdy;
+ int m_req;
int m_sasi_req;
int m_sasi_io;
int m_sasi_cd;
diff --git a/src/devices/bus/abcbus/lux4105.cpp b/src/devices/bus/abcbus/lux4105.cpp
index fbcf1dec72c..59b4f5191a5 100644
--- a/src/devices/bus/abcbus/lux4105.cpp
+++ b/src/devices/bus/abcbus/lux4105.cpp
@@ -37,6 +37,66 @@ Notes:
*/
+/*
+
+ TODO
+
+ - command execution gets stuck in message in phase
+
+ 08A88 move.l D7,D0 D0=00000025
+ 08A8A lsl.l #5, D0 D0=000004A0
+ 08A8C ori.l #$7e000, D0 D0=0007E4A0
+ 08A92 movea.l D0, A0 A0=0007E4A0
+ 08A94 move.b ($2,A0), D0 D0=0007E4AF
+ 08A98 btst #$2, D0
+ 08A9C beq $8aa4
+ 08AA0 bra $8a88
+
+ [:bus2:4105:sasi:0:s1410] state=3.1 change
+ [:bus2:4105:sasi:0:s1410] state=3.0 change
+ [:bus2:4105:sasi] ctrl .....B.CI stat 0005
+ [:bus2:4105:sasi] 0=ICB
+ [:bus2:4105:sasi] ctrl .....B.CI stat 0005
+ [:bus2:4105:sasi] 0=ICB
+ [:bus2:4105:sasi] ctrl .....B.CI stat 0000
+ [:bus2:4105:sasi] 0=ICB
+ [:bus2:4105:sasi] ctrl ...Q.B.CI stat 0000
+ [:bus2:4105:sasi] 0=QICB
+ [:bus2:4105:sasi] ctrl ...Q.B.CI stat 0000
+ [:bus2:4105:sasi] 0=QICB
+ [:bus2:4105:sasi:0:s1410] state=3.4 change
+ [:bus2:4105:sasi] ctrl ...Q.B.CI stat 0000
+ [:bus2:4105:sasi] 0=QICB
+ [:] ':3f' (089A8) STAT 25: 45
+ [:bus2:4105:sasi] ctrl ..KQ.B.CI stat 0000
+ [:bus2:4105:sasi] 0=QICB
+ [:bus2:4105:sasi] 1=K
+ [:bus2:4105:sasi:0:s1410] state=3.4 change
+ [:bus2:4105:sasi] ctrl ..K..B.CI stat 0000
+ [:bus2:4105:sasi] 0=ICB
+ [:bus2:4105:sasi] 1=K
+ [:bus2:4105:sasi] ctrl .....B.CI stat 0000
+ [:bus2:4105:sasi] 0=ICB
+ [:bus2:4105:sasi:0:s1410] state=3.3 change
+ [:bus2:4105:sasi:0:s1410] state=3.0 change
+ [:bus2:4105:sasi] ctrl .....BMCI min 0000
+ [:bus2:4105:sasi] 0=MICB
+ [:bus2:4105:sasi] ctrl .....BMCI min 0000
+ [:bus2:4105:sasi] 0=MICB
+ [:bus2:4105:sasi] ctrl .....BMCI min 0000
+ [:bus2:4105:sasi] 0=MICB
+ [:bus2:4105:sasi] ctrl ...Q.BMCI min 0000
+ [:bus2:4105:sasi] 0=QMICB
+ [:bus2:4105:sasi] ctrl ...Q.BMCI min 0000
+ [:bus2:4105:sasi] 0=QMICB
+ [:bus2:4105:sasi:0:s1410] state=3.4 change
+ [:bus2:4105:sasi] ctrl ...Q.BMCI min 0000
+ [:bus2:4105:sasi] 0=QMICB
+ [:] ':3f' (089D4) INP 25: 00
+ [:] ':3f' (089E8) STAT 25: 05
+
+*/
+
#include "emu.h"
#include "lux4105.h"
#include "bus/scsi/scsihd.h"
@@ -59,64 +119,22 @@ Notes:
DEFINE_DEVICE_TYPE(LUXOR_4105, luxor_4105_device, "lux4105", "Luxor 4105")
-WRITE_LINE_MEMBER( luxor_4105_device::write_sasi_bsy )
-{
- m_sasi_bsy = state;
-
- if (m_sasi_bsy)
- {
- m_sasibus->write_sel(0);
- }
-}
-
-WRITE_LINE_MEMBER( luxor_4105_device::write_sasi_io )
-{
- m_sasi_io = state;
-
- if (!m_sasi_io)
- {
- m_sasi_data_out->write(m_data);
- }
-
- update_trrq_int();
-}
-
-WRITE_LINE_MEMBER( luxor_4105_device::write_sasi_req )
-{
- m_sasi_req = state;
-
- if (m_sasi_req)
- {
- m_sasibus->write_ack(0);
- }
-
- update_trrq_int();
-}
-
-WRITE_LINE_MEMBER( luxor_4105_device::write_sasi_cd )
-{
- m_sasi_cd = state;
-}
-
-
//-------------------------------------------------
// device_add_mconfig - add device configuration
//-------------------------------------------------
void luxor_4105_device::device_add_mconfig(machine_config &config)
{
- SCSI_PORT(config, m_sasibus);
- m_sasibus->set_data_input_buffer(m_sasi_data_in);
- m_sasibus->bsy_handler().set(FUNC(luxor_4105_device::write_sasi_bsy));
- m_sasibus->req_handler().set(FUNC(luxor_4105_device::write_sasi_req));
- m_sasibus->cd_handler().set(FUNC(luxor_4105_device::write_sasi_cd));
- m_sasibus->io_handler().set(FUNC(luxor_4105_device::write_sasi_io));
- m_sasibus->set_slot_device(1, "harddisk", S1410, DEVICE_INPUT_DEFAULTS_NAME(SCSI_ID_0));
-
- OUTPUT_LATCH(config, m_sasi_data_out);
- m_sasibus->set_output_latch(*m_sasi_data_out);
-
- INPUT_BUFFER(config, m_sasi_data_in);
+ NSCSI_BUS(config, "sasi");
+ NSCSI_CONNECTOR(config, "sasi:0", default_scsi_devices, "s1410");
+ NSCSI_CONNECTOR(config, "sasi:7", default_scsi_devices, "scsicb", true)
+ .option_add_internal("scsicb", NSCSI_CB)
+ .machine_config([this](device_t* device) {
+ downcast<nscsi_callback_device&>(*device).cd_callback().set(*this, FUNC(luxor_4105_device::write_sasi_cd));
+ downcast<nscsi_callback_device&>(*device).bsy_callback().set(*this, FUNC(luxor_4105_device::write_sasi_bsy));
+ downcast<nscsi_callback_device&>(*device).req_callback().set(*this, FUNC(luxor_4105_device::write_sasi_req));
+ downcast<nscsi_callback_device&>(*device).io_callback().set(*this, FUNC(luxor_4105_device::write_sasi_io));
+ });
}
@@ -126,17 +144,17 @@ void luxor_4105_device::device_add_mconfig(machine_config &config)
INPUT_PORTS_START( luxor_4105 )
PORT_START("1E")
- PORT_DIPNAME( 0x03, 0x00, "Stepping" ) PORT_DIPLOCATION("1E:1,2")
+ PORT_DIPNAME( 0x03, 0x03, "Stepping" ) PORT_DIPLOCATION("1E:1,2")
PORT_DIPSETTING( 0x00, DEF_STR( Normal ) )
PORT_DIPSETTING( 0x01, "Half (Seagate/Texas)" )
PORT_DIPSETTING( 0x02, "Half (Tandon)" )
PORT_DIPSETTING( 0x03, "Buffered" )
- PORT_DIPNAME( 0x0c, 0x00, "Heads" ) PORT_DIPLOCATION("1E:3,4")
+ PORT_DIPNAME( 0x0c, 0x0c, "Heads" ) PORT_DIPLOCATION("1E:3,4")
PORT_DIPSETTING( 0x00, "2" )
PORT_DIPSETTING( 0x04, "4" )
PORT_DIPSETTING( 0x08, "6" )
PORT_DIPSETTING( 0x0c, "8" )
- PORT_DIPNAME( 0xf0, 0x00, "Drive Type" ) PORT_DIPLOCATION("1E:5,6,7,8")
+ PORT_DIPNAME( 0xf0, 0x30, "Drive Type" ) PORT_DIPLOCATION("1E:5,6,7,8")
PORT_DIPSETTING( 0x00, "Seagate ST506" )
PORT_DIPSETTING( 0x10, "Rodime RO100" )
PORT_DIPSETTING( 0x20, "Shugart SA600" )
@@ -159,36 +177,6 @@ ioport_constructor luxor_4105_device::device_input_ports() const
}
-//**************************************************************************
-// INLINE HELPERS
-//**************************************************************************
-
-inline void luxor_4105_device::update_trrq_int()
-{
- bool cd = !m_sasi_cd;
- bool req = !m_sasi_req;
- int trrq = (cd & !req) ? 0 : 1;
-
- if (BIT(m_dma, 5))
- {
- m_slot->irq_w(trrq ? CLEAR_LINE : ASSERT_LINE);
- }
- else
- {
- m_slot->irq_w(CLEAR_LINE);
- }
-
- if (BIT(m_dma, 6))
- {
- m_slot->trrq_w(trrq);
- }
- else
- {
- m_slot->trrq_w(1);
- }
-}
-
-
//**************************************************************************
// LIVE DEVICE
@@ -201,18 +189,11 @@ inline void luxor_4105_device::update_trrq_int()
luxor_4105_device::luxor_4105_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, LUXOR_4105, tag, owner, clock),
device_abcbus_card_interface(mconfig, *this),
- m_sasibus(*this, SASIBUS_TAG),
- m_sasi_data_out(*this, "sasi_data_out"),
- m_sasi_data_in(*this, "sasi_data_in"),
+ m_sasi(*this, "sasi:7:scsicb"),
m_1e(*this, "1E"),
m_5e(*this, "5E"),
m_cs(false),
- m_data(0),
- m_dma(0),
- m_sasi_bsy(false),
- m_sasi_req(false),
- m_sasi_cd(false),
- m_sasi_io(false)
+ m_dma(0)
{
}
@@ -225,7 +206,6 @@ void luxor_4105_device::device_start()
{
// state saving
save_item(NAME(m_cs));
- save_item(NAME(m_data));
save_item(NAME(m_dma));
}
@@ -237,16 +217,76 @@ void luxor_4105_device::device_start()
void luxor_4105_device::device_reset()
{
m_cs = false;
- m_data = 0;
m_dma = 0;
- m_sasibus->write_rst(1);
- m_sasibus->write_rst(0);
+ m_sasi->rst_w(1);
+ m_sasi->rst_w(0);
m_slot->trrq_w(1);
}
+void luxor_4105_device::update_trrq_int()
+{
+ bool cd = !m_sasi->cd_r();
+ bool req = !m_sasi->req_r();
+ int trrq = (cd & !req) ? 0 : 1;
+
+ if (BIT(m_dma, 5))
+ {
+ m_slot->irq_w(trrq ? CLEAR_LINE : ASSERT_LINE);
+ }
+ else
+ {
+ m_slot->irq_w(CLEAR_LINE);
+ }
+
+ if (BIT(m_dma, 6))
+ {
+ m_slot->trrq_w(trrq);
+ }
+ else
+ {
+ m_slot->trrq_w(1);
+ }
+}
+
+
+WRITE_LINE_MEMBER( luxor_4105_device::write_sasi_bsy )
+{
+ if (state)
+ {
+ m_sasi->sel_w(0);
+ }
+}
+
+
+WRITE_LINE_MEMBER( luxor_4105_device::write_sasi_cd )
+{
+ update_trrq_int();
+}
+
+
+WRITE_LINE_MEMBER( luxor_4105_device::write_sasi_req )
+{
+ if (!state)
+ {
+ m_sasi->ack_w(0);
+ }
+
+ update_trrq_int();
+}
+
+
+WRITE_LINE_MEMBER( luxor_4105_device::write_sasi_io )
+{
+ if (state)
+ {
+ m_sasi->write(0);
+ }
+}
+
+
//-------------------------------------------------
// abcbus_cs -
//-------------------------------------------------
@@ -285,17 +325,18 @@ uint8_t luxor_4105_device::abcbus_stat()
1 ?
2 ?
3 ?
- 4
+ 4 0
5
6 ? (tested at 014D9A, after command 08 sent and 1 byte read from SASI, should be 1)
7
*/
- data = m_sasi_bsy ? 0 : (1 << 0);
- data |= m_sasi_req ? 0 : (1 << 2);
- data |= m_sasi_cd ? 0 : (1 << 3);
- data |= m_sasi_io ? 0 : (1 << 6);
+ data = m_sasi->req_r();
+ data |= !m_sasi->cd_r() << 1;
+ data |= m_sasi->bsy_r() << 2;
+ data |= !m_sasi->io_r() << 3;
+ data |= !m_sasi->msg_r() << 6;
}
return data;
@@ -312,21 +353,15 @@ uint8_t luxor_4105_device::abcbus_inp()
if (m_cs)
{
- if (!m_sasi_bsy)
+ if (!m_sasi->bsy_r())
{
data = m_1e->read();
}
else
{
- if (m_sasi_io)
- {
- data = m_sasi_data_in->read();
-
- if (m_sasi_req)
- {
- m_sasibus->write_ack(1);
- }
- }
+ data = m_sasi->read();
+
+ m_sasi->ack_w(1);
}
}
@@ -342,17 +377,9 @@ void luxor_4105_device::abcbus_out(uint8_t data)
{
if (m_cs)
{
- m_data = data;
+ m_sasi->write(data);
- if (!m_sasi_io)
- {
- m_sasi_data_out->write(m_data);
-
- if (m_sasi_req)
- {
- m_sasibus->write_ack(1);
- }
- }
+ m_sasi->ack_w(1);
}
}
@@ -365,7 +392,7 @@ void luxor_4105_device::abcbus_c1(uint8_t data)
{
if (m_cs)
{
- m_sasibus->write_sel(1);
+ m_sasi->sel_w(1);
}
}
@@ -378,11 +405,12 @@ void luxor_4105_device::abcbus_c3(uint8_t data)
{
if (m_cs)
{
- m_data = 0;
m_dma = 0;
- m_sasibus->write_rst(1);
- m_sasibus->write_rst(0);
+ m_sasi->sel_w(0);
+
+ m_sasi->rst_w(1);
+ m_sasi->rst_w(0);
}
}
diff --git a/src/devices/bus/abcbus/lux4105.h b/src/devices/bus/abcbus/lux4105.h
index 8fb9e084094..e2c05d57dba 100644
--- a/src/devices/bus/abcbus/lux4105.h
+++ b/src/devices/bus/abcbus/lux4105.h
@@ -13,7 +13,9 @@
#include "abcbus.h"
-#include "bus/scsi/scsi.h"
+#include "bus/nscsi/devices.h"
+#include "machine/nscsi_bus.h"
+#include "machine/nscsi_cb.h"
@@ -24,7 +26,7 @@
// ======================> luxor_4105_device
class luxor_4105_device : public device_t,
- public device_abcbus_card_interface
+ public device_abcbus_card_interface
{
public:
// construction/destruction
@@ -53,24 +55,16 @@ private:
inline void update_trrq_int();
DECLARE_WRITE_LINE_MEMBER( write_sasi_bsy );
- DECLARE_WRITE_LINE_MEMBER( write_sasi_req );
DECLARE_WRITE_LINE_MEMBER( write_sasi_cd );
+ DECLARE_WRITE_LINE_MEMBER( write_sasi_req );
DECLARE_WRITE_LINE_MEMBER( write_sasi_io );
- required_device<scsi_port_device> m_sasibus;
- required_device<output_latch_device> m_sasi_data_out;
- required_device<input_buffer_device> m_sasi_data_in;
+ required_device<nscsi_callback_device> m_sasi;
required_ioport m_1e;
required_ioport m_5e;
bool m_cs;
- uint8_t m_data;
uint8_t m_dma;
-
- int m_sasi_bsy;
- bool m_sasi_req;
- bool m_sasi_cd;
- bool m_sasi_io;
};
diff --git a/src/devices/bus/abckb/abc77.cpp b/src/devices/bus/abckb/abc77.cpp
index c2bdceceaa6..782ab6ecab1 100644
--- a/src/devices/bus/abckb/abc77.cpp
+++ b/src/devices/bus/abckb/abc77.cpp
@@ -501,7 +501,7 @@ void abc77_device::txd_w(int state)
// p1_r -
//-------------------------------------------------
-READ8_MEMBER( abc77_device::p1_r )
+uint8_t abc77_device::p1_r()
{
/*
@@ -536,7 +536,7 @@ READ8_MEMBER( abc77_device::p1_r )
// p2_w -
//-------------------------------------------------
-WRITE8_MEMBER( abc77_device::p2_w )
+void abc77_device::p2_w(uint8_t data)
{
/*
diff --git a/src/devices/bus/abckb/abc77.h b/src/devices/bus/abckb/abc77.h
index b217a0fca47..4726e86f2f5 100644
--- a/src/devices/bus/abckb/abc77.h
+++ b/src/devices/bus/abckb/abc77.h
@@ -79,8 +79,8 @@ private:
emu_timer *m_serial_timer;
emu_timer *m_reset_timer;
- DECLARE_READ8_MEMBER( p1_r );
- DECLARE_WRITE8_MEMBER( p2_w );
+ uint8_t p1_r();
+ void p2_w(uint8_t data);
DECLARE_READ_LINE_MEMBER( t1_r );
DECLARE_WRITE_LINE_MEMBER( prog_w );
DECLARE_WRITE8_MEMBER( j3_w );
diff --git a/src/devices/bus/abckb/abc800kb.cpp b/src/devices/bus/abckb/abc800kb.cpp
index fa20b40d317..c69515eafbd 100644
--- a/src/devices/bus/abckb/abc800kb.cpp
+++ b/src/devices/bus/abckb/abc800kb.cpp
@@ -382,7 +382,7 @@ void abc800_keyboard_device::txd_w(int state)
// kb_p1_r - keyboard column data read
//-------------------------------------------------
-READ8_MEMBER( abc800_keyboard_device::kb_p1_r )
+uint8_t abc800_keyboard_device::kb_p1_r()
{
uint8_t data = 0xff;
@@ -402,7 +402,7 @@ READ8_MEMBER( abc800_keyboard_device::kb_p1_r )
// kb_p1_w - keyboard row write
//-------------------------------------------------
-WRITE8_MEMBER( abc800_keyboard_device::kb_p1_w )
+void abc800_keyboard_device::kb_p1_w(uint8_t data)
{
/*
@@ -431,7 +431,7 @@ WRITE8_MEMBER( abc800_keyboard_device::kb_p1_w )
// kb_p2_w - keyboard control write
//-------------------------------------------------
-WRITE8_MEMBER( abc800_keyboard_device::kb_p2_w )
+void abc800_keyboard_device::kb_p2_w(uint8_t data)
{
/*
diff --git a/src/devices/bus/abckb/abc800kb.h b/src/devices/bus/abckb/abc800kb.h
index 50fde4beac9..f076beeb102 100644
--- a/src/devices/bus/abckb/abc800kb.h
+++ b/src/devices/bus/abckb/abc800kb.h
@@ -50,9 +50,9 @@ private:
inline void serial_clock();
inline void key_down(int state);
- DECLARE_READ8_MEMBER( kb_p1_r );
- DECLARE_WRITE8_MEMBER( kb_p1_w );
- DECLARE_WRITE8_MEMBER( kb_p2_w );
+ 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 );
required_device<i8048_device> m_maincpu;
diff --git a/src/devices/bus/abckb/abc99.cpp b/src/devices/bus/abckb/abc99.cpp
index b784487062a..461bbaa0ffd 100644
--- a/src/devices/bus/abckb/abc99.cpp
+++ b/src/devices/bus/abckb/abc99.cpp
@@ -572,7 +572,7 @@ void abc99_device::txd_w(int state)
// z2_bus_w -
//-------------------------------------------------
-WRITE8_MEMBER( abc99_device::z2_led_w )
+void abc99_device::z2_led_w(uint8_t data)
{
if (m_led_en) return;
@@ -591,7 +591,7 @@ WRITE8_MEMBER( abc99_device::z2_led_w )
// z2_p1_w -
//-------------------------------------------------
-WRITE8_MEMBER( abc99_device::z2_p1_w )
+void abc99_device::z2_p1_w(uint8_t data)
{
/*
@@ -635,7 +635,7 @@ WRITE8_MEMBER( abc99_device::z2_p1_w )
// z2_p2_r -
//-------------------------------------------------
-READ8_MEMBER( abc99_device::z2_p2_r )
+uint8_t abc99_device::z2_p2_r()
{
/*
@@ -682,7 +682,7 @@ READ_LINE_MEMBER( abc99_device::z2_t1_r )
// z5_p1_r -
//-------------------------------------------------
-READ8_MEMBER( abc99_device::z5_p1_r )
+uint8_t abc99_device::z5_p1_r()
{
/*
@@ -715,7 +715,7 @@ READ8_MEMBER( abc99_device::z5_p1_r )
// z5_p2_w -
//-------------------------------------------------
-WRITE8_MEMBER( abc99_device::z5_p2_w )
+void abc99_device::z5_p2_w(uint8_t data)
{
/*
@@ -764,7 +764,7 @@ WRITE8_MEMBER( abc99_device::z5_p2_w )
// z5_t1_r -
//-------------------------------------------------
-READ8_MEMBER( abc99_device::z5_t1_r )
+uint8_t abc99_device::z5_t1_r()
{
return m_t1_z5;
}
diff --git a/src/devices/bus/abckb/abc99.h b/src/devices/bus/abckb/abc99.h
index cae72ac0675..8adb348d6c5 100644
--- a/src/devices/bus/abckb/abc99.h
+++ b/src/devices/bus/abckb/abc99.h
@@ -75,15 +75,15 @@ private:
inline void key_down(int state);
inline void scan_mouse();
- DECLARE_WRITE8_MEMBER( z2_p1_w );
- DECLARE_READ8_MEMBER( z2_p2_r );
+ void z2_p1_w(uint8_t data);
+ uint8_t z2_p2_r();
DECLARE_READ_LINE_MEMBER( z2_t0_r );
DECLARE_READ_LINE_MEMBER( z2_t1_r );
- DECLARE_WRITE8_MEMBER( z2_led_w );
- DECLARE_READ8_MEMBER( z5_p1_r );
- DECLARE_WRITE8_MEMBER( z5_p2_w );
- DECLARE_READ8_MEMBER( z5_t1_r );
+ void z2_led_w(uint8_t data);
+ uint8_t z5_p1_r();
+ void z5_p2_w(uint8_t data);
+ uint8_t z5_t1_r();
void abc99_z2_io(address_map &map);
void abc99_z2_mem(address_map &map);
diff --git a/src/devices/bus/adam/ide.cpp b/src/devices/bus/adam/ide.cpp
index 98078003f4b..114e9eeb2e6 100644
--- a/src/devices/bus/adam/ide.cpp
+++ b/src/devices/bus/adam/ide.cpp
@@ -116,7 +116,7 @@ uint8_t powermate_ide_device::adam_bd_r(offs_t offset, uint8_t data, int bmreq,
case 0x05:
case 0x06:
case 0x07:
- data = m_ata->read_cs0(offset & 0x07, 0xff);
+ data = m_ata->cs0_r(offset & 0x07, 0xff);
break;
case 0x40: // Printer status
@@ -137,7 +137,7 @@ uint8_t powermate_ide_device::adam_bd_r(offs_t offset, uint8_t data, int bmreq,
break;
case 0x58:
- m_ata_data = m_ata->read_cs0(0);
+ m_ata_data = m_ata->cs0_r(0);
data = m_ata_data & 0xff;
break;
@@ -147,7 +147,7 @@ uint8_t powermate_ide_device::adam_bd_r(offs_t offset, uint8_t data, int bmreq,
break;
case 0x5a:
- data = m_ata->read_cs1(6, 0xff);
+ data = m_ata->cs1_r(6, 0xff);
break;
case 0x5b: // Digital Input Register
@@ -176,7 +176,7 @@ void powermate_ide_device::adam_bd_w(offs_t offset, uint8_t data, int bmreq, int
case 0x05:
case 0x06:
case 0x07:
- m_ata->write_cs0(offset & 0x07, data, 0xff);
+ m_ata->cs0_w(offset & 0x07, data, 0xff);
break;
case 0x40:
@@ -188,7 +188,7 @@ void powermate_ide_device::adam_bd_w(offs_t offset, uint8_t data, int bmreq, int
case 0x58:
m_ata_data |= data;
- m_ata->write_cs0(0, m_ata_data);
+ m_ata->cs0_w(0, m_ata_data);
break;
case 0x59:
diff --git a/src/devices/bus/adamnet/ddp.cpp b/src/devices/bus/adamnet/ddp.cpp
index cc4c62ccd5b..6e05689cb29 100644
--- a/src/devices/bus/adamnet/ddp.cpp
+++ b/src/devices/bus/adamnet/ddp.cpp
@@ -140,7 +140,7 @@ void adam_digital_data_pack_device::adamnet_reset_w(int state)
// p1_w -
//-------------------------------------------------
-WRITE8_MEMBER( adam_digital_data_pack_device::p1_w )
+void adam_digital_data_pack_device::p1_w(uint8_t data)
{
/*
@@ -185,7 +185,7 @@ WRITE8_MEMBER( adam_digital_data_pack_device::p1_w )
// p2_r -
//-------------------------------------------------
-READ8_MEMBER( adam_digital_data_pack_device::p2_r )
+uint8_t adam_digital_data_pack_device::p2_r()
{
/*
@@ -217,7 +217,7 @@ READ8_MEMBER( adam_digital_data_pack_device::p2_r )
// p2_w -
//-------------------------------------------------
-WRITE8_MEMBER( adam_digital_data_pack_device::p2_w )
+void adam_digital_data_pack_device::p2_w(uint8_t data)
{
/*
@@ -252,7 +252,7 @@ WRITE8_MEMBER( adam_digital_data_pack_device::p2_w )
// p4_r -
//-------------------------------------------------
-READ8_MEMBER( adam_digital_data_pack_device::p4_r )
+uint8_t adam_digital_data_pack_device::p4_r()
{
/*
diff --git a/src/devices/bus/adamnet/ddp.h b/src/devices/bus/adamnet/ddp.h
index 0232fad9d06..c6fa66f98d3 100644
--- a/src/devices/bus/adamnet/ddp.h
+++ b/src/devices/bus/adamnet/ddp.h
@@ -51,10 +51,10 @@ private:
int m_wr1;
int m_track;
- DECLARE_WRITE8_MEMBER( p1_w );
- DECLARE_READ8_MEMBER( p2_r );
- DECLARE_WRITE8_MEMBER( p2_w );
- DECLARE_READ8_MEMBER( p4_r );
+ void p1_w(uint8_t data);
+ uint8_t p2_r();
+ void p2_w(uint8_t data);
+ uint8_t p4_r();
void adam_ddp_mem(address_map &map);
};
diff --git a/src/devices/bus/adamnet/fdc.cpp b/src/devices/bus/adamnet/fdc.cpp
index cd576e546be..867c7cd8103 100644
--- a/src/devices/bus/adamnet/fdc.cpp
+++ b/src/devices/bus/adamnet/fdc.cpp
@@ -213,7 +213,7 @@ READ8_MEMBER( adam_fdc_device::data_r )
// p1_r -
//-------------------------------------------------
-READ8_MEMBER( adam_fdc_device::p1_r )
+uint8_t adam_fdc_device::p1_r()
{
/*
@@ -250,7 +250,7 @@ READ8_MEMBER( adam_fdc_device::p1_r )
// p1_w -
//-------------------------------------------------
-WRITE8_MEMBER( adam_fdc_device::p1_w )
+void adam_fdc_device::p1_w(uint8_t data)
{
/*
@@ -292,7 +292,7 @@ WRITE8_MEMBER( adam_fdc_device::p1_w )
// p2_r -
//-------------------------------------------------
-READ8_MEMBER( adam_fdc_device::p2_r )
+uint8_t adam_fdc_device::p2_r()
{
/*
@@ -319,7 +319,7 @@ READ8_MEMBER( adam_fdc_device::p2_r )
// p2_w -
//-------------------------------------------------
-WRITE8_MEMBER( adam_fdc_device::p2_w )
+void adam_fdc_device::p2_w(uint8_t data)
{
/*
diff --git a/src/devices/bus/adamnet/fdc.h b/src/devices/bus/adamnet/fdc.h
index 2ed2eb24ccb..d0d1cd1df55 100644
--- a/src/devices/bus/adamnet/fdc.h
+++ b/src/devices/bus/adamnet/fdc.h
@@ -55,10 +55,10 @@ private:
DECLARE_FLOPPY_FORMATS( floppy_formats );
DECLARE_READ8_MEMBER( data_r );
- DECLARE_READ8_MEMBER( p1_r );
- DECLARE_WRITE8_MEMBER( p1_w );
- DECLARE_READ8_MEMBER( p2_r );
- DECLARE_WRITE8_MEMBER( p2_w );
+ uint8_t p1_r();
+ void p1_w(uint8_t data);
+ uint8_t p2_r();
+ void p2_w(uint8_t data);
void adam_fdc_mem(address_map &map);
};
diff --git a/src/devices/bus/adamnet/kb.cpp b/src/devices/bus/adamnet/kb.cpp
index 37ed72669e1..a401dbfb335 100644
--- a/src/devices/bus/adamnet/kb.cpp
+++ b/src/devices/bus/adamnet/kb.cpp
@@ -243,7 +243,7 @@ void adam_keyboard_device::adamnet_reset_w(int state)
// p1_r -
//-------------------------------------------------
-READ8_MEMBER( adam_keyboard_device::p1_r )
+uint8_t adam_keyboard_device::p1_r()
{
/*
@@ -275,7 +275,7 @@ READ8_MEMBER( adam_keyboard_device::p1_r )
// p2_r -
//-------------------------------------------------
-READ8_MEMBER( adam_keyboard_device::p2_r )
+uint8_t adam_keyboard_device::p2_r()
{
/*
@@ -302,7 +302,7 @@ READ8_MEMBER( adam_keyboard_device::p2_r )
// p2_w -
//-------------------------------------------------
-WRITE8_MEMBER( adam_keyboard_device::p2_w )
+void adam_keyboard_device::p2_w(uint8_t data)
{
/*
@@ -324,7 +324,7 @@ WRITE8_MEMBER( adam_keyboard_device::p2_w )
// p3_r -
//-------------------------------------------------
-READ8_MEMBER( adam_keyboard_device::p3_r )
+uint8_t adam_keyboard_device::p3_r()
{
return 0xff;
}
@@ -334,7 +334,7 @@ READ8_MEMBER( adam_keyboard_device::p3_r )
// p3_w -
//-------------------------------------------------
-WRITE8_MEMBER( adam_keyboard_device::p3_w )
+void adam_keyboard_device::p3_w(uint8_t data)
{
/*
@@ -359,7 +359,7 @@ WRITE8_MEMBER( adam_keyboard_device::p3_w )
// p4_r -
//-------------------------------------------------
-READ8_MEMBER( adam_keyboard_device::p4_r )
+uint8_t adam_keyboard_device::p4_r()
{
return 0xff;
}
@@ -369,7 +369,7 @@ READ8_MEMBER( adam_keyboard_device::p4_r )
// p4_w -
//-------------------------------------------------
-WRITE8_MEMBER( adam_keyboard_device::p4_w )
+void adam_keyboard_device::p4_w(uint8_t data)
{
/*
diff --git a/src/devices/bus/adamnet/kb.h b/src/devices/bus/adamnet/kb.h
index 2af2834e7e8..167ff1fc46d 100644
--- a/src/devices/bus/adamnet/kb.h
+++ b/src/devices/bus/adamnet/kb.h
@@ -47,13 +47,13 @@ private:
uint16_t m_key_y;
- DECLARE_READ8_MEMBER( p1_r );
- DECLARE_READ8_MEMBER( p2_r );
- DECLARE_WRITE8_MEMBER( p2_w );
- DECLARE_READ8_MEMBER( p3_r );
- DECLARE_WRITE8_MEMBER( p3_w );
- DECLARE_READ8_MEMBER( p4_r );
- DECLARE_WRITE8_MEMBER( p4_w );
+ uint8_t p1_r();
+ uint8_t p2_r();
+ void p2_w(uint8_t data);
+ uint8_t p3_r();
+ void p3_w(uint8_t data);
+ uint8_t p4_r();
+ void p4_w(uint8_t data);
void adam_kb_mem(address_map &map);
};
diff --git a/src/devices/bus/adamnet/printer.cpp b/src/devices/bus/adamnet/printer.cpp
index dcadb1a5a58..841fa76b138 100644
--- a/src/devices/bus/adamnet/printer.cpp
+++ b/src/devices/bus/adamnet/printer.cpp
@@ -116,7 +116,7 @@ void adam_printer_device::adamnet_reset_w(int state)
// p1_w -
//-------------------------------------------------
-WRITE8_MEMBER( adam_printer_device::p1_w )
+void adam_printer_device::p1_w(uint8_t data)
{
/*
@@ -139,7 +139,7 @@ WRITE8_MEMBER( adam_printer_device::p1_w )
// p2_r -
//-------------------------------------------------
-READ8_MEMBER( adam_printer_device::p2_r )
+uint8_t adam_printer_device::p2_r()
{
/*
@@ -166,7 +166,7 @@ READ8_MEMBER( adam_printer_device::p2_r )
// p2_w -
//-------------------------------------------------
-WRITE8_MEMBER( adam_printer_device::p2_w )
+void adam_printer_device::p2_w(uint8_t data)
{
/*
@@ -188,7 +188,7 @@ WRITE8_MEMBER( adam_printer_device::p2_w )
// p3_r -
//-------------------------------------------------
-READ8_MEMBER( adam_printer_device::p3_r )
+uint8_t adam_printer_device::p3_r()
{
return 0xff;
}
@@ -198,7 +198,7 @@ READ8_MEMBER( adam_printer_device::p3_r )
// p4_r -
//-------------------------------------------------
-READ8_MEMBER( adam_printer_device::p4_r )
+uint8_t adam_printer_device::p4_r()
{
/*
@@ -223,7 +223,7 @@ READ8_MEMBER( adam_printer_device::p4_r )
// p4_w -
//-------------------------------------------------
-WRITE8_MEMBER( adam_printer_device::p4_w )
+void adam_printer_device::p4_w(uint8_t data)
{
/*
diff --git a/src/devices/bus/adamnet/printer.h b/src/devices/bus/adamnet/printer.h
index bbb2617405e..376db4a9a99 100644
--- a/src/devices/bus/adamnet/printer.h
+++ b/src/devices/bus/adamnet/printer.h
@@ -43,12 +43,12 @@ protected:
private:
required_device<m6801_cpu_device> m_maincpu;
- DECLARE_WRITE8_MEMBER( p1_w );
- DECLARE_READ8_MEMBER( p2_r );
- DECLARE_WRITE8_MEMBER( p2_w );
- DECLARE_READ8_MEMBER( p3_r );
- DECLARE_READ8_MEMBER( p4_r );
- DECLARE_WRITE8_MEMBER( p4_w );
+ void p1_w(uint8_t data);
+ uint8_t p2_r();
+ void p2_w(uint8_t data);
+ uint8_t p3_r();
+ uint8_t p4_r();
+ void p4_w(uint8_t data);
void adam_prn_mem(address_map &map);
};
diff --git a/src/devices/bus/adamnet/spi.cpp b/src/devices/bus/adamnet/spi.cpp
index e5aafceafa1..008a99a2bfa 100644
--- a/src/devices/bus/adamnet/spi.cpp
+++ b/src/devices/bus/adamnet/spi.cpp
@@ -114,7 +114,7 @@ void adam_spi_device::adamnet_reset_w(int state)
// p2_r -
//-------------------------------------------------
-READ8_MEMBER( adam_spi_device::p2_r )
+uint8_t adam_spi_device::p2_r()
{
/*
@@ -141,7 +141,7 @@ READ8_MEMBER( adam_spi_device::p2_r )
// p2_w -
//-------------------------------------------------
-WRITE8_MEMBER( adam_spi_device::p2_w )
+void adam_spi_device::p2_w(uint8_t data)
{
/*
diff --git a/src/devices/bus/adamnet/spi.h b/src/devices/bus/adamnet/spi.h
index 89d61f10f01..36e2ba60789 100644
--- a/src/devices/bus/adamnet/spi.h
+++ b/src/devices/bus/adamnet/spi.h
@@ -46,8 +46,8 @@ protected:
private:
required_device<m6801_cpu_device> m_maincpu;
- DECLARE_READ8_MEMBER( p2_r );
- DECLARE_WRITE8_MEMBER( p2_w );
+ uint8_t p2_r();
+ void p2_w(uint8_t data);
void adam_spi_mem(address_map &map);
};
diff --git a/src/devices/bus/amiga/keyboard/a1200.cpp b/src/devices/bus/amiga/keyboard/a1200.cpp
index 8cf0c9ec2af..74d0f98518d 100644
--- a/src/devices/bus/amiga/keyboard/a1200.cpp
+++ b/src/devices/bus/amiga/keyboard/a1200.cpp
@@ -130,7 +130,7 @@ INPUT_CHANGED_MEMBER(a1200_kbd_device::layout_changed)
m_mpu->set_input_line(M68HC05_IRQ_LINE, newval ? CLEAR_LINE : ASSERT_LINE);
}
-READ8_MEMBER(a1200_kbd_device::mpu_portb_r)
+u8 a1200_kbd_device::mpu_portb_r()
{
u8 result(m_host_kdat ? 0xff : 0xfe);
for (unsigned row = 0; m_rows.size() > row; ++row)
@@ -141,12 +141,12 @@ READ8_MEMBER(a1200_kbd_device::mpu_portb_r)
return result;
}
-WRITE8_MEMBER(a1200_kbd_device::mpu_porta_w)
+void a1200_kbd_device::mpu_porta_w(offs_t offset, u8 data, u8 mem_mask)
{
m_row_drive = (m_row_drive & 0xff00) | u16(u8(data | ~mem_mask));
}
-WRITE8_MEMBER(a1200_kbd_device::mpu_portb_w)
+void a1200_kbd_device::mpu_portb_w(offs_t offset, u8 data, u8 mem_mask)
{
u8 const kdat(BIT(data, 0) | BIT(~mem_mask, 0));
m_host->kdat_w(kdat ? 1 : 0);
@@ -161,7 +161,7 @@ WRITE8_MEMBER(a1200_kbd_device::mpu_portb_w)
}
}
-WRITE8_MEMBER(a1200_kbd_device::mpu_portc_w)
+void a1200_kbd_device::mpu_portc_w(offs_t offset, u8 data, u8 mem_mask)
{
m_row_drive = (m_row_drive & 0x80ff) | (u16(u8(data | ~mem_mask) & 0x7f) << 8);
m_led_kbd_caps = BIT(~data, 7);
diff --git a/src/devices/bus/amiga/keyboard/a1200.h b/src/devices/bus/amiga/keyboard/a1200.h
index 42bc7fc933b..edb946699f2 100644
--- a/src/devices/bus/amiga/keyboard/a1200.h
+++ b/src/devices/bus/amiga/keyboard/a1200.h
@@ -33,10 +33,10 @@ public:
protected:
// MPU I/O
- DECLARE_READ8_MEMBER(mpu_portb_r);
- DECLARE_WRITE8_MEMBER(mpu_porta_w);
- DECLARE_WRITE8_MEMBER(mpu_portb_w);
- DECLARE_WRITE8_MEMBER(mpu_portc_w);
+ u8 mpu_portb_r();
+ 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);
virtual tiny_rom_entry const *device_rom_region() const override;
diff --git a/src/devices/bus/amiga/keyboard/a2000.cpp b/src/devices/bus/amiga/keyboard/a2000.cpp
index ed462318c97..656881eefe2 100644
--- a/src/devices/bus/amiga/keyboard/a2000.cpp
+++ b/src/devices/bus/amiga/keyboard/a2000.cpp
@@ -515,7 +515,7 @@ WRITE_LINE_MEMBER(a2000_kbd_g80_device::kdat_w)
}
}
-READ8_MEMBER(a2000_kbd_g80_device::mcu_bus_r)
+u8 a2000_kbd_g80_device::mcu_bus_r(offs_t offset)
{
// when jumpered for external ROM, offset latched by U2 is 0x60 + (row << 1)
uint8_t result(0U);
@@ -528,12 +528,12 @@ READ8_MEMBER(a2000_kbd_g80_device::mcu_bus_r)
return result;
}
-WRITE8_MEMBER(a2000_kbd_g80_device::mcu_p1_w)
+void a2000_kbd_g80_device::mcu_p1_w(u8 data)
{
m_row_drive = (m_row_drive & 0x1f00U) | uint16_t(data);
}
-WRITE8_MEMBER(a2000_kbd_g80_device::mcu_p2_w)
+void a2000_kbd_g80_device::mcu_p2_w(u8 data)
{
m_row_drive = (m_row_drive & 0x00ffU) | (uint16_t(data & 0x1fU) << 8);
diff --git a/src/devices/bus/amiga/keyboard/a2000.h b/src/devices/bus/amiga/keyboard/a2000.h
index 89bb9d77016..bcc7016ed8b 100644
--- a/src/devices/bus/amiga/keyboard/a2000.h
+++ b/src/devices/bus/amiga/keyboard/a2000.h
@@ -33,9 +33,9 @@ protected:
a2000_kbd_g80_device(machine_config const &mconfig, device_type type, char const *tag, device_t *owner, uint32_t clock);
// MCU I/O
- DECLARE_READ8_MEMBER(mcu_bus_r);
- DECLARE_WRITE8_MEMBER(mcu_p1_w);
- DECLARE_WRITE8_MEMBER(mcu_p2_w);
+ u8 mcu_bus_r(offs_t offset);
+ void mcu_p1_w(u8 data);
+ void mcu_p2_w(u8 data);
virtual const tiny_rom_entry *device_rom_region() const override;
virtual void device_add_mconfig(machine_config &config) override;
diff --git a/src/devices/bus/amiga/keyboard/keyboard.cpp b/src/devices/bus/amiga/keyboard/keyboard.cpp
index 4e0bed0650e..141998a15fa 100644
--- a/src/devices/bus/amiga/keyboard/keyboard.cpp
+++ b/src/devices/bus/amiga/keyboard/keyboard.cpp
@@ -1,5 +1,5 @@
-// license: GPL-2.0+
-// copyright-holders: Dirk Best
+// license:BSD-3-Clause
+// copyright-holders:Dirk Best
/***************************************************************************
Amiga Keyboard Interface
diff --git a/src/devices/bus/amiga/keyboard/keyboard.h b/src/devices/bus/amiga/keyboard/keyboard.h
index fef26d40388..ce11d82ba32 100644
--- a/src/devices/bus/amiga/keyboard/keyboard.h
+++ b/src/devices/bus/amiga/keyboard/keyboard.h
@@ -1,5 +1,5 @@
-// license: GPL-2.0+
-// copyright-holders: Dirk Best
+// license:BSD-3-Clause
+// copyright-holders:Dirk Best
/***************************************************************************
Amiga Keyboard Interface
diff --git a/src/devices/bus/amiga/keyboard/matrix.cpp b/src/devices/bus/amiga/keyboard/matrix.cpp
index 6ff33666fcb..fa588052cd7 100644
--- a/src/devices/bus/amiga/keyboard/matrix.cpp
+++ b/src/devices/bus/amiga/keyboard/matrix.cpp
@@ -661,7 +661,6 @@ INPUT_PORTS_START(matrix_dk)
INPUT_PORTS_END
INPUT_PORTS_START(matrix_ch)
- // FIXME: natural keyboard doesn't play nicely with PORT_CONDITION, but it's an issue with natural keyboard itself
PORT_INCLUDE(matrix_common)
PORT_START("CFG")
diff --git a/src/devices/bus/amiga/keyboard/mitsumi.cpp b/src/devices/bus/amiga/keyboard/mitsumi.cpp
index 36837410cc4..038d8bb72d7 100644
--- a/src/devices/bus/amiga/keyboard/mitsumi.cpp
+++ b/src/devices/bus/amiga/keyboard/mitsumi.cpp
@@ -109,7 +109,7 @@ public:
virtual WRITE_LINE_MEMBER(kdat_w) override
{
m_kdat_in = state ? 0x01U : 0x00U;
- m_mcu->pa_w(machine().dummy_space(), 0, m_meta->read());
+ m_mcu->pa_w(m_meta->read());
}
READ_LINE_MEMBER(kdat_r)
diff --git a/src/devices/bus/amiga/zorro/a2065.cpp b/src/devices/bus/amiga/zorro/a2065.cpp
index a3c0437aa17..ec74d08ffad 100644
--- a/src/devices/bus/amiga/zorro/a2065.cpp
+++ b/src/devices/bus/amiga/zorro/a2065.cpp
@@ -142,14 +142,14 @@ WRITE16_MEMBER( a2065_device::host_ram_w )
COMBINE_DATA(&m_ram[offset]);
}
-READ16_MEMBER( a2065_device::lance_ram_r )
+uint16_t a2065_device::lance_ram_r(offs_t offset)
{
offset = (offset >> 1) & 0x3fff;
// logerror("lance read offset %04x\n", offset);
return m_ram[offset];
}
-WRITE16_MEMBER( a2065_device::lance_ram_w )
+void a2065_device::lance_ram_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
offset = (offset >> 1) & 0x3fff;
// logerror("lance write %04x = %04x\n", offset, data);
diff --git a/src/devices/bus/amiga/zorro/a2065.h b/src/devices/bus/amiga/zorro/a2065.h
index c3311eb2a53..ee0a82541fd 100644
--- a/src/devices/bus/amiga/zorro/a2065.h
+++ b/src/devices/bus/amiga/zorro/a2065.h
@@ -35,8 +35,8 @@ public:
DECLARE_READ16_MEMBER( host_ram_r );
DECLARE_WRITE16_MEMBER( host_ram_w );
- DECLARE_READ16_MEMBER( lance_ram_r );
- DECLARE_WRITE16_MEMBER( lance_ram_w );
+ 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 );
protected:
diff --git a/src/devices/bus/amiga/zorro/a2232.cpp b/src/devices/bus/amiga/zorro/a2232.cpp
index 3243a6c7286..5e7e6733a50 100644
--- a/src/devices/bus/amiga/zorro/a2232.cpp
+++ b/src/devices/bus/amiga/zorro/a2232.cpp
@@ -357,17 +357,17 @@ WRITE8_MEMBER( a2232_device::cia_w )
m_cia->write(offset >> 1, data);
}
-READ8_MEMBER( a2232_device::cia_port_a_r )
+uint8_t a2232_device::cia_port_a_r()
{
return m_cia_port_a;
}
-READ8_MEMBER( a2232_device::cia_port_b_r )
+uint8_t a2232_device::cia_port_b_r()
{
return m_cia_port_b;
}
-WRITE8_MEMBER( a2232_device::cia_port_b_w )
+void a2232_device::cia_port_b_w(uint8_t data)
{
// tod clock connected to pb7
m_cia->tod_w(BIT(data, 7));
diff --git a/src/devices/bus/amiga/zorro/a2232.h b/src/devices/bus/amiga/zorro/a2232.h
index 14a452f65d2..9c4a6b05da1 100644
--- a/src/devices/bus/amiga/zorro/a2232.h
+++ b/src/devices/bus/amiga/zorro/a2232.h
@@ -73,9 +73,9 @@ private:
template<int N> DECLARE_WRITE8_MEMBER( acia_w );
// cia
- DECLARE_READ8_MEMBER( cia_port_a_r );
- DECLARE_READ8_MEMBER( cia_port_b_r );
- DECLARE_WRITE8_MEMBER( cia_port_b_w );
+ uint8_t cia_port_a_r();
+ uint8_t cia_port_b_r();
+ void cia_port_b_w(uint8_t data);
DECLARE_READ8_MEMBER( cia_r );
DECLARE_WRITE8_MEMBER( cia_w );
diff --git a/src/devices/bus/amiga/zorro/a590.cpp b/src/devices/bus/amiga/zorro/a590.cpp
index cba4f706fed..5f4944d29ad 100644
--- a/src/devices/bus/amiga/zorro/a590.cpp
+++ b/src/devices/bus/amiga/zorro/a590.cpp
@@ -338,7 +338,7 @@ WRITE_LINE_MEMBER( a2091_device::cfgin_w )
m_dmac->configin_w(state);
}
-READ8_MEMBER( dmac_hdc_device_base::dmac_scsi_r )
+uint8_t dmac_hdc_device_base::dmac_scsi_r(offs_t offset)
{
switch (offset)
{
@@ -349,7 +349,7 @@ READ8_MEMBER( dmac_hdc_device_base::dmac_scsi_r )
return 0xff;
}
-WRITE8_MEMBER( dmac_hdc_device_base::dmac_scsi_w )
+void dmac_hdc_device_base::dmac_scsi_w(offs_t offset, uint8_t data)
{
switch (offset)
{
diff --git a/src/devices/bus/amiga/zorro/a590.h b/src/devices/bus/amiga/zorro/a590.h
index 36b6ecf0a2e..bdf9ad1ec0c 100644
--- a/src/devices/bus/amiga/zorro/a590.h
+++ b/src/devices/bus/amiga/zorro/a590.h
@@ -58,8 +58,8 @@ protected:
std::vector<uint8_t> m_ram;
private:
- DECLARE_READ8_MEMBER( dmac_scsi_r );
- DECLARE_WRITE8_MEMBER( dmac_scsi_w );
+ 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 );
diff --git a/src/devices/bus/amiga/zorro/buddha.cpp b/src/devices/bus/amiga/zorro/buddha.cpp
index 3cc14d9d1d0..57a251eb67c 100644
--- a/src/devices/bus/amiga/zorro/buddha.cpp
+++ b/src/devices/bus/amiga/zorro/buddha.cpp
@@ -248,7 +248,7 @@ WRITE16_MEMBER( buddha_device::ide_interrupt_enable_w )
READ16_MEMBER( buddha_device::ide_0_cs0_r )
{
- uint16_t data = m_ata_0->read_cs0((offset >> 1) & 0x07, (mem_mask << 8) | (mem_mask >> 8));
+ uint16_t data = m_ata_0->cs0_r((offset >> 1) & 0x07, (mem_mask << 8) | (mem_mask >> 8));
data = (data << 8) | (data >> 8);
LOG("ide_0_cs0_r(%04x) %04x [mask = %04x]\n", offset, data, mem_mask);
@@ -263,12 +263,12 @@ WRITE16_MEMBER( buddha_device::ide_0_cs0_w )
mem_mask = (mem_mask << 8) | (mem_mask >> 8);
data = (data << 8) | (data >> 8);
- m_ata_0->write_cs0((offset >> 1) & 0x07, data, mem_mask);
+ m_ata_0->cs0_w((offset >> 1) & 0x07, data, mem_mask);
}
READ16_MEMBER( buddha_device::ide_0_cs1_r )
{
- uint16_t data = m_ata_0->read_cs1((offset >> 1) & 0x07, (mem_mask << 8) | (mem_mask >> 8));
+ uint16_t data = m_ata_0->cs1_r((offset >> 1) & 0x07, (mem_mask << 8) | (mem_mask >> 8));
data = (data << 8) | (data >> 8);
LOG("ide_0_cs1_r(%04x) %04x [mask = %04x]\n", offset, data, mem_mask);
@@ -283,12 +283,12 @@ WRITE16_MEMBER( buddha_device::ide_0_cs1_w )
mem_mask = (mem_mask << 8) | (mem_mask >> 8);
data = (data << 8) | (data >> 8);
- m_ata_0->write_cs1((offset >> 1) & 0x07, data, mem_mask);
+ m_ata_0->cs1_w((offset >> 1) & 0x07, data, mem_mask);
}
READ16_MEMBER( buddha_device::ide_1_cs0_r )
{
- uint16_t data = m_ata_1->read_cs0((offset >> 1) & 0x07, (mem_mask << 8) | (mem_mask >> 8));
+ uint16_t data = m_ata_1->cs0_r((offset >> 1) & 0x07, (mem_mask << 8) | (mem_mask >> 8));
data = (data << 8) | (data >> 8);
LOG("ide_1_cs0_r(%04x) %04x [mask = %04x]\n", offset, data, mem_mask);
@@ -303,12 +303,12 @@ WRITE16_MEMBER( buddha_device::ide_1_cs0_w )
mem_mask = (mem_mask << 8) | (mem_mask >> 8);
data = (data << 8) | (data >> 8);
- m_ata_1->write_cs0((offset >> 1) & 0x07, data, mem_mask);
+ m_ata_1->cs0_w((offset >> 1) & 0x07, data, mem_mask);
}
READ16_MEMBER( buddha_device::ide_1_cs1_r )
{
- uint16_t data = m_ata_1->read_cs1((offset >> 1) & 0x07, (mem_mask << 8) | (mem_mask >> 8));
+ uint16_t data = m_ata_1->cs1_r((offset >> 1) & 0x07, (mem_mask << 8) | (mem_mask >> 8));
data = (data << 8) | (data >> 8);
LOG("ide_1_cs1_r(%04x) %04x [mask = %04x]\n", offset, data, mem_mask);
@@ -323,7 +323,7 @@ WRITE16_MEMBER( buddha_device::ide_1_cs1_w )
mem_mask = (mem_mask << 8) | (mem_mask >> 8);
data = (data << 8) | (data >> 8);
- m_ata_1->write_cs1((offset >> 1) & 0x07, data, mem_mask);
+ m_ata_1->cs1_w((offset >> 1) & 0x07, data, mem_mask);
}
} } } // namespace bus::amiga::zorro
diff --git a/src/devices/bus/apf/rom.cpp b/src/devices/bus/apf/rom.cpp
index 113e5bf5259..509aa30f458 100644
--- a/src/devices/bus/apf/rom.cpp
+++ b/src/devices/bus/apf/rom.cpp
@@ -47,7 +47,7 @@ apf_spacedst_device::apf_spacedst_device(const machine_config &mconfig, const ch
mapper specific handlers
-------------------------------------------------*/
-READ8_MEMBER(apf_rom_device::read_rom)
+uint8_t apf_rom_device::read_rom(offs_t offset)
{
if (offset < m_rom_size)
return m_rom[offset];
@@ -56,7 +56,7 @@ READ8_MEMBER(apf_rom_device::read_rom)
}
-READ8_MEMBER(apf_basic_device::extra_rom)
+uint8_t apf_basic_device::extra_rom(offs_t offset)
{
if (offset < (m_rom_size - 0x2000))
return m_rom[offset + 0x2000];
@@ -65,12 +65,12 @@ READ8_MEMBER(apf_basic_device::extra_rom)
}
-READ8_MEMBER(apf_spacedst_device::read_ram)
+uint8_t apf_spacedst_device::read_ram(offs_t offset)
{
return m_ram[offset];
}
-WRITE8_MEMBER(apf_spacedst_device::write_ram)
+void apf_spacedst_device::write_ram(offs_t offset, uint8_t data)
{
m_ram[offset] = data;
}
diff --git a/src/devices/bus/apf/rom.h b/src/devices/bus/apf/rom.h
index 89d82f51a99..ab129289493 100644
--- a/src/devices/bus/apf/rom.h
+++ b/src/devices/bus/apf/rom.h
@@ -16,7 +16,7 @@ public:
apf_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// reading and writing
- virtual DECLARE_READ8_MEMBER(read_rom) override;
+ virtual uint8_t read_rom(offs_t offset) override;
protected:
apf_rom_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
@@ -35,7 +35,7 @@ public:
apf_basic_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// reading and writing
- virtual DECLARE_READ8_MEMBER(extra_rom) override;
+ virtual uint8_t extra_rom(offs_t offset) override;
};
// ======================> apf_spacedst_device
@@ -47,8 +47,8 @@ public:
apf_spacedst_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// reading and writing
- virtual DECLARE_READ8_MEMBER(read_ram) override;
- virtual DECLARE_WRITE8_MEMBER(write_ram) override;
+ virtual uint8_t read_ram(offs_t offset) override;
+ virtual void write_ram(offs_t offset, uint8_t data) override;
};
diff --git a/src/devices/bus/apf/slot.cpp b/src/devices/bus/apf/slot.cpp
index cf4e3b86c4e..2e62030e54f 100644
--- a/src/devices/bus/apf/slot.cpp
+++ b/src/devices/bus/apf/slot.cpp
@@ -227,10 +227,10 @@ std::string apf_cart_slot_device::get_default_card_software(get_default_card_sof
read
-------------------------------------------------*/
-READ8_MEMBER(apf_cart_slot_device::read_rom)
+uint8_t apf_cart_slot_device::read_rom(offs_t offset)
{
if (m_cart)
- return m_cart->read_rom(space, offset);
+ return m_cart->read_rom(offset);
else
return 0xff;
}
@@ -239,10 +239,10 @@ READ8_MEMBER(apf_cart_slot_device::read_rom)
read
-------------------------------------------------*/
-READ8_MEMBER(apf_cart_slot_device::extra_rom)
+uint8_t apf_cart_slot_device::extra_rom(offs_t offset)
{
if (m_cart)
- return m_cart->extra_rom(space, offset);
+ return m_cart->extra_rom(offset);
else
return 0xff;
}
@@ -251,10 +251,10 @@ READ8_MEMBER(apf_cart_slot_device::extra_rom)
read
-------------------------------------------------*/
-READ8_MEMBER(apf_cart_slot_device::read_ram)
+uint8_t apf_cart_slot_device::read_ram(offs_t offset)
{
if (m_cart)
- return m_cart->read_ram(space, offset);
+ return m_cart->read_ram(offset);
else
return 0xff;
}
@@ -263,8 +263,8 @@ READ8_MEMBER(apf_cart_slot_device::read_ram)
write
-------------------------------------------------*/
-WRITE8_MEMBER(apf_cart_slot_device::write_ram)
+void apf_cart_slot_device::write_ram(offs_t offset, uint8_t data)
{
if (m_cart)
- m_cart->write_ram(space, offset, data);
+ m_cart->write_ram(offset, data);
}
diff --git a/src/devices/bus/apf/slot.h b/src/devices/bus/apf/slot.h
index a0996d1ec4c..9ce2b84aec0 100644
--- a/src/devices/bus/apf/slot.h
+++ b/src/devices/bus/apf/slot.h
@@ -29,10 +29,10 @@ public:
virtual ~device_apf_cart_interface();
// reading and writing
- virtual DECLARE_READ8_MEMBER(read_rom) { return 0xff; }
- virtual DECLARE_READ8_MEMBER(extra_rom) { return 0xff; }
- virtual DECLARE_READ8_MEMBER(read_ram) { return 0xff; }
- virtual DECLARE_WRITE8_MEMBER(write_ram) {}
+ virtual uint8_t read_rom(offs_t offset) { return 0xff; }
+ virtual uint8_t extra_rom(offs_t offset) { return 0xff; }
+ virtual uint8_t read_ram(offs_t offset) { return 0xff; }
+ virtual void write_ram(offs_t offset, uint8_t data) {}
void rom_alloc(uint32_t size, const char *tag);
void ram_alloc(uint32_t size);
@@ -93,10 +93,10 @@ public:
void save_ram() { if (m_cart && m_cart->get_ram_size()) m_cart->save_ram(); }
// reading and writing
- virtual DECLARE_READ8_MEMBER(read_rom);
- virtual DECLARE_READ8_MEMBER(extra_rom);
- virtual DECLARE_READ8_MEMBER(read_ram);
- virtual DECLARE_WRITE8_MEMBER(write_ram);
+ uint8_t read_rom(offs_t offset);
+ uint8_t extra_rom(offs_t offset);
+ uint8_t read_ram(offs_t offset);
+ void write_ram(offs_t offset, uint8_t data);
protected:
// device-level overrides
diff --git a/src/devices/bus/arcadia/rom.cpp b/src/devices/bus/arcadia/rom.cpp
index 2221fed2f2c..60bc4b3a88e 100644
--- a/src/devices/bus/arcadia/rom.cpp
+++ b/src/devices/bus/arcadia/rom.cpp
@@ -42,7 +42,7 @@ arcadia_golf_device::arcadia_golf_device(const machine_config &mconfig, const ch
mapper specific handlers
-------------------------------------------------*/
-READ8_MEMBER(arcadia_rom_device::read_rom)
+uint8_t arcadia_rom_device::read_rom(offs_t offset)
{
if (offset < m_rom_size)
return m_rom[offset];
@@ -51,7 +51,7 @@ READ8_MEMBER(arcadia_rom_device::read_rom)
}
-READ8_MEMBER(arcadia_rom_device::extra_rom)
+uint8_t arcadia_rom_device::extra_rom(offs_t offset)
{
if (offset + 0x1000 < m_rom_size)
return m_rom[offset + 0x1000];
diff --git a/src/devices/bus/arcadia/rom.h b/src/devices/bus/arcadia/rom.h
index 31e71d833b5..b0ba196302e 100644
--- a/src/devices/bus/arcadia/rom.h
+++ b/src/devices/bus/arcadia/rom.h
@@ -18,8 +18,8 @@ public:
arcadia_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// reading and writing
- virtual DECLARE_READ8_MEMBER(read_rom) override;
- virtual DECLARE_READ8_MEMBER(extra_rom) override;
+ virtual uint8_t read_rom(offs_t offset) override;
+ virtual uint8_t extra_rom(offs_t offset) override;
public:
arcadia_rom_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
diff --git a/src/devices/bus/arcadia/slot.cpp b/src/devices/bus/arcadia/slot.cpp
index 19d2b1459f8..7d4e7547d9a 100644
--- a/src/devices/bus/arcadia/slot.cpp
+++ b/src/devices/bus/arcadia/slot.cpp
@@ -215,10 +215,10 @@ std::string arcadia_cart_slot_device::get_default_card_software(get_default_card
read
-------------------------------------------------*/
-READ8_MEMBER(arcadia_cart_slot_device::read_rom)
+uint8_t arcadia_cart_slot_device::read_rom(offs_t offset)
{
if (m_cart)
- return m_cart->read_rom(space, offset);
+ return m_cart->read_rom(offset);
else
return 0xff;
}
@@ -227,10 +227,10 @@ READ8_MEMBER(arcadia_cart_slot_device::read_rom)
write
-------------------------------------------------*/
-READ8_MEMBER(arcadia_cart_slot_device::extra_rom)
+uint8_t arcadia_cart_slot_device::extra_rom(offs_t offset)
{
if (m_cart)
- return m_cart->extra_rom(space, offset);
+ return m_cart->extra_rom(offset);
else
return 0xff;
}
diff --git a/src/devices/bus/arcadia/slot.h b/src/devices/bus/arcadia/slot.h
index eb04c946815..ae86bc13847 100644
--- a/src/devices/bus/arcadia/slot.h
+++ b/src/devices/bus/arcadia/slot.h
@@ -28,8 +28,8 @@ public:
virtual ~device_arcadia_cart_interface();
// reading and writing
- virtual DECLARE_READ8_MEMBER(read_rom) { return 0xff; }
- virtual DECLARE_READ8_MEMBER(extra_rom) { return 0xff; }
+ virtual uint8_t read_rom(offs_t offset) { return 0xff; }
+ virtual uint8_t extra_rom(offs_t offset) { return 0xff; }
void rom_alloc(uint32_t size, const char *tag);
uint8_t* get_rom_base() { return m_rom; }
@@ -81,8 +81,8 @@ public:
int get_type() { return m_type; }
// reading and writing
- virtual DECLARE_READ8_MEMBER(read_rom);
- virtual DECLARE_READ8_MEMBER(extra_rom);
+ uint8_t read_rom(offs_t offset);
+ uint8_t extra_rom(offs_t offset);
protected:
// device-level overrides
diff --git a/src/devices/bus/astrocde/exp.cpp b/src/devices/bus/astrocde/exp.cpp
index c0e20a57f88..a33259380f1 100644
--- a/src/devices/bus/astrocde/exp.cpp
+++ b/src/devices/bus/astrocde/exp.cpp
@@ -66,18 +66,18 @@ void astrocade_exp_device::device_start()
read
-------------------------------------------------*/
-READ8_MEMBER(astrocade_exp_device::read)
+uint8_t astrocade_exp_device::read(offs_t offset)
{
if (m_card)
- return m_card->read(space, offset);
+ return m_card->read(offset);
else
return 0xff;
}
-READ8_MEMBER(astrocade_exp_device::read_io)
+uint8_t astrocade_exp_device::read_io(offs_t offset)
{
if (m_card)
- return m_card->read_io(space, offset);
+ return m_card->read_io(offset);
else
return 0xff;
}
@@ -86,14 +86,14 @@ READ8_MEMBER(astrocade_exp_device::read_io)
write
-------------------------------------------------*/
-WRITE8_MEMBER(astrocade_exp_device::write)
+void astrocade_exp_device::write(offs_t offset, uint8_t data)
{
if (m_card)
- m_card->write(space, offset, data);
+ m_card->write(offset, data);
}
-WRITE8_MEMBER(astrocade_exp_device::write_io)
+void astrocade_exp_device::write_io(offs_t offset, uint8_t data)
{
if (m_card)
- m_card->write_io(space, offset, data);
+ m_card->write_io(offset, data);
}
diff --git a/src/devices/bus/astrocde/exp.h b/src/devices/bus/astrocde/exp.h
index b26bb51d03e..e2ed2279135 100644
--- a/src/devices/bus/astrocde/exp.h
+++ b/src/devices/bus/astrocde/exp.h
@@ -12,10 +12,10 @@ public:
virtual ~device_astrocade_exp_interface();
// reading and writing
- virtual DECLARE_READ8_MEMBER(read) { return 0xff; }
- virtual DECLARE_WRITE8_MEMBER(write) { }
- virtual DECLARE_READ8_MEMBER(read_io) { return 0xff; }
- virtual DECLARE_WRITE8_MEMBER(write_io) { }
+ virtual uint8_t read(offs_t offset) { return 0xff; }
+ virtual void write(offs_t offset, uint8_t data) { }
+ virtual uint8_t read_io(offs_t offset) { return 0xff; }
+ virtual void write_io(offs_t offset, uint8_t data) { }
protected:
device_astrocade_exp_interface(const machine_config &mconfig, device_t &device);
@@ -46,10 +46,10 @@ public:
bool get_card_mounted() { return m_card_mounted; }
// reading and writing
- virtual DECLARE_READ8_MEMBER(read);
- virtual DECLARE_WRITE8_MEMBER(write);
- virtual DECLARE_READ8_MEMBER(read_io);
- virtual DECLARE_WRITE8_MEMBER(write_io);
+ uint8_t read(offs_t offset);
+ void write(offs_t offset, uint8_t data);
+ uint8_t read_io(offs_t offset);
+ void write_io(offs_t offset, uint8_t data);
protected:
bool m_card_mounted;
diff --git a/src/devices/bus/astrocde/ram.cpp b/src/devices/bus/astrocde/ram.cpp
index 54664617be6..39eb299d8f6 100644
--- a/src/devices/bus/astrocde/ram.cpp
+++ b/src/devices/bus/astrocde/ram.cpp
@@ -151,7 +151,7 @@ ioport_constructor astrocade_rl64ram_device::device_input_ports() const
-------------------------------------------------*/
// Blue RAM expansions have RAM starting at 0x6000, up to the RAM size
-READ8_MEMBER(astrocade_blueram_4k_device::read)
+uint8_t astrocade_blueram_4k_device::read(offs_t offset)
{
if (offset >= 0x1000 && offset < 0x1000 + m_ram.size())
return m_ram[offset - 0x1000];
@@ -159,18 +159,18 @@ READ8_MEMBER(astrocade_blueram_4k_device::read)
return 0;
}
-WRITE8_MEMBER(astrocade_blueram_4k_device::write)
+void astrocade_blueram_4k_device::write(offs_t offset, uint8_t data)
{
if (offset >= 0x1000 && offset < 0x1000 + m_ram.size() && !m_write_prot->read())
m_ram[offset - 0x1000] = data;
}
-READ8_MEMBER(astrocade_blueram_4k_device::read_io)
+uint8_t astrocade_blueram_4k_device::read_io(offs_t offset)
{
return m_ramio->read_io(offset & 0x7f);
}
-WRITE8_MEMBER(astrocade_blueram_4k_device::write_io)
+void astrocade_blueram_4k_device::write_io(offs_t offset, uint8_t data)
{
logerror("write_io: %04x = %02x\n", offset, data);
m_ramio->write_io(offset & 0x7f, data);
@@ -196,7 +196,7 @@ void astrocade_blueram_4k_device::portb_w(uint8_t data)
}
// Viper System 1 expansion has RAM in 0x6000-0x9fff
-READ8_MEMBER(astrocade_viper_sys1_device::read)
+uint8_t astrocade_viper_sys1_device::read(offs_t offset)
{
if (offset >= 0x1000 && offset < 0xa000)
return m_ram[offset - 0x1000];
@@ -204,7 +204,7 @@ READ8_MEMBER(astrocade_viper_sys1_device::read)
return 0;
}
-WRITE8_MEMBER(astrocade_viper_sys1_device::write)
+void astrocade_viper_sys1_device::write(offs_t offset, uint8_t data)
{
if (offset >= 0x1000 && offset < 0xa000 && !m_write_prot->read())
m_ram[offset - 0x1000] = data;
@@ -213,12 +213,12 @@ WRITE8_MEMBER(astrocade_viper_sys1_device::write)
// Lil' WHITE RAM expansion has RAM in 0x5000-0xcfff + a mirror of the first 0x3000 bytes up to 0xffff
-READ8_MEMBER(astrocade_whiteram_device::read)
+uint8_t astrocade_whiteram_device::read(offs_t offset)
{
return m_ram[offset % 0x8000];
}
-WRITE8_MEMBER(astrocade_whiteram_device::write)
+void astrocade_whiteram_device::write(offs_t offset, uint8_t data)
{
if (!m_write_prot->read())
m_ram[offset % 0x8000] = data;
@@ -227,12 +227,12 @@ WRITE8_MEMBER(astrocade_whiteram_device::write)
// R&L 64K RAM Board (44KB installed) has RAM in 0x5000-0xffff
-READ8_MEMBER(astrocade_rl64ram_device::read)
+uint8_t astrocade_rl64ram_device::read(offs_t offset)
{
return m_ram[offset];
}
-WRITE8_MEMBER(astrocade_rl64ram_device::write)
+void astrocade_rl64ram_device::write(offs_t offset, uint8_t data)
{
if (!m_write_prot->read())
m_ram[offset] = data;
diff --git a/src/devices/bus/astrocde/ram.h b/src/devices/bus/astrocde/ram.h
index 5c15029fb26..22e6e3bd590 100644
--- a/src/devices/bus/astrocde/ram.h
+++ b/src/devices/bus/astrocde/ram.h
@@ -22,10 +22,10 @@ public:
virtual ioport_constructor device_input_ports() const override;
// reading and writing
- virtual DECLARE_READ8_MEMBER(read) override;
- virtual DECLARE_WRITE8_MEMBER(write) override;
- virtual DECLARE_READ8_MEMBER(read_io) override;
- virtual DECLARE_WRITE8_MEMBER(write_io) override;
+ virtual uint8_t read(offs_t offset) override;
+ virtual void write(offs_t offset, uint8_t data) override;
+ virtual uint8_t read_io(offs_t offset) override;
+ virtual void write_io(offs_t offset, uint8_t data) override;
uint8_t porta_r();
uint8_t portb_r();
@@ -79,8 +79,8 @@ public:
virtual ioport_constructor device_input_ports() const override;
// reading and writing
- virtual DECLARE_READ8_MEMBER(read) override;
- virtual DECLARE_WRITE8_MEMBER(write) override;
+ virtual uint8_t read(offs_t offset) override;
+ virtual void write(offs_t offset, uint8_t data) override;
protected:
virtual void device_start() override { m_ram.resize(0x4000); save_item(NAME(m_ram)); }
@@ -103,8 +103,8 @@ public:
virtual ioport_constructor device_input_ports() const override;
// reading and writing
- virtual DECLARE_READ8_MEMBER(read) override;
- virtual DECLARE_WRITE8_MEMBER(write) override;
+ virtual uint8_t read(offs_t offset) override;
+ virtual void write(offs_t offset, uint8_t data) override;
protected:
virtual void device_start() override { m_ram.resize(0x8000); save_item(NAME(m_ram)); }
@@ -127,8 +127,8 @@ public:
virtual ioport_constructor device_input_ports() const override;
// reading and writing
- virtual DECLARE_READ8_MEMBER(read) override;
- virtual DECLARE_WRITE8_MEMBER(write) override;
+ virtual uint8_t read(offs_t offset) override;
+ virtual void write(offs_t offset, uint8_t data) override;
protected:
virtual void device_start() override { m_ram.resize(0xb000); save_item(NAME(m_ram)); }
diff --git a/src/devices/bus/astrocde/rom.cpp b/src/devices/bus/astrocde/rom.cpp
index bb5d6912fc2..e574c63ecd7 100644
--- a/src/devices/bus/astrocde/rom.cpp
+++ b/src/devices/bus/astrocde/rom.cpp
@@ -75,7 +75,7 @@ void astrocade_rom_512k_device::device_reset()
mapper specific handlers
-------------------------------------------------*/
-READ8_MEMBER(astrocade_rom_device::read_rom)
+uint8_t astrocade_rom_device::read_rom(offs_t offset)
{
if (offset < m_rom_size)
return m_rom[offset];
@@ -83,7 +83,7 @@ READ8_MEMBER(astrocade_rom_device::read_rom)
return 0xff;
}
-READ8_MEMBER(astrocade_rom_256k_device::read_rom)
+uint8_t astrocade_rom_256k_device::read_rom(offs_t offset)
{
if (offset < 0x1000) // 0x2000-0x2fff
return m_rom[offset + 0x1000 * 0x3f];
@@ -93,7 +93,7 @@ READ8_MEMBER(astrocade_rom_256k_device::read_rom)
return m_base_bank = offset & 0x3f;
}
-READ8_MEMBER(astrocade_rom_512k_device::read_rom)
+uint8_t astrocade_rom_512k_device::read_rom(offs_t offset)
{
if (offset < 0x1000) // 0x2000-0x2fff
return m_rom[offset + 0x1000 * 0x7f];
@@ -103,7 +103,7 @@ READ8_MEMBER(astrocade_rom_512k_device::read_rom)
return m_base_bank = offset & 0x7f;
}
-READ8_MEMBER(astrocade_rom_cass_device::read_rom)
+uint8_t astrocade_rom_cass_device::read_rom(offs_t offset)
{
if (offset < m_rom_size)
return m_rom[offset];
diff --git a/src/devices/bus/astrocde/rom.h b/src/devices/bus/astrocde/rom.h
index efd17b16ded..8a8db1634de 100644
--- a/src/devices/bus/astrocde/rom.h
+++ b/src/devices/bus/astrocde/rom.h
@@ -19,7 +19,7 @@ public:
astrocade_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// reading and writing
- virtual DECLARE_READ8_MEMBER(read_rom) override;
+ virtual uint8_t read_rom(offs_t offset) override;
protected:
astrocade_rom_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
@@ -38,7 +38,7 @@ public:
astrocade_rom_256k_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// reading and writing
- virtual DECLARE_READ8_MEMBER(read_rom) override;
+ virtual uint8_t read_rom(offs_t offset) override;
private:
virtual void device_start() override;
@@ -56,7 +56,7 @@ public:
astrocade_rom_512k_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// reading and writing
- virtual DECLARE_READ8_MEMBER(read_rom) override;
+ virtual uint8_t read_rom(offs_t offset) override;
private:
virtual void device_start() override;
@@ -74,7 +74,7 @@ public:
astrocade_rom_cass_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// reading and writing
- virtual DECLARE_READ8_MEMBER(read_rom) override;
+ virtual uint8_t read_rom(offs_t offset) override;
private:
virtual void device_start() override { }
diff --git a/src/devices/bus/astrocde/slot.cpp b/src/devices/bus/astrocde/slot.cpp
index 15135e08af1..7e7dc8cf059 100644
--- a/src/devices/bus/astrocde/slot.cpp
+++ b/src/devices/bus/astrocde/slot.cpp
@@ -203,10 +203,10 @@ std::string astrocade_cart_slot_device::get_default_card_software(get_default_ca
read
-------------------------------------------------*/
-READ8_MEMBER(astrocade_cart_slot_device::read_rom)
+uint8_t astrocade_cart_slot_device::read_rom(offs_t offset)
{
if (m_cart)
- return m_cart->read_rom(space, offset);
+ return m_cart->read_rom(offset);
else
return 0xff;
}
diff --git a/src/devices/bus/astrocde/slot.h b/src/devices/bus/astrocde/slot.h
index f068d994798..d16f37e0fb1 100644
--- a/src/devices/bus/astrocde/slot.h
+++ b/src/devices/bus/astrocde/slot.h
@@ -33,7 +33,7 @@ public:
virtual ~device_astrocade_cart_interface();
// reading and writing
- virtual DECLARE_READ8_MEMBER(read_rom) { return 0xff; }
+ virtual uint8_t read_rom(offs_t offset) { return 0xff; }
void rom_alloc(uint32_t size, const char *tag);
uint8_t* get_rom_base() { return m_rom; }
@@ -88,7 +88,7 @@ public:
int get_type() { return m_type; }
// reading and writing
- virtual DECLARE_READ8_MEMBER(read_rom);
+ uint8_t read_rom(offs_t offset);
protected:
// device-level overrides
diff --git a/src/devices/bus/ata/ataintf.h b/src/devices/bus/ata/ataintf.h
index ce2e501886a..423a8165d35 100644
--- a/src/devices/bus/ata/ataintf.h
+++ b/src/devices/bus/ata/ataintf.h
@@ -133,15 +133,10 @@ public:
return *this;
}
- uint16_t read_cs0(offs_t offset, uint16_t mem_mask = 0xffff) { return internal_read_cs0(offset, mem_mask); }
- uint16_t read_cs1(offs_t offset, uint16_t mem_mask = 0xffff) { return internal_read_cs1(offset, mem_mask); }
- void write_cs0(offs_t offset, uint16_t data, uint16_t mem_mask = 0xffff) { internal_write_cs0(offset, data, mem_mask); }
- void write_cs1(offs_t offset, uint16_t data, uint16_t mem_mask = 0xffff) { internal_write_cs1(offset, data, mem_mask); }
-
- DECLARE_READ16_MEMBER(cs0_r) { return read_cs0(offset, mem_mask); }
- DECLARE_READ16_MEMBER(cs1_r) { return read_cs1(offset, mem_mask); }
- DECLARE_WRITE16_MEMBER(cs0_w) { write_cs0(offset, data, mem_mask); }
- DECLARE_WRITE16_MEMBER(cs1_w) { write_cs1(offset, data, mem_mask); }
+ uint16_t cs0_r(offs_t offset, uint16_t mem_mask = 0xffff) { return internal_read_cs0(offset, mem_mask); }
+ uint16_t cs1_r(offs_t offset, uint16_t mem_mask = 0xffff) { return internal_read_cs1(offset, mem_mask); }
+ void cs0_w(offs_t offset, uint16_t data, uint16_t mem_mask = 0xffff) { internal_write_cs0(offset, data, mem_mask); }
+ void cs1_w(offs_t offset, uint16_t data, uint16_t mem_mask = 0xffff) { internal_write_cs1(offset, data, mem_mask); }
};
DECLARE_DEVICE_TYPE(ATA_INTERFACE, ata_interface_device)
diff --git a/src/devices/bus/bbc/1mhzbus/datacentre.cpp b/src/devices/bus/bbc/1mhzbus/datacentre.cpp
index 8cac8ab9a55..05ba11a3bab 100644
--- a/src/devices/bus/bbc/1mhzbus/datacentre.cpp
+++ b/src/devices/bus/bbc/1mhzbus/datacentre.cpp
@@ -82,8 +82,7 @@ void bbc_datacentre_device::device_add_mconfig(machine_config &config)
ATA_INTERFACE(config, m_ide).options(ata_devices, "hdd", "hdd", false);
m_ide->irq_handler().set(FUNC(bbc_datacentre_device::irq_w));
- /* 24LC512 - 512Kb I2C Serial EEPROM */
- I2CMEM(config, m_nvram).set_page_size(128).set_data_size(0x10000);
+ I2C_24C512(config, m_nvram); // 24LC512
/* import floppy images - delayed to allow RAMFS to initialise before import */
QUICKLOAD(config, "import0", "ssd,dsd,img", attotime::from_seconds(1)).set_load_callback(FUNC(bbc_datacentre_device::quickload_cb<0>));
@@ -150,18 +149,18 @@ uint8_t bbc_datacentre_device::fred_r(offs_t offset)
case 0x40:
if (offset & 0x07)
{
- data = m_ide->read_cs0(offset & 0x07, 0xff);
+ data = m_ide->cs0_r(offset & 0x07, 0xff);
}
else
{
- m_ide_data = m_ide->read_cs0(offset & 0x07);
+ m_ide_data = m_ide->cs0_r(offset & 0x07);
data = m_ide_data & 0xff;
}
break;
case 0x48:
if (offset & 0x04)
{
- data = m_ide->read_cs1(offset & 0x07, 0xff);
+ data = m_ide->cs1_r(offset & 0x07, 0xff);
}
else
{
@@ -207,18 +206,18 @@ void bbc_datacentre_device::fred_w(offs_t offset, uint8_t data)
case 0x40:
if (offset & 0x07)
{
- m_ide->write_cs0(offset & 0x07, data, 0xff);
+ m_ide->cs0_w(offset & 0x07, data, 0xff);
}
else
{
m_ide_data = (m_ide_data & 0xff00) | data;
- m_ide->write_cs0(offset & 0x07, m_ide_data);
+ m_ide->cs0_w(offset & 0x07, m_ide_data);
}
break;
case 0x48:
if (offset & 0x04)
{
- m_ide->write_cs1(offset & 0x07, data, 0xff);
+ m_ide->cs1_w(offset & 0x07, data, 0xff);
}
else
{
diff --git a/src/devices/bus/bbc/1mhzbus/ide.cpp b/src/devices/bus/bbc/1mhzbus/ide.cpp
index 0fa7d3ad069..d5fdafb000d 100644
--- a/src/devices/bus/bbc/1mhzbus/ide.cpp
+++ b/src/devices/bus/bbc/1mhzbus/ide.cpp
@@ -117,7 +117,7 @@ uint8_t bbc_ide8_device::fred_r(offs_t offset)
switch (offset & 0xf8)
{
case 0x40:
- data = m_ide->read_cs0(offset & 0x07, 0xff);
+ data = m_ide->cs0_r(offset & 0x07, 0xff);
break;
}
@@ -129,7 +129,7 @@ void bbc_ide8_device::fred_w(offs_t offset, uint8_t data)
switch (offset & 0xf8)
{
case 0x40:
- m_ide->write_cs0(offset & 0x07, data, 0xff);
+ m_ide->cs0_w(offset & 0x07, data, 0xff);
break;
}
}
@@ -146,18 +146,18 @@ uint8_t bbc_beebide_device::fred_r(offs_t offset)
case 0x40:
if (offset & 0x07)
{
- data = m_ide->read_cs0(offset & 0x07, 0xff);
+ data = m_ide->cs0_r(offset & 0x07, 0xff);
}
else
{
- m_ide_data = m_ide->read_cs0(offset & 0x07);
+ m_ide_data = m_ide->cs0_r(offset & 0x07);
data = m_ide_data & 0xff;
}
break;
case 0x48:
if (offset & 0x04)
{
- data = m_ide->read_cs1(offset & 0x07, 0xff);
+ data = m_ide->cs1_r(offset & 0x07, 0xff);
}
else
{
@@ -181,18 +181,18 @@ void bbc_beebide_device::fred_w(offs_t offset, uint8_t data)
case 0x40:
if (offset & 0x07)
{
- m_ide->write_cs0(offset & 0x07, data, 0xff);
+ m_ide->cs0_w(offset & 0x07, data, 0xff);
}
else
{
m_ide_data = (m_ide_data & 0xff00) | data;
- m_ide->write_cs0(offset & 0x07, m_ide_data);
+ m_ide->cs0_w(offset & 0x07, m_ide_data);
}
break;
case 0x48:
if (offset & 0x04)
{
- m_ide->write_cs1(offset & 0x07, data, 0xff);
+ m_ide->cs1_w(offset & 0x07, data, 0xff);
}
else
{
diff --git a/src/devices/bus/bbc/internal/cumana68k.cpp b/src/devices/bus/bbc/internal/cumana68k.cpp
index 9e51485ec13..b81c44c6e5c 100644
--- a/src/devices/bus/bbc/internal/cumana68k.cpp
+++ b/src/devices/bus/bbc/internal/cumana68k.cpp
@@ -306,7 +306,7 @@ void bbc_cumana68k_device::mc146818_set(int as, int ds, int rw)
}
-WRITE8_MEMBER(bbc_cumana68k_device::pia_rtc_pb_w)
+void bbc_cumana68k_device::pia_rtc_pb_w(uint8_t data)
{
/* bit 0, 1: drive select */
floppy_image_device *floppy = m_floppy[data & 0x03]->get_device();
@@ -328,7 +328,7 @@ WRITE8_MEMBER(bbc_cumana68k_device::pia_rtc_pb_w)
}
-WRITE8_MEMBER(bbc_cumana68k_device::pia_sasi_pb_w)
+void bbc_cumana68k_device::pia_sasi_pb_w(uint8_t data)
{
/* bit 0: masknmi */
m_masknmi = BIT(data, 0);
diff --git a/src/devices/bus/bbc/internal/cumana68k.h b/src/devices/bus/bbc/internal/cumana68k.h
index e07c79617d0..273ff2edb9c 100644
--- a/src/devices/bus/bbc/internal/cumana68k.h
+++ b/src/devices/bus/bbc/internal/cumana68k.h
@@ -34,8 +34,8 @@ public:
// construction/destruction
bbc_cumana68k_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- DECLARE_WRITE8_MEMBER(pia_rtc_pb_w);
- DECLARE_WRITE8_MEMBER(pia_sasi_pb_w);
+ void pia_rtc_pb_w(uint8_t data);
+ void pia_sasi_pb_w(uint8_t data);
DECLARE_READ8_MEMBER(mem6502_r);
DECLARE_WRITE8_MEMBER(mem6502_w);
diff --git a/src/devices/bus/bbc/userport/palette.cpp b/src/devices/bus/bbc/userport/palette.cpp
index 571596e468a..78ffda84607 100644
--- a/src/devices/bus/bbc/userport/palette.cpp
+++ b/src/devices/bus/bbc/userport/palette.cpp
@@ -95,13 +95,13 @@ void bbc_chameleon_device::pb_w(uint8_t data)
switch (data >> 6)
{
case 0x00:
- m_palette_ram[m_colour].set_r((data << 4) | (data & 0x0f));
+ m_palette_ram[m_colour].set_r(pal4bit(data));
break;
case 0x01:
- m_palette_ram[m_colour].set_g((data << 4) | (data & 0x0f));
+ m_palette_ram[m_colour].set_g(pal4bit(data));
break;
case 0x02:
- m_palette_ram[m_colour].set_b((data << 4) | (data & 0x0f));
+ m_palette_ram[m_colour].set_b(pal4bit(data));
break;
case 0x03:
m_colour = data & 0x0f;
@@ -120,13 +120,13 @@ void bbc_cpalette_device::pb_w(uint8_t data)
m_colour = ~(data >> 4) & 0x07;
break;
case 0x01:
- m_palette_ram[m_colour].set_r((data & 0xf0) | (data >> 4));
+ m_palette_ram[m_colour].set_r(pal4bit(data));
break;
case 0x02:
- m_palette_ram[m_colour].set_g((data & 0xf0) | (data >> 4));
+ m_palette_ram[m_colour].set_g(pal4bit(data));
break;
case 0x03:
- m_palette_ram[m_colour].set_b((data & 0xf0) | (data >> 4));
+ m_palette_ram[m_colour].set_b(pal4bit(data));
break;
}
}
diff --git a/src/devices/bus/bml3/bml3kanji.cpp b/src/devices/bus/bml3/bml3kanji.cpp
index 585cbd93069..22bfe8d58a9 100644
--- a/src/devices/bus/bml3/bml3kanji.cpp
+++ b/src/devices/bus/bml3/bml3kanji.cpp
@@ -43,12 +43,12 @@ const tiny_rom_entry *bml3bus_kanji_device::device_rom_region() const
return ROM_NAME( kanji );
}
-READ8_MEMBER( bml3bus_kanji_device::bml3_kanji_r )
+uint8_t bml3bus_kanji_device::bml3_kanji_r(offs_t offset)
{
return m_rom[((uint32_t)m_kanji_addr << 1) + offset];
}
-WRITE8_MEMBER( bml3bus_kanji_device::bml3_kanji_w )
+void bml3bus_kanji_device::bml3_kanji_w(offs_t offset, uint8_t data)
{
m_kanji_addr &= (0xff << (offset*8));
m_kanji_addr |= (data << ((offset^1)*8));
@@ -76,7 +76,7 @@ void bml3bus_kanji_device::device_start()
// install into memory
address_space &space_prg = space();
- space_prg.install_readwrite_handler(0xff75, 0xff76, read8_delegate(*this, FUNC(bml3bus_kanji_device::bml3_kanji_r)), write8_delegate(*this, FUNC(bml3bus_kanji_device::bml3_kanji_w)));
+ space_prg.install_readwrite_handler(0xff75, 0xff76, read8sm_delegate(*this, FUNC(bml3bus_kanji_device::bml3_kanji_r)), write8sm_delegate(*this, FUNC(bml3bus_kanji_device::bml3_kanji_w)));
}
void bml3bus_kanji_device::device_reset()
diff --git a/src/devices/bus/bml3/bml3kanji.h b/src/devices/bus/bml3/bml3kanji.h
index cee2b828c6f..2ce54ed8230 100644
--- a/src/devices/bus/bml3/bml3kanji.h
+++ b/src/devices/bus/bml3/bml3kanji.h
@@ -27,8 +27,8 @@ public:
// construction/destruction
bml3bus_kanji_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- DECLARE_READ8_MEMBER(bml3_kanji_r);
- DECLARE_WRITE8_MEMBER(bml3_kanji_w);
+ uint8_t bml3_kanji_r(offs_t offset);
+ void bml3_kanji_w(offs_t offset, uint8_t data);
protected:
virtual void device_start() override;
diff --git a/src/devices/bus/bml3/bml3mp1802.cpp b/src/devices/bus/bml3/bml3mp1802.cpp
index 22c84884f68..bd6da666c3a 100644
--- a/src/devices/bus/bml3/bml3mp1802.cpp
+++ b/src/devices/bus/bml3/bml3mp1802.cpp
@@ -76,12 +76,12 @@ const tiny_rom_entry *bml3bus_mp1802_device::device_rom_region() const
return ROM_NAME( mp1802 );
}
-READ8_MEMBER( bml3bus_mp1802_device::bml3_mp1802_r)
+uint8_t bml3bus_mp1802_device::bml3_mp1802_r()
{
return m_fdc->drq_r() ? 0x00 : 0x80;
}
-WRITE8_MEMBER( bml3bus_mp1802_device::bml3_mp1802_w)
+void bml3bus_mp1802_device::bml3_mp1802_w(uint8_t data)
{
floppy_image_device *floppy = nullptr;
@@ -130,7 +130,7 @@ void bml3bus_mp1802_device::device_start()
// install into memory
address_space &space_prg = space();
space_prg.install_readwrite_handler(0xff00, 0xff03, read8sm_delegate(*m_fdc, FUNC(mb8866_device::read)), write8sm_delegate(*m_fdc, FUNC(mb8866_device::write)));
- space_prg.install_readwrite_handler(0xff04, 0xff04, read8_delegate(*this, FUNC(bml3bus_mp1802_device::bml3_mp1802_r)), write8_delegate(*this, FUNC(bml3bus_mp1802_device::bml3_mp1802_w)));
+ space_prg.install_readwrite_handler(0xff04, 0xff04, read8smo_delegate(*this, FUNC(bml3bus_mp1802_device::bml3_mp1802_r)), write8smo_delegate(*this, FUNC(bml3bus_mp1802_device::bml3_mp1802_w)));
// overwriting the main ROM (rather than using e.g. install_rom) should mean that bank switches for RAM expansion still work...
uint8_t *mainrom = device().machine().root_device().memregion("maincpu")->base();
memcpy(mainrom + 0xf800, m_rom + 0xf800, 0x800);
diff --git a/src/devices/bus/bml3/bml3mp1802.h b/src/devices/bus/bml3/bml3mp1802.h
index 277d9ae89bd..d1bbdad744b 100644
--- a/src/devices/bus/bml3/bml3mp1802.h
+++ b/src/devices/bus/bml3/bml3mp1802.h
@@ -31,8 +31,8 @@ public:
// construction/destruction
bml3bus_mp1802_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- DECLARE_READ8_MEMBER(bml3_mp1802_r);
- DECLARE_WRITE8_MEMBER(bml3_mp1802_w);
+ uint8_t bml3_mp1802_r();
+ void bml3_mp1802_w(uint8_t data);
protected:
virtual void device_start() override;
diff --git a/src/devices/bus/bml3/bml3mp1805.cpp b/src/devices/bus/bml3/bml3mp1805.cpp
index d5ce2f39598..c5608351b07 100644
--- a/src/devices/bus/bml3/bml3mp1805.cpp
+++ b/src/devices/bus/bml3/bml3mp1805.cpp
@@ -75,14 +75,14 @@ const tiny_rom_entry *bml3bus_mp1805_device::device_rom_region() const
return ROM_NAME( mp1805 );
}
-READ8_MEMBER( bml3bus_mp1805_device::bml3_mp1805_r)
+uint8_t bml3bus_mp1805_device::bml3_mp1805_r()
{
// TODO: read supported or not?
// return mc6843_drq_r(m_mc6843) ? 0x00 : 0x80;
return -1;
}
-WRITE8_MEMBER( bml3bus_mp1805_device::bml3_mp1805_w)
+void bml3bus_mp1805_device::bml3_mp1805_w(uint8_t data)
{
// b7 b6 b5 b4 b3 b2 b1 b0
// MT ? ? ? D3 D2 D1 D0
@@ -142,7 +142,7 @@ void bml3bus_mp1805_device::device_start()
// install into memory
address_space &space_prg = space();
space_prg.install_readwrite_handler(0xff18, 0xff1f, read8sm_delegate(*m_mc6843, FUNC(mc6843_device::read)), write8sm_delegate(*m_mc6843, FUNC(mc6843_device::write)));
- space_prg.install_readwrite_handler(0xff20, 0xff20, read8_delegate(*this, FUNC(bml3bus_mp1805_device::bml3_mp1805_r)), write8_delegate(*this, FUNC(bml3bus_mp1805_device::bml3_mp1805_w)));
+ space_prg.install_readwrite_handler(0xff20, 0xff20, read8smo_delegate(*this, FUNC(bml3bus_mp1805_device::bml3_mp1805_r)), write8smo_delegate(*this, FUNC(bml3bus_mp1805_device::bml3_mp1805_w)));
// overwriting the main ROM (rather than using e.g. install_rom) should mean that bank switches for RAM expansion still work...
uint8_t *mainrom = device().machine().root_device().memregion("maincpu")->base();
memcpy(mainrom + 0xf800, m_rom + 0xf800, 0x800);
diff --git a/src/devices/bus/bml3/bml3mp1805.h b/src/devices/bus/bml3/bml3mp1805.h
index 5cc814e7723..0c0a40f4fd2 100644
--- a/src/devices/bus/bml3/bml3mp1805.h
+++ b/src/devices/bus/bml3/bml3mp1805.h
@@ -30,8 +30,8 @@ public:
// construction/destruction
bml3bus_mp1805_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- DECLARE_READ8_MEMBER(bml3_mp1805_r);
- DECLARE_WRITE8_MEMBER(bml3_mp1805_w);
+ uint8_t bml3_mp1805_r();
+ void bml3_mp1805_w(uint8_t data);
protected:
virtual void device_start() override;
diff --git a/src/devices/bus/bml3/bml3rtc.cpp b/src/devices/bus/bml3/bml3rtc.cpp
index eced1123289..6fbe66f166e 100644
--- a/src/devices/bus/bml3/bml3rtc.cpp
+++ b/src/devices/bus/bml3/bml3rtc.cpp
@@ -35,7 +35,7 @@ void bml3bus_rtc_device::device_add_mconfig(machine_config &config)
}
-READ8_MEMBER(bml3bus_rtc_device::bml3_rtc_r)
+uint8_t bml3bus_rtc_device::bml3_rtc_r(offs_t offset)
{
uint8_t data = 0x00;
@@ -53,7 +53,7 @@ READ8_MEMBER(bml3bus_rtc_device::bml3_rtc_r)
return data | 0xf0; // return low nibble only
}
-WRITE8_MEMBER(bml3bus_rtc_device::bml3_rtc_w)
+void bml3bus_rtc_device::bml3_rtc_w(offs_t offset, uint8_t data)
{
switch (offset)
{
@@ -97,7 +97,7 @@ void bml3bus_rtc_device::device_start()
{
// install into memory
address_space &space_prg = space();
- space_prg.install_readwrite_handler(0xff38, 0xff3a, read8_delegate(*this, FUNC(bml3bus_rtc_device::bml3_rtc_r)), write8_delegate(*this, FUNC(bml3bus_rtc_device::bml3_rtc_w)));
+ space_prg.install_readwrite_handler(0xff38, 0xff3a, read8sm_delegate(*this, FUNC(bml3bus_rtc_device::bml3_rtc_r)), write8sm_delegate(*this, FUNC(bml3bus_rtc_device::bml3_rtc_w)));
m_addr_latch = 0;
m_data_latch = 0;
diff --git a/src/devices/bus/bml3/bml3rtc.h b/src/devices/bus/bml3/bml3rtc.h
index 2adb9870804..16c6cbd0e9c 100644
--- a/src/devices/bus/bml3/bml3rtc.h
+++ b/src/devices/bus/bml3/bml3rtc.h
@@ -29,8 +29,8 @@ public:
// construction/destruction
bml3bus_rtc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- DECLARE_READ8_MEMBER(bml3_rtc_r);
- DECLARE_WRITE8_MEMBER(bml3_rtc_w);
+ uint8_t bml3_rtc_r(offs_t offset);
+ void bml3_rtc_w(offs_t offset, uint8_t data);
protected:
// device-level overrides
diff --git a/src/devices/bus/c64/buscard.cpp b/src/devices/bus/c64/buscard.cpp
index e386b6839bc..aef66ef022b 100644
--- a/src/devices/bus/c64/buscard.cpp
+++ b/src/devices/bus/c64/buscard.cpp
@@ -91,7 +91,7 @@ ioport_constructor c64_buscard_device::device_input_ports() const
// PPI interface
//-------------------------------------------------
-READ8_MEMBER( c64_buscard_device::ppi_pa_r )
+uint8_t c64_buscard_device::ppi_pa_r()
{
uint8_t data = 0xff;
@@ -108,7 +108,7 @@ READ8_MEMBER( c64_buscard_device::ppi_pa_r )
return data;
}
-WRITE8_MEMBER( c64_buscard_device::ppi_pa_w )
+void c64_buscard_device::ppi_pa_w(uint8_t data)
{
m_ieee1->write(data);
@@ -122,7 +122,7 @@ WRITE8_MEMBER( c64_buscard_device::ppi_pa_w )
m_centronics->write_data7(BIT(data, 7));
}
-WRITE8_MEMBER( c64_buscard_device::ppi_pb_w )
+void c64_buscard_device::ppi_pb_w(uint8_t data)
{
/*
@@ -147,7 +147,7 @@ WRITE8_MEMBER( c64_buscard_device::ppi_pb_w )
m_dipsw = BIT(data, 7);
}
-READ8_MEMBER( c64_buscard_device::ppi_pc_r )
+uint8_t c64_buscard_device::ppi_pc_r()
{
/*
@@ -177,7 +177,7 @@ READ8_MEMBER( c64_buscard_device::ppi_pc_r )
return data;
}
-WRITE8_MEMBER( c64_buscard_device::ppi_pc_w )
+void c64_buscard_device::ppi_pc_w(uint8_t data)
{
/*
diff --git a/src/devices/bus/c64/buscard.h b/src/devices/bus/c64/buscard.h
index 5f6badff969..151598060ad 100644
--- a/src/devices/bus/c64/buscard.h
+++ b/src/devices/bus/c64/buscard.h
@@ -66,11 +66,11 @@ private:
bool m_dipsw;
bool m_busy;
- DECLARE_READ8_MEMBER( ppi_pa_r );
- DECLARE_WRITE8_MEMBER( ppi_pa_w );
- DECLARE_WRITE8_MEMBER( ppi_pb_w );
- DECLARE_READ8_MEMBER( ppi_pc_r );
- DECLARE_WRITE8_MEMBER( ppi_pc_w );
+ uint8_t ppi_pa_r();
+ void ppi_pa_w(uint8_t data);
+ 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 );
bool pd_pgm1(offs_t offset, int sphi2);
diff --git a/src/devices/bus/c64/ide64.cpp b/src/devices/bus/c64/ide64.cpp
index 1942ce466b5..73e14ea6b99 100644
--- a/src/devices/bus/c64/ide64.cpp
+++ b/src/devices/bus/c64/ide64.cpp
@@ -173,13 +173,13 @@ uint8_t c64_ide64_cartridge_device::c64_cd_r(offs_t offset, uint8_t data, int sp
if (io1_offset >= 0x20 && io1_offset < 0x28)
{
- m_ata_data = m_ata->read_cs0(offset & 0x07);
+ m_ata_data = m_ata->cs0_r(offset & 0x07);
data = m_ata_data & 0xff;
}
else if (io1_offset >= 0x28 && io1_offset < 0x30)
{
- m_ata_data = m_ata->read_cs1(offset & 0x07);
+ m_ata_data = m_ata->cs1_r(offset & 0x07);
data = m_ata_data & 0xff;
}
@@ -276,13 +276,13 @@ void c64_ide64_cartridge_device::c64_cd_w(offs_t offset, uint8_t data, int sphi2
{
m_ata_data = (m_ata_data & 0xff00) | data;
- m_ata->write_cs0(offset & 0x07, m_ata_data);
+ m_ata->cs0_w(offset & 0x07, m_ata_data);
}
else if (io1_offset >= 0x28 && io1_offset < 0x30)
{
m_ata_data = (m_ata_data & 0xff00) | data;
- m_ata->write_cs1(offset & 0x07, m_ata_data);
+ m_ata->cs1_w(offset & 0x07, m_ata_data);
}
else if (io1_offset == 0x31)
{
diff --git a/src/devices/bus/c64/ieee488.cpp b/src/devices/bus/c64/ieee488.cpp
index c3afe6ff26c..dc588dfc136 100644
--- a/src/devices/bus/c64/ieee488.cpp
+++ b/src/devices/bus/c64/ieee488.cpp
@@ -30,7 +30,7 @@ DEFINE_DEVICE_TYPE(C64_IEEE488, c64_ieee488_device, "c64_ieee488", "C64 IEEE-488
// tpi6525_interface tpi_intf
//-------------------------------------------------
-READ8_MEMBER( c64_ieee488_device::tpi_pa_r )
+uint8_t c64_ieee488_device::tpi_pa_r()
{
/*
@@ -59,7 +59,7 @@ READ8_MEMBER( c64_ieee488_device::tpi_pa_r )
return data;
}
-WRITE8_MEMBER( c64_ieee488_device::tpi_pa_w )
+void c64_ieee488_device::tpi_pa_w(uint8_t data)
{
/*
@@ -84,7 +84,7 @@ WRITE8_MEMBER( c64_ieee488_device::tpi_pa_w )
m_bus->host_nrfd_w(BIT(data, 7));
}
-READ8_MEMBER( c64_ieee488_device::tpi_pc_r )
+uint8_t c64_ieee488_device::tpi_pc_r(offs_t offset)
{
/*
@@ -111,7 +111,7 @@ READ8_MEMBER( c64_ieee488_device::tpi_pc_r )
return data;
}
-WRITE8_MEMBER( c64_ieee488_device::tpi_pc_w )
+void c64_ieee488_device::tpi_pc_w(uint8_t data)
{
/*
diff --git a/src/devices/bus/c64/ieee488.h b/src/devices/bus/c64/ieee488.h
index ab3c7748b8d..60919029bf7 100644
--- a/src/devices/bus/c64/ieee488.h
+++ b/src/devices/bus/c64/ieee488.h
@@ -44,10 +44,10 @@ protected:
virtual int c64_game_r(offs_t offset, int sphi2, int ba, int rw) override;
private:
- DECLARE_READ8_MEMBER( tpi_pa_r );
- DECLARE_WRITE8_MEMBER( tpi_pa_w );
- DECLARE_READ8_MEMBER( tpi_pc_r );
- DECLARE_WRITE8_MEMBER( tpi_pc_w );
+ uint8_t tpi_pa_r();
+ void tpi_pa_w(uint8_t data);
+ uint8_t tpi_pc_r(offs_t offset);
+ void tpi_pc_w(uint8_t data);
required_device<tpi6525_device> m_tpi;
required_device<ieee488_device> m_bus;
diff --git a/src/devices/bus/c64/magic_formel.cpp b/src/devices/bus/c64/magic_formel.cpp
index e47795a9eb0..8d43fd05810 100644
--- a/src/devices/bus/c64/magic_formel.cpp
+++ b/src/devices/bus/c64/magic_formel.cpp
@@ -34,7 +34,7 @@
DEFINE_DEVICE_TYPE(C64_MAGIC_FORMEL, c64_magic_formel_cartridge_device, "c64_magic_formel", "C64 Magic Formel cartridge")
-WRITE8_MEMBER( c64_magic_formel_cartridge_device::pia_pa_w )
+void c64_magic_formel_cartridge_device::pia_pa_w(uint8_t data)
{
/*
@@ -56,7 +56,7 @@ WRITE8_MEMBER( c64_magic_formel_cartridge_device::pia_pa_w )
m_ram_oe = BIT(data, 4);
}
-WRITE8_MEMBER( c64_magic_formel_cartridge_device::pia_pb_w )
+void c64_magic_formel_cartridge_device::pia_pb_w(uint8_t data)
{
/*
diff --git a/src/devices/bus/c64/magic_formel.h b/src/devices/bus/c64/magic_formel.h
index 818342d3c3f..43fb7c69fe5 100644
--- a/src/devices/bus/c64/magic_formel.h
+++ b/src/devices/bus/c64/magic_formel.h
@@ -46,8 +46,8 @@ protected:
virtual int c64_game_r(offs_t offset, int sphi2, int ba, int rw) override;
private:
- DECLARE_WRITE8_MEMBER( pia_pa_w );
- DECLARE_WRITE8_MEMBER( pia_pb_w );
+ void pia_pa_w(uint8_t data);
+ void pia_pb_w(uint8_t data);
DECLARE_WRITE_LINE_MEMBER( pia_cb2_w );
required_device<pia6821_device> m_pia;
diff --git a/src/devices/bus/c64/magic_voice.cpp b/src/devices/bus/c64/magic_voice.cpp
index 3b6c0ebdb62..faac3bc0a33 100644
--- a/src/devices/bus/c64/magic_voice.cpp
+++ b/src/devices/bus/c64/magic_voice.cpp
@@ -78,7 +78,7 @@ WRITE_LINE_MEMBER( c64_magic_voice_cartridge_device::tpi_irq_w )
m_slot->nmi_w(state);
}
-READ8_MEMBER( c64_magic_voice_cartridge_device::tpi_pa_r )
+uint8_t c64_magic_voice_cartridge_device::tpi_pa_r()
{
/*
@@ -104,7 +104,7 @@ READ8_MEMBER( c64_magic_voice_cartridge_device::tpi_pa_r )
return data;
}
-WRITE8_MEMBER( c64_magic_voice_cartridge_device::tpi_pa_w )
+void c64_magic_voice_cartridge_device::tpi_pa_w(uint8_t data)
{
/*
@@ -125,7 +125,7 @@ WRITE8_MEMBER( c64_magic_voice_cartridge_device::tpi_pa_w )
m_fifo->si_w(BIT(data, 4));
}
-READ8_MEMBER( c64_magic_voice_cartridge_device::tpi_pb_r )
+uint8_t c64_magic_voice_cartridge_device::tpi_pb_r()
{
/*
@@ -149,7 +149,7 @@ READ8_MEMBER( c64_magic_voice_cartridge_device::tpi_pb_r )
return data;
}
-WRITE8_MEMBER( c64_magic_voice_cartridge_device::tpi_pb_w )
+void c64_magic_voice_cartridge_device::tpi_pb_w(uint8_t data)
{
/*
diff --git a/src/devices/bus/c64/magic_voice.h b/src/devices/bus/c64/magic_voice.h
index bf6f081fd67..f6c4a4d138e 100644
--- a/src/devices/bus/c64/magic_voice.h
+++ b/src/devices/bus/c64/magic_voice.h
@@ -48,10 +48,10 @@ private:
offs_t get_offset(offs_t offset);
DECLARE_WRITE_LINE_MEMBER( tpi_irq_w );
- DECLARE_READ8_MEMBER( tpi_pa_r );
- DECLARE_WRITE8_MEMBER( tpi_pa_w );
- DECLARE_READ8_MEMBER( tpi_pb_r );
- DECLARE_WRITE8_MEMBER( tpi_pb_w );
+ 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 );
diff --git a/src/devices/bus/cbmiec/c1541.cpp b/src/devices/bus/cbmiec/c1541.cpp
index 0bedd729b0e..fb18a9a4092 100644
--- a/src/devices/bus/cbmiec/c1541.cpp
+++ b/src/devices/bus/cbmiec/c1541.cpp
@@ -716,13 +716,13 @@ WRITE_LINE_MEMBER( c1541_device_base::via0_irq_w )
m_maincpu->set_input_line(INPUT_LINE_IRQ0, (m_via0_irq || m_via1_irq) ? ASSERT_LINE : CLEAR_LINE);
}
-READ8_MEMBER( c1541_device_base::via0_pa_r )
+uint8_t c1541_device_base::via0_pa_r()
{
// dummy read to acknowledge ATN IN interrupt
return m_parallel_data;
}
-WRITE8_MEMBER( c1541_device_base::via0_pa_w )
+void c1541_device_base::via0_pa_w(uint8_t data)
{
if (m_other != nullptr)
{
@@ -730,7 +730,7 @@ WRITE8_MEMBER( c1541_device_base::via0_pa_w )
}
}
-READ8_MEMBER( c1541_device_base::via0_pb_r )
+uint8_t c1541_device_base::via0_pb_r()
{
/*
@@ -764,7 +764,7 @@ READ8_MEMBER( c1541_device_base::via0_pb_r )
return data;
}
-WRITE8_MEMBER( c1541_device_base::via0_pb_w )
+void c1541_device_base::via0_pb_w(uint8_t data)
{
/*
@@ -799,7 +799,7 @@ WRITE_LINE_MEMBER( c1541_device_base::via0_ca2_w )
}
}
-READ8_MEMBER( c1541c_device::via0_pa_r )
+uint8_t c1541c_device::via0_pa_r()
{
/*
@@ -827,7 +827,7 @@ WRITE_LINE_MEMBER( c1541_device_base::via1_irq_w )
m_maincpu->set_input_line(INPUT_LINE_IRQ0, (m_via0_irq || m_via1_irq) ? ASSERT_LINE : CLEAR_LINE);
}
-READ8_MEMBER( c1541_device_base::via1_pb_r )
+uint8_t c1541_device_base::via1_pb_r()
{
/*
@@ -855,7 +855,7 @@ READ8_MEMBER( c1541_device_base::via1_pb_r )
return data;
}
-WRITE8_MEMBER( c1541_device_base::via1_pb_w )
+void c1541_device_base::via1_pb_w(uint8_t data)
{
/*
@@ -923,7 +923,7 @@ WRITE8_MEMBER( c1541_prologic_dos_classic_device::pia_w )
m_pia->write((offset >> 2) & 0x03, data);
}
-WRITE8_MEMBER( c1541_prologic_dos_classic_device::pia_pa_w )
+void c1541_prologic_dos_classic_device::pia_pa_w(uint8_t data)
{
/*
@@ -941,12 +941,12 @@ WRITE8_MEMBER( c1541_prologic_dos_classic_device::pia_pa_w )
*/
}
-READ8_MEMBER( c1541_prologic_dos_classic_device::pia_pb_r )
+uint8_t c1541_prologic_dos_classic_device::pia_pb_r()
{
return m_parallel_data;
}
-WRITE8_MEMBER( c1541_prologic_dos_classic_device::pia_pb_w )
+void c1541_prologic_dos_classic_device::pia_pb_w(uint8_t data)
{
m_parallel_data = data;
diff --git a/src/devices/bus/cbmiec/c1541.h b/src/devices/bus/cbmiec/c1541.h
index 36310429f63..2dca91499dc 100644
--- a/src/devices/bus/cbmiec/c1541.h
+++ b/src/devices/bus/cbmiec/c1541.h
@@ -69,14 +69,14 @@ private:
inline void set_iec_data();
DECLARE_WRITE_LINE_MEMBER( via0_irq_w );
- virtual DECLARE_READ8_MEMBER( via0_pa_r );
- DECLARE_WRITE8_MEMBER( via0_pa_w );
- DECLARE_READ8_MEMBER( via0_pb_r );
- DECLARE_WRITE8_MEMBER( via0_pb_w );
+ 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 );
- DECLARE_READ8_MEMBER( via1_pb_r );
- DECLARE_WRITE8_MEMBER( via1_pb_w );
+ uint8_t via1_pb_r();
+ void via1_pb_w(uint8_t data);
DECLARE_WRITE_LINE_MEMBER( atn_w );
DECLARE_WRITE_LINE_MEMBER( byte_w );
@@ -139,8 +139,7 @@ protected:
virtual void device_add_mconfig(machine_config &config) override;
private:
- // not really public
- virtual DECLARE_READ8_MEMBER( via0_pa_r ) override;
+ virtual uint8_t via0_pa_r() override;
};
@@ -267,9 +266,9 @@ private:
DECLARE_READ8_MEMBER( pia_r );
DECLARE_WRITE8_MEMBER( pia_w );
- DECLARE_WRITE8_MEMBER( pia_pa_w );
- DECLARE_READ8_MEMBER( pia_pb_r );
- DECLARE_WRITE8_MEMBER( pia_pb_w );
+ void pia_pa_w(uint8_t data);
+ uint8_t pia_pb_r();
+ void pia_pb_w(uint8_t data);
DECLARE_READ8_MEMBER( read );
DECLARE_WRITE8_MEMBER( write );
diff --git a/src/devices/bus/cbmiec/c1571.cpp b/src/devices/bus/cbmiec/c1571.cpp
index dc0bae13ed3..c725892753b 100644
--- a/src/devices/bus/cbmiec/c1571.cpp
+++ b/src/devices/bus/cbmiec/c1571.cpp
@@ -179,7 +179,7 @@ WRITE_LINE_MEMBER( c1571_device::via0_irq_w )
m_maincpu->set_input_line(INPUT_LINE_IRQ0, (m_via0_irq || m_via1_irq || m_cia_irq) ? ASSERT_LINE : CLEAR_LINE);
}
-READ8_MEMBER( c1571_device::via0_pa_r )
+uint8_t c1571_device::via0_pa_r()
{
/*
@@ -207,7 +207,7 @@ READ8_MEMBER( c1571_device::via0_pa_r )
return data;
}
-WRITE8_MEMBER( c1571_device::via0_pa_w )
+void c1571_device::via0_pa_w(uint8_t data)
{
/*
@@ -252,7 +252,7 @@ WRITE8_MEMBER( c1571_device::via0_pa_w )
update_iec();
}
-WRITE8_MEMBER( c1571cr_device::via0_pa_w )
+void c1571cr_device::via0_pa_w(uint8_t data)
{
/*
@@ -289,7 +289,7 @@ WRITE8_MEMBER( c1571cr_device::via0_pa_w )
}
}
-READ8_MEMBER( c1571_device::via0_pb_r )
+uint8_t c1571_device::via0_pb_r()
{
/*
@@ -323,7 +323,7 @@ READ8_MEMBER( c1571_device::via0_pb_r )
return data;
}
-WRITE8_MEMBER( c1571_device::via0_pb_w )
+void c1571_device::via0_pb_w(uint8_t data)
{
/*
@@ -352,7 +352,7 @@ WRITE8_MEMBER( c1571_device::via0_pb_w )
update_iec();
}
-WRITE8_MEMBER( c1571cr_device::via0_pb_w )
+void c1571cr_device::via0_pb_w(uint8_t data)
{
/*
@@ -407,7 +407,7 @@ WRITE_LINE_MEMBER( c1571_device::via1_irq_w )
m_maincpu->set_input_line(INPUT_LINE_IRQ0, (m_via0_irq || m_via1_irq || m_cia_irq) ? ASSERT_LINE : CLEAR_LINE);
}
-READ8_MEMBER( c1571_device::via1_pb_r )
+uint8_t c1571_device::via1_pb_r()
{
/*
@@ -435,7 +435,7 @@ READ8_MEMBER( c1571_device::via1_pb_r )
return data;
}
-WRITE8_MEMBER( c1571_device::via1_pb_w )
+void c1571_device::via1_pb_w(uint8_t data)
{
/*
@@ -499,12 +499,12 @@ WRITE_LINE_MEMBER( c1571_device::cia_sp_w )
update_iec();
}
-READ8_MEMBER( c1571_device::cia_pb_r )
+uint8_t c1571_device::cia_pb_r()
{
return m_parallel_data;
}
-WRITE8_MEMBER( c1571_device::cia_pb_w )
+void c1571_device::cia_pb_w(uint8_t data)
{
if (m_other != nullptr)
{
@@ -517,19 +517,19 @@ WRITE8_MEMBER( c1571_device::cia_pb_w )
// MOS6526_INTERFACE( mini_chief_cia_intf )
//-------------------------------------------------
-READ8_MEMBER( mini_chief_device::cia_pa_r )
+uint8_t mini_chief_device::cia_pa_r()
{
// TODO read from ISA bus @ 0x320 | A2 A1 A0
return 0;
}
-WRITE8_MEMBER( mini_chief_device::cia_pa_w )
+void mini_chief_device::cia_pa_w(uint8_t data)
{
// TODO write to ISA bus @ 0x320 | A2 A1 A0
}
-WRITE8_MEMBER( mini_chief_device::cia_pb_w )
+void mini_chief_device::cia_pb_w(uint8_t data)
{
/*
diff --git a/src/devices/bus/cbmiec/c1571.h b/src/devices/bus/cbmiec/c1571.h
index 467c959963e..26bc3f43ba7 100644
--- a/src/devices/bus/cbmiec/c1571.h
+++ b/src/devices/bus/cbmiec/c1571.h
@@ -44,23 +44,23 @@ public:
c1571_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
DECLARE_WRITE_LINE_MEMBER( via0_irq_w );
- DECLARE_READ8_MEMBER( via0_pa_r );
- DECLARE_WRITE8_MEMBER( via0_pa_w );
- DECLARE_READ8_MEMBER( via0_pb_r );
- DECLARE_WRITE8_MEMBER( via0_pb_w );
+ 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_READ8_MEMBER( via1_r );
DECLARE_WRITE8_MEMBER( via1_w );
DECLARE_WRITE_LINE_MEMBER( via1_irq_w );
- DECLARE_READ8_MEMBER( via1_pb_r );
- DECLARE_WRITE8_MEMBER( via1_pb_w );
+ 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 );
- DECLARE_READ8_MEMBER( cia_pb_r );
- DECLARE_WRITE8_MEMBER( cia_pb_w );
+ uint8_t cia_pb_r();
+ void cia_pb_w(uint8_t data);
DECLARE_WRITE_LINE_MEMBER( byte_w );
@@ -157,8 +157,8 @@ protected:
virtual void device_add_mconfig(machine_config &config) override;
private:
- DECLARE_WRITE8_MEMBER( via0_pa_w );
- DECLARE_WRITE8_MEMBER( via0_pb_w );
+ void via0_pa_w(uint8_t data);
+ void via0_pb_w(uint8_t data);
};
@@ -176,9 +176,9 @@ protected:
virtual void device_add_mconfig(machine_config &config) override;
private:
- DECLARE_READ8_MEMBER( cia_pa_r );
- DECLARE_WRITE8_MEMBER( cia_pa_w );
- DECLARE_WRITE8_MEMBER( cia_pb_w );
+ uint8_t cia_pa_r();
+ void cia_pa_w(uint8_t data);
+ void cia_pb_w(uint8_t data);
void mini_chief_mem(address_map &map);
};
diff --git a/src/devices/bus/cbmiec/c1581.cpp b/src/devices/bus/cbmiec/c1581.cpp
index 57282efc9c3..ad2b4e054e2 100644
--- a/src/devices/bus/cbmiec/c1581.cpp
+++ b/src/devices/bus/cbmiec/c1581.cpp
@@ -116,7 +116,7 @@ WRITE_LINE_MEMBER( c1581_device::sp_w )
update_iec();
}
-READ8_MEMBER( c1581_device::cia_pa_r )
+uint8_t c1581_device::cia_pa_r()
{
/*
@@ -147,7 +147,7 @@ READ8_MEMBER( c1581_device::cia_pa_r )
return data;
}
-WRITE8_MEMBER( c1581_device::cia_pa_w )
+void c1581_device::cia_pa_w(uint8_t data)
{
/*
@@ -177,7 +177,7 @@ WRITE8_MEMBER( c1581_device::cia_pa_w )
m_leds[LED_ACT] = BIT(data, 6);
}
-READ8_MEMBER( c1581_device::cia_pb_r )
+uint8_t c1581_device::cia_pb_r()
{
/*
@@ -211,7 +211,7 @@ READ8_MEMBER( c1581_device::cia_pb_r )
return data;
}
-WRITE8_MEMBER( c1581_device::cia_pb_w )
+void c1581_device::cia_pb_w(uint8_t data)
{
/*
diff --git a/src/devices/bus/cbmiec/c1581.h b/src/devices/bus/cbmiec/c1581.h
index 811375dbdaa..b9aef830039 100644
--- a/src/devices/bus/cbmiec/c1581.h
+++ b/src/devices/bus/cbmiec/c1581.h
@@ -69,10 +69,10 @@ private:
DECLARE_WRITE_LINE_MEMBER( cnt_w );
DECLARE_WRITE_LINE_MEMBER( sp_w );
- DECLARE_READ8_MEMBER( cia_pa_r );
- DECLARE_WRITE8_MEMBER( cia_pa_w );
- DECLARE_READ8_MEMBER( cia_pb_r );
- DECLARE_WRITE8_MEMBER( cia_pb_w );
+ uint8_t cia_pa_r();
+ void cia_pa_w(uint8_t data);
+ uint8_t cia_pb_r();
+ void cia_pb_w(uint8_t data);
void c1581_mem(address_map &map);
diff --git a/src/devices/bus/cbmiec/fd2000.cpp b/src/devices/bus/cbmiec/fd2000.cpp
index c4d1bd311c1..0ac6321c359 100644
--- a/src/devices/bus/cbmiec/fd2000.cpp
+++ b/src/devices/bus/cbmiec/fd2000.cpp
@@ -113,7 +113,7 @@ void fd4000_device::fd4000_mem(address_map &map)
}
-READ8_MEMBER( fd2000_device::via_pa_r )
+uint8_t fd2000_device::via_pa_r()
{
/*
@@ -133,7 +133,7 @@ READ8_MEMBER( fd2000_device::via_pa_r )
return 0;
}
-WRITE8_MEMBER( fd2000_device::via_pa_w )
+void fd2000_device::via_pa_w(uint8_t data)
{
/*
@@ -151,7 +151,7 @@ WRITE8_MEMBER( fd2000_device::via_pa_w )
*/
}
-READ8_MEMBER( fd2000_device::via_pb_r )
+uint8_t fd2000_device::via_pb_r()
{
/*
@@ -176,7 +176,7 @@ READ8_MEMBER( fd2000_device::via_pb_r )
return data;
}
-WRITE8_MEMBER( fd2000_device::via_pb_w )
+void fd2000_device::via_pb_w(uint8_t data)
{
/*
diff --git a/src/devices/bus/cbmiec/fd2000.h b/src/devices/bus/cbmiec/fd2000.h
index cb47bca4fa2..0f0ecdd2485 100644
--- a/src/devices/bus/cbmiec/fd2000.h
+++ b/src/devices/bus/cbmiec/fd2000.h
@@ -33,10 +33,10 @@ public:
// construction/destruction
fd2000_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- DECLARE_READ8_MEMBER( via_pa_r );
- DECLARE_WRITE8_MEMBER( via_pa_w );
- DECLARE_READ8_MEMBER( via_pb_r );
- DECLARE_WRITE8_MEMBER( via_pb_w );
+ uint8_t via_pa_r();
+ void via_pa_w(uint8_t data);
+ uint8_t via_pb_r();
+ void via_pb_w(uint8_t data);
//DECLARE_FLOPPY_FORMATS( floppy_formats );
diff --git a/src/devices/bus/cbus/pc9801_amd98.cpp b/src/devices/bus/cbus/pc9801_amd98.cpp
index 684dc8978df..c89e88bc632 100644
--- a/src/devices/bus/cbus/pc9801_amd98.cpp
+++ b/src/devices/bus/cbus/pc9801_amd98.cpp
@@ -180,12 +180,12 @@ WRITE8_MEMBER(pc9801_amd98_device::write)
}
}
-WRITE8_MEMBER(pc9801_amd98_device::ay3_address_w)
+void pc9801_amd98_device::ay3_address_w(uint8_t data)
{
m_ay3_latch = data;
}
-WRITE8_MEMBER(pc9801_amd98_device::ay3_data_latch_w)
+void pc9801_amd98_device::ay3_data_latch_w(uint8_t data)
{
// TODO: this actually uses a flip flop mechanism, not quite sure about how it works yet
switch(data)
diff --git a/src/devices/bus/cbus/pc9801_amd98.h b/src/devices/bus/cbus/pc9801_amd98.h
index 993cd6e9e4b..f116166fc9e 100644
--- a/src/devices/bus/cbus/pc9801_amd98.h
+++ b/src/devices/bus/cbus/pc9801_amd98.h
@@ -42,8 +42,8 @@ protected:
virtual ioport_constructor device_input_ports() const override;
private:
- DECLARE_WRITE8_MEMBER(ay3_address_w);
- DECLARE_WRITE8_MEMBER(ay3_data_latch_w);
+ void ay3_address_w(uint8_t data);
+ void ay3_data_latch_w(uint8_t data);
uint8_t m_ay3_latch;
diff --git a/src/devices/bus/cbus/pc9801_snd.cpp b/src/devices/bus/cbus/pc9801_snd.cpp
index 670e423e4d3..6a611d77e78 100644
--- a/src/devices/bus/cbus/pc9801_snd.cpp
+++ b/src/devices/bus/cbus/pc9801_snd.cpp
@@ -17,7 +17,7 @@ pc9801_snd_device::pc9801_snd_device(const machine_config &mconfig, device_type
{
}
-READ8_MEMBER(pc9801_snd_device::opn_porta_r)
+uint8_t pc9801_snd_device::opn_porta_r()
{
if(m_joy_sel & 0x80)
return ioport(m_joy_sel & 0x40 ? "PA2" : "PA1")->read();
@@ -25,7 +25,7 @@ READ8_MEMBER(pc9801_snd_device::opn_porta_r)
return 0xff;
}
-WRITE8_MEMBER(pc9801_snd_device::opn_portb_w) { m_joy_sel = data; }
+void pc9801_snd_device::opn_portb_w(uint8_t data) { m_joy_sel = data; }
INPUT_PORTS_START(pc9801_joy_port)
PORT_START("PA1")
diff --git a/src/devices/bus/cbus/pc9801_snd.h b/src/devices/bus/cbus/pc9801_snd.h
index 600e555b329..c7408c09383 100644
--- a/src/devices/bus/cbus/pc9801_snd.h
+++ b/src/devices/bus/cbus/pc9801_snd.h
@@ -18,8 +18,8 @@ public:
pc9801_snd_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
protected:
- DECLARE_READ8_MEMBER(opn_porta_r);
- DECLARE_WRITE8_MEMBER(opn_portb_w);
+ uint8_t opn_porta_r();
+ void opn_portb_w(uint8_t data);
private:
uint8_t m_joy_sel;
diff --git a/src/devices/bus/centronics/epson_ex800.cpp b/src/devices/bus/centronics/epson_ex800.cpp
index 5c978d49172..986678300f8 100644
--- a/src/devices/bus/centronics/epson_ex800.cpp
+++ b/src/devices/bus/centronics/epson_ex800.cpp
@@ -1,4 +1,4 @@
-// license:GPL-2.0+
+// license:BSD-3-Clause
// copyright-holders:Dirk Best
/******************************************************************************
@@ -372,25 +372,25 @@ void epson_ex800_device::device_reset()
}
-READ8_MEMBER(epson_ex800_device::porta_r)
+uint8_t epson_ex800_device::porta_r()
{
logerror("PA R %s\n", machine().describe_context());
return machine().rand();
}
-READ8_MEMBER(epson_ex800_device::portb_r)
+uint8_t epson_ex800_device::portb_r()
{
logerror("PB R %s\n", machine().describe_context());
return machine().rand();
}
-READ8_MEMBER(epson_ex800_device::portc_r)
+uint8_t epson_ex800_device::portc_r()
{
logerror("PC R %s\n", machine().describe_context());
return machine().rand();
}
-WRITE8_MEMBER(epson_ex800_device::porta_w)
+void epson_ex800_device::porta_w(uint8_t data)
{
if (PA6) logerror("BNK0 selected.\n");
if (PA7) logerror("BNK1 selected.\n");
@@ -398,7 +398,7 @@ WRITE8_MEMBER(epson_ex800_device::porta_w)
logerror("PA W %x %s\n", data, machine().describe_context());
}
-WRITE8_MEMBER(epson_ex800_device::portb_w)
+void epson_ex800_device::portb_w(uint8_t data)
{
if (data & 3)
logerror("PB0/1 Line feed %s\n", machine().describe_context());
@@ -422,7 +422,7 @@ WRITE8_MEMBER(epson_ex800_device::portb_w)
// logerror("PB W %x %s\n", data, machine().describe_context());
}
-WRITE8_MEMBER(epson_ex800_device::portc_w)
+void epson_ex800_device::portc_w(uint8_t data)
{
if (data & 0x80)
m_beeper->set_state(0);
diff --git a/src/devices/bus/centronics/epson_ex800.h b/src/devices/bus/centronics/epson_ex800.h
index 372f30eb660..750eb8a771f 100644
--- a/src/devices/bus/centronics/epson_ex800.h
+++ b/src/devices/bus/centronics/epson_ex800.h
@@ -1,4 +1,4 @@
-// license:GPL-2.0+
+// license:BSD-3-Clause
// copyright-holders:Dirk Best
/**********************************************************************
@@ -42,12 +42,12 @@ protected:
virtual ioport_constructor device_input_ports() const override;
private:
- DECLARE_READ8_MEMBER(porta_r);
- DECLARE_READ8_MEMBER(portb_r);
- DECLARE_READ8_MEMBER(portc_r);
- DECLARE_WRITE8_MEMBER(porta_w);
- DECLARE_WRITE8_MEMBER(portb_w);
- DECLARE_WRITE8_MEMBER(portc_w);
+ uint8_t porta_r();
+ uint8_t portb_r();
+ uint8_t portc_r();
+ void porta_w(uint8_t data);
+ void portb_w(uint8_t data);
+ void portc_w(uint8_t data);
DECLARE_READ8_MEMBER(devsel_r);
DECLARE_WRITE8_MEMBER(devsel_w);
DECLARE_READ8_MEMBER(gate5a_r);
diff --git a/src/devices/bus/centronics/epson_lx800.cpp b/src/devices/bus/centronics/epson_lx800.cpp
index 3dde6e8b916..0ef9b942f53 100644
--- a/src/devices/bus/centronics/epson_lx800.cpp
+++ b/src/devices/bus/centronics/epson_lx800.cpp
@@ -1,4 +1,4 @@
-// license:GPL-2.0+
+// license:BSD-3-Clause
// copyright-holders:Dirk Best
/**********************************************************************
@@ -232,7 +232,7 @@ void epson_lx800_device::device_reset()
* PA6 not used
* PA7 R P/S P/S signal from the optional interface
*/
-READ8_MEMBER( epson_lx800_device::porta_r )
+uint8_t epson_lx800_device::porta_r(offs_t offset)
{
uint8_t result = 0;
@@ -247,7 +247,7 @@ READ8_MEMBER( epson_lx800_device::porta_r )
return result;
}
-WRITE8_MEMBER( epson_lx800_device::porta_w )
+void epson_lx800_device::porta_w(offs_t offset, uint8_t data)
{
logerror("%s: lx800_porta_w(%02x): %02x\n", machine().describe_context(), offset, data);
logerror("--> carriage: %d, paper feed: %d\n", BIT(data, 0), BIT(data, 2));
@@ -262,7 +262,7 @@ WRITE8_MEMBER( epson_lx800_device::porta_w )
* PC6 W FIRE drive pulse width signal
* PC7 W BUZZER buzzer signal
*/
-READ8_MEMBER( epson_lx800_device::portc_r )
+uint8_t epson_lx800_device::portc_r(offs_t offset)
{
uint8_t result = 0;
@@ -273,7 +273,7 @@ READ8_MEMBER( epson_lx800_device::portc_r )
return result;
}
-WRITE8_MEMBER( epson_lx800_device::portc_w )
+void epson_lx800_device::portc_w(offs_t offset, uint8_t data)
{
logerror("%s: lx800_portc_w(%02x): %02x\n", machine().describe_context(), offset, data);
logerror("--> err: %d, ack: %d, fire: %d, buzzer: %d\n", BIT(data, 4), BIT(data, 5), BIT(data, 6), BIT(data, 7));
@@ -317,7 +317,7 @@ READ_LINE_MEMBER( epson_lx800_device::an5_r )
GATE ARRAY
***************************************************************************/
-READ8_MEMBER( epson_lx800_device::centronics_data_r )
+uint8_t epson_lx800_device::centronics_data_r()
{
logerror("centronics: data read\n");
return 0x55;
diff --git a/src/devices/bus/centronics/epson_lx800.h b/src/devices/bus/centronics/epson_lx800.h
index e9c86b59105..d7e092e31a5 100644
--- a/src/devices/bus/centronics/epson_lx800.h
+++ b/src/devices/bus/centronics/epson_lx800.h
@@ -1,4 +1,4 @@
-// license:GPL-2.0+
+// license:BSD-3-Clause
// copyright-holders:Dirk Best
/**********************************************************************
@@ -43,10 +43,10 @@ protected:
virtual ioport_constructor device_input_ports() const override;
private:
- DECLARE_READ8_MEMBER(porta_r);
- DECLARE_WRITE8_MEMBER(porta_w);
- DECLARE_READ8_MEMBER(portc_r);
- DECLARE_WRITE8_MEMBER(portc_w);
+ uint8_t porta_r(offs_t offset);
+ void porta_w(offs_t offset, uint8_t data);
+ 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);
@@ -55,7 +55,7 @@ private:
DECLARE_READ_LINE_MEMBER(an4_r);
DECLARE_READ_LINE_MEMBER(an5_r);
- DECLARE_READ8_MEMBER(centronics_data_r);
+ uint8_t centronics_data_r();
DECLARE_WRITE_LINE_MEMBER(centronics_pe_w);
DECLARE_WRITE_LINE_MEMBER(reset_w);
diff --git a/src/devices/bus/centronics/epson_lx810l.cpp b/src/devices/bus/centronics/epson_lx810l.cpp
index 11f474fc689..00d0ef866b4 100644
--- a/src/devices/bus/centronics/epson_lx810l.cpp
+++ b/src/devices/bus/centronics/epson_lx810l.cpp
@@ -372,7 +372,7 @@ WRITE8_MEMBER(epson_lx810l_device::fakemem_w)
* PA6 R Line Feed SWITCH
* PA7 R Form Feed SWITCH
*/
-READ8_MEMBER( epson_lx810l_device::porta_r )
+uint8_t epson_lx810l_device::porta_r(offs_t offset)
{
uint8_t result = 0;
uint8_t hp_sensor = m_cr_pos_abs <= 0 ? 0 : 1;
@@ -388,7 +388,7 @@ READ8_MEMBER( epson_lx810l_device::porta_r )
return result;
}
-WRITE8_MEMBER( epson_lx810l_device::porta_w )
+void epson_lx810l_device::porta_w(offs_t offset, uint8_t data)
{
LOG("%s: lx810l_PA_w(%02x): %02x: stepper vref %d\n", machine().describe_context(), offset, data, BIT(data, 3) | (BIT(data, 4)<<1) | (BIT(data, 5)<<2));
}
@@ -403,7 +403,7 @@ WRITE8_MEMBER( epson_lx810l_device::porta_w )
* PB6 R DIP1.6
* PB7 R DIP1.7
*/
-READ8_MEMBER( epson_lx810l_device::portb_r )
+uint8_t epson_lx810l_device::portb_r(offs_t offset)
{
uint8_t result = ~ioport("DIPSW1")->read();
@@ -419,7 +419,7 @@ READ8_MEMBER( epson_lx810l_device::portb_r )
return result;
}
-WRITE8_MEMBER( epson_lx810l_device::portb_w )
+void epson_lx810l_device::portb_w(offs_t offset, uint8_t data)
{
uint8_t data_in = BIT(data, 1);
@@ -440,7 +440,7 @@ WRITE8_MEMBER( epson_lx810l_device::portb_w )
* PC6 W FIRE drive pulse width signal, also E05A30.57
* PC7 W BUZZER buzzer signal
*/
-READ8_MEMBER( epson_lx810l_device::portc_r )
+uint8_t epson_lx810l_device::portc_r(offs_t offset)
{
uint8_t result = 0;
@@ -454,7 +454,7 @@ READ8_MEMBER( epson_lx810l_device::portc_r )
return result;
}
-WRITE8_MEMBER( epson_lx810l_device::portc_w )
+void epson_lx810l_device::portc_w(offs_t offset, uint8_t data)
{
/* ioport("serial")->write(BIT(data, 0)); */
@@ -474,12 +474,12 @@ WRITE8_MEMBER( epson_lx810l_device::portc_w )
GATE ARRAY
***************************************************************************/
-WRITE16_MEMBER( epson_lx810l_device::printhead )
+void epson_lx810l_device::printhead(uint16_t data)
{
m_printhead = data;
}
-WRITE8_MEMBER( epson_lx810l_device::pf_stepper )
+void epson_lx810l_device::pf_stepper(uint8_t data)
{
int changed = m_pf_stepper->update(data);
m_pf_pos_abs = -m_pf_stepper->get_absolute_position();
@@ -493,7 +493,7 @@ WRITE8_MEMBER( epson_lx810l_device::pf_stepper )
LOG("%s: %s(%02x); abs %d\n", machine().describe_context(), __func__, data, m_pf_pos_abs);
}
-WRITE8_MEMBER( epson_lx810l_device::cr_stepper )
+void epson_lx810l_device::cr_stepper(uint8_t data)
{
int m_cr_pos_abs_prev = m_cr_pos_abs;
@@ -571,47 +571,47 @@ WRITE_LINE_MEMBER( epson_lx810l_device::co0_w )
ADC
***************************************************************************/
-READ8_MEMBER(epson_lx810l_device::an0_r)
+uint8_t epson_lx810l_device::an0_r()
{
uint8_t res = !!(ioport("DIPSW2")->read() & 0x01);
return res - 1; /* DIPSW2.1 */
}
-READ8_MEMBER(epson_lx810l_device::an1_r)
+uint8_t epson_lx810l_device::an1_r()
{
uint8_t res = !!(ioport("DIPSW2")->read() & 0x02);
return res - 1; /* DIPSW2.2 */
}
-READ8_MEMBER(epson_lx810l_device::an2_r)
+uint8_t epson_lx810l_device::an2_r()
{
uint8_t res = !!(ioport("DIPSW2")->read() & 0x04);
return res - 1; /* DIPSW2.3 */
}
-READ8_MEMBER(epson_lx810l_device::an3_r)
+uint8_t epson_lx810l_device::an3_r()
{
uint8_t res = !!(ioport("DIPSW2")->read() & 0x08);
return res - 1; /* DIPSW2.4 */
}
-READ8_MEMBER(epson_lx810l_device::an4_r)
+uint8_t epson_lx810l_device::an4_r()
{
return 0xff;
}
-READ8_MEMBER(epson_lx810l_device::an5_r)
+uint8_t epson_lx810l_device::an5_r()
{
return 0xCB; /* motor voltage, 0xcb = 24V */
}
-READ8_MEMBER(epson_lx810l_device::an6_r)
+uint8_t epson_lx810l_device::an6_r()
{
uint8_t res = !ioport("LOADEJECT")->read();
return res - 1;
}
-READ8_MEMBER(epson_lx810l_device::an7_r)
+uint8_t epson_lx810l_device::an7_r()
{
return 0xff;
}
diff --git a/src/devices/bus/centronics/epson_lx810l.h b/src/devices/bus/centronics/epson_lx810l.h
index f952244d6a2..670ad10dae5 100644
--- a/src/devices/bus/centronics/epson_lx810l.h
+++ b/src/devices/bus/centronics/epson_lx810l.h
@@ -69,12 +69,12 @@ protected:
virtual ioport_constructor device_input_ports() const override;
private:
- DECLARE_READ8_MEMBER(porta_r);
- DECLARE_WRITE8_MEMBER(porta_w);
- DECLARE_READ8_MEMBER(portb_r);
- DECLARE_WRITE8_MEMBER(portb_w);
- DECLARE_READ8_MEMBER(portc_r);
- DECLARE_WRITE8_MEMBER(portc_w);
+ uint8_t porta_r(offs_t offset);
+ void porta_w(offs_t offset, uint8_t data);
+ uint8_t portb_r(offs_t offset);
+ void portb_w(offs_t offset, uint8_t data);
+ uint8_t portc_r(offs_t offset);
+ void portc_w(offs_t offset, uint8_t data);
/* fake memory I/O to get past memory reset check */
DECLARE_READ8_MEMBER(fakemem_r);
@@ -84,20 +84,20 @@ private:
DECLARE_WRITE_LINE_MEMBER(co0_w);
/* ADC */
- DECLARE_READ8_MEMBER(an0_r);
- DECLARE_READ8_MEMBER(an1_r);
- DECLARE_READ8_MEMBER(an2_r);
- DECLARE_READ8_MEMBER(an3_r);
- DECLARE_READ8_MEMBER(an4_r);
- DECLARE_READ8_MEMBER(an5_r);
- DECLARE_READ8_MEMBER(an6_r);
- DECLARE_READ8_MEMBER(an7_r);
+ uint8_t an0_r();
+ uint8_t an1_r();
+ uint8_t an2_r();
+ uint8_t an3_r();
+ uint8_t an4_r();
+ uint8_t an5_r();
+ uint8_t an6_r();
+ uint8_t an7_r();
/* GATE ARRAY */
- DECLARE_WRITE16_MEMBER(printhead);
- DECLARE_WRITE8_MEMBER(pf_stepper);
- DECLARE_WRITE8_MEMBER(cr_stepper);
+ void printhead(uint16_t data);
+ void pf_stepper(uint8_t data);
+ void cr_stepper(uint8_t data);
DECLARE_WRITE_LINE_MEMBER(e05a30_ready);
DECLARE_WRITE_LINE_MEMBER(e05a30_centronics_ack) { output_ack(state); }
diff --git a/src/devices/bus/cgenie/expansion/floppy.cpp b/src/devices/bus/cgenie/expansion/floppy.cpp
index 6238aaa936f..ef1dd23128f 100644
--- a/src/devices/bus/cgenie/expansion/floppy.cpp
+++ b/src/devices/bus/cgenie/expansion/floppy.cpp
@@ -155,13 +155,15 @@ void cgenie_fdc_device::device_reset()
// IMPLEMENTATION
//**************************************************************************
-READ8_MEMBER( cgenie_fdc_device::irq_r )
+uint8_t cgenie_fdc_device::irq_r()
{
uint8_t data = m_irq_status;
- m_irq_status &= ~IRQ_TIMER;
- m_slot->int_w(m_irq_status ? ASSERT_LINE : CLEAR_LINE);
-
+ if (!machine().side_effects_disabled())
+ {
+ m_irq_status &= ~IRQ_TIMER;
+ m_slot->int_w(m_irq_status ? ASSERT_LINE : CLEAR_LINE);
+ }
return data;
}
@@ -200,7 +202,7 @@ WRITE_LINE_MEMBER( cgenie_fdc_device::intrq_w )
m_slot->int_w(m_irq_status ? ASSERT_LINE : CLEAR_LINE);
}
-WRITE8_MEMBER( cgenie_fdc_device::select_w )
+void cgenie_fdc_device::select_w(uint8_t data)
{
if (VERBOSE)
logerror("cgenie_fdc_device::motor_w: 0x%02x\n", data);
@@ -221,7 +223,7 @@ WRITE8_MEMBER( cgenie_fdc_device::select_w )
}
}
-WRITE8_MEMBER( cgenie_fdc_device::command_w )
+void cgenie_fdc_device::command_w(uint8_t data)
{
// density select is encoded into this pseudo-command
if ((data & 0xfe) == 0xfe)
diff --git a/src/devices/bus/cgenie/expansion/floppy.h b/src/devices/bus/cgenie/expansion/floppy.h
index 1b6dbf5268b..80f1f47aa65 100644
--- a/src/devices/bus/cgenie/expansion/floppy.h
+++ b/src/devices/bus/cgenie/expansion/floppy.h
@@ -43,9 +43,9 @@ private:
TIMER_DEVICE_CALLBACK_MEMBER(timer_callback);
- DECLARE_READ8_MEMBER(irq_r);
- DECLARE_WRITE8_MEMBER(select_w);
- DECLARE_WRITE8_MEMBER(command_w);
+ uint8_t irq_r();
+ void select_w(uint8_t data);
+ void command_w(uint8_t data);
void mmio(address_map &map);
diff --git a/src/devices/bus/cgenie/parallel/parallel.cpp b/src/devices/bus/cgenie/parallel/parallel.cpp
index 27a5bba5a3a..2d08f27a1e5 100644
--- a/src/devices/bus/cgenie/parallel/parallel.cpp
+++ b/src/devices/bus/cgenie/parallel/parallel.cpp
@@ -56,7 +56,7 @@ void cg_parallel_slot_device::device_start()
// I/O PORTS
//**************************************************************************
-READ8_MEMBER( cg_parallel_slot_device::pa_r )
+uint8_t cg_parallel_slot_device::pa_r()
{
if (m_cart)
return m_cart->pa_r();
@@ -64,13 +64,13 @@ READ8_MEMBER( cg_parallel_slot_device::pa_r )
return 0xff;
}
-WRITE8_MEMBER( cg_parallel_slot_device::pa_w )
+void cg_parallel_slot_device::pa_w(uint8_t data)
{
if (m_cart)
m_cart->pa_w(data);
}
-READ8_MEMBER( cg_parallel_slot_device::pb_r )
+uint8_t cg_parallel_slot_device::pb_r()
{
if (m_cart)
return m_cart->pb_r();
@@ -78,7 +78,7 @@ READ8_MEMBER( cg_parallel_slot_device::pb_r )
return 0xff;
}
-WRITE8_MEMBER( cg_parallel_slot_device::pb_w )
+void cg_parallel_slot_device::pb_w(uint8_t data)
{
if (m_cart)
m_cart->pb_w(data);
diff --git a/src/devices/bus/cgenie/parallel/parallel.h b/src/devices/bus/cgenie/parallel/parallel.h
index cf96a4faaef..74fb8b7a50b 100644
--- a/src/devices/bus/cgenie/parallel/parallel.h
+++ b/src/devices/bus/cgenie/parallel/parallel.h
@@ -49,12 +49,12 @@ public:
virtual ~cg_parallel_slot_device();
// IOA
- DECLARE_READ8_MEMBER(pa_r);
- DECLARE_WRITE8_MEMBER(pa_w);
+ uint8_t pa_r();
+ void pa_w(uint8_t data);
// IOB
- DECLARE_READ8_MEMBER(pb_r);
- DECLARE_WRITE8_MEMBER(pb_w);
+ uint8_t pb_r();
+ void pb_w(uint8_t data);
protected:
// device-level overrides
diff --git a/src/devices/bus/chanf/rom.cpp b/src/devices/bus/chanf/rom.cpp
index a3a213ba7ed..ab4b1a83750 100644
--- a/src/devices/bus/chanf/rom.cpp
+++ b/src/devices/bus/chanf/rom.cpp
@@ -145,7 +145,7 @@ void chanf_multi_final_device::device_reset()
mapper specific handlers
-------------------------------------------------*/
-READ8_MEMBER(chanf_rom_device::read_rom)
+uint8_t chanf_rom_device::read_rom(offs_t offset)
{
if (offset < m_rom_size)
return m_rom[offset];
@@ -212,7 +212,7 @@ void chanf_rom_device::common_write_3853(uint32_t offset, uint8_t data)
m_ram[offset] = data;
}
-READ8_MEMBER(chanf_multi_old_device::read_rom)
+uint8_t chanf_multi_old_device::read_rom(offs_t offset)
{
if (offset < 0x2000)
return m_rom[offset + m_base_bank * 0x2000];
@@ -220,13 +220,13 @@ READ8_MEMBER(chanf_multi_old_device::read_rom)
return 0xff;
}
-WRITE8_MEMBER(chanf_multi_old_device::write_bank)
+void chanf_multi_old_device::write_bank(uint8_t data)
{
//printf("0x%x\n", data);
m_base_bank = data & 0x1f;
}
-READ8_MEMBER(chanf_multi_final_device::read_rom)
+uint8_t chanf_multi_final_device::read_rom(offs_t offset)
{
if (offset < 0x2000)
return m_rom[offset + (m_base_bank * 0x2000) + (m_half_bank * 0x1000)];
@@ -234,7 +234,7 @@ READ8_MEMBER(chanf_multi_final_device::read_rom)
return 0xff;
}
-WRITE8_MEMBER(chanf_multi_final_device::write_bank)
+void chanf_multi_final_device::write_bank(uint8_t data)
{
//printf("0x%x\n", data);
m_base_bank = data & 0x1f;
diff --git a/src/devices/bus/chanf/rom.h b/src/devices/bus/chanf/rom.h
index bd32f177ff8..76221811881 100644
--- a/src/devices/bus/chanf/rom.h
+++ b/src/devices/bus/chanf/rom.h
@@ -25,7 +25,7 @@ public:
void common_write_3853(uint32_t offset, uint8_t data);
// reading and writing
- virtual DECLARE_READ8_MEMBER(read_rom) override;
+ virtual uint8_t read_rom(offs_t offset) override;
protected:
chanf_rom_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
@@ -49,8 +49,8 @@ public:
virtual void device_reset() override;
// reading and writing
- virtual DECLARE_READ8_MEMBER(read_ram) override { return common_read_2102(offset); }
- virtual DECLARE_WRITE8_MEMBER(write_ram) override { common_write_2102(offset, data); }
+ virtual uint8_t read_ram(offs_t offset) override { return common_read_2102(offset); }
+ virtual void write_ram(offs_t offset, uint8_t data) override { common_write_2102(offset, data); }
};
@@ -67,8 +67,8 @@ public:
virtual void device_reset() override;
// reading and writing
- virtual DECLARE_READ8_MEMBER(read_ram) override { return common_read_2102(offset); }
- virtual DECLARE_WRITE8_MEMBER(write_ram) override { common_write_2102(offset, data); }
+ virtual uint8_t read_ram(offs_t offset) override { return common_read_2102(offset); }
+ virtual void write_ram(offs_t offset, uint8_t data) override { common_write_2102(offset, data); }
};
@@ -81,8 +81,8 @@ public:
chanf_chess_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// reading and writing
- virtual DECLARE_READ8_MEMBER(read_ram) override { return common_read_3853(offset); }
- virtual DECLARE_WRITE8_MEMBER(write_ram) override { common_write_3853(offset, data); }
+ virtual uint8_t read_ram(offs_t offset) override { return common_read_3853(offset); }
+ virtual void write_ram(offs_t offset, uint8_t data) override { common_write_3853(offset, data); }
};
@@ -99,10 +99,10 @@ public:
virtual void device_reset() override;
// reading and writing
- virtual DECLARE_READ8_MEMBER(read_rom) override;
- virtual DECLARE_READ8_MEMBER(read_ram) override { return common_read_3853(offset); }
- virtual DECLARE_WRITE8_MEMBER(write_ram) override { common_write_3853(offset, data); }
- virtual DECLARE_WRITE8_MEMBER(write_bank) override;
+ virtual uint8_t read_rom(offs_t offset) override;
+ virtual uint8_t read_ram(offs_t offset) override { return common_read_3853(offset); }
+ virtual void write_ram(offs_t offset, uint8_t data) override { common_write_3853(offset, data); }
+ virtual void write_bank(uint8_t data) override;
private:
int m_base_bank;
@@ -122,10 +122,10 @@ public:
virtual void device_reset() override;
// reading and writing
- virtual DECLARE_READ8_MEMBER(read_rom) override;
- virtual DECLARE_READ8_MEMBER(read_ram) override { return common_read_3853(offset); }
- virtual DECLARE_WRITE8_MEMBER(write_ram) override { common_write_3853(offset, data); }
- virtual DECLARE_WRITE8_MEMBER(write_bank) override;
+ virtual uint8_t read_rom(offs_t offset) override;
+ virtual uint8_t read_ram(offs_t offset) override { return common_read_3853(offset); }
+ virtual void write_ram(offs_t offset, uint8_t data) override { common_write_3853(offset, data); }
+ virtual void write_bank(uint8_t data) override;
private:
int m_base_bank, m_half_bank;
diff --git a/src/devices/bus/chanf/slot.cpp b/src/devices/bus/chanf/slot.cpp
index ae0b5f6096b..62de4ba67c0 100644
--- a/src/devices/bus/chanf/slot.cpp
+++ b/src/devices/bus/chanf/slot.cpp
@@ -219,10 +219,10 @@ std::string channelf_cart_slot_device::get_default_card_software(get_default_car
read
-------------------------------------------------*/
-READ8_MEMBER(channelf_cart_slot_device::read_rom)
+uint8_t channelf_cart_slot_device::read_rom(offs_t offset)
{
if (m_cart)
- return m_cart->read_rom(space, offset);
+ return m_cart->read_rom(offset);
else
return 0xff;
}
@@ -231,10 +231,10 @@ READ8_MEMBER(channelf_cart_slot_device::read_rom)
read
-------------------------------------------------*/
-READ8_MEMBER(channelf_cart_slot_device::read_ram)
+uint8_t channelf_cart_slot_device::read_ram(offs_t offset)
{
if (m_cart)
- return m_cart->read_ram(space, offset);
+ return m_cart->read_ram(offset);
else
return 0xff;
}
@@ -243,18 +243,18 @@ READ8_MEMBER(channelf_cart_slot_device::read_ram)
write
-------------------------------------------------*/
-WRITE8_MEMBER(channelf_cart_slot_device::write_ram)
+void channelf_cart_slot_device::write_ram(offs_t offset, uint8_t data)
{
if (m_cart)
- m_cart->write_ram(space, offset, data);
+ m_cart->write_ram(offset, data);
}
/*-------------------------------------------------
write
-------------------------------------------------*/
-WRITE8_MEMBER(channelf_cart_slot_device::write_bank)
+void channelf_cart_slot_device::write_bank(uint8_t data)
{
if (m_cart)
- m_cart->write_bank(space, offset, data);
+ m_cart->write_bank(data);
}
diff --git a/src/devices/bus/chanf/slot.h b/src/devices/bus/chanf/slot.h
index 5287dad72da..09f58f03800 100644
--- a/src/devices/bus/chanf/slot.h
+++ b/src/devices/bus/chanf/slot.h
@@ -32,10 +32,10 @@ public:
virtual ~device_channelf_cart_interface();
// reading and writing
- virtual DECLARE_READ8_MEMBER(read_rom) { return 0xff; }
- virtual DECLARE_READ8_MEMBER(read_ram) { return 0xff; }
- virtual DECLARE_WRITE8_MEMBER(write_ram) { }
- virtual DECLARE_WRITE8_MEMBER(write_bank) { }
+ virtual uint8_t read_rom(offs_t offset) { return 0xff; }
+ virtual uint8_t read_ram(offs_t offset) { return 0xff; }
+ virtual void write_ram(offs_t offset, uint8_t data) { }
+ virtual void write_bank(uint8_t data) { }
void rom_alloc(uint32_t size, const char *tag);
void ram_alloc(uint32_t size);
@@ -98,10 +98,10 @@ public:
void save_ram() { if (m_cart && m_cart->get_ram_size()) m_cart->save_ram(); }
// reading and writing
- virtual DECLARE_READ8_MEMBER(read_rom);
- virtual DECLARE_READ8_MEMBER(read_ram);
- virtual DECLARE_WRITE8_MEMBER(write_ram);
- virtual DECLARE_WRITE8_MEMBER(write_bank);
+ uint8_t read_rom(offs_t offset);
+ uint8_t read_ram(offs_t offset);
+ void write_ram(offs_t offset, uint8_t data);
+ void write_bank(uint8_t data);
protected:
// device-level overrides
diff --git a/src/devices/bus/coco/coco_fdc.cpp b/src/devices/bus/coco/coco_fdc.cpp
index c0f8295716b..d494eb92a16 100644
--- a/src/devices/bus/coco/coco_fdc.cpp
+++ b/src/devices/bus/coco/coco_fdc.cpp
@@ -40,6 +40,32 @@
Reading from $FF48-$FF4F clears bit 7 of DSKREG ($FF40)
+ ---------------------------------------------------------------------------
+
+ Disto No Halt Extension
+
+ The Disto Super Controller II includes "no halt" circuitry. Implemented
+ by using a read and write cache.
+
+ CachDat - Cache Data Register
+ $FF74 & $FF75: Read/Write cache data.
+
+ CachCtrl - Cache Controller
+ $FF76: Read
+ Bit 7 low indicates an interrupt request from the disk controller
+
+ $FF76: Write:
+ 00000000 = Caching off
+ 00001000 = Tell cache controller to send interrupt when device is
+ ready to send/receive a buffer (seek done, etc.)
+ 00000111 = Read cache on - Get next 256 data bytes from controller
+ to cache
+ 00000100 = Write cache on - Next 256 bytes stored in cache are
+ sector
+ 00000110 = Copy Write cache to controller
+
+
+
*********************************************************************/
#include "emu.h"
@@ -49,18 +75,20 @@
#include "machine/msm6242.h"
#include "machine/ds1315.h"
#include "machine/wd_fdc.h"
+#include "machine/ram.h"
#include "formats/dmk_dsk.h"
#include "formats/jvc_dsk.h"
#include "formats/vdk_dsk.h"
#include "formats/sdf_dsk.h"
#include "formats/os9_dsk.h"
+// #define VERBOSE (LOG_GENERAL )
+#include "logmacro.h"
/***************************************************************************
PARAMETERS
***************************************************************************/
-#define LOG_FDC 0
#define WD_TAG "wd17xx"
#define WD2797_TAG "wd2797"
#define DISTO_TAG "disto"
@@ -89,6 +117,10 @@ protected:
};
// device-level overrides
+ virtual void device_start() override;
+ virtual void device_reset() override;
+
+ // device-level overrides
virtual DECLARE_READ8_MEMBER(cts_read) override;
virtual DECLARE_READ8_MEMBER(scs_read) override;
virtual DECLARE_WRITE8_MEMBER(scs_write) override;
@@ -108,6 +140,16 @@ protected:
required_device<msm6242_device> m_disto_msm6242; // 6242 RTC on Disto interface
offs_t m_msm6242_rtc_address;
optional_ioport m_rtc;
+
+ // Protected
+ virtual DECLARE_READ8_MEMBER(ff74_read);
+ virtual DECLARE_WRITE8_MEMBER(ff74_write);
+
+private:
+ // registers
+ uint8_t m_cache_controler;
+ uint8_t m_cache_pointer;
+ required_device<ram_device> m_cache_buffer;
};
@@ -143,6 +185,8 @@ void coco_fdc_device_base::device_add_mconfig(machine_config &config)
MSM6242(config, m_disto_msm6242, 32.768_kHz_XTAL);
DS1315(config, CLOUD9_TAG, 0);
+
+ RAM(config, "cachebuffer").set_default_size("256").set_default_value(0);
}
@@ -183,6 +227,7 @@ uint8_t* coco_family_fdc_device_base::get_cart_base()
return memregion("eprom")->base();
}
+
//-------------------------------------------------
// coco_family_fdc_device_base::get_cart_memregion
//-------------------------------------------------
@@ -209,9 +254,102 @@ coco_fdc_device_base::coco_fdc_device_base(const machine_config &mconfig, device
, m_disto_msm6242(*this, DISTO_TAG)
, m_msm6242_rtc_address(0)
, m_rtc(*this, ":real_time_clock")
+ , m_cache_buffer(*this, "cachebuffer")
{
}
+
+//-------------------------------------------------
+// device_start - device-specific start
+//-------------------------------------------------
+
+void coco_fdc_device_base::device_start()
+{
+ install_readwrite_handler(0xFF74, 0xFF76,
+ read8_delegate(*this, FUNC(coco_fdc_device_base::ff74_read)),
+ write8_delegate(*this, FUNC(coco_fdc_device_base::ff74_write)));
+
+ save_item(NAME(m_cache_controler));
+ save_item(NAME(m_cache_pointer));
+}
+
+
+//-------------------------------------------------
+// device_reset - device-specific reset
+//-------------------------------------------------
+
+void coco_fdc_device_base::device_reset()
+{
+ coco_family_fdc_device_base::device_reset();
+
+ m_cache_controler = 0x80;
+ m_cache_pointer = 0;
+}
+
+
+//-------------------------------------------------
+// ff74_read - no halt registers
+//-------------------------------------------------
+
+READ8_MEMBER(coco_fdc_device_base::ff74_read)
+{
+ uint8_t data = 0x0;
+
+ switch(offset)
+ {
+ case 0x0:
+ data = m_cache_buffer->read(m_cache_pointer++);
+ LOG( "CachDat_A read: %2.2x\n", data );
+ break;
+ case 0x1:
+ data = m_cache_buffer->read(m_cache_pointer++);
+ LOG( "CachDat_B read: %2.2x\n", data );
+ break;
+ case 0x2:
+ data = m_cache_controler;
+ LOG( "CachCtrl read: %2.2x\n", data );
+ break;
+ }
+
+ return data;
+}
+
+
+//-------------------------------------------------
+// ff74_write - no halt registers
+//-------------------------------------------------
+
+WRITE8_MEMBER(coco_fdc_device_base::ff74_write)
+{
+ switch(offset)
+ {
+ case 0x0:
+ LOG( "CachDat_A write: %2.2x\n", data );
+ m_cache_buffer->write(m_cache_pointer++, data);
+ break;
+ case 0x1:
+ LOG( "CachDat_B write: %2.2x\n", data );
+ m_cache_buffer->write(m_cache_pointer++, data);
+ break;
+ case 0x2:
+ LOG( "CachCtrl write: %2.2x\n", data );
+
+ // reset static ram buffer pointer on any write
+ m_cache_pointer = 0;
+
+ if(data == 0)
+ {
+ // Clear interrupt when caching is turned off
+ set_line_value(line::CART, CLEAR_LINE);
+ m_cache_controler |= 0x80;
+ }
+
+ m_cache_controler = (m_cache_controler & 0x80) | (data & 0x7f);
+ break;
+ }
+}
+
+
//-------------------------------------------------
// real_time_clock
//-------------------------------------------------
@@ -238,15 +376,60 @@ coco_fdc_device_base::rtc_type coco_fdc_device_base::real_time_clock()
void coco_fdc_device_base::update_lines()
{
- // clear HALT enable under certain circumstances
- if (intrq() && (dskreg() & 0x20))
- set_dskreg(dskreg() & ~0x80); // clear halt enable
+ if( (m_cache_controler & 0x7f) == 0) /* cache disabled */
+ {
+ // clear HALT enable under certain circumstances
+ if (intrq() && (dskreg() & 0x20))
+ set_dskreg(dskreg() & ~0x80); // clear halt enable
+
+ // set the NMI line
+ set_line_value(line::NMI, intrq() && (dskreg() & 0x20));
+
+ // set the HALT line
+ set_line_value(line::HALT, !drq() && (dskreg() & 0x80));
+ }
+ else
+ {
+ if( drq() == ASSERT_LINE)
+ {
+ if( (m_cache_controler & 0x07) == 0x07) /* Read cache on */
+ {
+ uint8_t data = m_wd17xx->data_r();
+ LOG("Cached drq read: %2.2x\n", data );
+ m_cache_buffer->write(m_cache_pointer++, data);
+ }
+ else if( (m_cache_controler & 0x07) == 0x04 ) /* Write cache on */
+ {
+ uint8_t data = m_cache_buffer->read(m_cache_pointer++);
+ LOG("Cached drq write: %2.2x\n", data );
+ m_wd17xx->data_w(data);
+ }
+ else if( (m_cache_controler & 0x07) == 0x06 ) /* Copy Write cache to controller */
+ {
+ uint8_t data = m_cache_buffer->read(m_cache_pointer++);
+ LOG("Cached drq write: %2.2x\n", data );
+ m_wd17xx->data_w(data);
+ }
+ else
+ {
+ LOG("illegal DRQ cached assert mode\n" );
+ }
+ }
- // set the NMI line
- set_line_value(line::NMI, intrq() && (dskreg() & 0x20));
+ if( (m_cache_controler & 0x08) == 0x08)
+ {
+ set_line_value(line::CART, intrq());
+ }
- // set the HALT line
- set_line_value(line::HALT, !drq() && (dskreg() & 0x80));
+ if( intrq() == ASSERT_LINE)
+ {
+ m_cache_controler &= 0x7f;
+ }
+ else
+ {
+ m_cache_controler |= 0x80;
+ }
+ }
}
@@ -259,19 +442,16 @@ void coco_fdc_device_base::dskreg_w(uint8_t data)
uint8_t drive = 0;
uint8_t head;
- if (LOG_FDC)
- {
- logerror("fdc_coco_dskreg_w(): %c%c%c%c%c%c%c%c ($%02x)\n",
- data & 0x80 ? 'H' : 'h',
- data & 0x40 ? '3' : '.',
- data & 0x20 ? 'D' : 'S',
- data & 0x10 ? 'P' : 'p',
- data & 0x08 ? 'M' : 'm',
- data & 0x04 ? '2' : '.',
- data & 0x02 ? '1' : '.',
- data & 0x01 ? '0' : '.',
- data);
- }
+ LOG("fdc_coco_dskreg_w(): %c%c%c%c%c%c%c%c ($%02x)\n",
+ data & 0x80 ? 'H' : 'h',
+ data & 0x40 ? '3' : '.',
+ data & 0x20 ? 'D' : 'S',
+ data & 0x10 ? 'P' : 'p',
+ data & 0x08 ? 'M' : 'm',
+ data & 0x04 ? '2' : '.',
+ data & 0x02 ? '1' : '.',
+ data & 0x01 ? '0' : '.',
+ data);
// An email from John Kowalski informed me that if the DS3 is
// high, and one of the other drive bits is selected (DS0-DS2), then the
@@ -334,41 +514,46 @@ READ8_MEMBER(coco_fdc_device_base::scs_read)
{
case 8:
result = m_wd17xx->status_r();
+ LOG("m_wd17xx->status_r: %2.2x\n", result );
break;
case 9:
result = m_wd17xx->track_r();
+ LOG("m_wd17xx->track_r: %2.2x\n", result );
break;
case 10:
result = m_wd17xx->sector_r();
+ LOG("m_wd17xx->sector_r: %2.2x\n", result );
break;
case 11:
result = m_wd17xx->data_r();
+ LOG("m_wd17xx->data_r: %2.2x\n", result );
break;
}
/* other stuff for RTCs */
switch (offset)
{
- case 0x10: /* FF50 */
- if (real_time_clock() == rtc_type::DISTO)
- result = m_disto_msm6242->read(m_msm6242_rtc_address);
- break;
-
- case 0x38: /* FF78 */
- if (real_time_clock() == rtc_type::CLOUD9)
- m_ds1315->read_0();
- break;
-
- case 0x39: /* FF79 */
- if (real_time_clock() == rtc_type::CLOUD9)
- m_ds1315->read_1();
- break;
-
- case 0x3C: /* FF7C */
- if (real_time_clock() == rtc_type::CLOUD9)
- result = m_ds1315->read_data();
- break;
+ case 0x10: /* FF50 */
+ if (real_time_clock() == rtc_type::DISTO)
+ result = m_disto_msm6242->read(m_msm6242_rtc_address);
+ break;
+
+ case 0x38: /* FF78 */
+ if (real_time_clock() == rtc_type::CLOUD9)
+ m_ds1315->read_0();
+ break;
+
+ case 0x39: /* FF79 */
+ if (real_time_clock() == rtc_type::CLOUD9)
+ m_ds1315->read_1();
+ break;
+
+ case 0x3C: /* FF7C */
+ if (real_time_clock() == rtc_type::CLOUD9)
+ result = m_ds1315->read_data();
+ break;
}
+
return result;
}
@@ -386,15 +571,19 @@ WRITE8_MEMBER(coco_fdc_device_base::scs_write)
dskreg_w(data);
break;
case 8:
+ LOG("m_wd17xx->cmd_w: %2.2x\n", data );
m_wd17xx->cmd_w(data);
break;
case 9:
+ LOG("m_wd17xx->track_w: %2.2x\n", data );
m_wd17xx->track_w(data);
break;
case 10:
+ LOG("m_wd17xx->sector_w: %2.2x\n", data );
m_wd17xx->sector_w(data);
break;
case 11:
+ LOG("m_wd17xx->data_w: %2.2x\n", data );
m_wd17xx->data_w(data);
break;
};
diff --git a/src/devices/bus/coco/coco_multi.cpp b/src/devices/bus/coco/coco_multi.cpp
index a6705a7b751..1ffa00e3078 100644
--- a/src/devices/bus/coco/coco_multi.cpp
+++ b/src/devices/bus/coco/coco_multi.cpp
@@ -64,6 +64,7 @@
#include "coco_pak.h"
#include "coco_rs232.h"
#include "coco_ssc.h"
+#include "coco_ram.h"
#define SLOT1_TAG "slot1"
#define SLOT2_TAG "slot2"
@@ -164,6 +165,7 @@ static void coco_cart_slot1_3(device_slot_interface &device)
device.option_add("dcmodem", COCO_DCMODEM);
device.option_add("orch90", COCO_ORCH90);
device.option_add("ssc", COCO_SSC);
+ device.option_add("ram", COCO_PAK_RAM);
device.option_add("games_master", COCO_PAK_GMC);
device.option_add("banked_16k", COCO_PAK_BANKED);
device.option_add("pak", COCO_PAK);
@@ -177,6 +179,7 @@ static void coco_cart_slot4(device_slot_interface &device)
device.option_add("dcmodem", COCO_DCMODEM);
device.option_add("orch90", COCO_ORCH90);
device.option_add("ssc", COCO_SSC);
+ device.option_add("ram", COCO_PAK_RAM);
device.option_add("games_master", COCO_PAK_GMC);
device.option_add("banked_16k", COCO_PAK_BANKED);
device.option_add("pak", COCO_PAK);
diff --git a/src/devices/bus/coco/coco_ram.cpp b/src/devices/bus/coco/coco_ram.cpp
new file mode 100644
index 00000000000..46a2b8bfd4e
--- /dev/null
+++ b/src/devices/bus/coco/coco_ram.cpp
@@ -0,0 +1,183 @@
+// license:BSD-3-Clause
+// copyright-holders:tim lindner
+/***************************************************************************
+
+ coco_ram.cpp
+
+ Code for emulating the Disto RAM cartridge
+
+ This cartridge came in several forms: 256K, 512K, 768K, and 1024K.
+
+***************************************************************************/
+
+#include "emu.h"
+#include "coco_ram.h"
+#include "cococart.h"
+#include "machine/ram.h"
+
+#define STATICRAM_TAG "static_ram"
+
+
+// #define VERBOSE (LOG_GENERAL )
+#include "logmacro.h"
+
+#define RAM_SIZE_IN_K 1024
+#define BUFFER_SIZE (RAM_SIZE_IN_K * 1024)
+
+#define STRINGIZE_HELPER(expr) #expr
+#define STRINGIZE(expr) STRINGIZE_HELPER(expr)
+
+//**************************************************************************
+// TYPE DECLARATIONS
+//**************************************************************************
+
+namespace
+{
+ // ======================> coco_pak_device
+
+ class coco_pak_ram_device :
+ public device_t,
+ public device_cococart_interface
+ {
+ public:
+ // construction/destruction
+ coco_pak_ram_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ virtual void device_add_mconfig(machine_config &config) override;
+
+ protected:
+ // device-level overrides
+ virtual void device_start() override;
+ virtual void device_reset() override;
+ virtual DECLARE_WRITE8_MEMBER(scs_write) override;
+ virtual DECLARE_READ8_MEMBER(scs_read) override;
+
+ private:
+ required_device<ram_device> m_staticram;
+ int m_offset;
+ };
+};
+
+
+
+//**************************************************************************
+// GLOBAL VARIABLES
+//**************************************************************************
+
+DEFINE_DEVICE_TYPE_PRIVATE(COCO_PAK_RAM, device_cococart_interface, coco_pak_ram_device, "cocopakram", "Disto " STRINGIZE(RAM_SIZE_IN_K) "K RAM Cartridge")
+
+
+
+//-------------------------------------------------
+// coco_pak_device - constructor
+//-------------------------------------------------
+
+coco_pak_ram_device::coco_pak_ram_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+ : device_t(mconfig, COCO_PAK_RAM, tag, owner, clock)
+ , device_cococart_interface(mconfig, *this)
+ , m_staticram(*this, STATICRAM_TAG)
+ , m_offset(0)
+{
+}
+
+
+
+//**************************************************************************
+// MACHINE FRAGMENTS AND ADDRESS MAPS
+//**************************************************************************
+
+void coco_pak_ram_device::device_add_mconfig(machine_config &config)
+{
+ RAM(config, STATICRAM_TAG).set_default_size(STRINGIZE(RAM_SIZE_IN_K) "K").set_default_value(0);
+}
+
+
+
+//-------------------------------------------------
+// device_start - device-specific startup
+//-------------------------------------------------
+
+void coco_pak_ram_device::device_start()
+{
+ // initial state
+ m_offset = 0;
+
+ // save state
+ save_item(NAME(m_offset));
+}
+
+
+
+//-------------------------------------------------
+// device_reset - device-specific reset
+//-------------------------------------------------
+
+void coco_pak_ram_device::device_reset()
+{
+ m_offset = 0;
+}
+
+
+
+//-------------------------------------------------
+// scs_write
+//-------------------------------------------------
+
+WRITE8_MEMBER(coco_pak_ram_device::scs_write)
+{
+// int idata = data;
+
+ switch(offset)
+ {
+ case 0:
+ m_offset = ((m_offset & 0xffff00) + data);
+ break;
+ case 1:
+ m_offset = ((m_offset & 0xff00ff) + (data << 8));
+ break;
+ case 2:
+ m_offset = ((m_offset & 0x00ffff) + (data << 16));
+ break;
+ case 3:
+ if( m_offset < BUFFER_SIZE )
+ {
+ m_staticram->write(m_offset, data);
+ }
+ break;
+ }
+
+ LOG("scs_write: %s: %06x, %02x, %02x\n", machine().describe_context(), m_offset, offset, data);
+}
+
+
+
+//-------------------------------------------------
+// scs_read
+//-------------------------------------------------
+
+READ8_MEMBER(coco_pak_ram_device::scs_read)
+{
+ uint8_t data = 0x00;
+
+ switch (offset)
+ {
+ case 0:
+ data = (m_offset) & 0xff;
+ break;
+ case 1:
+ data = (m_offset & 0xff00ff) >> 8;
+ break;
+ case 2:
+ data = (m_offset & 0xff0000) >> 16;
+ break;
+ case 3:
+ if( m_offset < BUFFER_SIZE )
+ {
+ data = m_staticram->read(m_offset);
+ }
+
+ break;
+ }
+
+ LOG("scs_read: %s: %06x, %02x, %02x\n", machine().describe_context(), m_offset, offset, data);
+ return data;
+}
diff --git a/src/devices/bus/coco/coco_ram.h b/src/devices/bus/coco/coco_ram.h
new file mode 100644
index 00000000000..a88874cc959
--- /dev/null
+++ b/src/devices/bus/coco/coco_ram.h
@@ -0,0 +1,14 @@
+// license:BSD-3-Clause
+// copyright-holders:tim lindner
+#ifndef MAME_BUS_COCO_COCO_RAM_H
+#define MAME_BUS_COCO_COCO_RAM_H
+
+#pragma once
+
+#include "cococart.h"
+
+// device type definition
+DECLARE_DEVICE_TYPE(COCO_PAK_RAM, device_cococart_interface)
+
+#endif // MAME_BUS_COCO_COCO_RAM_H
+
diff --git a/src/devices/bus/coco/coco_ssc.cpp b/src/devices/bus/coco/coco_ssc.cpp
index cc50f7cf6ad..4e96d57699b 100644
--- a/src/devices/bus/coco/coco_ssc.cpp
+++ b/src/devices/bus/coco/coco_ssc.cpp
@@ -84,12 +84,12 @@ namespace
virtual void device_add_mconfig(machine_config &config) override;
virtual void device_reset() override;
- DECLARE_READ8_MEMBER(ssc_port_a_r);
- DECLARE_WRITE8_MEMBER(ssc_port_b_w);
- DECLARE_READ8_MEMBER(ssc_port_c_r);
- DECLARE_WRITE8_MEMBER(ssc_port_c_w);
- DECLARE_READ8_MEMBER(ssc_port_d_r);
- DECLARE_WRITE8_MEMBER(ssc_port_d_w);
+ uint8_t ssc_port_a_r();
+ void ssc_port_b_w(uint8_t data);
+ uint8_t ssc_port_c_r();
+ void ssc_port_c_w(uint8_t data);
+ uint8_t ssc_port_d_r();
+ void ssc_port_d_w(uint8_t data);
protected:
// device-level overrides
@@ -391,7 +391,7 @@ WRITE8_MEMBER(coco_ssc_device::ff7d_write)
// Handlers for secondary CPU ports
//-------------------------------------------------
-READ8_MEMBER(coco_ssc_device::ssc_port_a_r)
+uint8_t coco_ssc_device::ssc_port_a_r()
{
if (LOG_SSC)
{
@@ -403,7 +403,7 @@ READ8_MEMBER(coco_ssc_device::ssc_port_a_r)
return m_tms7000_porta;
}
-WRITE8_MEMBER(coco_ssc_device::ssc_port_b_w)
+void coco_ssc_device::ssc_port_b_w(uint8_t data)
{
if (LOG_SSC)
{
@@ -413,7 +413,7 @@ WRITE8_MEMBER(coco_ssc_device::ssc_port_b_w)
m_tms7000_portb = data;
}
-READ8_MEMBER(coco_ssc_device::ssc_port_c_r)
+uint8_t coco_ssc_device::ssc_port_c_r()
{
if (LOG_SSC)
{
@@ -423,7 +423,7 @@ READ8_MEMBER(coco_ssc_device::ssc_port_c_r)
return m_tms7000_portc;
}
-WRITE8_MEMBER(coco_ssc_device::ssc_port_c_w)
+void coco_ssc_device::ssc_port_c_w(uint8_t data)
{
if( (data & C_RCS) == 0 && (data & C_RRW) == 0) /* static RAM write */
{
@@ -475,7 +475,7 @@ WRITE8_MEMBER(coco_ssc_device::ssc_port_c_w)
m_tms7000_portc = data;
}
-READ8_MEMBER(coco_ssc_device::ssc_port_d_r)
+uint8_t coco_ssc_device::ssc_port_d_r()
{
if( ((m_tms7000_portc & C_RCS) == 0) && ((m_tms7000_portc & C_ACS) == 0))
logerror( "[%s] Warning: Reading RAM and PSG at the same time!\n", machine().describe_context() );
@@ -505,7 +505,7 @@ READ8_MEMBER(coco_ssc_device::ssc_port_d_r)
return m_tms7000_portd;
}
-WRITE8_MEMBER(coco_ssc_device::ssc_port_d_w)
+void coco_ssc_device::ssc_port_d_w(uint8_t data)
{
if (LOG_SSC)
{
diff --git a/src/devices/bus/coco/coco_t4426.cpp b/src/devices/bus/coco/coco_t4426.cpp
index 4bb44e5949a..47a1421ed1a 100644
--- a/src/devices/bus/coco/coco_t4426.cpp
+++ b/src/devices/bus/coco/coco_t4426.cpp
@@ -103,7 +103,7 @@ namespace
virtual ioport_constructor device_input_ports() const override;
virtual uint8_t* get_cart_base() override;
- DECLARE_WRITE8_MEMBER(pia_A_w);
+ void pia_A_w(uint8_t data);
// Clocks
void write_acia_clocks(int id, int state);
@@ -397,7 +397,7 @@ WRITE8_MEMBER(coco_t4426_device::scs_write)
#define ROM6 (~0x40 & 0xff)
#define ROM7 (~0x80 & 0xff)
-WRITE8_MEMBER( coco_t4426_device::pia_A_w )
+void coco_t4426_device::pia_A_w(uint8_t data)
{
LOGPIA("%s(%02x)\n", FUNCNAME, data);
m_select = data;
diff --git a/src/devices/bus/coco/cococart.cpp b/src/devices/bus/coco/cococart.cpp
index c97c770eea7..1cb97210e34 100644
--- a/src/devices/bus/coco/cococart.cpp
+++ b/src/devices/bus/coco/cococart.cpp
@@ -450,7 +450,7 @@ image_init_result cococart_slot_device::call_load()
while (read_length < cart_length)
{
- offs_t len = std::min(read_length, m_cart->get_cart_size() - read_length);
+ offs_t len = std::min(read_length, cart_length - read_length);
memcpy(base + read_length, base, len);
read_length += len;
}
diff --git a/src/devices/bus/comx35/exp.cpp b/src/devices/bus/comx35/exp.cpp
index 6931eecfda0..9c5095e5fd1 100644
--- a/src/devices/bus/comx35/exp.cpp
+++ b/src/devices/bus/comx35/exp.cpp
@@ -157,7 +157,7 @@ READ_LINE_MEMBER(comx_expansion_slot_device::ef4_r)
// sc_w - state code/N0-N2 write
//-------------------------------------------------
-WRITE8_MEMBER(comx_expansion_slot_device::sc_w)
+void comx_expansion_slot_device::sc_w(offs_t offset, uint8_t data)
{
if (m_card != nullptr)
m_card->comx_sc_w(offset, data);
diff --git a/src/devices/bus/comx35/exp.h b/src/devices/bus/comx35/exp.h
index 75ff26f77ce..8f99edae4fd 100644
--- a/src/devices/bus/comx35/exp.h
+++ b/src/devices/bus/comx35/exp.h
@@ -73,7 +73,7 @@ public:
DECLARE_WRITE_LINE_MEMBER(irq_w) { m_write_irq(state); }
- DECLARE_WRITE8_MEMBER(sc_w);
+ void sc_w(offs_t offset, uint8_t data);
DECLARE_WRITE_LINE_MEMBER(tpb_w);
protected:
diff --git a/src/devices/bus/cpc/magicsound.cpp b/src/devices/bus/cpc/magicsound.cpp
index 090a7ef732e..4495f16a629 100644
--- a/src/devices/bus/cpc/magicsound.cpp
+++ b/src/devices/bus/cpc/magicsound.cpp
@@ -159,7 +159,7 @@ WRITE_LINE_MEMBER(al_magicsound_device::sam1_w) { m_current_channel = 1; if(m_da
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); }
-READ8_MEMBER(al_magicsound_device::dma_read_byte)
+uint8_t al_magicsound_device::dma_read_byte(offs_t offset)
{
uint8_t ret = 0xff;
uint8_t page = (offset & 0xc000) >> 14;
@@ -169,7 +169,7 @@ READ8_MEMBER(al_magicsound_device::dma_read_byte)
return ret;
}
-WRITE8_MEMBER(al_magicsound_device::dma_write_byte)
+void al_magicsound_device::dma_write_byte(uint8_t data)
{
m_output[m_current_channel] = data;
}
diff --git a/src/devices/bus/cpc/magicsound.h b/src/devices/bus/cpc/magicsound.h
index b90bbf4e897..ae31b962c2a 100644
--- a/src/devices/bus/cpc/magicsound.h
+++ b/src/devices/bus/cpc/magicsound.h
@@ -57,8 +57,8 @@ protected:
private:
DECLARE_WRITE_LINE_MEMBER(da0_w);
- DECLARE_READ8_MEMBER(dma_read_byte);
- DECLARE_WRITE8_MEMBER(dma_write_byte);
+ 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);
diff --git a/src/devices/bus/cpc/symbfac2.cpp b/src/devices/bus/cpc/symbfac2.cpp
index 8710717de6c..13edcad0aa6 100644
--- a/src/devices/bus/cpc/symbfac2.cpp
+++ b/src/devices/bus/cpc/symbfac2.cpp
@@ -133,27 +133,27 @@ READ8_MEMBER(cpc_symbiface2_device::ide_cs0_r)
else
{
m_iohigh = true;
- m_ide_data = m_ide->read_cs0(offset);
+ m_ide_data = m_ide->cs0_r(offset);
return m_ide_data & 0xff;
}
}
else
- return m_ide->read_cs0(offset);
+ return m_ide->cs0_r(offset);
}
WRITE8_MEMBER(cpc_symbiface2_device::ide_cs0_w)
{
- m_ide->write_cs0(offset, data);
+ m_ide->cs0_w(offset, data);
}
READ8_MEMBER(cpc_symbiface2_device::ide_cs1_r)
{
- return m_ide->read_cs1(offset);
+ return m_ide->cs1_r(offset);
}
WRITE8_MEMBER(cpc_symbiface2_device::ide_cs1_w)
{
- m_ide->write_cs1(offset, data);
+ m_ide->cs1_w(offset, data);
}
// RTC (Dallas DS1287A)
diff --git a/src/devices/bus/crvision/rom.cpp b/src/devices/bus/crvision/rom.cpp
index fad177683b0..f4aac5393d8 100644
--- a/src/devices/bus/crvision/rom.cpp
+++ b/src/devices/bus/crvision/rom.cpp
@@ -72,7 +72,7 @@ crvision_rom18k_device::crvision_rom18k_device(const machine_config &mconfig, co
mapper specific handlers
-------------------------------------------------*/
-READ8_MEMBER(crvision_rom_device::read_rom80)
+uint8_t crvision_rom_device::read_rom80(offs_t offset)
{
offset &= 0x1fff;
if (offset < 0x1000)
@@ -82,7 +82,7 @@ READ8_MEMBER(crvision_rom_device::read_rom80)
}
-READ8_MEMBER(crvision_rom6k_device::read_rom80)
+uint8_t crvision_rom6k_device::read_rom80(offs_t offset)
{
offset &= 0x1fff;
if (offset < 0x1000)
@@ -92,48 +92,48 @@ READ8_MEMBER(crvision_rom6k_device::read_rom80)
}
-READ8_MEMBER(crvision_rom8k_device::read_rom80)
+uint8_t crvision_rom8k_device::read_rom80(offs_t offset)
{
return m_rom[offset & 0x1fff];
}
-READ8_MEMBER(crvision_rom10k_device::read_rom80)
+uint8_t crvision_rom10k_device::read_rom80(offs_t offset)
{
return m_rom[offset & 0x1fff];
}
-READ8_MEMBER(crvision_rom10k_device::read_rom40)
+uint8_t crvision_rom10k_device::read_rom40(offs_t offset)
{
return m_rom[0x2000 + (offset & 0x7ff)];
}
-READ8_MEMBER(crvision_rom12k_device::read_rom80)
+uint8_t crvision_rom12k_device::read_rom80(offs_t offset)
{
return m_rom[offset & 0x1fff];
}
-READ8_MEMBER(crvision_rom12k_device::read_rom40)
+uint8_t crvision_rom12k_device::read_rom40(offs_t offset)
{
return m_rom[0x2000 + (offset & 0xfff)];
}
-READ8_MEMBER(crvision_rom16k_device::read_rom80)
+uint8_t crvision_rom16k_device::read_rom80(offs_t offset)
{
// lower 8K in 0xa000-0xbfff, higher 8K in 0x8000-0x9fff
return m_rom[offset ^ 0x2000];
}
-READ8_MEMBER(crvision_rom18k_device::read_rom80)
+uint8_t crvision_rom18k_device::read_rom80(offs_t offset)
{
// lower 8K in 0xa000-0xbfff, higher 8K in 0x8000-0x9fff
return m_rom[offset ^ 0x2000];
}
-READ8_MEMBER(crvision_rom18k_device::read_rom40)
+uint8_t crvision_rom18k_device::read_rom40(offs_t offset)
{
return m_rom[0x4000 + (offset & 0x7ff)];
}
diff --git a/src/devices/bus/crvision/rom.h b/src/devices/bus/crvision/rom.h
index cf15b1e4e2a..ffb07e8c601 100644
--- a/src/devices/bus/crvision/rom.h
+++ b/src/devices/bus/crvision/rom.h
@@ -18,7 +18,7 @@ public:
crvision_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// reading and writing
- virtual DECLARE_READ8_MEMBER(read_rom80) override;
+ virtual uint8_t read_rom80(offs_t offset) override;
protected:
crvision_rom_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
@@ -37,7 +37,7 @@ public:
crvision_rom6k_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// reading and writing
- virtual DECLARE_READ8_MEMBER(read_rom80) override;
+ virtual uint8_t read_rom80(offs_t offset) override;
};
// ======================> crvision_rom8k_device
@@ -49,7 +49,7 @@ public:
crvision_rom8k_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// reading and writing
- virtual DECLARE_READ8_MEMBER(read_rom80) override;
+ virtual uint8_t read_rom80(offs_t offset) override;
};
// ======================> crvision_rom10k_device
@@ -61,8 +61,8 @@ public:
crvision_rom10k_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// reading and writing
- virtual DECLARE_READ8_MEMBER(read_rom40) override;
- virtual DECLARE_READ8_MEMBER(read_rom80) override;
+ virtual uint8_t read_rom40(offs_t offset) override;
+ virtual uint8_t read_rom80(offs_t offset) override;
};
// ======================> crvision_rom12k_device
@@ -74,8 +74,8 @@ public:
crvision_rom12k_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// reading and writing
- virtual DECLARE_READ8_MEMBER(read_rom40) override;
- virtual DECLARE_READ8_MEMBER(read_rom80) override;
+ virtual uint8_t read_rom40(offs_t offset) override;
+ virtual uint8_t read_rom80(offs_t offset) override;
};
// ======================> crvision_rom16k_device
@@ -87,7 +87,7 @@ public:
crvision_rom16k_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// reading and writing
- virtual DECLARE_READ8_MEMBER(read_rom80) override;
+ virtual uint8_t read_rom80(offs_t offset) override;
};
// ======================> crvision_rom18k_device
@@ -99,8 +99,8 @@ public:
crvision_rom18k_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// reading and writing
- virtual DECLARE_READ8_MEMBER(read_rom40) override;
- virtual DECLARE_READ8_MEMBER(read_rom80) override;
+ virtual uint8_t read_rom40(offs_t offset) override;
+ virtual uint8_t read_rom80(offs_t offset) override;
};
diff --git a/src/devices/bus/crvision/slot.cpp b/src/devices/bus/crvision/slot.cpp
index 068e5b056ab..1df2292c982 100644
--- a/src/devices/bus/crvision/slot.cpp
+++ b/src/devices/bus/crvision/slot.cpp
@@ -253,18 +253,18 @@ std::string crvision_cart_slot_device::get_default_card_software(get_default_car
read_rom
-------------------------------------------------*/
-READ8_MEMBER(crvision_cart_slot_device::read_rom40)
+uint8_t crvision_cart_slot_device::read_rom40(offs_t offset)
{
if (m_cart)
- return m_cart->read_rom40(space, offset);
+ return m_cart->read_rom40(offset);
else
return 0xff;
}
-READ8_MEMBER(crvision_cart_slot_device::read_rom80)
+uint8_t crvision_cart_slot_device::read_rom80(offs_t offset)
{
if (m_cart)
- return m_cart->read_rom80(space, offset);
+ return m_cart->read_rom80(offset);
else
return 0xff;
}
diff --git a/src/devices/bus/crvision/slot.h b/src/devices/bus/crvision/slot.h
index ce3de1b3c4c..9ea0c72b5c5 100644
--- a/src/devices/bus/crvision/slot.h
+++ b/src/devices/bus/crvision/slot.h
@@ -36,8 +36,8 @@ public:
virtual ~device_crvision_cart_interface();
// reading and writing
- virtual DECLARE_READ8_MEMBER(read_rom40) { return 0xff; }
- virtual DECLARE_READ8_MEMBER(read_rom80) { return 0xff; }
+ virtual uint8_t read_rom40(offs_t offset) { return 0xff; }
+ virtual uint8_t read_rom80(offs_t offset) { return 0xff; }
void rom_alloc(uint32_t size, const char *tag);
uint8_t* get_rom_base() { return m_rom; }
@@ -91,8 +91,8 @@ public:
int get_type() { return m_type; }
// reading and writing
- virtual DECLARE_READ8_MEMBER(read_rom40);
- virtual DECLARE_READ8_MEMBER(read_rom80);
+ uint8_t read_rom40(offs_t offset);
+ uint8_t read_rom80(offs_t offset);
protected:
// device-level overrides
diff --git a/src/devices/bus/dmv/k210.cpp b/src/devices/bus/dmv/k210.cpp
index 23a5da77a53..3ab9209d877 100644
--- a/src/devices/bus/dmv/k210.cpp
+++ b/src/devices/bus/dmv/k210.cpp
@@ -115,27 +115,27 @@ void dmv_k210_device::io_write(int ifsel, offs_t offset, uint8_t data)
m_ppi->write(offset & 0x03, data);
}
-READ8_MEMBER( dmv_k210_device::porta_r )
+uint8_t dmv_k210_device::porta_r()
{
return m_cent_data_in->read();
}
-READ8_MEMBER( dmv_k210_device::portb_r )
+uint8_t dmv_k210_device::portb_r()
{
return m_portb;
}
-READ8_MEMBER( dmv_k210_device::portc_r )
+uint8_t dmv_k210_device::portc_r()
{
return m_portc;
}
-WRITE8_MEMBER( dmv_k210_device::porta_w )
+void dmv_k210_device::porta_w(uint8_t data)
{
m_cent_data_out->write(data);
}
-WRITE8_MEMBER( dmv_k210_device::portb_w )
+void dmv_k210_device::portb_w(uint8_t data)
{
m_centronics->write_ack(BIT(data, 2));
m_centronics->write_select(BIT(data, 4));
@@ -144,7 +144,7 @@ WRITE8_MEMBER( dmv_k210_device::portb_w )
m_centronics->write_fault(BIT(data, 7));
}
-WRITE8_MEMBER( dmv_k210_device::portc_w )
+void dmv_k210_device::portc_w(uint8_t data)
{
if (!(data & 0x80))
{
diff --git a/src/devices/bus/dmv/k210.h b/src/devices/bus/dmv/k210.h
index 2200af31472..1755ee1a9f5 100644
--- a/src/devices/bus/dmv/k210.h
+++ b/src/devices/bus/dmv/k210.h
@@ -38,12 +38,12 @@ protected:
virtual void io_write(int ifsel, offs_t offset, uint8_t data) override;
private:
- DECLARE_READ8_MEMBER(porta_r);
- DECLARE_READ8_MEMBER(portb_r);
- DECLARE_READ8_MEMBER(portc_r);
- DECLARE_WRITE8_MEMBER(porta_w);
- DECLARE_WRITE8_MEMBER(portb_w);
- DECLARE_WRITE8_MEMBER(portc_w);
+ uint8_t porta_r();
+ uint8_t portb_r();
+ uint8_t portc_r();
+ void porta_w(uint8_t data);
+ 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);
diff --git a/src/devices/bus/dmv/k220.cpp b/src/devices/bus/dmv/k220.cpp
index d157130ce8e..64df90c21d8 100644
--- a/src/devices/bus/dmv/k220.cpp
+++ b/src/devices/bus/dmv/k220.cpp
@@ -237,7 +237,7 @@ bool dmv_k220_device::write(offs_t offset, uint8_t data)
return false;
}
-WRITE8_MEMBER( dmv_k220_device::porta_w )
+void dmv_k220_device::porta_w(uint8_t data)
{
// 74LS247 BCD-to-Seven-Segment Decoder
static uint8_t bcd2hex[] = { 0x3f, 0x06, 0x5b, 0x4f, 0x66, 0x6d, 0x7d, 0x07, 0x7f, 0x6f, 0x58, 0x4c, 0x62, 0x69, 0x78, 0x00 };
@@ -247,7 +247,7 @@ WRITE8_MEMBER( dmv_k220_device::porta_w )
}
-WRITE8_MEMBER( dmv_k220_device::portc_w )
+void dmv_k220_device::portc_w(uint8_t data)
{
/*
xxxx ---- not connected
diff --git a/src/devices/bus/dmv/k220.h b/src/devices/bus/dmv/k220.h
index 21b23a4981a..b58777df15e 100644
--- a/src/devices/bus/dmv/k220.h
+++ b/src/devices/bus/dmv/k220.h
@@ -39,8 +39,8 @@ protected:
virtual bool write(offs_t offset, uint8_t data) override;
private:
- DECLARE_WRITE8_MEMBER(porta_w);
- DECLARE_WRITE8_MEMBER(portc_w);
+ 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);
diff --git a/src/devices/bus/dmv/k230.cpp b/src/devices/bus/dmv/k230.cpp
index b661ed95abf..595cc5f970a 100644
--- a/src/devices/bus/dmv/k230.cpp
+++ b/src/devices/bus/dmv/k230.cpp
@@ -252,24 +252,24 @@ READ8_MEMBER(dmv_k230_device::rom_r)
return m_rom->base()[offset & 0x0fff];
}
-READ8_MEMBER( dmv_k230_device::io_r )
+uint8_t dmv_k230_device::io_r(offs_t offset)
{
return iospace().read_byte(offset);
}
-WRITE8_MEMBER( dmv_k230_device::io_w )
+void dmv_k230_device::io_w(offs_t offset, uint8_t data)
{
iospace().write_byte(offset, data);
}
-READ8_MEMBER( dmv_k230_device::program_r )
+uint8_t dmv_k230_device::program_r(offs_t offset)
{
- return prog_read(space, offset);
+ return prog_read(offset);
}
-WRITE8_MEMBER( dmv_k230_device::program_w )
+void dmv_k230_device::program_w(offs_t offset, uint8_t data)
{
- prog_write(space, offset, data);
+ prog_write(offset, data);
}
void dmv_k234_device::hold_w(int state)
diff --git a/src/devices/bus/dmv/k230.h b/src/devices/bus/dmv/k230.h
index ebf8a868ae3..c7f8c967c44 100644
--- a/src/devices/bus/dmv/k230.h
+++ b/src/devices/bus/dmv/k230.h
@@ -55,10 +55,10 @@ protected:
int m_switch16;
int m_hold;
- DECLARE_READ8_MEMBER(io_r);
- DECLARE_READ8_MEMBER(program_r);
- DECLARE_WRITE8_MEMBER(io_w);
- DECLARE_WRITE8_MEMBER(program_w);
+ uint8_t io_r(offs_t offset);
+ uint8_t program_r(offs_t offset);
+ void io_w(offs_t offset, uint8_t data);
+ void program_w(offs_t offset, uint8_t data);
private:
DECLARE_READ8_MEMBER(rom_r);
diff --git a/src/devices/bus/dmv/k806.cpp b/src/devices/bus/dmv/k806.cpp
index 3ee1f9dbb3c..89802ca43bd 100644
--- a/src/devices/bus/dmv/k806.cpp
+++ b/src/devices/bus/dmv/k806.cpp
@@ -154,7 +154,7 @@ void dmv_k806_device::io_write(int ifsel, offs_t offset, uint8_t data)
}
}
-READ8_MEMBER( dmv_k806_device::port1_r )
+uint8_t dmv_k806_device::port1_r()
{
// ---- ---x Left button
// ---- --x- Middle button
@@ -180,7 +180,7 @@ READ_LINE_MEMBER( dmv_k806_device::portt1_r )
return BIT(m_jumpers->read(), 7) ? 0 : 1;
}
-WRITE8_MEMBER( dmv_k806_device::port2_w )
+void dmv_k806_device::port2_w(uint8_t data)
{
out_int((data & 1) ? CLEAR_LINE : ASSERT_LINE);
}
diff --git a/src/devices/bus/dmv/k806.h b/src/devices/bus/dmv/k806.h
index 3b90f7442a8..8c7c3618f69 100644
--- a/src/devices/bus/dmv/k806.h
+++ b/src/devices/bus/dmv/k806.h
@@ -41,8 +41,8 @@ protected:
private:
DECLARE_READ_LINE_MEMBER(portt1_r);
- DECLARE_READ8_MEMBER(port1_r);
- DECLARE_WRITE8_MEMBER(port2_w);
+ uint8_t port1_r();
+ void port2_w(uint8_t data);
TIMER_DEVICE_CALLBACK_MEMBER(mouse_timer);
diff --git a/src/devices/bus/ecbbus/ecbbus.cpp b/src/devices/bus/ecbbus/ecbbus.cpp
index d222573cdf4..5eaeda9f284 100644
--- a/src/devices/bus/ecbbus/ecbbus.cpp
+++ b/src/devices/bus/ecbbus/ecbbus.cpp
@@ -116,7 +116,7 @@ void ecbbus_device::add_card(device_ecbbus_card_interface &card, int pos)
// mem_r -
//-------------------------------------------------
-READ8_MEMBER( ecbbus_device::mem_r )
+uint8_t ecbbus_device::mem_r(offs_t offset)
{
uint8_t data = 0;
@@ -136,7 +136,7 @@ READ8_MEMBER( ecbbus_device::mem_r )
// mem_w -
//-------------------------------------------------
-WRITE8_MEMBER( ecbbus_device::mem_w )
+void ecbbus_device::mem_w(offs_t offset, uint8_t data)
{
for (auto & elem : m_ecbbus_device)
{
@@ -152,7 +152,7 @@ WRITE8_MEMBER( ecbbus_device::mem_w )
// io_r -
//-------------------------------------------------
-READ8_MEMBER( ecbbus_device::io_r )
+uint8_t ecbbus_device::io_r(offs_t offset)
{
uint8_t data = 0;
@@ -172,7 +172,7 @@ READ8_MEMBER( ecbbus_device::io_r )
// io_w -
//-------------------------------------------------
-WRITE8_MEMBER( ecbbus_device::io_w )
+void ecbbus_device::io_w(offs_t offset, uint8_t data)
{
for (auto & elem : m_ecbbus_device)
{
diff --git a/src/devices/bus/ecbbus/ecbbus.h b/src/devices/bus/ecbbus/ecbbus.h
index 21ee9eb2bd3..bee5201a2fc 100644
--- a/src/devices/bus/ecbbus/ecbbus.h
+++ b/src/devices/bus/ecbbus/ecbbus.h
@@ -110,11 +110,11 @@ public:
void add_card(device_ecbbus_card_interface &card, int pos);
- DECLARE_READ8_MEMBER( mem_r );
- DECLARE_WRITE8_MEMBER( mem_w );
+ uint8_t mem_r(offs_t offset);
+ void mem_w(offs_t offset, uint8_t data);
- DECLARE_READ8_MEMBER( io_r );
- DECLARE_WRITE8_MEMBER( io_w );
+ 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); }
diff --git a/src/devices/bus/ecbbus/grip.cpp b/src/devices/bus/ecbbus/grip.cpp
index 83adcc78952..da925187f5e 100644
--- a/src/devices/bus/ecbbus/grip.cpp
+++ b/src/devices/bus/ecbbus/grip.cpp
@@ -223,7 +223,7 @@ static const int16_t speaker_levels[] = { -32768, 0, 32767, 0 };
// I8255A interface
//-------------------------------------------------
-READ8_MEMBER( ecb_grip21_device::ppi_pa_r )
+uint8_t ecb_grip21_device::ppi_pa_r()
{
/*
@@ -243,7 +243,7 @@ READ8_MEMBER( ecb_grip21_device::ppi_pa_r )
return m_ppi_pa;
}
-WRITE8_MEMBER( ecb_grip21_device::ppi_pa_w )
+void ecb_grip21_device::ppi_pa_w(uint8_t data)
{
/*
@@ -263,7 +263,7 @@ WRITE8_MEMBER( ecb_grip21_device::ppi_pa_w )
m_ppi_pa = data;
}
-READ8_MEMBER( ecb_grip21_device::ppi_pb_r )
+uint8_t ecb_grip21_device::ppi_pb_r()
{
/*
@@ -283,7 +283,7 @@ READ8_MEMBER( ecb_grip21_device::ppi_pb_r )
return m_keydata;
}
-WRITE8_MEMBER( ecb_grip21_device::ppi_pc_w )
+void ecb_grip21_device::ppi_pc_w(uint8_t data)
{
/*
@@ -324,7 +324,7 @@ WRITE_LINE_MEMBER(ecb_grip21_device::write_centronics_busy)
m_centronics_busy = state;
}
-READ8_MEMBER( ecb_grip21_device::sti_gpio_r )
+uint8_t ecb_grip21_device::sti_gpio_r()
{
/*
@@ -634,7 +634,7 @@ void ecb_grip21_device::device_reset()
// vol0_w - volume 0
//-------------------------------------------------
-WRITE8_MEMBER( ecb_grip21_device::vol0_w )
+void ecb_grip21_device::vol0_w(uint8_t data)
{
m_vol0 = BIT(data, 7);
}
@@ -644,7 +644,7 @@ WRITE8_MEMBER( ecb_grip21_device::vol0_w )
// vol1_w - volume 1
//-------------------------------------------------
-WRITE8_MEMBER( ecb_grip21_device::vol1_w )
+void ecb_grip21_device::vol1_w(uint8_t data)
{
m_vol1 = BIT(data, 7);
}
@@ -654,7 +654,7 @@ WRITE8_MEMBER( ecb_grip21_device::vol1_w )
// flash_w -
//-------------------------------------------------
-WRITE8_MEMBER( ecb_grip21_device::flash_w )
+void ecb_grip21_device::flash_w(uint8_t data)
{
m_flash = BIT(data, 7);
}
@@ -664,7 +664,7 @@ WRITE8_MEMBER( ecb_grip21_device::flash_w )
// page_w - video page select
//-------------------------------------------------
-WRITE8_MEMBER( ecb_grip21_device::page_w )
+void ecb_grip21_device::page_w(uint8_t data)
{
m_page = BIT(data, 7);
@@ -681,7 +681,7 @@ WRITE_LINE_MEMBER(ecb_grip21_device::write_centronics_fault)
m_centronics_fault = state;
}
-READ8_MEMBER( ecb_grip21_device::stat_r )
+uint8_t ecb_grip21_device::stat_r()
{
/*
@@ -739,9 +739,10 @@ READ8_MEMBER( ecb_grip21_device::stat_r )
// lrs_r -
//-------------------------------------------------
-READ8_MEMBER( ecb_grip21_device::lrs_r )
+uint8_t ecb_grip21_device::lrs_r()
{
- m_lps = 0;
+ if (!machine().side_effects_disabled())
+ m_lps = 0;
return 0;
}
@@ -751,7 +752,7 @@ READ8_MEMBER( ecb_grip21_device::lrs_r )
// lrs_w -
//-------------------------------------------------
-WRITE8_MEMBER( ecb_grip21_device::lrs_w )
+void ecb_grip21_device::lrs_w(uint8_t data)
{
m_lps = 0;
}
@@ -761,10 +762,13 @@ WRITE8_MEMBER( ecb_grip21_device::lrs_w )
// cxstb_r - centronics strobe
//-------------------------------------------------
-READ8_MEMBER( ecb_grip21_device::cxstb_r )
+uint8_t ecb_grip21_device::cxstb_r()
{
- m_centronics->write_strobe(0);
- m_centronics->write_strobe(1);
+ if (!machine().side_effects_disabled())
+ {
+ m_centronics->write_strobe(0);
+ m_centronics->write_strobe(1);
+ }
return 0;
}
@@ -774,7 +778,7 @@ READ8_MEMBER( ecb_grip21_device::cxstb_r )
// cxstb_w - centronics strobe
//-------------------------------------------------
-WRITE8_MEMBER( ecb_grip21_device::cxstb_w )
+void ecb_grip21_device::cxstb_w(uint8_t data)
{
m_centronics->write_strobe(0);
m_centronics->write_strobe(1);
@@ -785,9 +789,9 @@ WRITE8_MEMBER( ecb_grip21_device::cxstb_w )
// eprom_w - EPROM bank select
//-------------------------------------------------
-WRITE8_MEMBER( grip5_state::eprom_w )
+void grip5_state::eprom_w(uint8_t data)
{
- membank("eprom")->set_entry(BIT(data, 0));
+ membank("eprom")->set_entry(BIT(data, 0));
}
@@ -795,9 +799,9 @@ WRITE8_MEMBER( grip5_state::eprom_w )
// dpage_w - display page select
//-------------------------------------------------
-WRITE8_MEMBER( grip5_state::dpage_w )
+void grip5_state::dpage_w(uint8_t data)
{
- m_dpage = BIT(data, 7);
+ m_dpage = BIT(data, 7);
}
*/
diff --git a/src/devices/bus/ecbbus/grip.h b/src/devices/bus/ecbbus/grip.h
index d1e1456eb57..076a61880d9 100644
--- a/src/devices/bus/ecbbus/grip.h
+++ b/src/devices/bus/ecbbus/grip.h
@@ -52,11 +52,11 @@ protected:
virtual void ecbbus_io_w(offs_t offset, uint8_t data) override;
private:
- DECLARE_READ8_MEMBER( ppi_pa_r );
- DECLARE_WRITE8_MEMBER( ppi_pa_w );
- DECLARE_READ8_MEMBER( ppi_pb_r );
- DECLARE_WRITE8_MEMBER( ppi_pc_w );
- DECLARE_READ8_MEMBER( sti_gpio_r );
+ uint8_t ppi_pa_r();
+ void ppi_pa_w(uint8_t data);
+ uint8_t ppi_pb_r();
+ void ppi_pc_w(uint8_t data);
+ uint8_t sti_gpio_r();
DECLARE_WRITE_LINE_MEMBER( speaker_w );
void kb_w(uint8_t data);
@@ -103,23 +103,23 @@ private:
// timers
emu_timer *m_kb_timer;
- DECLARE_WRITE8_MEMBER( vol0_w );
- DECLARE_WRITE8_MEMBER( vol1_w );
- DECLARE_WRITE8_MEMBER( flash_w );
- DECLARE_WRITE8_MEMBER( page_w );
- DECLARE_READ8_MEMBER( stat_r );
- DECLARE_READ8_MEMBER( lrs_r );
- DECLARE_WRITE8_MEMBER( lrs_w );
- DECLARE_READ8_MEMBER( cxstb_r );
- DECLARE_WRITE8_MEMBER( cxstb_w );
+ void vol0_w(uint8_t data);
+ void vol1_w(uint8_t data);
+ void flash_w(uint8_t data);
+ void page_w(uint8_t data);
+ uint8_t stat_r();
+ uint8_t lrs_r();
+ void lrs_w(uint8_t data);
+ uint8_t cxstb_r();
+ void cxstb_w(uint8_t data);
void grip_io(address_map &map);
void grip_mem(address_map &map);
/*
required_device<hd6345_device> m_crtc;
- DECLARE_WRITE8_MEMBER( eprom_w );
- DECLARE_WRITE8_MEMBER( dpage_w );
+ void eprom_w(uint8_t data);
+ void dpage_w(uint8_t data);
// video state
int m_dpage; // displayed video page
diff --git a/src/devices/bus/econet/e01.cpp b/src/devices/bus/econet/e01.cpp
index 4a58753628e..ede1c58dafa 100644
--- a/src/devices/bus/econet/e01.cpp
+++ b/src/devices/bus/econet/e01.cpp
@@ -467,7 +467,7 @@ void econet_e01_device::device_timer(emu_timer &timer, device_timer_id id, int p
// read -
//-------------------------------------------------
-READ8_MEMBER( econet_e01_device::read )
+uint8_t econet_e01_device::read(offs_t offset)
{
uint8_t data;
@@ -488,7 +488,7 @@ READ8_MEMBER( econet_e01_device::read )
// write -
//-------------------------------------------------
-WRITE8_MEMBER( econet_e01_device::write )
+void econet_e01_device::write(offs_t offset, uint8_t data)
{
m_ram->pointer()[offset] = data;
}
@@ -498,9 +498,10 @@ WRITE8_MEMBER( econet_e01_device::write )
// eprom_r - ROM/RAM select read
//-------------------------------------------------
-READ8_MEMBER( econet_e01_device::ram_select_r )
+uint8_t econet_e01_device::ram_select_r()
{
- m_ram_en = true;
+ if (!machine().side_effects_disabled())
+ m_ram_en = true;
return 0;
}
@@ -510,7 +511,7 @@ READ8_MEMBER( econet_e01_device::ram_select_r )
// floppy_w - floppy control write
//-------------------------------------------------
-WRITE8_MEMBER( econet_e01_device::floppy_w )
+void econet_e01_device::floppy_w(uint8_t data)
{
/*
@@ -558,9 +559,10 @@ WRITE8_MEMBER( econet_e01_device::floppy_w )
// network_irq_disable_r -
//-------------------------------------------------
-READ8_MEMBER( econet_e01_device::network_irq_disable_r )
+uint8_t econet_e01_device::network_irq_disable_r()
{
- network_irq_enable(0);
+ if (!machine().side_effects_disabled())
+ network_irq_enable(0);
return 0;
}
@@ -570,7 +572,7 @@ READ8_MEMBER( econet_e01_device::network_irq_disable_r )
// network_irq_disable_w -
//-------------------------------------------------
-WRITE8_MEMBER( econet_e01_device::network_irq_disable_w )
+void econet_e01_device::network_irq_disable_w(uint8_t data)
{
network_irq_enable(0);
}
@@ -580,9 +582,10 @@ WRITE8_MEMBER( econet_e01_device::network_irq_disable_w )
// network_irq_enable_r -
//-------------------------------------------------
-READ8_MEMBER( econet_e01_device::network_irq_enable_r )
+uint8_t econet_e01_device::network_irq_enable_r()
{
- network_irq_enable(1);
+ if (!machine().side_effects_disabled())
+ network_irq_enable(1);
return 0;
}
@@ -592,7 +595,7 @@ READ8_MEMBER( econet_e01_device::network_irq_enable_r )
// network_irq_enable_w -
//-------------------------------------------------
-WRITE8_MEMBER( econet_e01_device::network_irq_enable_w )
+void econet_e01_device::network_irq_enable_w(uint8_t data)
{
network_irq_enable(1);
}
@@ -602,11 +605,12 @@ WRITE8_MEMBER( econet_e01_device::network_irq_enable_w )
// hdc_data_r -
//-------------------------------------------------
-READ8_MEMBER( econet_e01_device::hdc_data_r )
+uint8_t econet_e01_device::hdc_data_r()
{
uint8_t data = m_scsi_data_in->read();
- m_scsibus->write_ack(1);
+ if (!machine().side_effects_disabled())
+ m_scsibus->write_ack(1);
return data;
}
@@ -616,7 +620,7 @@ READ8_MEMBER( econet_e01_device::hdc_data_r )
// hdc_data_w -
//-------------------------------------------------
-WRITE8_MEMBER( econet_e01_device::hdc_data_w )
+void econet_e01_device::hdc_data_w(uint8_t data)
{
m_scsi_data_out->write(data);
@@ -628,7 +632,7 @@ WRITE8_MEMBER( econet_e01_device::hdc_data_w )
// hdc_select_w -
//-------------------------------------------------
-WRITE8_MEMBER( econet_e01_device::hdc_select_w )
+void econet_e01_device::hdc_select_w(uint8_t data)
{
m_scsibus->write_sel(1);
}
@@ -638,7 +642,7 @@ WRITE8_MEMBER( econet_e01_device::hdc_select_w )
// hdc_irq_enable_w -
//-------------------------------------------------
-WRITE8_MEMBER( econet_e01_device::hdc_irq_enable_w )
+void econet_e01_device::hdc_irq_enable_w(uint8_t data)
{
hdc_irq_enable(BIT(data, 0));
}
@@ -648,7 +652,7 @@ WRITE8_MEMBER( econet_e01_device::hdc_irq_enable_w )
// rtc_address_r -
//-------------------------------------------------
-READ8_MEMBER( econet_e01_device::rtc_address_r )
+uint8_t econet_e01_device::rtc_address_r()
{
return m_rtc->read(0);
}
@@ -658,7 +662,7 @@ READ8_MEMBER( econet_e01_device::rtc_address_r )
// rtc_address_w -
//-------------------------------------------------
-WRITE8_MEMBER( econet_e01_device::rtc_address_w )
+void econet_e01_device::rtc_address_w(uint8_t data)
{
m_rtc->write(0, data);
}
@@ -668,7 +672,7 @@ WRITE8_MEMBER( econet_e01_device::rtc_address_w )
// rtc_data_r -
//-------------------------------------------------
-READ8_MEMBER( econet_e01_device::rtc_data_r )
+uint8_t econet_e01_device::rtc_data_r()
{
return m_rtc->read(1);
}
@@ -678,7 +682,7 @@ READ8_MEMBER( econet_e01_device::rtc_data_r )
// rtc_data_w -
//-------------------------------------------------
-WRITE8_MEMBER( econet_e01_device::rtc_data_w )
+void econet_e01_device::rtc_data_w(uint8_t data)
{
m_rtc->write(1, data);
}
diff --git a/src/devices/bus/econet/e01.h b/src/devices/bus/econet/e01.h
index 6dc2d105949..9c434b58768 100644
--- a/src/devices/bus/econet/e01.h
+++ b/src/devices/bus/econet/e01.h
@@ -65,22 +65,22 @@ private:
DECLARE_WRITE_LINE_MEMBER( fdc_drq_w );
DECLARE_WRITE_LINE_MEMBER( scsi_bsy_w );
DECLARE_WRITE_LINE_MEMBER( scsi_req_w );
- DECLARE_READ8_MEMBER( read );
- DECLARE_WRITE8_MEMBER( write );
- DECLARE_READ8_MEMBER( ram_select_r );
- DECLARE_WRITE8_MEMBER( floppy_w );
- DECLARE_READ8_MEMBER( network_irq_disable_r );
- DECLARE_WRITE8_MEMBER( network_irq_disable_w );
- DECLARE_READ8_MEMBER( network_irq_enable_r );
- DECLARE_WRITE8_MEMBER( network_irq_enable_w );
- DECLARE_READ8_MEMBER( hdc_data_r );
- DECLARE_WRITE8_MEMBER( hdc_data_w );
- DECLARE_WRITE8_MEMBER( hdc_select_w );
- DECLARE_WRITE8_MEMBER( hdc_irq_enable_w );
- DECLARE_READ8_MEMBER( rtc_address_r );
- DECLARE_WRITE8_MEMBER( rtc_address_w );
- DECLARE_READ8_MEMBER( rtc_data_r );
- DECLARE_WRITE8_MEMBER( rtc_data_w );
+ uint8_t read(offs_t offset);
+ void write(offs_t offset, uint8_t data);
+ uint8_t ram_select_r();
+ void floppy_w(uint8_t data);
+ uint8_t network_irq_disable_r();
+ void network_irq_disable_w(uint8_t data);
+ uint8_t network_irq_enable_r();
+ void network_irq_enable_w(uint8_t data);
+ uint8_t hdc_data_r();
+ void hdc_data_w(uint8_t data);
+ void hdc_select_w(uint8_t data);
+ void hdc_irq_enable_w(uint8_t data);
+ uint8_t rtc_address_r();
+ void rtc_address_w(uint8_t data);
+ uint8_t rtc_data_r();
+ void rtc_data_w(uint8_t data);
DECLARE_FLOPPY_FORMATS(floppy_formats_afs);
diff --git a/src/devices/bus/einstein/pipe/silicon_disc.cpp b/src/devices/bus/einstein/pipe/silicon_disc.cpp
index ff4ac92a910..c0a29f304bd 100644
--- a/src/devices/bus/einstein/pipe/silicon_disc.cpp
+++ b/src/devices/bus/einstein/pipe/silicon_disc.cpp
@@ -87,8 +87,8 @@ void einstein_silicon_disc_device::device_reset()
// install i/o ports
io_space().install_device(0xf0, 0xff, *this, &einstein_silicon_disc_device::map);
io_space().install_readwrite_handler(0xfa, 0xfa, 0, 0, 0xff00,
- read8_delegate(*this, FUNC(einstein_silicon_disc_device::ram_r)),
- write8_delegate(*this, FUNC(einstein_silicon_disc_device::ram_w)));
+ read8sm_delegate(*this, FUNC(einstein_silicon_disc_device::ram_r)),
+ write8sm_delegate(*this, FUNC(einstein_silicon_disc_device::ram_w)));
}
@@ -96,25 +96,25 @@ void einstein_silicon_disc_device::device_reset()
// IMPLEMENTATION
//**************************************************************************
-WRITE8_MEMBER( einstein_silicon_disc_device::sector_low_w )
+void einstein_silicon_disc_device::sector_low_w(uint8_t data)
{
m_sector &= 0xff00;
m_sector |= data;
}
-WRITE8_MEMBER( einstein_silicon_disc_device::sector_high_w )
+void einstein_silicon_disc_device::sector_high_w(uint8_t data)
{
m_sector &= 0x00ff;
m_sector |= ((data & 0x07) << 8);
}
// a8 to a14 are used to specify the byte in a 128-byte sector
-READ8_MEMBER( einstein_silicon_disc_device::ram_r )
+uint8_t einstein_silicon_disc_device::ram_r(offs_t offset)
{
return m_ram[(m_sector * 0x80) | ((offset >> 8) & 0x7f)];
}
-WRITE8_MEMBER( einstein_silicon_disc_device::ram_w )
+void einstein_silicon_disc_device::ram_w(offs_t offset, uint8_t data)
{
m_ram[(m_sector * 0x80) | ((offset >> 8) & 0x7f)] = data;
}
diff --git a/src/devices/bus/einstein/pipe/silicon_disc.h b/src/devices/bus/einstein/pipe/silicon_disc.h
index dad8ad7c940..c80ef0ed88c 100644
--- a/src/devices/bus/einstein/pipe/silicon_disc.h
+++ b/src/devices/bus/einstein/pipe/silicon_disc.h
@@ -42,10 +42,10 @@ private:
std::unique_ptr<uint8_t[]> m_ram;
uint16_t m_sector;
- DECLARE_READ8_MEMBER(ram_r);
- DECLARE_WRITE8_MEMBER(ram_w);
- DECLARE_WRITE8_MEMBER(sector_low_w);
- DECLARE_WRITE8_MEMBER(sector_high_w);
+ uint8_t ram_r(offs_t offset);
+ void ram_w(offs_t offset, uint8_t data);
+ void sector_low_w(uint8_t data);
+ void sector_high_w(uint8_t data);
};
// device type definition
diff --git a/src/devices/bus/einstein/pipe/speculator.cpp b/src/devices/bus/einstein/pipe/speculator.cpp
index c4afaa4ac2d..e99d3978cb4 100644
--- a/src/devices/bus/einstein/pipe/speculator.cpp
+++ b/src/devices/bus/einstein/pipe/speculator.cpp
@@ -97,18 +97,18 @@ void einstein_speculator_device::device_reset()
{
// ram: range 0x1f, 0x3f, 0x5f, 0x7f, 0x9f, 0xbf, 0xdf, 0xff
io_space().install_readwrite_handler(0x1f, 0x1f, 0, 0, 0xffe0,
- read8_delegate(*this, FUNC(einstein_speculator_device::ram_r)),
- write8_delegate(*this, FUNC(einstein_speculator_device::ram_w)));
+ read8sm_delegate(*this, FUNC(einstein_speculator_device::ram_r)),
+ write8sm_delegate(*this, FUNC(einstein_speculator_device::ram_w)));
// ram: range 0x60 - 0xff
io_space().install_readwrite_handler(0x60, 0x60, 0, 0, 0xff9f,
- read8_delegate(*this, FUNC(einstein_speculator_device::ram_r)),
- write8_delegate(*this, FUNC(einstein_speculator_device::ram_w)));
+ read8sm_delegate(*this, FUNC(einstein_speculator_device::ram_r)),
+ write8sm_delegate(*this, FUNC(einstein_speculator_device::ram_w)));
// tape read/nmi write register: range 0xff
io_space().install_readwrite_handler(0xff, 0xff, 0, 0, 0xff00,
- read8_delegate(*this, FUNC(einstein_speculator_device::tape_r)),
- write8_delegate(*this, FUNC(einstein_speculator_device::nmi_w)));
+ read8smo_delegate(*this, FUNC(einstein_speculator_device::tape_r)),
+ write8smo_delegate(*this, FUNC(einstein_speculator_device::nmi_w)));
}
@@ -167,19 +167,19 @@ offs_t einstein_speculator_device::address_translate(offs_t offset)
return (ra3 << 3) | (ra2 << 2) | (ra1 << 1) | (ra0 << 0);
}
-READ8_MEMBER( einstein_speculator_device::ram_r )
+uint8_t einstein_speculator_device::ram_r(offs_t offset)
{
offs_t addr = ((offset << 4) & 0x7f) | address_translate(offset);
return m_ram[addr];
}
-WRITE8_MEMBER( einstein_speculator_device::ram_w )
+void einstein_speculator_device::ram_w(offs_t offset, uint8_t data)
{
offs_t addr = ((offset << 4) & 0x7f) | address_translate(offset);
m_ram[addr] = data;
}
-READ8_MEMBER( einstein_speculator_device::tape_r )
+uint8_t einstein_speculator_device::tape_r()
{
// 7654321- unknown
// -------0 cassette input
@@ -187,9 +187,9 @@ READ8_MEMBER( einstein_speculator_device::tape_r )
return m_cassette->input() > 0.0038 ? 1 : 0;
}
-WRITE8_MEMBER( einstein_speculator_device::nmi_w )
+void einstein_speculator_device::nmi_w(uint8_t data)
{
- logerror("nmi_w offset %04x data %02x\n", offset, data);
+ logerror("nmi_w data %02x\n", data);
// 76543--- unknown
// -----2-- nmi enable?
diff --git a/src/devices/bus/einstein/pipe/speculator.h b/src/devices/bus/einstein/pipe/speculator.h
index bdbb4476e3e..c66b2e0122e 100644
--- a/src/devices/bus/einstein/pipe/speculator.h
+++ b/src/devices/bus/einstein/pipe/speculator.h
@@ -34,10 +34,10 @@ public:
virtual void int_w(int state) override;
- DECLARE_READ8_MEMBER(ram_r);
- DECLARE_WRITE8_MEMBER(ram_w);
- DECLARE_READ8_MEMBER(tape_r);
- DECLARE_WRITE8_MEMBER(nmi_w);
+ uint8_t ram_r(offs_t offset);
+ void ram_w(offs_t offset, uint8_t data);
+ uint8_t tape_r();
+ void nmi_w(uint8_t data);
DECLARE_WRITE_LINE_MEMBER(ic5a_q_w);
DECLARE_WRITE_LINE_MEMBER(ic5b_q_w);
diff --git a/src/devices/bus/einstein/pipe/tk02.cpp b/src/devices/bus/einstein/pipe/tk02.cpp
index 5f0a38ed27b..b0cf5998131 100644
--- a/src/devices/bus/einstein/pipe/tk02.cpp
+++ b/src/devices/bus/einstein/pipe/tk02.cpp
@@ -160,7 +160,7 @@ void tk02_device::device_start()
void tk02_device::device_reset()
{
io_space().install_device(0x40, 0x4f, *this, &tk02_device::map);
- io_space().install_readwrite_handler(0x40, 0x47, 0, 0, 0xff00, read8_delegate(*this, FUNC(tk02_device::ram_r)), write8_delegate(*this, FUNC(tk02_device::ram_w)));
+ io_space().install_readwrite_handler(0x40, 0x47, 0, 0, 0xff00, read8sm_delegate(*this, FUNC(tk02_device::ram_r)), write8sm_delegate(*this, FUNC(tk02_device::ram_w)));
}
@@ -203,17 +203,17 @@ WRITE_LINE_MEMBER( tk02_device::de_w )
// lower 3 bits of address define a 256-byte "row"
// upper 8 bits define the offset in the row
-READ8_MEMBER( tk02_device::ram_r )
+uint8_t tk02_device::ram_r(offs_t offset)
{
return m_ram[((offset & 0x07) << 8) | ((offset >> 8) & 0xff)];
}
-WRITE8_MEMBER( tk02_device::ram_w )
+void tk02_device::ram_w(offs_t offset, uint8_t data)
{
m_ram[((offset & 0x07) << 8) | ((offset >> 8) & 0xff)] = data;
}
-READ8_MEMBER( tk02_device::status_r )
+uint8_t tk02_device::status_r()
{
// 7654---- unused
// ----3--- link M001
diff --git a/src/devices/bus/einstein/pipe/tk02.h b/src/devices/bus/einstein/pipe/tk02.h
index 8782def764c..3834585ed2a 100644
--- a/src/devices/bus/einstein/pipe/tk02.h
+++ b/src/devices/bus/einstein/pipe/tk02.h
@@ -40,9 +40,9 @@ private:
DECLARE_WRITE_LINE_MEMBER(de_w);
- DECLARE_READ8_MEMBER(ram_r);
- DECLARE_WRITE8_MEMBER(ram_w);
- DECLARE_READ8_MEMBER(status_r);
+ uint8_t ram_r(offs_t offset);
+ void ram_w(offs_t offset, uint8_t data);
+ uint8_t status_r();
MC6845_UPDATE_ROW(crtc_update_row);
diff --git a/src/devices/bus/einstein/userport/userport.cpp b/src/devices/bus/einstein/userport/userport.cpp
index 4869c5a5cae..e2fdd06acd2 100644
--- a/src/devices/bus/einstein/userport/userport.cpp
+++ b/src/devices/bus/einstein/userport/userport.cpp
@@ -62,7 +62,7 @@ void einstein_userport_device::device_start()
// I/O PORTS
//**************************************************************************
-READ8_MEMBER( einstein_userport_device::read )
+uint8_t einstein_userport_device::read()
{
if (m_card)
return m_card->read();
@@ -70,7 +70,7 @@ READ8_MEMBER( einstein_userport_device::read )
return 0xff;
}
-WRITE8_MEMBER( einstein_userport_device::write )
+void einstein_userport_device::write(uint8_t data)
{
if (m_card)
m_card->write(data);
diff --git a/src/devices/bus/einstein/userport/userport.h b/src/devices/bus/einstein/userport/userport.h
index 215fc9e6812..d543f14d7c6 100644
--- a/src/devices/bus/einstein/userport/userport.h
+++ b/src/devices/bus/einstein/userport/userport.h
@@ -54,8 +54,8 @@ public:
// called from card device
DECLARE_WRITE_LINE_MEMBER( bstb_w ) { m_bstb_handler(state); }
- DECLARE_READ8_MEMBER( read );
- DECLARE_WRITE8_MEMBER (write );
+ uint8_t read();
+ void write(uint8_t data);
DECLARE_WRITE_LINE_MEMBER( brdy_w );
protected:
diff --git a/src/devices/bus/ekara/rom.cpp b/src/devices/bus/ekara/rom.cpp
index f55fd325d2a..e29f7d03ae6 100644
--- a/src/devices/bus/ekara/rom.cpp
+++ b/src/devices/bus/ekara/rom.cpp
@@ -66,22 +66,22 @@ ekara_rom_i2c_24lc02_gc0010_device::ekara_rom_i2c_24lc02_gc0010_device(const mac
// plain
-READ8_MEMBER(ekara_rom_plain_device::read_cart)
+uint8_t ekara_rom_plain_device::read_cart(offs_t offset)
{
- return read_rom(space, offset, mem_mask);
+ return read_rom(offset);
}
-READ8_MEMBER(ekara_rom_plain_device::read_rom)
+uint8_t ekara_rom_plain_device::read_rom(offs_t offset)
{
return m_rom[offset & (m_rom_size-1)];
}
-WRITE8_MEMBER(ekara_rom_plain_device::write_cart)
+void ekara_rom_plain_device::write_cart(offs_t offset, uint8_t data)
{
- write_rom(space, offset, data, mem_mask);
+ write_rom(offset, data);
}
-WRITE8_MEMBER(ekara_rom_plain_device::write_rom)
+void ekara_rom_plain_device::write_rom(offs_t offset, uint8_t data)
{
logerror("ekara_rom_plain_device::write_rom %08x %02x\n", offset, data);
}
@@ -98,30 +98,30 @@ bool ekara_rom_i2c_base_device::is_write_access_not_rom(void)
return (m_buscontrol[0] & 0x08) ? true : false;
}
-WRITE8_MEMBER(ekara_rom_i2c_base_device::write_bus_control)
+void ekara_rom_i2c_base_device::write_bus_control(offs_t offset, uint8_t data)
{
logerror("ekara_rom_i2c_base_device::write_bus_control %08x %02x\n", offset, data);
m_buscontrol[offset] = data;
}
-WRITE8_MEMBER(ekara_rom_i2c_base_device::write_rom)
+void ekara_rom_i2c_base_device::write_rom(offs_t offset, uint8_t data)
{
logerror("ekara_rom_i2c_base_device::write_rom %08x %02x\n", offset, data);
}
-READ8_MEMBER(ekara_rom_i2c_base_device::read_rom)
+uint8_t ekara_rom_i2c_base_device::read_rom(offs_t offset)
{
return m_rom[offset & (m_rom_size - 1)];
}
-READ8_MEMBER(ekara_rom_i2c_base_device::read_extra)
+uint8_t ekara_rom_i2c_base_device::read_extra(offs_t offset)
{
logerror("ekara_rom_i2c_base_device::read_extra %08x\n", offset);
return (m_i2cmem->read_sda() & 1) ? 0xff : 0x00;
}
-WRITE8_MEMBER(ekara_rom_i2c_base_device::write_extra)
+void ekara_rom_i2c_base_device::write_extra(offs_t offset, uint8_t data)
{
logerror("ekara_rom_i2c_base_device::write_extra %08x %02x\n", offset, data);
@@ -148,21 +148,21 @@ bool ekara_rom_i2c_24c08_epitch_device::is_write_access_not_rom(void)
void ekara_rom_i2c_24c08_epitch_device::device_add_mconfig(machine_config &config)
{
- I2CMEM(config, "i2cmem", 0).set_page_size(16).set_data_size(0x400); // 24C08
+ I2C_24C08(config, "i2cmem", 0);
}
// i2c 24lc04
void ekara_rom_i2c_24lc04_device::device_add_mconfig(machine_config &config)
{
- I2CMEM(config, "i2cmem", 0).set_page_size(16).set_data_size(0x200); // 24LC04
+ I2C_24C04(config, "i2cmem", 0); // 24LC04
}
// i2c 24lc02
void ekara_rom_i2c_24lc02_device::device_add_mconfig(machine_config &config)
{
- I2CMEM(config, "i2cmem", 0).set_page_size(16).set_data_size(0x100); // 24LC02
+ I2C_24C02(config, "i2cmem", 0); // 24LC02
}
// i2c 24lc02 with direct IO port access
@@ -177,12 +177,12 @@ bool ekara_rom_i2c_24lc02_gc0010_device::is_write_access_not_rom(void)
return false;
}
-READ8_MEMBER(ekara_rom_i2c_24lc02_gc0010_device::read_extra)
+uint8_t ekara_rom_i2c_24lc02_gc0010_device::read_extra(offs_t offset)
{
return 0;
}
-WRITE8_MEMBER(ekara_rom_i2c_24lc02_gc0010_device::write_extra)
+void ekara_rom_i2c_24lc02_gc0010_device::write_extra(offs_t offset, uint8_t data)
{
}
@@ -206,7 +206,7 @@ READ_LINE_MEMBER(ekara_rom_i2c_24lc02_gc0010_device::read_sda )
void ekara_rom_i2c_24lc02_gc0010_device::device_add_mconfig(machine_config &config)
{
- I2CMEM(config, "i2cmem", 0)/*.set_page_size(16)*/.set_data_size(0x100); // 24LC02
+ I2C_24C02(config, "i2cmem", 0); // 24LC02
}
diff --git a/src/devices/bus/ekara/rom.h b/src/devices/bus/ekara/rom.h
index 76c5ed45e46..19dcca1fb36 100644
--- a/src/devices/bus/ekara/rom.h
+++ b/src/devices/bus/ekara/rom.h
@@ -18,14 +18,14 @@ public:
ekara_rom_plain_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// reading and writing
- virtual DECLARE_READ8_MEMBER(read_cart) override;
- virtual DECLARE_WRITE8_MEMBER(write_cart) override;
+ virtual uint8_t read_cart(offs_t offset) override;
+ virtual void write_cart(offs_t offset, uint8_t data) override;
- virtual DECLARE_READ8_MEMBER(read_extra) override { return 0xff; };
- virtual DECLARE_WRITE8_MEMBER(write_extra) override { };
+ virtual uint8_t read_extra(offs_t offset) override { return 0xff; }
+ virtual void write_extra(offs_t offset, uint8_t data) override { }
- virtual READ8_MEMBER(read_rom);
- virtual WRITE8_MEMBER(write_rom);
+ virtual uint8_t read_rom(offs_t offset);
+ virtual void write_rom(offs_t offset, uint8_t data);
protected:
ekara_rom_plain_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
@@ -47,15 +47,15 @@ protected:
ekara_rom_i2c_base_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
// reading and writing
- virtual READ8_MEMBER(read_rom) override;
- virtual WRITE8_MEMBER(write_rom) override;
+ virtual uint8_t read_rom(offs_t offset) override;
+ virtual void write_rom(offs_t offset, uint8_t data) override;
optional_device<i2cmem_device> m_i2cmem;
- virtual DECLARE_READ8_MEMBER(read_extra) override;
- virtual DECLARE_WRITE8_MEMBER(write_extra) override;
+ virtual uint8_t read_extra(offs_t offset) override;
+ virtual void write_extra(offs_t offset, uint8_t data) override;
- virtual DECLARE_WRITE8_MEMBER(write_bus_control) override;
+ virtual void write_bus_control(offs_t offset, uint8_t data) override;
virtual bool is_read_access_not_rom(void) override;
virtual bool is_write_access_not_rom(void) override;
@@ -118,8 +118,8 @@ protected:
bool is_read_access_not_rom(void) override;
bool is_write_access_not_rom(void) override;
- DECLARE_READ8_MEMBER(read_extra) override;
- DECLARE_WRITE8_MEMBER(write_extra) 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;
diff --git a/src/devices/bus/ekara/slot.cpp b/src/devices/bus/ekara/slot.cpp
index 2b4673f9db9..b8eafff441b 100644
--- a/src/devices/bus/ekara/slot.cpp
+++ b/src/devices/bus/ekara/slot.cpp
@@ -206,45 +206,45 @@ std::string ekara_cart_slot_device::get_default_card_software(get_default_card_s
read
-------------------------------------------------*/
-READ8_MEMBER(ekara_cart_slot_device::read_cart)
+uint8_t ekara_cart_slot_device::read_cart(offs_t offset)
{
- return m_cart->read_cart(space, offset);
+ return m_cart->read_cart(offset);
}
/*-------------------------------------------------
write
-------------------------------------------------*/
-WRITE8_MEMBER(ekara_cart_slot_device::write_cart)
+void ekara_cart_slot_device::write_cart(offs_t offset, uint8_t data)
{
- m_cart->write_cart(space, offset, data);
+ m_cart->write_cart(offset, data);
}
/*-------------------------------------------------
read extra
-------------------------------------------------*/
-READ8_MEMBER(ekara_cart_slot_device::read_extra)
+uint8_t ekara_cart_slot_device::read_extra(offs_t offset)
{
- return m_cart->read_extra(space, offset);
+ return m_cart->read_extra(offset);
}
/*-------------------------------------------------
write extra
-------------------------------------------------*/
-WRITE8_MEMBER(ekara_cart_slot_device::write_extra)
+void ekara_cart_slot_device::write_extra(offs_t offset, uint8_t data)
{
- m_cart->write_extra(space, offset, data);
+ m_cart->write_extra(offset, data);
}
/*-------------------------------------------------
write control
-------------------------------------------------*/
-WRITE8_MEMBER(ekara_cart_slot_device::write_bus_control)
+void ekara_cart_slot_device::write_bus_control(offs_t offset, uint8_t data)
{
- m_cart->write_bus_control(space, offset, data);
+ m_cart->write_bus_control(offset, data);
}
bool ekara_cart_slot_device::is_read_access_not_rom(void)
diff --git a/src/devices/bus/ekara/slot.h b/src/devices/bus/ekara/slot.h
index 92442a5353d..895b2b51e41 100644
--- a/src/devices/bus/ekara/slot.h
+++ b/src/devices/bus/ekara/slot.h
@@ -30,18 +30,18 @@ public:
virtual ~device_ekara_cart_interface();
// reading and writing
- virtual DECLARE_READ8_MEMBER(read_cart) { return 0xff; }
- virtual DECLARE_WRITE8_MEMBER(write_cart) { }
+ virtual uint8_t read_cart(offs_t offset) { return 0xff; }
+ virtual void write_cart(offs_t offset, uint8_t data) { }
- virtual DECLARE_READ8_MEMBER(read_extra) { return 0xff; }
- virtual DECLARE_WRITE8_MEMBER(write_extra) { }
+ 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 DECLARE_WRITE8_MEMBER(write_bus_control) { }
+ virtual void write_bus_control(offs_t offset, uint8_t data) { }
virtual bool is_read_access_not_rom(void) { return false; }
virtual bool is_write_access_not_rom(void) { return false; }
@@ -100,21 +100,21 @@ public:
static int get_cart_type(const uint8_t *ROM, uint32_t len);
// reading and writing
- virtual DECLARE_READ8_MEMBER(read_cart);
- virtual DECLARE_WRITE8_MEMBER(write_cart);
+ uint8_t read_cart(offs_t offset);
+ void write_cart(offs_t offset, uint8_t data);
- virtual DECLARE_READ8_MEMBER(read_extra);
- virtual DECLARE_WRITE8_MEMBER(write_extra);
+ uint8_t read_extra(offs_t offset);
+ 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 );
+ DECLARE_WRITE_LINE_MEMBER(write_sda);
+ DECLARE_WRITE_LINE_MEMBER(write_scl);
+ //DECLARE_WRITE_LINE_MEMBER( write_wc );
+ DECLARE_READ_LINE_MEMBER( read_sda );
- virtual DECLARE_WRITE8_MEMBER(write_bus_control);
+ void write_bus_control(offs_t offset, uint8_t data);
- virtual bool is_read_access_not_rom(void);
- virtual bool is_write_access_not_rom(void);
+ bool is_read_access_not_rom(void);
+ bool is_write_access_not_rom(void);
bool has_cart() { return m_cart ? true : false; }
diff --git a/src/devices/bus/epson_sio/pf10.cpp b/src/devices/bus/epson_sio/pf10.cpp
index 411762657ec..2a55c2129fe 100644
--- a/src/devices/bus/epson_sio/pf10.cpp
+++ b/src/devices/bus/epson_sio/pf10.cpp
@@ -140,24 +140,24 @@ void epson_pf10_device::device_timer(emu_timer &timer, device_timer_id id, int p
// CPU
//**************************************************************************
-READ8_MEMBER( epson_pf10_device::port1_r )
+uint8_t epson_pf10_device::port1_r()
{
logerror("%s: port1_r(%02x)\n", tag(), m_port1);
return m_port1;
}
-WRITE8_MEMBER( epson_pf10_device::port1_w )
+void epson_pf10_device::port1_w(uint8_t data)
{
logerror("%s: port1_w(%02x)\n", tag(), data);
}
-READ8_MEMBER( epson_pf10_device::port2_r )
+uint8_t epson_pf10_device::port2_r()
{
logerror("%s: port2_r(%02x)\n", tag(), m_port2);
return m_port2;
}
-WRITE8_MEMBER( epson_pf10_device::port2_w )
+void epson_pf10_device::port2_w(uint8_t data)
{
if (m_floppy->get_device() != nullptr)
m_floppy->get_device()->mon_w(data & PORT2_MON);
diff --git a/src/devices/bus/epson_sio/pf10.h b/src/devices/bus/epson_sio/pf10.h
index 7f305bed8c9..ced99d41715 100644
--- a/src/devices/bus/epson_sio/pf10.h
+++ b/src/devices/bus/epson_sio/pf10.h
@@ -58,10 +58,10 @@ private:
DECLARE_WRITE8_MEMBER( fdc_tc_w );
// hd6303 i/o
- DECLARE_READ8_MEMBER( port1_r );
- DECLARE_WRITE8_MEMBER( port1_w );
- DECLARE_READ8_MEMBER( port2_r );
- DECLARE_WRITE8_MEMBER( port2_w );
+ uint8_t port1_r();
+ void port1_w(uint8_t data);
+ uint8_t port2_r();
+ void port2_w(uint8_t data);
void cpu_mem(address_map &map);
diff --git a/src/devices/bus/gamate/rom.cpp b/src/devices/bus/gamate/rom.cpp
index 74af9e76160..7301b6bdfc7 100644
--- a/src/devices/bus/gamate/rom.cpp
+++ b/src/devices/bus/gamate/rom.cpp
@@ -77,11 +77,11 @@ void gamate_rom_4in1_device::device_reset()
------------------------------------------